Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed alloc_sanitize_path()'s handling of a rootdir == "/" (the old
[rsync/rsync.git]
/
batch.c
diff --git
a/batch.c
b/batch.c
index
aa60130
..
33364e6
100644
(file)
--- a/
batch.c
+++ b/
batch.c
@@
-32,7
+32,7
@@
void write_batch_flist_info(int flist_count, struct file_struct **files)
stringjoin(filename, sizeof filename,
batch_prefix, rsync_flist_file, NULL);
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));
if (f < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
filename, strerror(errno));
@@
-70,7
+70,7
@@
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,
batch_prefix, rsync_argvs_file, NULL);
f = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
- S_IR
EAD | S_IWRITE
| S_IEXEC);
+ S_IR
USR | S_IWUSR
| S_IEXEC);
if (f < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
filename, strerror(errno));
if (f < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
filename, strerror(errno));
@@
-136,26
+136,21
@@
struct file_list *create_flist_from_batch(void)
exit_cleanup(1);
}
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);
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;
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;
protocol_version = save_pv;
stats.total_read = save_read;
@@
-199,7
+194,7
@@
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,
batch_prefix, rsync_csums_file, NULL);
f_csums = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
- S_IR
EAD | S_IWRITE
);
+ S_IR
USR | S_IWUSR
);
if (f_csums < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
filename, strerror(errno));
if (f_csums < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
filename, strerror(errno));
@@
-287,7
+282,7
@@
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,
batch_prefix, rsync_delta_file, NULL);
f_delta = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
- S_IR
EAD | S_IWRITE
);
+ S_IR
USR | S_IWUSR
);
if (f_delta < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
filename, strerror(errno));
if (f_delta < 0) {
rprintf(FERROR, "Batch file %s open error: %s\n",
filename, strerror(errno));