X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f3c3ed44e6c69570be81d5a968265e5f1c27ffc3..eb9b2e53c8d966f356454f1ba70ea5901674fedf:/flist.c diff --git a/flist.c b/flist.c index 97a83aae..2ded8e6e 100644 --- a/flist.c +++ b/flist.c @@ -411,11 +411,11 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags) /* We must make sure we don't send a zero flag byte or the * other end will terminate the flist transfer. Note that - * the use of XMIT_DEL_START on a non-dir has no meaning, so + * the use of XMIT_TOP_DIR on a non-dir has no meaning, so * it's harmless way to add a bit to the first flag byte. */ if (protocol_version >= 28) { if (!flags && !S_ISDIR(mode)) - flags |= XMIT_DEL_START; + flags |= XMIT_TOP_DIR; if ((flags & 0xFF00) || !flags) { flags |= XMIT_EXTENDED_FLAGS; write_byte(f, flags); @@ -424,7 +424,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags) write_byte(f, flags); } else { if (!(flags & 0xFF) && !S_ISDIR(mode)) - flags |= XMIT_DEL_START; + flags |= XMIT_TOP_DIR; if (!(flags & 0xFF)) flags |= XMIT_LONG_NAME; write_byte(f, flags); @@ -659,17 +659,17 @@ static void receive_file_entry(struct file_list *flist, int ndx, file->dir.depth = 1; if (S_ISDIR(mode)) { - if (basename_len == 1+1 && *basename == '.') /* N.B. null */ + if (basename_len == 1+1 && *basename == '.') /* +1 for '\0' */ file->dir.depth--; - if (flags & XMIT_DEL_START) { + if (flags & XMIT_TOP_DIR) { in_del_hier = 1; del_hier_name_len = file->dir.depth == 0 ? 0 : l1 + l2; - file->flags |= FLAG_DEL_START; - } else if (delete_during && in_del_hier) { + file->flags |= FLAG_TOP_DIR | FLAG_DEL_HERE; + } else if (in_del_hier) { if (!relative_paths || !del_hier_name_len || (l1 >= del_hier_name_len && thisname[del_hier_name_len] == '/')) - file->flags |= FLAG_DEL_START; + file->flags |= FLAG_DEL_HERE; else in_del_hier = 0; } @@ -1216,7 +1216,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) filesystem_dev = st.st_dev; do_subdirs = recurse >= 1 ? recurse-- : recurse; - send_file_name(f, flist, fname, do_subdirs, XMIT_DEL_START); + send_file_name(f, flist, fname, do_subdirs, XMIT_TOP_DIR); if (olddir[0]) { flist_dir = NULL; @@ -1366,20 +1366,9 @@ oom: } -int file_compare(struct file_struct **file1, struct file_struct **file2) +static int file_compare(struct file_struct **file1, struct file_struct **file2) { - struct file_struct *f1 = *file1; - struct file_struct *f2 = *file2; - - if (!f1->basename && !f2->basename) - return 0; - if (!f1->basename) - return -1; - if (!f2->basename) - return 1; - if (f1->dirname == f2->dirname) - return u_strcmp(f1->basename, f2->basename); - return f_name_cmp(f1, f2); + return f_name_cmp(*file1, *file2); } @@ -1392,7 +1381,7 @@ static int flist_find(struct file_list *flist, struct file_struct *f) mid = (low + high) / 2; for (mid_up = mid; !flist->files[mid_up]->basename; mid_up++) {} if (mid_up <= high) - ret = file_compare(&flist->files[mid_up], &f); + ret = f_name_cmp(flist->files[mid_up], f); else ret = 1; if (ret == 0) @@ -1488,10 +1477,9 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) f_name(flist->files[i]), i); } /* Make sure that if we unduplicate '.', that we don't - * lose track of a user-specified starting point (or - * else deletions will mysteriously fail with -R). */ - if (flist->files[i]->flags & FLAG_DEL_START) - flist->files[prev_i]->flags |= FLAG_DEL_START; + * lose track of a user-specified top directory. */ + if (flist->files[i]->flags & FLAG_TOP_DIR) + flist->files[prev_i]->flags |= FLAG_TOP_DIR; clear_file(i, flist); } else @@ -1537,9 +1525,11 @@ static void output_flist(struct file_list *flist, const char *whose_list) *gidbuf = '\0'; if (!am_sender) sprintf(depthbuf, "%d", file->dir.depth); - rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f%s%s (%x)\n", + rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n", whose_list, i, am_sender ? NS(file->dir.root) : depthbuf, - NS(file->dirname), NS(file->basename), (int)file->mode, + file->dirname ? file->dirname : "", + file->dirname ? "/" : "", NS(file->basename), + S_ISDIR(file->mode) ? "/" : "", (int)file->mode, (double)file->length, uidbuf, gidbuf, file->flags); } } @@ -1565,7 +1555,11 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) if (!f2 || !f2->basename) return 1; - if (!(c1 = (uchar*)f1->dirname)) { + c1 = (uchar*)f1->dirname; + c2 = (uchar*)f2->dirname; + if (c1 == c2) + c1 = c2 = NULL; + if (!c1) { state1 = fnc_BASE; c1 = (uchar*)f1->basename; } else if (!*c1) { @@ -1573,7 +1567,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) c1 = (uchar*)"/"; } else state1 = fnc_DIR; - if (!(c2 = (uchar*)f2->dirname)) { + if (!c2) { state2 = fnc_BASE; c2 = (uchar*)f2->basename; } else if (!*c2) { @@ -1660,22 +1654,29 @@ static int is_backup_file(char *fn) } -/* This function is used to implement --delete-during. */ -void delete_in_dir(struct file_list *flist, char *fname) +/* This function is used to implement per-directory deletion, and + * is used by all the --delete-WHEN options. Note that the fbuf + * pointer must point to a MAXPATHLEN buffer with the name of the + * directory in it (the functions we call will append names onto + * the end, but the old dir value will be restored on exit). */ +void delete_in_dir(struct file_list *flist, char *fbuf, + struct file_struct *file) { - static void *filt_array[MAXPATHLEN/2]; - static int fa_lvl = 0; - static char fbuf[MAXPATHLEN]; + static int min_depth = MAXPATHLEN, cur_depth = -1; + static void *filt_array[MAXPATHLEN/2+1]; struct file_list *dir_list; STRUCT_STAT st; - int dlen, j; + int dlen; if (!flist) { - while (fa_lvl) - pop_local_filters(filt_array[--fa_lvl]); - *fbuf = '\0'; + while (cur_depth >= min_depth) + pop_local_filters(filt_array[cur_depth--]); + min_depth = MAXPATHLEN; + cur_depth = -1; return; } + if (file->dir.depth >= MAXPATHLEN/2+1) + return; /* Impossible... */ if (max_delete && deletion_count >= max_delete) return; @@ -1687,46 +1688,31 @@ void delete_in_dir(struct file_list *flist, char *fname) return; } - for (j = 0; fbuf[j]; j++) { - if (fbuf[j] != fname[j]) { - while (fa_lvl) { - if (fbuf[j] == '/') - pop_local_filters(filt_array[--fa_lvl]); - if (!fbuf[++j]) - break; - } - break; - } - } - - dlen = strlcpy(fbuf, fname, MAXPATHLEN); - if (dlen >= MAXPATHLEN - 1) - return; - if (fa_lvl >= MAXPATHLEN/2) - return; /* impossible... */ + while (cur_depth >= file->dir.depth && cur_depth >= min_depth) + pop_local_filters(filt_array[cur_depth--]); + cur_depth = file->dir.depth; + if (min_depth > cur_depth) + min_depth = cur_depth; + dlen = strlen(fbuf); + filt_array[cur_depth] = push_local_filters(fbuf, dlen); - if (link_stat(fname, &st, keep_dirlinks) < 0) + if (link_stat(fbuf, &st, keep_dirlinks) < 0) return; - if (one_file_system) + if (one_file_system && file->flags & FLAG_TOP_DIR) filesystem_dev = st.st_dev; dir_list = flist_new(WITHOUT_HLINK, "delete_in_dir"); recurse = 0; - filt_array[fa_lvl++] = push_local_filters(fbuf, dlen); send_directory(-1, dir_list, fbuf, dlen); recurse = -1; - - if (dlen == 1 && *fbuf == '.') - *fbuf = '\0'; - - clean_flist(dir_list, 0, 0); + fbuf[dlen] = '\0'; if (verbose > 3) output_flist(dir_list, "delete"); - delete_missing(flist, dir_list, fname); + delete_missing(flist, dir_list, fbuf); flist_free(dir_list); } @@ -1742,8 +1728,8 @@ void delete_missing(struct file_list *full_list, struct file_list *dir_list, if (max_delete && deletion_count >= max_delete) return; - if (verbose > 1) - rprintf(FINFO, "deleting in %s\n", safe_fname(dirname)); + if (verbose > 2) + rprintf(FINFO, "delete_missing(%s)\n", safe_fname(dirname)); for (i = dir_list->count; i--; ) { if (!dir_list->files[i]->basename) @@ -1760,13 +1746,10 @@ void delete_missing(struct file_list *full_list, struct file_list *dir_list, rprintf(FINFO, "deleting %s\n", safe_fname(f)); } - } else if (S_ISDIR(mode)) { - int dflag = delete_during ? DEL_FORCE_RECURSE - : DEL_NO_RECURSE; - delete_file(f, DEL_DIR | dflag); - } else { + } else if (S_ISDIR(mode)) + delete_file(f, DEL_DIR | DEL_FORCE_RECURSE); + else delete_file(f, 0); - } deletion_count++; if (max_delete && deletion_count >= max_delete) break;