extern int io_error;
extern int sanitize_paths;
+extern int read_batch;
+extern int write_batch;
+
static char topsrcname[MAXPATHLEN];
static struct exclude_struct **local_exclude_list;
static void clean_flist(struct file_list *flist, int strip_root);
-struct string_area *string_area_new(int size)
+static struct string_area *string_area_new(int size)
{
struct string_area *a;
a->current = a->base = malloc(size);
if (!a->current) out_of_memory("string_area_new buffer");
a->end = a->base + size;
- a->next = 0;
+ a->next = NULL;
return a;
}
-void string_area_free(struct string_area *a)
+static void string_area_free(struct string_area *a)
{
struct string_area *next;
}
}
-char *string_area_malloc(struct string_area **ap, int size)
+static char *string_area_malloc(struct string_area **ap, int size)
{
char *p;
struct string_area *a;
return p;
}
-char *string_area_strdup(struct string_area **ap, const char *src)
+static char *string_area_strdup(struct string_area **ap, const char *src)
{
char* dest = string_area_malloc(ap, strlen(src) + 1);
return strcpy(dest, src);
}
if (S_ISLNK(Buffer->st_mode)) {
int l;
- if ((l = readlink(Path,Linkbuf,MAXPATHLEN-1)) == -1) {
+ if ((l = readlink((char *) Path, Linkbuf, MAXPATHLEN-1))== -1) {
return -1;
}
Linkbuf[l] = 0;
static int match_file_name(char *fname,STRUCT_STAT *st)
{
if (check_exclude(fname,local_exclude_list,st)) {
- if (verbose > 2)
- rprintf(FINFO,"excluding file %s\n",fname);
return 0;
}
return 1;
static int to_wire_mode(mode_t mode)
{
- if (S_ISLNK(mode) && (S_IFLNK != 0120000)) {
+ if (S_ISLNK(mode) && (_S_IFLNK != 0120000)) {
return (mode & ~(_S_IFMT)) | 0120000;
}
return (int)mode;
static mode_t from_wire_mode(int mode)
{
- if ((mode & (_S_IFMT)) == 0120000 && (S_IFLNK != 0120000)) {
- return (mode & ~(_S_IFMT)) | S_IFLNK;
+ if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000)) {
+ return (mode & ~(_S_IFMT)) | _S_IFLNK;
}
return (mode_t)mode;
}
if (lastdir && strcmp(fname, lastdir)==0) {
file->dirname = lastdir;
} else {
- file->dirname = STRDUP(ap, fname);
+ file->dirname = strdup(fname);
lastdir = file->dirname;
}
file->basename = STRDUP(ap, p+1);
if (lastdir && strcmp(lastdir, flist_dir)==0) {
file->basedir = lastdir;
} else {
- file->basedir = STRDUP(ap, flist_dir);
+ file->basedir = strdup(flist_dir);
lastdir = file->basedir;
}
} else {
out_of_memory("send_file_name");
}
+ if (write_batch) /* dw */
+ file->flags = FLAG_DELETE;
+
if (strcmp(file->basename,"")) {
flist->files[flist->count++] = file;
send_file_entry(file,f,base_flags);
if (verbose && recurse && !am_server && f != -1) {
rprintf(FINFO,"building file list ... ");
+ if (verbose > 1)
+ rprintf(FINFO, "\n");
rflush(FINFO);
}
io_end_buffering(f);
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
+ if (write_batch) /* dw */
+ write_batch_flist_info(flist->count, flist->files);
}
if (verbose > 2)
}
/* if protocol version is >= 17 then recv the io_error flag */
- if (f != -1 && remote_version >= 17) {
+ if (f != -1 && remote_version >= 17 && !read_batch) { /* dw-added readbatch */
extern int module_id;
extern int ignore_errors;
if (lp_ignore_errors(module_id) || ignore_errors) {
#if ARENA_SIZE > 0
flist->string_area = string_area_new(0);
#else
- flist->string_area = 0;
+ flist->string_area = NULL;
#endif
return flist;
}
for (i=0;i<flist->count;i++) {
rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%.0f\n",
- getpid(), i,
+ (int) getpid(), i,
NS(flist->files[i]->dirname),
NS(flist->files[i]->basename),
- flist->files[i]->mode,
+ (int) flist->files[i]->mode,
(double)flist->files[i]->length);
}
}