mbox.c (mairix-0.23) | : | mbox.c (mairix-0.24) | ||
---|---|---|---|---|
skipping to change at line 743 | skipping to change at line 743 | |||
for (i=0; i<n_in; i++) { | for (i=0; i<n_in; i++) { | |||
char *path = paths_in[i]; | char *path = paths_in[i]; | |||
handle_one_path(folder_base, path, &list, methods, omit_globs); | handle_one_path(folder_base, path, &list, methods, omit_globs); | |||
} | } | |||
string_list_to_array(&list, n_out, paths_out); | string_list_to_array(&list, n_out, paths_out); | |||
} | } | |||
/*}}}*/ | /*}}}*/ | |||
void build_mbox_lists(struct database *db, const char *folder_base, /*{{{*/ | void build_mbox_lists(struct database *db, const char *folder_base, /*{{{*/ | |||
const char *mboxen_paths, struct globber_array *omit_globs) | const char *mboxen_paths, struct globber_array *omit_globs, | |||
int do_mbox_symlinks) | ||||
{ | { | |||
char **raw_paths, **paths; | char **raw_paths, **paths; | |||
int n_raw_paths, i; | int n_raw_paths, i; | |||
int n_paths; | int n_paths; | |||
struct stat sb; | struct stat sb; | |||
int n_extant; | int n_extant; | |||
struct extant_mbox *extant_mboxen; | struct extant_mbox *extant_mboxen; | |||
n_extant = 0; | n_extant = 0; | |||
skipping to change at line 776 | skipping to change at line 777 | |||
* */ | * */ | |||
/* TODO TODO ::: Build a sorted list of the paths and check that there aren't | /* TODO TODO ::: Build a sorted list of the paths and check that there aren't | |||
any duplicates!! */ | any duplicates!! */ | |||
for (i=0; i<n_paths; i++) { | for (i=0; i<n_paths; i++) { | |||
char *path = paths[i]; | char *path = paths[i]; | |||
if (lstat(path, &sb) < 0) { | if (lstat(path, &sb) < 0) { | |||
/* can't stat */ | /* can't stat */ | |||
} else { | } else { | |||
if (S_ISLNK(sb.st_mode)) { | if (S_ISLNK(sb.st_mode) && !do_mbox_symlinks) { | |||
/* Skip mbox if symlink */ | /* Skip mbox if symlink and no follow_mbox_symlinks in mairixrc */ | |||
if (verbose) { | if (verbose) { | |||
printf("%s is a link - skipping\n", path); | printf("%s is a link - skipping\n", path); | |||
} | } | |||
} else { | } else { | |||
extant_mboxen[n_extant].full_path = new_string(path); | extant_mboxen[n_extant].full_path = new_string(path); | |||
extant_mboxen[n_extant].mtime = sb.st_mtime; | extant_mboxen[n_extant].mtime = sb.st_mtime; | |||
extant_mboxen[n_extant].size = sb.st_size; | extant_mboxen[n_extant].size = sb.st_size; | |||
n_extant++; | n_extant++; | |||
} | } | |||
} | } | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 4 lines changed or added |