Got rid of unused string_area struct.

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index b3e2f23..da89819 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -91,8 +91,9 @@ 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;
 
                argv[0] = f_name_to(flist->files[j], fbuf);
 
@@ -410,7 +411,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 +426,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) {