extern int dry_run;
extern int preserve_times;
extern int am_root;
-extern int am_server;
extern int am_sender;
extern int am_generator;
extern int preserve_uid;
extern int preserve_gid;
-extern int preserve_perms;
extern int make_backups;
#else
ret = do_stat(fname, &st);
#endif
- if (ret) {
+ if (ret)
return -1;
- }
if (!S_ISDIR(st.st_mode)) {
- if (robust_unlink(fname) == 0 || errno == ENOENT) return 0;
+ 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 ||
- (errno != ENOTEMPTY && errno != EEXIST)) {
+ if (do_rmdir(fname) == 0 || errno == ENOENT)
+ return 0;
+ if (!force_delete || !recurse
+ || (errno != ENOTEMPTY && errno != EEXIST)) {
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) {
+ if (!(d = opendir(fname))) {
rprintf(FERROR, "delete_file: opendir %s failed: %s\n",
full_fname(fname), strerror(errno));
return -1;
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 (dname[0] == '.' && (dname[1] == '\0'
+ || (dname[1] == '.' && dname[2] == '\0')))
continue;
pathjoin(buf, sizeof buf, fname, dname);
if (verbose > 0)
- rprintf(FINFO,"deleting %s\n", buf);
+ rprintf(FINFO, "deleting %s\n", buf);
if (delete_file(buf) != 0) {
closedir(d);
return -1;
}
int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
- int report)
+ int flags)
{
int updated = 0;
STRUCT_STAT st2;
st = &st2;
}
- if (preserve_times && !S_ISLNK(st->st_mode) &&
- cmp_modtime(st->st_mtime, file->modtime) != 0) {
+ if (!preserve_times || S_ISLNK(st->st_mode))
+ flags |= PERMS_SKIP_TIME;
+ if (!(flags & PERMS_SKIP_TIME)
+ && 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 &&
}
#endif
- if (verbose > 1 && report) {
+ if (verbose > 1 && flags & PERMS_REPORT) {
if (updated)
rprintf(FINFO,"%s\n",fname);
else
/* finish off a file transfer, renaming the file and setting the permissions
and ownership */
-void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
+void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
+ int ok_to_set_time)
{
int ret;
full_fname(fnametmp), fname, strerror(errno));
do_unlink(fnametmp);
} else {
- set_perms(fname,file,NULL,0);
+ set_perms(fname, file, NULL,
+ ok_to_set_time ? 0 : PERMS_SKIP_TIME);
}
}