mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-03-10 10:27:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a directory push problem with the user specified an arg

Browse Source 
with a subdir followed by an arg with no subdirs.
This commit is contained in:
Wayne Davison
2007-04-24 17:53:54 +00:00
parent b3fbe3ce35
commit 3bb88b4388
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
flist.c
View File

@@ -1417,7 +1417,9 @@ void send_extra_file_list(int f, int at_least)
struct file_list *send_file_list(int f, int argc, char *argv[])
{
int len;
static const char *lastdir;
static int lastdir_len = -1;
int len, dirlen;
STRUCT_STAT st;
char *p, *dir;
char lastpath[MAXPATHLEN] = "";
@@ -1569,23 +1571,18 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
fn = ".";
}
if (dir && *dir) {
static const char *lastdir;
static int lastdir_len = -1;
int len = strlen(dir);
if (len != lastdir_len || memcmp(lastdir, dir, len) != 0) {
if (!push_flist_dir(strdup(dir), len))
goto push_error;
lastdir = flist_dir;
lastdir_len = flist_dir_len;
} else if (!push_flist_dir(lastdir, lastdir_len)) {
push_error:
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "push_dir %s failed in %s",
full_fname(dir), curr_dir);
continue;
}
dirlen = dir ? strlen(dir) : 0;
if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) {
if (!push_flist_dir(dir ? strdup(dir) : NULL, dirlen))
goto push_error;
lastdir = flist_dir;
lastdir_len = flist_dir_len;
} else if (!push_flist_dir(lastdir, lastdir_len)) {
push_error:
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "push_dir %s failed in %s",
full_fname(dir), curr_dir);
continue;
}
if (fn != fbuf)