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
Support the recent changes in the flist_struct.
[rsync/rsync.git]
/
batch.c
diff --git
a/batch.c
b/batch.c
index
6ef89e8
..
1364b56
100644
(file)
--- a/
batch.c
+++ b/
batch.c
@@
-60,6
+60,8
@@
void write_batch_flist_file(char *buff, int bytes_to_write)
}
}
}
}
+/* TODO: Someone please rewrite this! Why in the world don't we use
+ * the send/receive code from flist.c for this? */
void write_batch_flist_info(int flist_count, struct file_struct **fptr)
{
int i;
void write_batch_flist_info(int flist_count, struct file_struct **fptr)
{
int i;
@@
-68,7
+70,6
@@
void write_batch_flist_info(int flist_count, struct file_struct **fptr)
/* Write flist info to batch file */
bytes_to_write =
/* Write flist info to batch file */
bytes_to_write =
- sizeof(unsigned) +
sizeof(time_t) +
sizeof(OFF_T) +
sizeof(mode_t) +
sizeof(time_t) +
sizeof(OFF_T) +
sizeof(mode_t) +
@@
-82,7
+83,8
@@
void write_batch_flist_info(int flist_count, struct file_struct **fptr)
fdb_close = 0;
for (i = 0; i < flist_count; i++) {
fdb_close = 0;
for (i = 0; i < flist_count; i++) {
- write_batch_flist_file((char *) fptr[i], bytes_to_write);
+ write_batch_flist_file((char*)&fptr[i]->flags, sizeof fptr[0]->flags);
+ write_batch_flist_file((char*)fptr[i], bytes_to_write);
write_char_bufs(fptr[i]->basename);
write_char_bufs(fptr[i]->dirname);
write_char_bufs(fptr[i]->basedir);
write_char_bufs(fptr[i]->basename);
write_char_bufs(fptr[i]->dirname);
write_char_bufs(fptr[i]->basedir);
@@
-180,20
+182,19
@@
void write_batch_argvs_file(int argc, char *argv[])
struct file_list *create_flist_from_batch(void)
{
struct file_list *create_flist_from_batch(void)
{
- unsigned
char
flags;
+ unsigned
short
flags;
fdb_open = 1;
fdb_close = 0;
fdb_open = 1;
fdb_close = 0;
- batch_flist =
(struct file_list *) malloc(sizeof(batch_flist[0])
);
+ batch_flist =
new(struct file_list
);
if (!batch_flist) {
out_of_memory("create_flist_from_batch");
}
batch_flist->count = 0;
batch_flist->malloced = 1000;
if (!batch_flist) {
out_of_memory("create_flist_from_batch");
}
batch_flist->count = 0;
batch_flist->malloced = 1000;
- batch_flist->files =
- (struct file_struct **) malloc(sizeof(batch_flist->files[0]) *
- batch_flist->malloced);
+ batch_flist->files = new_array(struct file_struct *,
+ batch_flist->malloced);
if (!batch_flist->files) {
out_of_memory("create_flist_from_batch");
}
if (!batch_flist->files) {
out_of_memory("create_flist_from_batch");
}
@@
-207,14
+208,10
@@
struct file_list *create_flist_from_batch(void)
batch_flist->malloced += 1000;
else
batch_flist->malloced *= 2;
batch_flist->malloced += 1000;
else
batch_flist->malloced *= 2;
- batch_flist->files =
- (struct file_struct **) realloc(batch_flist->
- files,
- sizeof
- (batch_flist->
- files[0]) *
- batch_flist->
- malloced);
+ batch_flist->files
+ = realloc_array(batch_flist->files,
+ struct file_struct *,
+ batch_flist->malloced);
if (!batch_flist->files)
out_of_memory("create_flist_from_batch");
}
if (!batch_flist->files)
out_of_memory("create_flist_from_batch");
}
@@
-264,15
+261,13
@@
int read_batch_flist_file(char *buff, int len)
return bytes_read;
}
return bytes_read;
}
-unsigned
char read_batch_flags(
)
+unsigned
short read_batch_flags(void
)
{
{
-
in
t flags;
+
unsigned shor
t flags;
- if (read_batch_flist_file((char
*) &flags, 4)) {
+ if (read_batch_flist_file((char
*)&flags, sizeof flags))
return 1;
return 1;
- } else {
- return 0;
- }
+ return 0;
}
void read_batch_flist_info(struct file_struct **fptr)
}
void read_batch_flist_info(struct file_struct **fptr)
@@
-282,7
+277,7
@@
void read_batch_flist_info(struct file_struct **fptr)
char buff[256];
struct file_struct *file;
char buff[256];
struct file_struct *file;
- file =
(struct file_struct *) malloc(sizeof(*file)
);
+ file =
new(struct file_struct
);
if (!file)
out_of_memory("read_batch_flist_info");
memset((char *) file, 0, sizeof(*file));
if (!file)
out_of_memory("read_batch_flist_info");
memset((char *) file, 0, sizeof(*file));
@@
-405,14
+400,14
@@
void write_batch_csum_info(int *flist_entry, int flist_count,
struct sum_struct *s)
{
size_t i;
struct sum_struct *s)
{
size_t i;
-
size_
t int_count;
+
in
t int_count;
extern int csum_length;
fdb_open = 1;
write_batch_csums_file(flist_entry, sizeof(int));
extern int csum_length;
fdb_open = 1;
write_batch_csums_file(flist_entry, sizeof(int));
- int_count = s
->count
;
- write_batch_csums_file(&int_count, int_count);
+ int_count = s
? (int) s->count : 0
;
+ write_batch_csums_file(&int_count,
sizeof
int_count);
if (s) {
for (i = 0; i < s->count; i++) {
if (s) {
for (i = 0; i < s->count; i++) {