Split code to generate "rwx-----" strings into lib/permstring.c so it

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 4845238..6b24268 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -56,7 +56,7 @@ static int skip_file(char *fname,
 
                if (compare_dest != NULL) {
                        if (access(fname, 0) != 0) {
-                               slprintf(fnamecmpdest,MAXPATHLEN,"%s/%s",
+                               snprintf(fnamecmpdest,MAXPATHLEN,"%s/%s",
                                                    compare_dest,fname);
                                fname = fnamecmpdest;
                        }
@@ -329,7 +329,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
        if ((statret == -1) && (compare_dest != NULL)) {
                /* try the file at compare_dest instead */
                int saveerrno = errno;
-               slprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,fname);
+               snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,fname);
                statret = link_stat(fnamecmpbuf,&st);
                if (!S_ISREG(st.st_mode))
                        statret = -1;
@@ -429,6 +429,11 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
                rprintf(FINFO,"generator starting pid=%d count=%d\n",
                        (int)getpid(),flist->count);
 
+       /* we expect to just sit around now, so don't exit on a
+          timeout. If we really get a timeout then the other process should
+          exit */
+       io_timeout = 0;
+
        for (i = 0; i < flist->count; i++) {
                struct file_struct *file = flist->files[i];
                mode_t saved_mode = file->mode;
@@ -458,11 +463,6 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
 
        write_int(f,-1);
 
-       /* we expect to just sit around now, so don't exit on a
-          timeout. If we really get a timeout then the other process should
-          exit */
-       io_timeout = 0;
-
        if (remote_version >= 13) {
                /* in newer versions of the protocol the files can cycle through
                   the system more than once to catch initial checksum errors */