Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed sprintf() calls to snprintf() calls.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
501a02e
..
e8043c5
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-90,15
+90,15
@@
static int show_filelist_p(void)
static void start_filelist_progress(char *kind)
{
static void start_filelist_progress(char *kind)
{
- rprintf(F
INFO
, "%s ... ", kind);
+ rprintf(F
CLIENT
, "%s ... ", kind);
if (verbose > 1 || do_progress)
if (verbose > 1 || do_progress)
- rprintf(F
INFO
, "\n");
+ rprintf(F
CLIENT
, "\n");
rflush(FINFO);
}
static void emit_filelist_progress(int count)
{
rflush(FINFO);
}
static void emit_filelist_progress(int count)
{
- rprintf(F
INFO
, " %d files...\r", count);
+ rprintf(F
CLIENT
, " %d files...\r", count);
}
static void maybe_emit_filelist_progress(int count)
}
static void maybe_emit_filelist_progress(int count)
@@
-172,7
+172,7
@@
static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf)
rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n",
path, linkbuf);
}
rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n",
path, linkbuf);
}
- return
safe
_stat(path, stp);
+ return
do
_stat(path, stp);
}
}
return 0;
}
}
return 0;
@@
-185,12
+185,12
@@
int link_stat(const char *path, STRUCT_STAT *stp, int follow_dirlinks)
{
#ifdef SUPPORT_LINKS
if (copy_links)
{
#ifdef SUPPORT_LINKS
if (copy_links)
- return
safe
_stat(path, stp);
+ return
do
_stat(path, stp);
if (do_lstat(path, stp) < 0)
return -1;
if (follow_dirlinks && S_ISLNK(stp->st_mode)) {
STRUCT_STAT st;
if (do_lstat(path, stp) < 0)
return -1;
if (follow_dirlinks && S_ISLNK(stp->st_mode)) {
STRUCT_STAT st;
- if (
safe
_stat(path, &st) == 0 && S_ISDIR(st.st_mode))
+ if (
do
_stat(path, &st) == 0 && S_ISDIR(st.st_mode))
*stp = st;
}
return 0;
*stp = st;
}
return 0;
@@
-233,17
+233,21
@@
static int is_excluded(char *fname, int is_dir, int filter_level)
static int to_wire_mode(mode_t mode)
{
#ifdef SUPPORT_LINKS
static int to_wire_mode(mode_t mode)
{
#ifdef SUPPORT_LINKS
- if (S_ISLNK(mode) && (_S_IFLNK != 0120000))
+#if _S_IFLNK != 0120000
+ if (S_ISLNK(mode))
return (mode & ~(_S_IFMT)) | 0120000;
#endif
return (mode & ~(_S_IFMT)) | 0120000;
#endif
- return (int)mode;
+#endif
+ return mode;
}
static mode_t from_wire_mode(int mode)
{
}
static mode_t from_wire_mode(int mode)
{
- if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000))
+#if _S_IFLNK != 0120000
+ if ((mode & (_S_IFMT)) == 0120000)
return (mode & ~(_S_IFMT)) | _S_IFLNK;
return (mode & ~(_S_IFMT)) | _S_IFLNK;
- return (mode_t)mode;
+#endif
+ return mode;
}
static void send_directory(int f, struct file_list *flist,
}
static void send_directory(int f, struct file_list *flist,
@@
-282,7
+286,7
@@
void flist_expand(struct file_list *flist)
flist->malloced);
if (verbose >= 2 && flist->malloced != FLIST_START) {
flist->malloced);
if (verbose >= 2 && flist->malloced != FLIST_START) {
- rprintf(F
INFO
, "[%s] expand file_list to %.0f bytes, did%s move\n",
+ rprintf(F
CLIENT
, "[%s] expand file_list to %.0f bytes, did%s move\n",
who_am_i(),
(double)sizeof flist->files[0] * flist->malloced,
(new_ptr == flist->files) ? " not" : "");
who_am_i(),
(double)sizeof flist->files[0] * flist->malloced,
(new_ptr == flist->files) ? " not" : "");
@@
-314,7
+318,7
@@
static void send_file_entry(struct file_struct *file, int f)
if (!file) {
write_byte(f, 0);
modtime = 0, mode = 0;
if (!file) {
write_byte(f, 0);
modtime = 0, mode = 0;
- dev = 0, rdev =
makedev
(0, 0);
+ dev = 0, rdev =
MAKEDEV
(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
*lastname = '\0';
rdev_major = 0;
uid = 0, gid = 0;
*lastname = '\0';
@@
-346,7
+350,7
@@
static void send_file_entry(struct file_struct *file, int f)
flags |= XMIT_RDEV_MINOR_IS_SMALL;
}
} else if (protocol_version < 28)
flags |= XMIT_RDEV_MINOR_IS_SMALL;
}
} else if (protocol_version < 28)
- rdev =
makedev
(0, 0);
+ rdev =
MAKEDEV
(0, 0);
if (file->uid == uid)
flags |= XMIT_SAME_UID;
else
if (file->uid == uid)
flags |= XMIT_SAME_UID;
else
@@
-446,7
+450,7
@@
static void send_file_entry(struct file_struct *file, int f)
#endif
#ifdef SUPPORT_HARD_LINKS
#endif
#ifdef SUPPORT_HARD_LINKS
- if (f
lags & XMIT_HAS_IDEV_DATA
) {
+ if (f
ile->link_u.idev
) {
if (protocol_version < 26) {
/* 32-bit dev_t and ino_t */
write_int(f, dev);
if (protocol_version < 26) {
/* 32-bit dev_t and ino_t */
write_int(f, dev);
@@
-497,7
+501,7
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
if (!flist) {
modtime = 0, mode = 0;
if (!flist) {
modtime = 0, mode = 0;
- dev = 0, rdev =
makedev
(0, 0);
+ dev = 0, rdev =
MAKEDEV
(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
*lastname = '\0';
rdev_major = 0;
uid = 0, gid = 0;
*lastname = '\0';
@@
-574,10
+578,10
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
rdev_minor = read_byte(f);
else
rdev_minor = read_int(f);
rdev_minor = read_byte(f);
else
rdev_minor = read_int(f);
- rdev =
makedev
(rdev_major, rdev_minor);
+ rdev =
MAKEDEV
(rdev_major, rdev_minor);
}
} else if (protocol_version < 28)
}
} else if (protocol_version < 28)
- rdev =
makedev
(0, 0);
+ rdev =
MAKEDEV
(0, 0);
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
@@
-655,6
+659,8
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
if (linkname_len) {
file->u.link = bp;
read_sbuf(f, bp, linkname_len - 1);
if (linkname_len) {
file->u.link = bp;
read_sbuf(f, bp, linkname_len - 1);
+ if (sanitize_paths)
+ sanitize_path(bp, bp, "", lastdir_depth, NULL);
bp += linkname_len;
}
#endif
bp += linkname_len;
}
#endif
@@
-739,9
+745,10
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
memset(sum, 0, SUM_LENGTH);
memset(sum, 0, SUM_LENGTH);
- if (stp && S_ISDIR(stp->st_mode))
+ if (stp && S_ISDIR(stp->st_mode))
{
st = *stp; /* Needed for "symlink/." with --relative. */
st = *stp; /* Needed for "symlink/." with --relative. */
- else if (readlink_stat(thisname, &st, linkname) != 0) {
+ *linkname = '\0'; /* make IBM code checker happy */
+ } else if (readlink_stat(thisname, &st, linkname) != 0) {
int save_errno = errno;
/* See if file is excluded before reporting an error. */
if (filter_level != NO_FILTERS
int save_errno = errno;
/* See if file is excluded before reporting an error. */
if (filter_level != NO_FILTERS
@@
-920,7
+927,7
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
int save_mode = file->mode;
file->mode = S_IFDIR; /* Find a directory with our name. */
if (flist_find(the_file_list, file) >= 0
int save_mode = file->mode;
file->mode = S_IFDIR; /* Find a directory with our name. */
if (flist_find(the_file_list, file) >= 0
- &&
safe
_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
+ &&
do
_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
file->modtime = st2.st_mtime;
file->length = st2.st_size;
file->mode = st2.st_mode;
file->modtime = st2.st_mtime;
file->length = st2.st_size;
file->mode = st2.st_mode;
@@
-1058,6
+1065,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
int64 start_write;
int use_ff_fd = 0;
int64 start_write;
int use_ff_fd = 0;
+ rprintf(FLOG, "building file list\n");
if (show_filelist_p())
start_filelist_progress("building file list");
if (show_filelist_p())
start_filelist_progress("building file list");
@@
-1068,9
+1076,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
io_start_buffering_out();
if (filesfrom_fd >= 0) {
io_start_buffering_out();
if (filesfrom_fd >= 0) {
- if (sanitize_paths)
- die_on_unsafe_path(argv[0], 0);
- if (argv[0] && !push_dir(argv[0])) {
+ if (argv[0] && !push_dir(argv[0], 0)) {
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(argv[0]));
exit_cleanup(RERR_FILESELECT);
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(argv[0]));
exit_cleanup(RERR_FILESELECT);
@@
-1123,8
+1129,6
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
&& (len == 1 || fbuf[len-2] == '/');
}
&& (len == 1 || fbuf[len-2] == '/');
}
- if (sanitize_paths)
- die_on_unsafe_path(fbuf, 1);
if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "link_stat %s failed",
if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "link_stat %s failed",
@@
-1182,6
+1186,8
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
} else
break;
}
} else
break;
}
+ if (len == 1 && fn[0] == '/')
+ fn[len++] = '.';
fn[len] = '\0';
/* Reject a ".." dir in the active part of the path. */
for (p = fn; (p = strstr(p, "..")) != NULL; p += 2) {
fn[len] = '\0';
/* Reject a ".." dir in the active part of the path. */
for (p = fn; (p = strstr(p, "..")) != NULL; p += 2) {
@@
-1206,7
+1212,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
strlcpy(olddir, curr_dir, sizeof olddir);
strlcpy(olddir, curr_dir, sizeof olddir);
- if (!push_dir(dir)) {
+ if (!push_dir(dir
, 0
)) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(dir));
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(dir));
@@
-1222,8
+1228,11
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
}
}
}
}
- if (fn != fbuf)
+ if (fn != fbuf) {
+ if (len >= MAXPATHLEN)
+ overflow_exit("send_file_list");
memmove(fbuf, fn, len + 1);
memmove(fbuf, fn, len + 1);
+ }
if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) {
/* Send the implied directories at the start of the
if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) {
/* Send the implied directories at the start of the
@@
-1328,6
+1337,7
@@
struct file_list *recv_file_list(int f)
unsigned short flags;
int64 start_read;
unsigned short flags;
int64 start_read;
+ rprintf(FLOG, "receiving file list\n");
if (show_filelist_p())
start_filelist_progress("receiving file list");
if (show_filelist_p())
start_filelist_progress("receiving file list");
@@
-1755,10
+1765,6
@@
int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
c1 = (uchar*)"";
} else
state1 = s_BASE;
c1 = (uchar*)"";
} else
state1 = s_BASE;
- } else if (!*c1) {
- type1 = t_path;
- state1 = s_SLASH;
- c1 = (uchar*)"/";
} else {
type1 = t_path;
state1 = s_DIR;
} else {
type1 = t_path;
state1 = s_DIR;
@@
-1772,10
+1778,6
@@
int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
c2 = (uchar*)"";
} else
state2 = s_BASE;
c2 = (uchar*)"";
} else
state2 = s_BASE;
- } else if (!*c2) {
- type2 = t_path;
- state2 = s_SLASH;
- c2 = (uchar*)"/";
} else {
type2 = t_path;
state2 = s_DIR;
} else {
type2 = t_path;
state2 = s_DIR;
@@
-1784,9
+1786,7
@@
int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
- while (1) {
- if ((dif = (int)*c1++ - (int)*c2++) != 0)
- break;
+ do {
if (!*c1) {
switch (state1) {
case s_DIR:
if (!*c1) {
switch (state1) {
case s_DIR:
@@
-1849,7
+1849,7
@@
int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
}
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
}
- }
+ }
while ((dif = (int)*c1++ - (int)*c2++) == 0);
return dif;
}
return dif;
}