A helper file for cleanup.c.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 16c95ab..08a75b2 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);
                        }
-                       return safe_stat(path, stp);
+                       return do_stat(path, stp);
                }
        }
        return 0;
@@ -185,12 +185,12 @@ int link_stat(const char *path, STRUCT_STAT *stp, int follow_dirlinks)
 {
 #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 (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;
@@ -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
-       if (S_ISLNK(mode) && (_S_IFLNK != 0120000))
+#if _S_IFLNK != 0120000
+       if (S_ISLNK(mode))
                return (mode & ~(_S_IFMT)) | 0120000;
 #endif
-       return (int)mode;
+#endif
+       return 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_t)mode;
+#endif
+       return mode;
 }
 
 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
-       if (flags & XMIT_HAS_IDEV_DATA) {
+       if (file->link_u.idev) {
                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 (lp_munge_symlinks(module_id))
+               if (sanitize_paths)
                        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);
 
-       if (stp && S_ISDIR(stp->st_mode))
+       if (stp && S_ISDIR(stp->st_mode)) {
                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
@@ -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
-                   && 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;
@@ -1071,8 +1076,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
        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]));
@@ -1126,8 +1129,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                                   && (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",
@@ -1696,15 +1697,15 @@ static void output_flist(struct file_list *flist)
        for (i = 0; i < flist->count; i++) {
                file = flist->files[i];
                if ((am_root || am_sender) && preserve_uid)
-                       sprintf(uidbuf, " uid=%ld", (long)file->uid);
+                       snprintf(uidbuf, sizeof uidbuf, " uid=%ld", (long)file->uid);
                else
                        *uidbuf = '\0';
                if (preserve_gid && file->gid != GID_NONE)
-                       sprintf(gidbuf, " gid=%ld", (long)file->gid);
+                       snprintf(gidbuf, sizeof gidbuf, " gid=%ld", (long)file->gid);
                else
                        *gidbuf = '\0';
                if (!am_sender)
-                       sprintf(depthbuf, "%d", file->dir.depth);
+                       snprintf(depthbuf, sizeof depthbuf, "%d", file->dir.depth);
                rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
                        who, i, am_sender ? NS(file->dir.root) : depthbuf,
                        file->dirname ? file->dirname : "",
@@ -1761,10 +1762,6 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
                        c1 = (uchar*)"";
                } else
                        state1 = s_BASE;
-       } else if (!*c1) {
-               type1 = t_path;
-               state1 = s_SLASH;
-               c1 = (uchar*)"/";
        } else {
                type1 = t_path;
                state1 = s_DIR;
@@ -1778,10 +1775,6 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
                        c2 = (uchar*)"";
                } else
                        state2 = s_BASE;
-       } else if (!*c2) {
-               type2 = t_path;
-               state2 = s_SLASH;
-               c2 = (uchar*)"/";
        } else {
                type2 = t_path;
                state2 = s_DIR;
@@ -1790,9 +1783,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
        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:
@@ -1855,7 +1846,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
                        if (type1 != type2)
                                return type1 == t_PATH ? 1 : -1;
                }
-       }
+       } while ((dif = (int)*c1++ - (int)*c2++) == 0);
 
        return dif;
 }
@@ -1882,9 +1873,9 @@ char *f_name(struct file_struct *f, char *fbuf)
                int len = strlen(f->dirname);
                memcpy(fbuf, f->dirname, len);
                fbuf[len] = '/';
-               strcpy(fbuf + len + 1, f->basename);
+               strlcpy(fbuf + len + 1, f->basename, MAXPATHLEN - (len + 1));
        } else
-               strcpy(fbuf, f->basename);
+               strlcpy(fbuf, f->basename, MAXPATHLEN);
 
        return fbuf;
 }