Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document the new --log-file option.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
1860b0d
..
e4023d3
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-27,7
+27,7
@@
extern int verbose;
extern int dry_run;
extern int do_xfers;
extern int log_format_has_i;
extern int dry_run;
extern int do_xfers;
extern int log_format_has_i;
-extern int
daemon_log
_format_has_i;
+extern int
logfile
_format_has_i;
extern int am_root;
extern int am_server;
extern int am_daemon;
extern int am_root;
extern int am_server;
extern int am_daemon;
@@
-50,8
+50,6
@@
extern int delete_before;
extern int delete_during;
extern int delete_after;
extern int module_id;
extern int delete_during;
extern int delete_after;
extern int module_id;
-extern int sanitize_paths;
-extern int startdir_depth;
extern int ignore_errors;
extern int remove_sent_files;
extern int delay_updates;
extern int ignore_errors;
extern int remove_sent_files;
extern int delay_updates;
@@
-659,8
+657,8
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
match_level = 0;
}
match_level = 0;
}
-#ifdef HAVE_LINK
if (match_level == 3 && !copy_dest) {
if (match_level == 3 && !copy_dest) {
+#ifdef SUPPORT_HARD_LINKS
if (link_dest) {
if (hard_link_one(file, ndx, fname, 0, stp,
cmpbuf, 1,
if (link_dest) {
if (hard_link_one(file, ndx, fname, 0, stp,
cmpbuf, 1,
@@
-669,16
+667,17
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
goto try_a_copy;
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
goto try_a_copy;
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
- } else if (itemizing)
+ } else
+#endif
+ if (itemizing)
itemize(file, ndx, 0, stp, 0, 0, NULL);
if (verbose > 1 && maybe_ATTRS_REPORT) {
itemize(file, ndx, 0, stp, 0, 0, NULL);
if (verbose > 1 && maybe_ATTRS_REPORT) {
- code =
daemon_log
_format_has_i || dry_run
+ code =
logfile
_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
}
return -2;
}
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
}
return -2;
}
-#endif
if (match_level >= 2) {
try_a_copy: /* Copy the file locally. */
if (match_level >= 2) {
try_a_copy: /* Copy the file locally. */
@@
-695,7
+694,7
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
if (maybe_ATTRS_REPORT
&& ((!itemizing && verbose && match_level == 2)
|| (verbose > 1 && match_level == 3))) {
if (maybe_ATTRS_REPORT
&& ((!itemizing && verbose && match_level == 2)
|| (verbose > 1 && match_level == 3))) {
- code =
daemon_log
_format_has_i || dry_run
+ code =
logfile
_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s%s\n", fname,
match_level == 3 ? " is uptodate" : "");
? FCLIENT : FINFO;
rprintf(code, "%s%s\n", fname,
match_level == 3 ? " is uptodate" : "");
@@
-742,9
+741,10
@@
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
} else {
rprintf(FERROR,
"internal: try_dests_non() called with invalid mode (%o)\n",
} else {
rprintf(FERROR,
"internal: try_dests_non() called with invalid mode (%o)\n",
- file->mode);
+
(int)
file->mode);
exit_cleanup(RERR_UNSUPPORTED);
}
exit_cleanup(RERR_UNSUPPORTED);
}
+#ifdef SUPPORT_HARD_LINKS
if (link_dest
#ifndef CAN_HARDLINK_SYMLINK
&& !S_ISLNK(file->mode)
if (link_dest
#ifndef CAN_HARDLINK_SYMLINK
&& !S_ISLNK(file->mode)
@@
-762,6
+762,7
@@
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
}
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
}
+#endif
if (itemizing && log_format_has_i && verbose > 1) {
int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
+ (link_dest ? ITEM_XNAME_FOLLOWS : 0);
if (itemizing && log_format_has_i && verbose > 1) {
int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
+ (link_dest ? ITEM_XNAME_FOLLOWS : 0);
@@
-769,7
+770,7
@@
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
itemize(file, ndx, 0, &st, changes, 0, lp);
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
itemize(file, ndx, 0, &st, changes, 0, lp);
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
- code =
daemon_log
_format_has_i || dry_run
+ code =
logfile
_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
}
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
}
@@
-859,7
+860,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
if (relative_paths && !implied_dirs
char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
if (relative_paths && !implied_dirs
- &&
do
_stat(dn, &st) < 0
+ &&
safe
_stat(dn, &st) < 0
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
@@
-955,10
+956,6
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
return;
}
}
return;
}
- if (sanitize_paths) {
- sanitize_path(file->u.link, file->u.link, "",
- startdir_depth + file->dir.depth - 1);
- }
if (statret == 0) {
char lnk[MAXPATHLEN];
int len;
if (statret == 0) {
char lnk[MAXPATHLEN];
int len;
@@
-1342,9
+1339,9
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
if (protocol_version >= 29) {
itemizing = 1;
maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
if (protocol_version >= 29) {
itemizing = 1;
maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
- code =
daemon_log
_format_has_i ? 0 : FLOG;
+ code =
logfile
_format_has_i ? 0 : FLOG;
} else if (am_daemon) {
} else if (am_daemon) {
- itemizing =
daemon_log
_format_has_i && do_xfers;
+ itemizing =
logfile
_format_has_i && do_xfers;
maybe_ATTRS_REPORT = ATTRS_REPORT;
code = itemizing || !do_xfers ? FCLIENT : FINFO;
} else if (!am_server) {
maybe_ATTRS_REPORT = ATTRS_REPORT;
code = itemizing || !do_xfers ? FCLIENT : FINFO;
} else if (!am_server) {