Make idev, hlink and file_struct + strings use allocation

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 246caea..ca6bf23 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -76,7 +76,7 @@ void delete_files(struct file_list *flist)
 {
        struct file_list *local_file_list;
        int i, j;
-       char *name, fbuf[MAXPATHLEN];
+       char *argv[1], fbuf[MAXPATHLEN];
        extern int module_id;
        extern int ignore_errors;
        extern int max_delete;
@@ -91,16 +91,17 @@ void delete_files(struct file_list *flist)
        }
 
        for (j = 0;j < flist->count; j++) {
-               if (!S_ISDIR(flist->files[j]->mode) ||
-                   !(flist->files[j]->flags & FLAG_DELETE)) continue;
+               if (!(flist->files[j]->flags & FLAG_TOP_DIR)
+                   || !S_ISDIR(flist->files[j]->mode))
+                       continue;
 
-               name = f_name_to(flist->files[j], fbuf, sizeof fbuf);
+               argv[0] = f_name_to(flist->files[j], fbuf);
 
-               if (!(local_file_list = send_file_list(-1,1,&name)))
+               if (!(local_file_list = send_file_list(-1, 1, argv)))
                        continue;
 
                if (verbose > 1)
-                       rprintf(FINFO,"deleting in %s\n", name);
+                       rprintf(FINFO,"deleting in %s\n", fbuf);
 
                for (i = local_file_list->count-1; i >= 0; i--) {
                        if (max_delete && deletion_count > max_delete) break;
@@ -151,6 +152,7 @@ static int get_tmpname(char *fnametmp, char *fname)
        int     maxname;
 
        if (tmpdir) {
+               /* Note: this can't overflow, so the return value is safe */
                length = strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
                fnametmp[length++] = '/';
                fnametmp[length] = '\0';        /* always NULL terminated */
@@ -303,6 +305,12 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
                rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
        }
 
+       if (flist->hlink_pool)
+       {
+               pool_destroy(flist->hlink_pool);
+               flist->hlink_pool = NULL;
+       }
+
        while (1) {
                cleanup_disable();
 
@@ -335,7 +343,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
                if (local_name)
                        fname = local_name;
                else
-                       fname = f_name_to(file, fbuf, sizeof fbuf);
+                       fname = f_name_to(file, fbuf);
 
                if (dry_run) {
                        if (!am_server && verbose) {    /* log transfer */
@@ -356,8 +364,8 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 
                if ((fd1 == -1) && (compare_dest != NULL)) {
                        /* try the file at compare_dest instead */
-                       snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
-                                               compare_dest,fname);
+                       pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+                                compare_dest, fname);
                        fnamecmp = fnamecmpbuf;
                        fd1 = do_open(fnamecmp, O_RDONLY, 0);
                }
@@ -409,7 +417,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
                        continue;
                }
 
-               strlcpy(template, fnametmp, sizeof(template));
+               strlcpy(template, fnametmp, sizeof template);
 
                /* we initially set the perms without the
                 * setuid/setgid bits to ensure that there is no race
@@ -424,7 +432,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
                 * transferred, but that may not be the case with -R */
                if (fd2 == -1 && relative_paths && errno == ENOENT &&
                    create_directory_path(fnametmp, orig_umask) == 0) {
-                       strlcpy(fnametmp, template, sizeof(fnametmp));
+                       strlcpy(fnametmp, template, sizeof fnametmp);
                        fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
                }
                if (fd2 == -1) {
@@ -478,18 +486,6 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
            && flist->count > 0)
                delete_files(flist);
 
-       if (preserve_hard_links)
-               do_hard_links();
-
-       /* now we need to fix any directory permissions that were
-        * modified during the transfer */
-       for (i = 0; i < flist->count; i++) {
-               file = flist->files[i];
-               if (!file->basename || !S_ISDIR(file->mode)) continue;
-               recv_generator(local_name? local_name
-                            : f_name_to(file,fbuf,sizeof fbuf), file, i, -1);
-       }
-
        if (verbose > 2)
                rprintf(FINFO,"recv_files finished\n");