X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7a16e12207b65010dc2f0c05dc87a9690c9ed87b..9059e0ac2fe66857af46c5716749ea8789e99e1a:/flist.c diff --git a/flist.c b/flist.c index 29d75cab..1a259bcd 100644 --- a/flist.c +++ b/flist.c @@ -480,19 +480,16 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags) } #endif - if (always_checksum) { + if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) { char *sum; + int slen = protocol_version < 21 ? 2 : MD4_SUM_LENGTH; if (S_ISREG(mode)) sum = file->u.sum; - else if (protocol_version < 28) { + else { /* Prior to 28, we sent a useless set of nulls. */ sum = empty_sum; - } else - sum = NULL; - if (sum) { - write_buf(f, sum, - protocol_version < 21 ? 2 : MD4_SUM_LENGTH); } + write_buf(f, sum, slen); } strlcpy(lastname, fname, MAXPATHLEN); @@ -546,7 +543,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist, rprintf(FERROR, "overflow: flags=0x%x l1=%d l2=%d lastname=%s\n", flags, l1, l2, safe_fname(lastname)); - overflow("receive_file_entry"); + overflow_exit("receive_file_entry"); } strlcpy(thisname, lastname, l1 + 1); @@ -611,7 +608,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist, if (linkname_len <= 0 || linkname_len > MAXPATHLEN) { rprintf(FERROR, "overflow: linkname_len=%d\n", linkname_len - 1); - overflow("receive_file_entry"); + overflow_exit("receive_file_entry"); } } else @@ -708,20 +705,17 @@ static struct file_struct *receive_file_entry(struct file_list *flist, } #endif - if (always_checksum) { + if (always_checksum && (sum_len || protocol_version < 28)) { char *sum; + int slen = protocol_version < 21 ? 2 : MD4_SUM_LENGTH; if (sum_len) { file->u.sum = sum = bp; /*bp += sum_len;*/ - } else if (protocol_version < 28) { + } else { /* Prior to 28, we get a useless set of nulls. */ sum = empty_sum; - } else - sum = NULL; - if (sum) { - read_buf(f, sum, - protocol_version < 21 ? 2 : MD4_SUM_LENGTH); } + read_buf(f, sum, slen); } if (!preserve_perms) { @@ -1120,11 +1114,21 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (l == 2 && fname[0] == '.') { /* Turn "./" into just "." rather than "./." */ fname[1] = '\0'; - } else if (l < MAXPATHLEN) { + } else { + if (l + 1 >= MAXPATHLEN) + overflow_exit("send_file_list"); fname[l++] = '.'; fname[l] = '\0'; } is_dot_dir = 1; + } else if (l > 1 && fname[l-1] == '.' && fname[l-2] == '.' + && (l == 2 || fname[l-3] == '/')) { + if (l + 2 >= MAXPATHLEN) + overflow_exit("send_file_list"); + fname[l++] = '/'; + fname[l++] = '.'; + fname[l] = '\0'; + is_dot_dir = 1; } else { is_dot_dir = fname[l-1] == '.' && (l == 1 || fname[l-2] == '/'); @@ -1149,42 +1153,20 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (!relative_paths) { p = strrchr(fname, '/'); if (p) { - *p = 0; + *p = '\0'; if (p == fname) dir = "/"; else dir = fname; fname = p + 1; } - } else if (implied_dirs && (p=strrchr(fname,'/')) && p != fname) { - /* this ensures we send the intermediate directories, - thus getting their permissions right */ - char *lp = lastpath, *fn = fname, *slash = fname; - *p = 0; - /* Skip any initial directories in our path that we - * have in common with lastpath. */ - while (*fn && *lp == *fn) { - if (*fn == '/') - slash = fn; - lp++, fn++; - } - *p = '/'; - if (fn != p || (*lp && *lp != '/')) { - int save_copy_links = copy_links; - int save_xfer_dirs = xfer_dirs; - copy_links = copy_unsafe_links; - xfer_dirs = 1; - while ((slash = strchr(slash+1, '/')) != 0) { - *slash = 0; - send_file_name(f, flist, fname, 0); - *slash = '/'; - } - copy_links = save_copy_links; - xfer_dirs = save_xfer_dirs; - *p = 0; - strlcpy(lastpath, fname, sizeof lastpath); - *p = '/'; - } + } else if ((p = strstr(fname, "/./")) != NULL) { + *p = '\0'; + if (p == fname) + dir = "/"; + else + dir = fname; + fname = p + 3; } if (!*fname) @@ -1212,6 +1194,37 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } } + if (implied_dirs && (p=strrchr(fname,'/')) && p != fname) { + /* Send the implied directories at the start of the + * source spec, so we get their permissions right. */ + char *lp = lastpath, *fn = fname, *slash = fname; + *p = '\0'; + /* Skip any initial directories in our path that we + * have in common with lastpath. */ + while (*fn && *lp == *fn) { + if (*fn == '/') + slash = fn; + lp++, fn++; + } + *p = '/'; + if (fn != p || (*lp && *lp != '/')) { + int save_copy_links = copy_links; + int save_xfer_dirs = xfer_dirs; + copy_links = copy_unsafe_links; + xfer_dirs = 1; + while ((slash = strchr(slash+1, '/')) != 0) { + *slash = '\0'; + send_file_name(f, flist, fname, 0); + *slash = '/'; + } + copy_links = save_copy_links; + xfer_dirs = save_xfer_dirs; + *p = '\0'; + strlcpy(lastpath, fname, sizeof lastpath); + *p = '/'; + } + } + if (one_file_system) filesystem_dev = st.st_dev; @@ -1225,7 +1238,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) flist_dir_len = 0; if (!pop_dir(olddir)) { rsyserr(FERROR, errno, "pop_dir %s failed", - full_fname(dir)); + full_fname(olddir)); exit_cleanup(RERR_FILESELECT); } } @@ -1461,8 +1474,12 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) { int i, prev_i = 0; - if (!flist || flist->count == 0) + if (!flist) + return; + if (flist->count == 0) { + flist->high = -1; return; + } sorting_flist = flist; qsort(flist->files, flist->count, @@ -1514,8 +1531,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) } /* Make sure that if we unduplicate '.', that we don't * lose track of a user-specified top directory. */ - if (flist->files[drop]->flags & FLAG_TOP_DIR) - flist->files[keep]->flags |= FLAG_TOP_DIR; + flist->files[keep]->flags |= flist->files[drop]->flags + & (FLAG_TOP_DIR|FLAG_DEL_HERE); clear_file(drop, flist); @@ -1670,8 +1687,13 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) break; case s_SLASH: type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM; - state1 = s_BASE; c1 = (uchar*)f1->basename; + if (type1 == t_PATH && *c1 == '.' && !c1[1]) { + type1 = t_ITEM; + state1 = s_TRAILING; + c1 = (uchar*)""; + } else + state1 = s_BASE; break; case s_BASE: state1 = s_TRAILING; @@ -1695,8 +1717,13 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) break; case s_SLASH: type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM; - state2 = s_BASE; c2 = (uchar*)f2->basename; + if (type2 == t_PATH && *c2 == '.' && !c2[1]) { + type2 = t_ITEM; + state2 = s_TRAILING; + c2 = (uchar*)""; + } else + state2 = s_BASE; break; case s_BASE: state2 = s_TRAILING;