Got rid of suffix_specified and instead set backup_suffix to the

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index d50e67a..3e24880 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -35,6 +35,7 @@ extern int io_error;
 extern char *tmpdir;
 extern char *compare_dest;
 extern int make_backups;
+extern int do_progress;
 extern char *backup_suffix;
 
 static struct delete_list {
@@ -164,40 +165,63 @@ void delete_files(struct file_list *flist)
 }
 
 
+/*
+ * get_tmpname() - create a tmp filename for a given filename
+ *
+ *   If a tmpdir is defined, use that as the directory to
+ *   put it in.  Otherwise, the tmp filename is in the same
+ *   directory as the given name.  Note that there may be no
+ *   directory at all in the given name!
+ *      
+ *   The tmp filename is basically the given filename with a
+ *   dot prepended, and .XXXXXX appended (for mkstemp() to
+ *   put its unique gunk in).  Take care to not exceed
+ *   either the MAXPATHLEN or NAME_MAX, esp. the last, as
+ *   the basename basically becomes 8 chars longer. In that
+ *   case, the original name is shortened sufficiently to
+ *   make it all fit.
+ *      
+ *   Of course, there's no real reason for the tmp name to
+ *   look like the original, except to satisfy us humans.
+ *   As long as it's unique, rsync will work.
+ */
+
 static int get_tmpname(char *fnametmp, char *fname)
 {
        char *f;
+       int     length = 0;
+       int     maxname;
 
-       /* open tmp file */
        if (tmpdir) {
-               f = strrchr(fname,'/');
-               if (f == NULL) 
-                       f = fname;
-               else 
-                       f++;
-               if (strlen(tmpdir)+strlen(f)+10 > MAXPATHLEN) {
-                       rprintf(FERROR,"filename too long\n");
-                       return 0;
+               strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
+               length = strlen(fnametmp);
+               fnametmp[length++] = '/';
+               fnametmp[length] = '\0';        /* always NULL terminated */
                }
-               snprintf(fnametmp,MAXPATHLEN, "%s/.%s.XXXXXX",tmpdir,f);
-               return 1;
+
+       if ((f = strrchr(fname, '/'))) {        /* extra () for gcc */
+               ++f;
+               if (!tmpdir) {
+                       length = f - fname;
+                       strlcpy(fnametmp, fname, length + 1);
+               }               /* copy up to and including the slash */
+       } else {
+               f = fname;
        } 
+       fnametmp[length++] = '.';
+       fnametmp[length] = '\0';                /* always NULL terminated */
 
-       f = strrchr(fname,'/');
+       maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8);
 
-       if (strlen(fname)+9 > MAXPATHLEN) {
-               rprintf(FERROR,"filename too long\n");
+       if (maxname < 1)
+       {
+               rprintf(FERROR, "temporary filename too long: %s\n", fname);
+               fnametmp[0] = '\0';
                return 0;
        }
 
-       if (f) {
-               *f = 0;
-               snprintf(fnametmp,MAXPATHLEN,"%s/.%s.XXXXXX",
-                        fname,f+1);
-               *f = '/';
-       } else {
-               snprintf(fnametmp,MAXPATHLEN,".%s.XXXXXX",fname);
-       }
+       strlcpy(fnametmp + length, f, maxname); 
+       strcat(fnametmp + length, ".XXXXXX");
 
        return 1;
 }
@@ -207,7 +231,8 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
                        OFF_T total_size)
 {
        int i;
-       unsigned int n,remainder,len,count;
+       struct sum_struct sum;
+       unsigned int len;
        OFF_T offset = 0;
        OFF_T offset2;
        char *data;
@@ -215,15 +240,13 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
        static char file_sum2[MD4_SUM_LENGTH];
        char *map=NULL;
        
-       count = read_int(f_in);
-       n = read_int(f_in);
-       remainder = read_int(f_in);
+       read_sum_head(f_in, &sum);
        
        sum_init();
        
        for (i=recv_token(f_in,&data); i != 0; i=recv_token(f_in,&data)) {
-
-               show_progress(offset, total_size);
+               if (do_progress)
+                       show_progress(offset, total_size);
 
                if (i > 0) {
                        extern int cleanup_got_literal;
@@ -247,10 +270,10 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
                } 
 
                i = -(i+1);
-               offset2 = i*(OFF_T)n;
-               len = n;
-               if (i == (int) count-1 && remainder != 0)
-                       len = remainder;
+               offset2 = i*(OFF_T)sum.blength;
+               len = sum.blength;
+               if (i == (int) sum.count-1 && sum.remainder != 0)
+                       len = sum.remainder;
                
                stats.matched_data += len;
                
@@ -273,7 +296,8 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
                offset += len;
        }
 
-       end_progress(total_size);
+       if (do_progress)
+               end_progress(total_size);
 
        if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
                rprintf(FERROR,"write failed on %s : %s\n",
@@ -283,15 +307,13 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
 
        sum_end(file_sum1);
 
-       if (remote_version >= 14) {
-               read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
-               if (verbose > 2) {
-                       rprintf(FINFO,"got file_sum\n");
-               }
-               if (fd != -1 && 
-                   memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0) {
-                       return 0;
-               }
+       read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
+       if (verbose > 2) {
+               rprintf(FINFO,"got file_sum\n");
+       }
+       if (fd != -1
+           && memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0) {
+               return 0;
        }
        return 1;
 }
@@ -330,7 +352,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 
                i = read_int(f_in);
                if (i == -1) {
-                       if (phase==0 && remote_version >= 13) {
+                       if (phase==0) {
                                phase++;
                                csum_length = SUM_LENGTH;
                                if (verbose > 2)