X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/60be6acf46ab7851a01396f8cd2439a9f61118ae..30ce7e8a648284a177c798804b609e45f6712aa2:/generator.c diff --git a/generator.c b/generator.c index 3f6322f8..767e86c7 100644 --- a/generator.c +++ b/generator.c @@ -1,5 +1,6 @@ -/* - Copyright (C) Andrew Tridgell 1996 +/* -*- c-file-style: "linux" -*- + + Copyright (C) 1996-2000 by Andrew Tridgell Copyright (C) Paul Mackerras 1996 This program is free software; you can redistribute it and/or modify @@ -35,6 +36,8 @@ extern int size_only; extern int io_timeout; extern int remote_version; extern int always_checksum; +extern int modify_window; +extern char *compare_dest; /* choose whether to skip a particular file */ @@ -49,6 +52,15 @@ static int skip_file(char *fname, of the file time to determine whether to sync */ if (always_checksum && S_ISREG(st->st_mode)) { char sum[MD4_SUM_LENGTH]; + char fnamecmpdest[MAXPATHLEN]; + + if (compare_dest != NULL) { + if (access(fname, 0) != 0) { + snprintf(fnamecmpdest,MAXPATHLEN,"%s/%s", + compare_dest,fname); + fname = fnamecmpdest; + } + } file_checksum(fname,sum,st->st_size); if (remote_version < 21) { return (memcmp(sum,file->sum,2) == 0); @@ -65,7 +77,7 @@ static int skip_file(char *fname, return 0; } - return (st->st_mtime == file->modtime); + return (cmp_modtime(st->st_mtime,file->modtime) == 0); } @@ -136,8 +148,8 @@ static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n) } if (verbose > 3) - rprintf(FINFO,"count=%d rem=%d n=%d flength=%d\n", - s->count,s->remainder,s->n,(int)s->flength); + rprintf(FINFO,"count=%d rem=%d n=%d flength=%.0f\n", + s->count,s->remainder,s->n,(double)s->flength); s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count); if (!s->sums) out_of_memory("generate_sums"); @@ -154,8 +166,8 @@ static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n) s->sums[i].i = i; if (verbose > 3) - rprintf(FINFO,"chunk[%d] offset=%d len=%d sum1=%08x\n", - i,(int)s->sums[i].offset,s->sums[i].len,s->sums[i].sum1); + rprintf(FINFO,"chunk[%d] offset=%.0f len=%d sum1=%08x\n", + i,(double)s->sums[i].offset,s->sums[i].len,s->sums[i].sum1); len -= n1; offset += n1; @@ -165,6 +177,15 @@ static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n) } + +/* + * Acts on file number I from FLIST, whose name is fname. + * + * First fixes up permissions, then generates checksums for the file. + * + * (This comment was added later by mbp who was trying to work it out; + * it might be wrong.) + */ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) { int fd; @@ -178,6 +199,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) extern char *compare_dest; extern int list_only; extern int preserve_perms; + extern int only_existing; if (list_only) return; @@ -186,6 +208,12 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) statret = link_stat(fname,&st); + if (only_existing && statret == -1 && errno == ENOENT) { + /* we only want to update existing files */ + if (verbose > 1) rprintf(FINFO,"not creating %s\n",fname); + return; + } + if (statret == 0 && !preserve_perms && (S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) { @@ -196,10 +224,17 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) } if (S_ISDIR(file->mode)) { + /* The file to be received is a directory, so we need + * to prepare appropriately. If there is already a + * file of that name and it is *not* a directory, then + * we need to delete it. If it doesn't exist, then + * recursively create it. */ + if (dry_run) return; if (statret == 0 && !S_ISDIR(st.st_mode)) { if (robust_unlink(fname) != 0) { - rprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno)); + rprintf(FERROR,"recv_generator: unlink %s: %s\n", + fname,strerror(errno)); return; } statret = -1; @@ -208,7 +243,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) if (!(relative_paths && errno==ENOENT && create_directory_path(fname)==0 && do_mkdir(fname,file->mode)==0)) { - rprintf(FERROR,"mkdir %s : %s (2)\n", + rprintf(FERROR,"recv_generator: mkdir %s: %s (2)\n", fname,strerror(errno)); } } @@ -239,10 +274,10 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) return; } } + delete_file(fname); } - delete_file(fname); if (do_symlink(file->link,fname) != 0) { - rprintf(FERROR,"link %s -> %s : %s\n", + rprintf(FERROR,"symlink %s -> %s : %s\n", fname,file->link,strerror(errno)); } else { set_perms(fname,file,NULL,0); @@ -294,7 +329,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) if ((statret == -1) && (compare_dest != NULL)) { /* try the file at compare_dest instead */ int saveerrno = errno; - slprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,fname); + snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,fname); statret = link_stat(fnamecmpbuf,&st); if (!S_ISREG(st.st_mode)) statret = -1; @@ -326,7 +361,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) return; } - if (update_only && st.st_mtime > file->modtime && fnamecmp == fname) { + if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) { if (verbose > 1) rprintf(FINFO,"%s is newer\n",fname); return; @@ -367,7 +402,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) } if (verbose > 3) - rprintf(FINFO,"gen mapped %s of size %d\n",fnamecmp,(int)st.st_size); + rprintf(FINFO,"gen mapped %s of size %.0f\n",fnamecmp,(double)st.st_size); s = generate_sums(buf,st.st_size,adapt_block_size(file, block_size)); @@ -404,6 +439,8 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv) them. This is then fixed after the files are transferred */ if (!am_root && S_ISDIR(file->mode)) { file->mode |= S_IWUSR; /* user write */ + /* XXX: Could this be causing a problem on SCO? Perhaps their + * handling of permissions is strange? */ } recv_generator(local_name?local_name:f_name(file),