diff options
author | louie <lshprung@yahoo.com> | 2020-07-11 08:57:14 -0700 |
---|---|---|
committer | louie <lshprung@yahoo.com> | 2020-07-11 08:57:14 -0700 |
commit | 8ec8e9d5dd37eac5266f8cd94ce946f23f436ef9 (patch) | |
tree | 27bbd50e9e2d5deb663488dfdd6018da9addbb74 /read_cfg.c | |
parent | 1008c6e563a29000653016fd25ce24f0c8a78df7 (diff) |
Fixed bug when compmode is on and an entry is forced
Diffstat (limited to 'read_cfg.c')
-rw-r--r-- | read_cfg.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -202,12 +202,12 @@ void handle_fname(char *path, char *group, bool recurs, bool force, char *name){ //don't check that the path arg is valid if(force){ - if(name != NULL) new = create_entry(name, full_path_cpy); + if(name != NULL) new = create_entry(name, full_path_cpy, force); else if(hr){ strcpy(auto_name, autoAlias(full_path_cpy)); - new = create_entry(auto_name, full_path_cpy); + new = create_entry(auto_name, full_path_cpy, force); } - else new = create_entry(full_path_cpy, full_path_cpy); + else new = create_entry(full_path_cpy, full_path_cpy, force); if(new != NULL) group_add(group, new); } @@ -237,13 +237,13 @@ void handle_fname(char *path, char *group, bool recurs, bool force, char *name){ if(fname->d_type == DT_REG && !(wild_cmp(&arg_cpy[i+1], fname->d_name))){ //check if a name was given as argument - if(name != NULL) new = create_entry(name, relative_path_cpy); + if(name != NULL) new = create_entry(name, relative_path_cpy, force); //check if autoAlias is on. If it is, go to the autoAlias function else if(hr){ strcpy(auto_name, autoAlias(relative_path_cpy)); - new = create_entry(auto_name, relative_path_cpy); + new = create_entry(auto_name, relative_path_cpy, force); } - else new = create_entry(relative_path_cpy, relative_path_cpy); + else new = create_entry(relative_path_cpy, relative_path_cpy, force); if(new != NULL) group_add(group, new); } } @@ -262,12 +262,12 @@ void handle_fname(char *path, char *group, bool recurs, bool force, char *name){ //file name is okay //FIXME does not take into account whether the argument is a file (could be a directory, symlink, etc.) else{ - if(name != NULL) new = create_entry(name, full_path_cpy); + if(name != NULL) new = create_entry(name, full_path_cpy, force); else if(hr){ strcpy(auto_name, autoAlias(full_path_cpy)); - new = create_entry(auto_name, full_path_cpy); + new = create_entry(auto_name, full_path_cpy, force); } - else new = create_entry(full_path_cpy, full_path_cpy); + else new = create_entry(full_path_cpy, full_path_cpy, force); if(new != NULL){ group_add(group, new); } |