preparing for release of 2.0.9

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 80754e9..cf40151 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -69,7 +69,7 @@ static int match_file_name(char *fname,STRUCT_STAT *st)
 {
   if (check_exclude(fname,local_exclude_list)) {
     if (verbose > 2)
-      fprintf(FINFO,"excluding file %s\n",fname);
+      rprintf(FINFO,"excluding file %s\n",fname);
     return 0;
   }
   return 1;
@@ -218,7 +218,7 @@ void send_file_entry(struct file_struct *file,int f,unsigned base_flags)
   last_gid = file->gid;
   last_time = file->modtime;
 
-  strncpy(lastname,fname,MAXPATHLEN-1);
+  strlcpy(lastname,fname,MAXPATHLEN-1);
   lastname[MAXPATHLEN-1] = 0;
 }
 
@@ -253,11 +253,11 @@ static void receive_file_entry(struct file_struct **fptr,
 
   if (l2 >= MAXPATHLEN-l1) overflow("receive_file_entry");
 
-  strncpy(thisname,lastname,l1);
+  strlcpy(thisname,lastname,l1);
   read_sbuf(f,&thisname[l1],l2);
   thisname[l1+l2] = 0;
 
-  strncpy(lastname,thisname,MAXPATHLEN-1);
+  strlcpy(lastname,thisname,MAXPATHLEN-1);
   lastname[MAXPATHLEN-1] = 0;
 
   clean_fname(thisname);
@@ -351,7 +351,7 @@ static struct file_struct *make_file(char *fname)
        char *p;
        char cleaned_name[MAXPATHLEN];
 
-       strncpy(cleaned_name, fname, MAXPATHLEN-1);
+       strlcpy(cleaned_name, fname, MAXPATHLEN-1);
        cleaned_name[MAXPATHLEN-1] = 0;
        clean_fname(cleaned_name);
        fname = cleaned_name;
@@ -360,13 +360,13 @@ static struct file_struct *make_file(char *fname)
 
        if (link_stat(fname,&st) != 0) {
                io_error = 1;
-               fprintf(FERROR,"%s: %s\n",
+               rprintf(FERROR,"%s: %s\n",
                        fname,strerror(errno));
                return NULL;
        }
 
        if (S_ISDIR(st.st_mode) && !recurse) {
-               fprintf(FINFO,"skipping directory %s\n",fname);
+               rprintf(FINFO,"skipping directory %s\n",fname);
                return NULL;
        }
        
@@ -379,7 +379,7 @@ static struct file_struct *make_file(char *fname)
                return NULL;
        
        if (verbose > 2)
-               fprintf(FINFO,"make_file(%s)\n",fname);
+               rprintf(FINFO,"make_file(%s)\n",fname);
        
        file = (struct file_struct *)malloc(sizeof(*file));
        if (!file) out_of_memory("make_file");
@@ -418,7 +418,7 @@ static struct file_struct *make_file(char *fname)
                char lnk[MAXPATHLEN];
                if ((l=readlink(fname,lnk,MAXPATHLEN-1)) == -1) {
                        io_error=1;
-                       fprintf(FERROR,"readlink %s : %s\n",
+                       rprintf(FERROR,"readlink %s : %s\n",
                                fname,strerror(errno));
                        return NULL;
                }
@@ -507,22 +507,21 @@ static void send_directory(int f,struct file_list *flist,char *dir)
        d = opendir(dir);
        if (!d) {
                io_error = 1;
-               fprintf(FERROR,"%s: %s\n",
+               rprintf(FERROR,"%s: %s\n",
                        dir,strerror(errno));
                return;
        }
 
-       strncpy(fname,dir,MAXPATHLEN-1);
-       fname[MAXPATHLEN-1]=0;
+       strlcpy(fname,dir,MAXPATHLEN-1);
        l = strlen(fname);
        if (fname[l-1] != '/') {
                if (l == MAXPATHLEN-1) {
                        io_error = 1;
-                       fprintf(FERROR,"skipping long-named directory %s\n",fname);
+                       rprintf(FERROR,"skipping long-named directory %s\n",fname);
                        closedir(d);
                        return;
                }
-               strcat(fname,"/");
+               strlcat(fname,"/", MAXPATHLEN-1);
                l++;
        }
        p = fname + strlen(fname);
@@ -533,15 +532,16 @@ static void send_directory(int f,struct file_list *flist,char *dir)
                        local_exclude_list = make_exclude_list(fname,NULL,0);
                } else {
                        io_error = 1;
-                       fprintf(FINFO,"cannot cvs-exclude in long-named directory %s\n",fname);
+                       rprintf(FINFO,"cannot cvs-exclude in long-named directory %s\n",fname);
                }
        }  
        
        for (di=readdir(d); di; di=readdir(d)) {
-               if (strcmp(di->d_name,".")==0 ||
-                   strcmp(di->d_name,"..")==0)
+               char *dname = d_name(di);
+               if (strcmp(dname,".")==0 ||
+                   strcmp(dname,"..")==0)
                        continue;
-               strncpy(p,di->d_name,MAXPATHLEN-(l+1));
+               strlcpy(p,dname,MAXPATHLEN-(l+1));
                send_file_name(f,flist,fname,recurse,FLAG_DELETE);
        }
 
@@ -560,8 +560,8 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
        struct file_list *flist;
 
        if (verbose && recurse && !am_server && f != -1) {
-               fprintf(FINFO,"building file list ... ");
-               fflush(FINFO);
+               rprintf(FINFO,"building file list ... ");
+               rflush(FINFO);
        }
 
        flist = (struct file_list *)malloc(sizeof(flist[0]));
@@ -573,26 +573,29 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                                                     flist->malloced);
        if (!flist->files) out_of_memory("send_file_list");
 
+       if (f != -1) {
+               io_start_buffering(f);
+       }
+
        for (i=0;i<argc;i++) {
                char fname2[MAXPATHLEN];
                char *fname = fname2;
 
-               strncpy(fname,argv[i],MAXPATHLEN-1);
-               fname[MAXPATHLEN-1] = 0;
+               strlcpy(fname,argv[i],MAXPATHLEN-1);
 
                l = strlen(fname);
                if (l != 1 && fname[l-1] == '/') {
-                       strcat(fname,".");
+                       strlcat(fname,".",MAXPATHLEN-1);
                }
 
                if (link_stat(fname,&st) != 0) {
                        io_error=1;
-                       fprintf(FERROR,"%s : %s\n",fname,strerror(errno));
+                       rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
                        continue;
                }
 
                if (S_ISDIR(st.st_mode) && !recurse) {
-                       fprintf(FINFO,"skipping directory %s\n",fname);
+                       rprintf(FINFO,"skipping directory %s\n",fname);
                        continue;
                }
 
@@ -613,7 +616,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                           thus getting their permissions right */
                        *p = 0;
                        if (strcmp(lastpath,fname)) {
-                               strcpy(lastpath, fname);
+                               strlcpy(lastpath, fname, sizeof(lastpath)-1);
                                *p = '/';
                                for (p=fname+1; (p=strchr(p,'/')); p++) {
                                        *p = 0;
@@ -630,12 +633,12 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                
                if (dir && *dir) {
                        if (getcwd(dbuf,MAXPATHLEN-1) == NULL) {
-                               fprintf(FERROR,"getwd : %s\n",strerror(errno));
+                               rprintf(FERROR,"getwd : %s\n",strerror(errno));
                                exit_cleanup(1);
                        }
                        if (chdir(dir) != 0) {
                                io_error=1;
-                               fprintf(FERROR,"chdir %s : %s\n",
+                               rprintf(FERROR,"chdir %s : %s\n",
                                        dir,strerror(errno));
                                continue;
                        }
@@ -645,7 +648,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                        send_file_name(f,flist,fname,recurse,FLAG_DELETE);
                        flist_dir = NULL;
                        if (chdir(dbuf) != 0) {
-                               fprintf(FERROR,"chdir %s : %s\n",
+                               rprintf(FERROR,"chdir %s : %s\n",
                                        dbuf,strerror(errno));
                                exit_cleanup(1);
                        }
@@ -659,11 +662,10 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
 
        if (f != -1) {
                send_file_entry(NULL,f,0);
-               write_flush(f);
        }
 
        if (verbose && recurse && !am_server && f != -1)
-               fprintf(FINFO,"done\n");
+               rprintf(FINFO,"done\n");
        
        clean_flist(flist);
        
@@ -678,8 +680,13 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                write_int(f, io_error);
        }
 
+       if (f != -1) {
+               io_end_buffering(f);
+               write_flush(f);
+       }
+
        if (verbose > 2)
-               fprintf(FINFO,"send_file_list done\n");
+               rprintf(FINFO,"send_file_list done\n");
 
        return flist;
 }
@@ -691,8 +698,8 @@ struct file_list *recv_file_list(int f)
   unsigned char flags;
 
   if (verbose && recurse && !am_server) {
-    fprintf(FINFO,"receiving file list ... ");
-    fflush(FINFO);
+    rprintf(FINFO,"receiving file list ... ");
+    rflush(FINFO);
   }
 
   flist = (struct file_list *)malloc(sizeof(flist[0]));
@@ -730,17 +737,17 @@ struct file_list *recv_file_list(int f)
     flist->count++;
 
     if (verbose > 2)
-      fprintf(FINFO,"recv_file_name(%s)\n",f_name(flist->files[i]));
+      rprintf(FINFO,"recv_file_name(%s)\n",f_name(flist->files[i]));
   }
 
 
   if (verbose > 2)
-    fprintf(FINFO,"received %d names\n",flist->count);
+    rprintf(FINFO,"received %d names\n",flist->count);
 
   clean_flist(flist);
 
   if (verbose && recurse && !am_server) {
-    fprintf(FINFO,"done\n");
+    rprintf(FINFO,"done\n");
   }
 
   /* now recv the uid/gid list. This was introduced in protocol version 15 */
@@ -754,7 +761,7 @@ struct file_list *recv_file_list(int f)
   }
 
   if (verbose > 2)
-    fprintf(FINFO,"recv_file_list done\n");
+    rprintf(FINFO,"recv_file_list done\n");
 
   return flist;
 
@@ -849,7 +856,7 @@ void clean_flist(struct file_list *flist)
                    strcmp(f_name(flist->files[i]),
                           f_name(flist->files[i-1])) == 0) {
                        if (verbose > 1 && !am_server)
-                               fprintf(FINFO,"removing duplicate name %s from file list %d\n",
+                               rprintf(FINFO,"removing duplicate name %s from file list %d\n",
                                        f_name(flist->files[i-1]),i-1);
                        free_file(flist->files[i]);
                } 
@@ -871,9 +878,9 @@ char *f_name(struct file_struct *f)
        n = (n+1)%10;
 
        if (f->dirname) {
-               sprintf(p, "%s/%s", f->dirname, f->basename);
+               slprintf(p, MAXPATHLEN-1, "%s/%s", f->dirname, f->basename);
        } else {
-               strcpy(p, f->basename);
+               strlcpy(p, f->basename, MAXPATHLEN-1);
        }
 
        return p;