extern int preserve_gid;
extern int preserve_perms;
extern int make_backups;
-extern char *backup_suffix;
/*
/*
- * delete a file or directory. If force_delet is set then delete
+ * delete a file or directory. If force_delete is set then delete
* recursively
*/
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) : %s\n", fname, strerror(errno));
return -1;
}
if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
if (!force_delete || !recurse ||
(errno != ENOTEMPTY && errno != EEXIST)) {
- rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+ rprintf(FERROR,"delete_file: rmdir(%s) : %s\n", 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",
+ rprintf(FERROR,"delete_file: opendir(%s): %s\n",
fname,strerror(errno));
return -1;
}
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);
if (do_rmdir(fname) != 0) {
- rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+ rprintf(FERROR,"delete_file: rmdir(%s) : %s\n", fname, strerror(errno));
return -1;
}
static int is_in_group(gid_t gid)
{
-#ifdef HAVE_GETGROUPS
+#ifdef GETGROUPS_T
static gid_t last_in = (gid_t) -2, last_out;
static int ngroups = -2;
- static gid_t *gidset;
+ static GETGROUPS_T *gidset;
int n;
if (gid == last_in)
/* treat failure (-1) as if not member of any group */
ngroups = getgroups(0, 0);
if (ngroups > 0) {
- gidset = (gid_t *) malloc(ngroups * sizeof(gid_t));
+ gidset = (GETGROUPS_T *) malloc(ngroups * sizeof(GETGROUPS_T));
ngroups = getgroups(ngroups, gidset);
}
}
int updated = 0;
STRUCT_STAT st2;
int change_uid, change_gid;
- extern int am_daemon;
if (dry_run) return 0;
}
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 &&
}
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
rprintf(FERROR,"chown %s : %s\n", 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 != file->mode) {
+ updated = 1;
+ if (do_chmod(fname,file->mode) != 0) {
+ rprintf(FERROR,"failed to set permissions on %s : %s\n",
+ fname,strerror(errno));
+ return 0;
+ }
}
}
#endif
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 */
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.
Copy the file instead. */
- if (copy_file(fnametmp,fname, file->mode & INITPERMMASK)) {
+ if (copy_file(fnametmp,fname, file->mode & INITACCESSPERMS)) {
rprintf(FERROR,"copy %s -> %s : %s\n",
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);
}
+ do_unlink(fnametmp);
} else {
set_perms(fname,file,NULL,0);
}
}
-
-
-
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff