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 strcpy() calls into strlcpy() calls, just to be extra safe.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
16c95ab
..
e8043c5
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-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,
@@
-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);
@@
-655,7
+659,7
@@
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 (
lp_munge_symlinks(module_id)
)
+ if (
sanitize_paths
)
sanitize_path(bp, bp, "", lastdir_depth, NULL);
bp += linkname_len;
}
sanitize_path(bp, bp, "", lastdir_depth, NULL);
bp += linkname_len;
}
@@
-741,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
@@
-922,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;
@@
-1071,8
+1076,6
@@
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], 0)) {
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(argv[0]));
if (argv[0] && !push_dir(argv[0], 0)) {
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(argv[0]));
@@
-1126,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",
@@
-1227,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
@@
-1761,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;
@@
-1778,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;
@@
-1790,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:
@@
-1855,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;
}