static int deletion_count = 0; /* used to implement --max-delete */
static FILE *delete_delay_fp = NULL;
+static BOOL solo_file = 0;
/* For calling delete_item() and delete_dir_contents(). */
#define DEL_RECURSE (1<<1) /* recurse */
if (flist_find(flist, fp) < 0) {
f_name(fp, delbuf);
if (delete_delay_fp)
- fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0');
+ fprintf(delete_delay_fp, "%o %s%c", fp->mode, delbuf, '\0');
else
delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
}
char lnk[MAXPATHLEN];
int best_match = -1;
int match_level = 0;
+ uint32 *devp;
enum nonregtype type;
int len, j = 0;
break;
case TYPE_SPECIAL:
case TYPE_DEVICE:
- if (stp->st_rdev != MAKEDEV(F_DMAJOR(file), F_DMINOR(file)))
+ devp = F_RDEV_P(file);
+ if (stp->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
continue;
break;
#ifdef SUPPORT_LINKS
const char *sl = F_SYMLINK(file);
if (safe_symlinks && unsafe_symlink(sl, fname)) {
if (verbose) {
- if (the_file_list->count == 1)
+ if (solo_file)
fname = f_name(file, NULL);
rprintf(FINFO,
"ignoring unsafe symlink %s -> \"%s\"\n",
if ((am_root && preserve_devices && IS_DEVICE(file->mode))
|| (preserve_specials && IS_SPECIAL(file->mode))) {
- dev_t rdev = MAKEDEV(F_DMAJOR(file), F_DMINOR(file));
+ uint32 *devp = F_RDEV_P(file);
+ dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
if (statret == 0) {
char *t;
if (IS_DEVICE(file->mode)) {
return;
#endif
if (verbose > 2) {
- rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
- fname, (int)file->mode, (int)rdev);
+ rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n",
+ fname, (int)file->mode,
+ (long)major(rdev), (long)minor(rdev));
}
if (do_mknod(fname, file->mode, rdev) < 0) {
rsyserr(FERROR, errno, "mknod %s failed",
}
if (!S_ISREG(file->mode)) {
- if (the_file_list->count == 1)
+ if (solo_file)
fname = f_name(file, NULL);
rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
return;
if (max_size && F_LENGTH(file) > max_size) {
if (verbose > 1) {
- if (the_file_list->count == 1)
+ if (solo_file)
fname = f_name(file, NULL);
rprintf(FINFO, "%s is over max-size\n", fname);
}
}
if (min_size && F_LENGTH(file) < min_size) {
if (verbose > 1) {
- if (the_file_list->count == 1)
+ if (solo_file)
fname = f_name(file, NULL);
rprintf(FINFO, "%s is under min-size\n", fname);
}
maybe_ATTRS_REPORT = ATTRS_REPORT;
code = FINFO;
}
+ solo_file = local_name != NULL;
if (verbose > 2) {
rprintf(FINFO, "generator starting pid=%ld count=%d\n",
make_backups = 0; /* avoid a duplicate backup for inplace processing */
if (verbose > 2)
- rprintf(FINFO,"generate_files phase=%d\n",phase);
+ rprintf(FINFO, "generate_files phase=%d\n", phase);
write_int(f_out, NDX_DONE);
make_backups = save_make_backups;
if (verbose > 2)
- rprintf(FINFO,"generate_files phase=%d\n",phase);
+ rprintf(FINFO, "generate_files phase=%d\n", phase);
write_int(f_out, NDX_DONE);
/* Reduce round-trip lag-time for a useless delay-updates phase. */
}
if (verbose > 2)
- rprintf(FINFO,"generate_files finished\n");
+ rprintf(FINFO, "generate_files finished\n");
}