Moved write_ndx_and_attrs() to sender.c and made it public.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 9608ec9..52aaa9c 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -34,7 +34,7 @@ extern int append_mode;
 extern int io_error;
 extern int allowed_lull;
 extern int protocol_version;
-extern int remove_sent_files;
+extern int remove_source_files;
 extern int updating_basis_file;
 extern int make_backups;
 extern int do_progress;
@@ -128,80 +128,19 @@ void successful_send(int ndx)
                return;
 
        file = the_file_list->files[ndx];
-       /* The generator might tell us about symlinks we didn't send. */
-       if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
-               return;
        if (file->dir.root) {
                offset = stringjoin(fname, sizeof fname,
                                    file->dir.root, "/", NULL);
        } else
                offset = 0;
        f_name(file, fname + offset);
-       if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1)
-               rprintf(FINFO, "sender removed %s\n", fname + offset);
-}
-
-static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
-                               uchar fnamecmp_type, char *buf, int len)
-{
-       write_int(f_out, ndx);
-       if (protocol_version < 29)
-               return;
-       write_shortint(f_out, iflags);
-       if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
-               write_byte(f_out, fnamecmp_type);
-       if (iflags & ITEM_XNAME_FOLLOWS)
-               write_vstring(f_out, buf, len);
-}
-
-/* This is also used by receive.c with f_out = -1. */
-int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
-                   char *buf, int *len_ptr)
-{
-       int len;
-       uchar fnamecmp_type = FNAMECMP_FNAME;
-       int iflags = protocol_version >= 29 ? read_shortint(f_in)
-                  : ITEM_TRANSFER | ITEM_MISSING_DATA;
-
-       /* Handle the new keep-alive (no-op) packet. */
-       if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
-               ;
-       else if (ndx < 0 || ndx >= the_file_list->count) {
-               rprintf(FERROR, "Invalid file index: %d (count=%d) [%s]\n",
-                       ndx, the_file_list->count, who_am_i());
-               exit_cleanup(RERR_PROTOCOL);
-       } else if (iflags == ITEM_IS_NEW) {
-               rprintf(FERROR, "Invalid itemized flag word: %x [%s]\n",
-                       iflags, who_am_i());
-               exit_cleanup(RERR_PROTOCOL);
-       }
-
-       if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
-               fnamecmp_type = read_byte(f_in);
-       *type_ptr = fnamecmp_type;
-
-       if (iflags & ITEM_XNAME_FOLLOWS) {
-               if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
-                       exit_cleanup(RERR_PROTOCOL);
-       } else {
-               *buf = '\0';
-               len = -1;
-       }
-       *len_ptr = len;
-
-       if (iflags & ITEM_TRANSFER) {
-               if (!S_ISREG(the_file_list->files[ndx]->mode)) {
-                       rprintf(FERROR,
-                               "received request to transfer non-regular file: %d [%s]\n",
-                               ndx, who_am_i());
-                       exit_cleanup(RERR_PROTOCOL);
-               }
-       } else if (f_out >= 0) {
-               write_ndx_and_attrs(f_out, ndx, iflags,
-                                   fnamecmp_type, buf, len);
+       if (remove_source_files) {
+               if (do_unlink(fname) == 0) {
+                       if (verbose > 1)
+                               rprintf(FINFO, "sender removed %s\n", fname + offset);
+               } else
+                       rsyserr(FERROR, errno, "sender failed to remove %s", fname + offset);
        }
-
-       return iflags;
 }
 
 void send_files(struct file_list *flist, int f_out, int f_in)