extern int verbose;
extern int dry_run;
+extern int daemon_log_format_has_i;
extern int preserve_times;
extern int omit_dir_times;
extern int am_root;
extern int am_server;
extern int am_sender;
extern int am_generator;
+extern int am_starting_up;
extern int preserve_uid;
extern int preserve_gid;
-extern int force_delete;
-extern int recurse;
+extern int inplace;
extern int keep_dirlinks;
extern int make_backups;
-extern char *backup_dir;
-extern int inplace;
+extern struct stats stats;
/*
}
-/*
- * delete a file or directory. If force_delete is set then delete
- * recursively
- */
-int delete_file(char *fname, int flags)
-{
- DIR *d;
- struct dirent *di;
- char buf[MAXPATHLEN];
- STRUCT_STAT st;
- int zap_dir;
-
- if (!(flags & DEL_DIR)) {
- if (robust_unlink(fname) == 0) {
- if (verbose && !(flags & DEL_TERSE)) {
- rprintf(FINFO, "deleting %s\n",
- safe_fname(fname));
- }
- return 0;
- }
- if (errno == ENOENT)
- return 0;
- rsyserr(FERROR, errno, "delete_file: unlink %s failed",
- full_fname(fname));
- return -1;
- }
-
- zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
- && !(flags & DEL_NO_RECURSE);
- if (dry_run && zap_dir)
- errno = ENOTEMPTY;
- else if (do_rmdir(fname) == 0) {
- if (verbose && !(flags & DEL_TERSE)) {
- rprintf(FINFO, "deleting %s/\n",
- safe_fname(fname));
- }
- return 0;
- }
- if (errno == ENOENT)
- return 0;
- if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) {
- rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
- full_fname(fname));
- return -1;
- }
-
- /* now we do a recsursive delete on the directory ... */
- if (!(d = opendir(fname))) {
- rsyserr(FERROR, errno, "delete_file: opendir %s failed",
- full_fname(fname));
- return -1;
- }
-
- if (!(flags & DEL_TERSE)) {
- if (verbose)
- rprintf(FINFO, "deleting %s/\n", safe_fname(fname));
- flags |= DEL_TERSE;
- }
-
- for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
- char *dname = d_name(di);
- if (dname[0] == '.' && (dname[1] == '\0'
- || (dname[1] == '.' && dname[2] == '\0')))
- continue;
- pathjoin(buf, sizeof buf, fname, dname);
-
- if (do_lstat(buf, &st) < 0)
- continue;
- if (S_ISDIR(st.st_mode))
- flags |= DEL_DIR;
- else
- flags &= ~DEL_DIR;
-
- if (verbose) {
- rprintf(FINFO, "deleting %s%s\n", safe_fname(buf),
- flags & DEL_DIR ? "/" : "");
- }
- if (delete_file(buf, flags) != 0) {
- closedir(d);
- return -1;
- }
- }
- if (errno) {
- rsyserr(FERROR, errno, "delete_file: readdir %s failed",
- full_fname(fname));
- closedir(d);
- return -1;
- }
-
- closedir(d);
-
- if (do_rmdir(fname) != 0 && errno != ENOENT) {
- rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
- full_fname(fname));
- return -1;
- }
-
- return 0;
-}
-
int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
int flags)
{
st = &st2;
}
- if (!preserve_times || S_ISLNK(st->st_mode)
- || (S_ISDIR(st->st_mode)
- && (omit_dir_times || (make_backups && !backup_dir))))
+ if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
flags |= PERMS_SKIP_MTIME;
if (!(flags & PERMS_SKIP_MTIME)
&& cmp_modtime(st->st_mtime, file->modtime) != 0) {
- if (set_modtime(fname,file->modtime) != 0) {
+ int ret = set_modtime(fname, file->modtime, st->st_mode);
+ if (ret < 0) {
rsyserr(FERROR, errno, "failed to set times on %s",
full_fname(fname));
return 0;
}
- updated = 1;
+ if (ret == 0) /* ret == 1 if symlink could not be set */
+ updated = 1;
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
}
#ifdef HAVE_CHMOD
- 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) {
- rsyserr(FERROR, errno, "failed to set permissions on %s",
- full_fname(fname));
- return 0;
- }
+ if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
+ int ret = do_chmod(fname, file->mode);
+ if (ret < 0) {
+ rsyserr(FERROR, errno,
+ "failed to set permissions on %s",
+ full_fname(fname));
+ return 0;
}
+ if (ret == 0) /* ret == 1 if symlink could not be set */
+ updated = 1;
}
#endif
if (verbose > 1 && flags & PERMS_REPORT) {
+ enum logcode code = daemon_log_format_has_i || dry_run
+ ? FCLIENT : FINFO;
if (updated)
- rprintf(FINFO, "%s\n", safe_fname(fname));
+ rprintf(code, "%s\n", safe_fname(fname));
else
- rprintf(FINFO, "%s is uptodate\n", safe_fname(fname));
+ rprintf(code, "%s is uptodate\n", safe_fname(fname));
}
return updated;
}
const char *who_am_i(void)
{
- if (am_sender < 0)
+ if (am_starting_up)
return am_server ? "server" : "client";
return am_sender ? "sender" : am_generator ? "generator" : "receiver";
}