X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9422bb3fdf16ae5a3d726e41435ba405b4c22a8e..314a74d73101cdb9402ee21999187173456085dc:/rsync.c diff --git a/rsync.c b/rsync.c index 02dd8373..cfee2d03 100644 --- a/rsync.c +++ b/rsync.c @@ -1,17 +1,17 @@ -/* +/* Copyright (C) Andrew Tridgell 1996 Copyright (C) Paul Mackerras 1996 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -30,7 +30,6 @@ extern int preserve_uid; extern int preserve_gid; extern int preserve_perms; extern int make_backups; -extern char *backup_suffix; /* @@ -44,8 +43,8 @@ void free_sums(struct sum_struct *s) /* - * delete a file or directory. If force_delet is set then delete - * recursively + * delete a file or directory. If force_delete is set then delete + * recursively */ int delete_file(char *fname) { @@ -57,56 +56,63 @@ int delete_file(char *fname) int ret; extern int recurse; - if (do_unlink(fname) == 0 || errno == ENOENT) return 0; - #if SUPPORT_LINKS ret = do_lstat(fname, &st); #else ret = do_stat(fname, &st); #endif if (ret) { - rprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno)); return -1; } if (!S_ISDIR(st.st_mode)) { - rprintf(FERROR,"unlink(%s) : %s\n", fname, strerror(errno)); + if (robust_unlink(fname) == 0 || errno == ENOENT) return 0; + rprintf(FERROR, "delete_file: unlink %s failed: %s\n", + full_fname(fname), strerror(errno)); return -1; } if (do_rmdir(fname) == 0 || errno == ENOENT) return 0; - if (!force_delete || !recurse || + if (!force_delete || !recurse || (errno != ENOTEMPTY && errno != EEXIST)) { - rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno)); + rprintf(FERROR, "delete_file: rmdir %s failed: %s\n", + full_fname(fname), strerror(errno)); return -1; } /* now we do a recsursive delete on the directory ... */ d = opendir(fname); if (!d) { - rprintf(FERROR,"opendir(%s): %s\n", - fname,strerror(errno)); + rprintf(FERROR, "delete_file: opendir %s failed: %s\n", + full_fname(fname), strerror(errno)); return -1; } - for (di=readdir(d); di; di=readdir(d)) { + for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { char *dname = d_name(di); - if (strcmp(dname,".")==0 || - strcmp(dname,"..")==0) + if (strcmp(dname,".") == 0 + || strcmp(dname,"..") == 0) continue; - slprintf(buf, sizeof(buf), "%s/%s", fname, dname); + snprintf(buf, sizeof(buf), "%s/%s", fname, dname); if (verbose > 0) rprintf(FINFO,"deleting %s\n", buf); if (delete_file(buf) != 0) { closedir(d); return -1; } - } + } + if (errno) { + rprintf(FERROR, "delete_file: readdir %s failed: %s\n", + full_fname(fname), strerror(errno)); + closedir(d); + return -1; + } closedir(d); - + if (do_rmdir(fname) != 0) { - rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno)); + rprintf(FERROR, "delete_file: rmdir %s failed: %s\n", + full_fname(fname), strerror(errno)); return -1; } @@ -127,7 +133,7 @@ static int is_in_group(gid_t gid) /* treat failure (-1) as if not member of any group */ ngroups = getgroups(0, 0); if (ngroups > 0) { - gidset = (GETGROUPS_T *) malloc(ngroups * sizeof(GETGROUPS_T)); + gidset = new_array(GETGROUPS_T, ngroups); ngroups = getgroups(ngroups, gidset); } } @@ -148,31 +154,31 @@ static int is_in_group(gid_t gid) } int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, - int report) + int report) { int updated = 0; STRUCT_STAT st2; int change_uid, change_gid; - extern int am_daemon; if (dry_run) return 0; if (!st) { if (link_stat(fname,&st2) != 0) { - rprintf(FERROR,"stat %s : %s\n",fname,strerror(errno)); + rprintf(FERROR, "stat %s failed: %s\n", + full_fname(fname), strerror(errno)); return 0; } st = &st2; } if (preserve_times && !S_ISLNK(st->st_mode) && - st->st_mtime != file->modtime) { + cmp_modtime(st->st_mtime, file->modtime) != 0) { /* don't complain about not setting times on directories because some filesystems can't do it */ if (set_modtime(fname,file->modtime) != 0 && !S_ISDIR(st->st_mode)) { - rprintf(FERROR,"failed to set times on %s : %s\n", - fname,strerror(errno)); + rprintf(FERROR, "failed to set times on %s: %s\n", + full_fname(fname), strerror(errno)); return 0; } else { updated = 1; @@ -180,7 +186,7 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, } change_uid = am_root && preserve_uid && st->st_uid != file->uid; - change_gid = !am_daemon && preserve_gid && file->gid != (gid_t) -1 && \ + change_gid = preserve_gid && file->gid != (gid_t) -1 && \ st->st_gid != file->gid; if (change_gid && !am_root) { /* enforce bsd-style group semantics: non-root can only @@ -193,25 +199,32 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, change_gid?file->gid:st->st_gid) != 0) { /* shouldn't have attempted to change uid or gid unless have the privilege */ - rprintf(FERROR,"chown %s : %s\n", fname,strerror(errno)); + rprintf(FERROR, "chown %s failed: %s\n", + full_fname(fname), strerror(errno)); return 0; } + /* a lchown had been done - we have to re-stat if the + destination had the setuid or setgid bits set due + to the side effect of the chown call */ + if (st->st_mode & (S_ISUID | S_ISGID)) { + link_stat(fname, st); + } updated = 1; } #ifdef HAVE_CHMOD - if (preserve_perms && !S_ISLNK(st->st_mode) && - (st->st_mode != file->mode || - (updated && (file->mode & ~INITPERMMASK)))) { - updated = 1; - if (do_chmod(fname,file->mode) != 0) { - rprintf(FERROR,"failed to set permissions on %s : %s\n", - fname,strerror(errno)); - return 0; + if (!S_ISLNK(st->st_mode)) { + if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) { + updated = 1; + if (do_chmod(fname,(file->mode & CHMOD_BITS)) != 0) { + rprintf(FERROR, "failed to set permissions on %s: %s\n", + full_fname(fname), strerror(errno)); + return 0; + } } } #endif - + if (verbose > 1 && report) { if (updated) rprintf(FINFO,"%s\n",fname); @@ -227,26 +240,6 @@ void sig_int(void) exit_cleanup(RERR_SIGNAL); } -int make_backup(char *fname) -{ - char fnamebak[MAXPATHLEN]; - if (strlen(fname) + strlen(backup_suffix) > (MAXPATHLEN-1)) { - rprintf(FERROR,"backup filename too long\n"); - return 0; - } - - slprintf(fnamebak,sizeof(fnamebak),"%s%s",fname,backup_suffix); - if (do_rename(fname,fnamebak) != 0) { - if (errno != ENOENT) { - rprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno)); - return 0; - } - } else if (verbose > 1) { - rprintf(FINFO,"backed up %s to %s\n",fname,fnamebak); - } - return 1; -} - /* finish off a file transfer, renaming the file and setting the permissions and ownership */ @@ -256,26 +249,23 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file) return; /* move tmp file over real file */ - if (do_rename(fnametmp,fname) != 0) { + if (robust_rename(fnametmp,fname) != 0) { if (errno == EXDEV) { - /* rename failed on cross-filesystem link. + /* rename failed on cross-filesystem link. Copy the file instead. */ - if (copy_file(fnametmp,fname, file->mode & INITPERMMASK)) { - rprintf(FERROR,"copy %s -> %s : %s\n", - fnametmp,fname,strerror(errno)); + if (copy_file(fnametmp,fname, file->mode & INITACCESSPERMS)) { + rprintf(FERROR, "copy %s -> \"%s\": %s\n", + full_fname(fnametmp), fname, + strerror(errno)); } else { set_perms(fname,file,NULL,0); } - do_unlink(fnametmp); } else { - rprintf(FERROR,"rename %s -> %s : %s\n", - fnametmp,fname,strerror(errno)); - do_unlink(fnametmp); + rprintf(FERROR,"rename %s -> \"%s\": %s\n", + full_fname(fnametmp), fname, strerror(errno)); } + do_unlink(fnametmp); } else { set_perms(fname,file,NULL,0); } } - - -