search for: read_batch_flag

Hello list, This is a patch to rsync 2.5.5, and it serves two purposes. The small patches to batch.c, flist.c and log.c simply add "void" to some function definitions so that all declarations in proto.h have full parameter lists. unsigned char read_batch_flags() OLD unsigned char read_batch_flags(void) NEW The SCO UNIXWare compiler correctly objected to these functions not having a prototype in scope. The fix seems to be innocuous and should not break anything. It does seem to require a "make proto" afterwards to rebuild proto.h The change...

...rite_char_bufs((char *)fptr[i]->sum); } } @@ -175,7 +176,7 @@ close(fdb); } -struct file_list *create_flist_from_batch() +struct file_list *create_flist_from_batch(void) { unsigned char flags; @@ -261,7 +262,7 @@ return bytes_read; } -unsigned char read_batch_flags() +unsigned char read_batch_flags(void) { int flags; @@ -339,13 +340,13 @@ if (int_str_len > 0) { read_batch_flist_file(buff, int_str_len); buff[int_str_len] = '\0'; - file[0].sum = strdup(buff); + file[...

...rite_char_bufs((char *)fptr[i]->sum); } } @@ -184,7 +185,7 @@ close(fdb); } -struct file_list *create_flist_from_batch() +struct file_list *create_flist_from_batch(void) { unsigned char flags; @@ -270,7 +271,7 @@ return bytes_read; } -unsigned char read_batch_flags() +unsigned char read_batch_flags(void) { int flags; @@ -348,7 +349,7 @@ if (int_str_len > 0) { read_batch_flist_file(buff, int_str_len); buff[int_str_len] = '\0'; - file[0].sum = strdup(buff); + file[0]....

...5,7 @@ (struct file_struct **) malloc(sizeof(batch_flist->files[0]) * batch_flist->malloced); if (!batch_flist->files) { - out_of_memory("create_flist_from_batch"); /* dw -- will exit */ + out_of_memory("create_flist_from_batch"); } for (flags = read_batch_flags(); flags; flags = read_batch_flags()) { @@ -231,23 +225,23 @@ } return batch_flist; - } int read_batch_flist_file(char *buff, int len) { int bytes_read; + char filename[MAXPATHLEN]; if (fdb_open) { - - /* Set up file extension */ - strcat(rsync_flist_file, batch_file_ext); +...

> Just curious: what about the rsync+ patch? Thanks for the reminder. I've just committed Jos's rsync+ patch onto the "branch_mbp_rsyncplus_merge" branch. If it works OK and nobody screams I will move it across onto the main tree tomorrow or Wednesday. I see the patch doesn't add documentation about the new options to the man page, so we should fix that in the future.