Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-04 04:17:25 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

r2r: Don't trim diff lines (#17059)

Browse Source
This commit is contained in:
Khairul Azhar Kasmiran 2020-06-14 13:06:58 +08:00 committed by GitHub
parent 77cc18ba04
commit ddeb513374
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binr/r2r/load.c
View File

@ -231,7 +231,7 @@ R_API void r2r_asm_test_free(R2RAsmTest *test) {
}
static bool parse_asm_path(const char *path, RStrConstPool *strpool, const char **arch_out, const char **cpuout, int *bitsout) {
RList *file_tokens = r_str_split_duplist (path, R_SYS_DIR);
RList *file_tokens = r_str_split_duplist (path, R_SYS_DIR, true);
if (!file_tokens || r_list_empty (file_tokens)) {
r_list_free (file_tokens);
return false;

2
binr/r2r/r2r.c
View File

@ -526,7 +526,7 @@ static void print_diff(const char *actual, const char *expected) {
char *uni = r_diff_buffers_to_string (d, (const ut8 *)expected, (int)strlen (expected), (const ut8 *)actual, (int)strlen (actual));
r_diff_free (d);
RList *lines = r_str_split_duplist (uni, "\n");
RList *lines = r_str_split_duplist (uni, "\n", false);
RListIter *it;
char *line;
bool header_found = false;

4
binr/r2r/run.c
View File

@ -919,8 +919,8 @@ static R2RProcessOutput *run_r2_test(R2RRunConfig *config, const char *cmds, RLi
}
R_API R2RProcessOutput *r2r_run_cmd_test(R2RRunConfig *config, R2RCmdTest *test, R2RCmdRunner runner, void *user) {
RList *extra_args = test->args.value ? r_str_split_duplist (test->args.value, " ") : NULL;
RList *files = r_str_split_duplist (test->file.value, "\n");
RList *extra_args = test->args.value ? r_str_split_duplist (test->args.value, " ", true) : NULL;
RList *files = r_str_split_duplist (test->file.value, "\n", true);
RListIter *it;
RListIter *tmpit;
char *token;

4
libr/core/cbin.c
View File

@ -2352,7 +2352,7 @@ next:
static char *build_hash_string(int mode, const char *chksum, ut8 *data, ut32 datalen) {
char *chkstr = NULL, *aux, *ret = NULL;
RList *hashlist = r_str_split_duplist (chksum, ",");
RList *hashlist = r_str_split_duplist (chksum, ",", true);
RListIter *iter;
char *hashname;
r_list_foreach (hashlist, iter, hashname) {
@ -2382,7 +2382,7 @@ static char *filter_hash_string(const char *chksum) {
char *aux, *ret = NULL;
bool isFirst = true;
RList *hashlist = r_str_split_duplist (chksum, ",");
RList *hashlist = r_str_split_duplist (chksum, ",", true);
RListIter *iter;
char *hashname;
r_list_foreach (hashlist, iter, hashname) {

2
libr/core/cconfig.c
View File

@ -2554,7 +2554,7 @@ static bool cb_dirpfx(RCore *core, RConfigNode *node) {
static bool cb_anal_roregs(RCore *core, RConfigNode *node) {
if (core && core->anal && core->anal->reg) {
r_list_free (core->anal->reg->roregs);
core->anal->reg->roregs = r_str_split_duplist (node->value, ",");
core->anal->reg->roregs = r_str_split_duplist (node->value, ",", true);
}
return true;
}

2
libr/include/r_util/r_str.h
View File

@ -53,7 +53,7 @@ R_API const char *r_str_firstbut(const char *s, char ch, const char *but);
R_API const char *r_str_lastbut(const char *s, char ch, const char *but);
R_API int r_str_split(char *str, char ch);
R_API RList *r_str_split_list(char *str, const char *c, int n);
R_API RList *r_str_split_duplist(const char *str, const char *c);
R_API RList *r_str_split_duplist(const char *str, const char *c, bool trim);
R_API int *r_str_split_lines(char *str, int *count);
R_API char* r_str_replace(char *str, const char *key, const char *val, int g);
R_API char *r_str_replace_icase(char *str, const char *key, const char *val, int g, int keep_case);

6
libr/util/str.c
View File

@ -3086,7 +3086,7 @@ R_API RList *r_str_split_list(char *str, const char *c, int n) {
return lst;
}
R_API RList *r_str_split_duplist(const char *_str, const char *c) {
R_API RList *r_str_split_duplist(const char *_str, const char *c, bool trim) {
r_return_val_if_fail (_str && c, NULL);
RList *lst = r_list_newf (free);
char *str = strdup (_str);
@ -3098,7 +3098,9 @@ R_API RList *r_str_split_duplist(const char *_str, const char *c) {
*next = '\0';
next += clen;
}
r_str_trim (aux);
if (trim) {
r_str_trim (aux);
}
r_list_append (lst, strdup (aux));
aux = next;
}