/*
- * 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 (robust_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;
}
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 (!S_ISLNK(st->st_mode)) {
- if (st->st_mode != file->mode) {
+ if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
updated = 1;
- if (do_chmod(fname,file->mode) != 0) {
+ if (do_chmod(fname,(file->mode & CHMOD_BITS)) != 0) {
rprintf(FERROR,"failed to set permissions on %s : %s\n",
fname,strerror(errno));
return 0;
set_perms(fname,file,NULL,0);
}
}
-
-
-