Added "debug_type" to the exclude_list_struct.

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 82f2b0a..108c856 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -23,12 +23,15 @@
 extern int verbose;
 extern int recurse;
 extern int delete_mode;
+extern int delete_after;
+extern int max_delete;
 extern int csum_length;
 extern struct stats stats;
 extern int dry_run;
 extern int am_server;
 extern int relative_paths;
 extern int preserve_hard_links;
+extern int preserve_perms;
 extern int cvs_exclude;
 extern int io_error;
 extern char *tmpdir;
@@ -39,6 +42,9 @@ extern char *backup_dir;
 extern char *backup_suffix;
 extern int backup_suffix_len;
 extern int cleanup_got_literal;
+extern int module_id;
+extern int ignore_errors;
+extern int orig_umask;
 
 static void delete_one(char *fn, int is_dir)
 {
@@ -69,17 +75,13 @@ static int is_backup_file(char *fn)
 }
 
 
-/* this deletes any files on the receiving side that are not present
- * on the sending side. For version 1.6.4 I have changed the behaviour
- * to match more closely what most people seem to expect of this option */
+/* This deletes any files on the receiving side that are not present
+ * on the sending side. */
 void delete_files(struct file_list *flist)
 {
        struct file_list *local_file_list;
        int i, j;
        char *argv[1], fbuf[MAXPATHLEN];
-       extern int module_id;
-       extern int ignore_errors;
-       extern int max_delete;
        static int deletion_count;
 
        if (cvs_exclude)
@@ -90,9 +92,10 @@ void delete_files(struct file_list *flist)
                return;
        }
 
-       for (j = 0;j < flist->count; j++) {
-               if (!S_ISDIR(flist->files[j]->mode) ||
-                   !(flist->files[j]->flags & FLAG_DELETE)) continue;
+       for (j = 0; j < flist->count; j++) {
+               if (!(flist->files[j]->flags & FLAG_TOP_DIR)
+                   || !S_ISDIR(flist->files[j]->mode))
+                       continue;
 
                argv[0] = f_name_to(flist->files[j], fbuf);
 
@@ -100,12 +103,14 @@ void delete_files(struct file_list *flist)
                        continue;
 
                if (verbose > 1)
-                       rprintf(FINFO,"deleting in %s\n", fbuf);
+                       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;
-                       if (!local_file_list->files[i]->basename) continue;
-                       if (-1 == flist_find(flist,local_file_list->files[i])) {
+                       if (max_delete && deletion_count > max_delete)
+                               break;
+                       if (!local_file_list->files[i]->basename)
+                               continue;
+                       if (flist_find(flist,local_file_list->files[i]) < 0) {
                                char *f = f_name(local_file_list->files[i]);
                                if (make_backups && (backup_dir || !is_backup_file(f))) {
                                        (void) make_backup(f);
@@ -294,16 +299,17 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
        struct file_struct *file;
        int phase=0;
        int recv_ok;
-       extern struct stats stats;
-       extern int preserve_perms;
-       extern int delete_after;
-       extern int orig_umask;
        struct stats initial_stats;
 
        if (verbose > 2) {
                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();
 
@@ -355,10 +361,10 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
                /* open the file */
                fd1 = do_open(fnamecmp, O_RDONLY, 0);
 
-               if ((fd1 == -1) && (compare_dest != NULL)) {
+               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);
                }
@@ -410,7 +416,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
@@ -425,7 +431,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) {
@@ -479,18 +485,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),
-                              file, i, -1);
-       }
-
        if (verbose > 2)
                rprintf(FINFO,"recv_files finished\n");