Changed rprintf() calls that included strerror() to use rsyserr().

[rsync/rsync.git] / batch.c

diff --git a/batch.c b/batch.c
index aa60130..ade9484 100644 (file)
--- a/batch.c
+++ b/batch.c
@@ -32,10 +32,9 @@ void write_batch_flist_info(int flist_count, struct file_struct **files)
        stringjoin(filename, sizeof filename,
            batch_prefix, rsync_flist_file, NULL);
 
-       f = do_open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IREAD|S_IWRITE);
+       f = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
        if (f < 0) {
-               rprintf(FERROR, "Batch file %s open error: %s\n",
-                   filename, strerror(errno));
+               rsyserr(FERROR, errno, "Batch file %s open error", filename);
                exit_cleanup(1);
        }
 
@@ -70,10 +69,9 @@ void write_batch_argvs_file(int argc, char *argv[])
            batch_prefix, rsync_argvs_file, NULL);
 
        f = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
-           S_IREAD | S_IWRITE | S_IEXEC);
+           S_IRUSR | S_IWUSR | S_IEXEC);
        if (f < 0) {
-               rprintf(FERROR, "Batch file %s open error: %s\n",
-                   filename, strerror(errno));
+               rsyserr(FERROR, errno, "Batch file %s open error", filename);
                exit_cleanup(1);
        }
        buff[0] = '\0';
@@ -111,8 +109,7 @@ void write_batch_argvs_file(int argc, char *argv[])
        }
        strlcat(buff, "\n", sizeof buff);
        if (!write(f, buff, strlen(buff))) {
-               rprintf(FERROR, "Batch file %s write error: %s\n",
-                   filename, strerror(errno));
+               rsyserr(FERROR, errno, "Batch file %s write error", filename);
                close(f);
                exit_cleanup(1);
        }
@@ -131,31 +128,25 @@ struct file_list *create_flist_from_batch(void)
 
        f = do_open(filename, O_RDONLY, 0);
        if (f < 0) {
-               rprintf(FERROR, "Batch file %s open error: %s\n",
-                   filename, strerror(errno));
+               rsyserr(FERROR, errno, "Batch file %s open error", filename);
                exit_cleanup(1);
        }
 
-       batch_flist = new(struct file_list);
-       if (!batch_flist)
-               out_of_memory("create_flist_from_batch");
+       batch_flist = flist_new(WITH_HLINK, "create_flist_from_batch");
 
        save_read = stats.total_read;
        save_pv = protocol_version;
        protocol_version = read_int(f);
 
-       batch_flist->count = batch_flist->malloced = read_int(f);
-       batch_flist->files = new_array(struct file_struct *,
-           batch_flist->malloced);
-       if (!batch_flist->files)
-               out_of_memory("create_flist_from_batch");
+       batch_flist->count = read_int(f);
+       flist_expand(batch_flist);
 
        for (i = 0; (flags = read_byte(f)) != 0; i++) {
                if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
                        flags |= read_byte(f) << 8;
-               receive_file_entry(&batch_flist->files[i], flags, f);
+               receive_file_entry(&batch_flist->files[i], flags, batch_flist, f);
        }
-       receive_file_entry(NULL, 0, 0); /* Signal that we're done. */
+       receive_file_entry(NULL, 0, NULL, 0); /* Signal that we're done. */
 
        protocol_version = save_pv;
        stats.total_read = save_read;
@@ -166,8 +157,7 @@ struct file_list *create_flist_from_batch(void)
 void write_batch_csums_file(void *buff, int bytes_to_write)
 {
        if (write(f_csums, buff, bytes_to_write) < 0) {
-               rprintf(FERROR, "Batch file write error: %s\n",
-                   strerror(errno));
+               rsyserr(FERROR, errno, "Batch file write error");
                close(f_csums);
                exit_cleanup(1);
        }
@@ -199,10 +189,10 @@ void write_batch_csum_info(int *flist_entry, struct sum_struct *s)
                    batch_prefix, rsync_csums_file, NULL);
 
                f_csums = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
-                   S_IREAD | S_IWRITE);
+                   S_IRUSR | S_IWUSR);
                if (f_csums < 0) {
-                       rprintf(FERROR, "Batch file %s open error: %s\n",
-                           filename, strerror(errno));
+                       rsyserr(FERROR, errno, "Batch file %s open error",
+                               filename);
                        close(f_csums);
                        exit_cleanup(1);
                }
@@ -226,7 +216,7 @@ int read_batch_csums_file(char *buff, int len)
        int bytes_read;
 
        if ((bytes_read = read(f_csums, buff, len)) < 0) {
-               rprintf(FERROR, "Batch file read error: %s\n", strerror(errno));
+               rsyserr(FERROR, errno, "Batch file read error");
                close(f_csums);
                exit_cleanup(1);
        }
@@ -249,8 +239,8 @@ void read_batch_csum_info(int flist_entry, struct sum_struct *s,
 
                f_csums = do_open(filename, O_RDONLY, 0);
                if (f_csums < 0) {
-                       rprintf(FERROR, "Batch file %s open error: %s\n",
-                           filename, strerror(errno));
+                       rsyserr(FERROR, errno, "Batch file %s open error",
+                               filename);
                        close(f_csums);
                        exit_cleanup(1);
                }
@@ -287,17 +277,16 @@ void write_batch_delta_file(char *buff, int bytes_to_write)
                    batch_prefix, rsync_delta_file, NULL);
 
                f_delta = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
-                                 S_IREAD | S_IWRITE);
+                                 S_IRUSR | S_IWUSR);
                if (f_delta < 0) {
-                       rprintf(FERROR, "Batch file %s open error: %s\n",
-                               filename, strerror(errno));
+                       rsyserr(FERROR, errno, "Batch file %s open error",
+                               filename);
                        exit_cleanup(1);
                }
        }
 
        if (write(f_delta, buff, bytes_to_write) < 0) {
-               rprintf(FERROR, "Batch file %s write error: %s\n",
-                   filename, strerror(errno));
+               rsyserr(FERROR, errno, "Batch file %s write error", filename);
                close(f_delta);
                exit_cleanup(1);
        }
@@ -320,8 +309,8 @@ int read_batch_delta_file(char *buff, int len)
 
                f_delta = do_open(filename, O_RDONLY, 0);
                if (f_delta < 0) {
-                       rprintf(FERROR, "Batch file %s open error: %s\n",
-                           filename, strerror(errno));
+                       rsyserr(FERROR, errno, "Batch file %s open error",
+                               filename);
                        close(f_delta);
                        exit_cleanup(1);
                }
@@ -329,8 +318,7 @@ int read_batch_delta_file(char *buff, int len)
 
        bytes_read = read(f_delta, buff, len);
        if (bytes_read < 0) {
-               rprintf(FERROR, "Batch file %s read error: %s\n",
-                   filename, strerror(errno));
+               rsyserr(FERROR, errno, "Batch file %s read error", filename);
                close(f_delta);
                exit_cleanup(1);
        }