rprintf(FINFO, "flist->length=%.0f\n",
(double) fptr[i]->length);
rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- orig/flist.c 2005-01-01 21:11:00
+--- orig/flist.c 2005-01-21 00:35:26
+++ flist.c 2004-07-03 20:15:41
@@ -59,6 +59,7 @@ extern int relative_paths;
extern int implied_dirs;
static time_t modtime;
+ static time_t atime;
static mode_t mode;
- static uint64 dev;
+ static int64 dev;
static dev_t rdev;
@@ -349,7 +351,7 @@ void send_file_entry(struct file_struct
static time_t modtime;
+ static time_t atime;
static mode_t mode;
- static uint64 dev;
+ static int64 dev;
static dev_t rdev;
@@ -542,7 +553,7 @@ void receive_file_entry(struct file_stru
struct file_struct *file;
uid = (uid_t)read_int(f);
@@ -647,6 +660,7 @@ void receive_file_entry(struct file_stru
- file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
+ file->flags = flags & XMIT_DEL_START ? FLAG_DEL_START : 0;
file->modtime = modtime;
+ file->atime = atime;
file->length = file_length;
file->length = st.st_size;
file->mode = st.st_mode;
file->uid = st.st_uid;
---- orig/generator.c 2005-01-01 21:11:00
+--- orig/generator.c 2005-01-20 23:05:34
+++ generator.c 2004-11-03 23:02:12
@@ -96,7 +96,7 @@ static int unchanged_file(char *fn, stru
if (ignore_times)
}
-@@ -513,7 +513,7 @@ static void recv_generator(char *fname,
+@@ -492,7 +492,7 @@ static void recv_generator(char *fname,
}
if (update_only && fnamecmp_type == FNAMECMP_FNAME
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", safe_fname(fname));
return;
---- orig/options.c 2005-01-01 21:11:00
+--- orig/options.c 2005-01-20 23:05:34
+++ options.c 2004-07-03 20:15:41
@@ -48,6 +48,7 @@ int preserve_devices = 0;
int preserve_uid = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -260,6 +261,7 @@ void usage(enum logcode F)
+@@ -261,6 +262,7 @@ void usage(enum logcode F)
rprintf(F," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
rprintf(F," -t, --times preserve times\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
rprintf(F," -W, --whole-file copy whole files, no incremental checks\n");
-@@ -366,6 +368,7 @@ static struct poptOption long_options[]
+@@ -367,6 +369,7 @@ static struct poptOption long_options[]
{"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
{"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 },
{"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
{"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
-@@ -1081,6 +1084,8 @@ void server_options(char **args,int *arg
+@@ -1080,6 +1083,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
if (preserve_perms)
argstr[x++] = 'p';
if (recurse)
---- orig/rsync.c 2004-09-07 21:45:30
+--- orig/rsync.c 2005-01-20 23:52:09
+++ rsync.c 2004-08-13 08:17:28
@@ -25,6 +25,7 @@
extern int verbose;
extern int am_root;
extern int am_sender;
extern int am_generator;
-@@ -145,17 +146,32 @@ int set_perms(char *fname,struct file_st
+@@ -167,17 +168,32 @@ int set_perms(char *fname,struct file_st
if (!preserve_times || S_ISLNK(st->st_mode)
|| (make_backups && !backup_dir && S_ISDIR(st->st_mode)))
flags |= PERMS_SKIP_MTIME;
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h 2005-01-01 21:11:01
+--- orig/rsync.h 2005-01-21 00:35:26
+++ rsync.h 2004-07-03 20:15:41
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
/* These flags are used in the live flist data. */
-@@ -114,6 +115,7 @@
+@@ -115,6 +116,7 @@
#define PERMS_REPORT (1<<0)
#define PERMS_SKIP_MTIME (1<<1)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -436,6 +438,7 @@ struct file_struct {
+@@ -433,6 +435,7 @@ struct file_struct {
struct hlink *links;
} link_u;
time_t modtime;
uid_t uid;
gid_t gid;
mode_t mode;
---- orig/rsync.yo 2005-01-01 21:11:01
+--- orig/rsync.yo 2005-01-20 19:47:08
+++ rsync.yo 2004-07-03 20:15:41
@@ -330,6 +330,7 @@ verb(
-g, --group preserve group
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-W, --whole-file copy whole files, no incremental checks
-@@ -628,6 +629,11 @@ cause the next transfer to behave as if
+@@ -630,6 +631,11 @@ cause the next transfer to behave as if
updated (though the rsync algorithm will make the update fairly efficient
if the files haven't actually changed, you're much better off using -t).
if [ -z "$failed" ] ; then
return 0
else
---- orig/tls.c 2005-01-01 21:11:01
+--- orig/tls.c 2005-01-19 20:11:10
+++ tls.c 2004-07-03 20:15:41
@@ -39,6 +39,7 @@
+ char mtimebuf[50];
+ char atimebuf[50];
char linkbuf[4096];
- int ret;
-@@ -102,19 +119,8 @@ static void list_file(const char *fname)
+ if (do_lstat(fname, &buf) < 0)
+@@ -96,19 +113,8 @@ static void list_file(const char *fname)
permstring(permbuf, buf.st_mode);
/* TODO: Perhaps escape special characters in fname? */
-@@ -125,24 +131,55 @@ static void list_file(const char *fname)
+@@ -119,24 +125,55 @@ static void list_file(const char *fname)
(long)minor(buf.st_rdev));
} else /* NB: use double for size since it might not fit in a long. */
printf("%12.0f", (double)buf.st_size);
return 0;
}
---- orig/util.c 2004-09-07 21:45:30
-+++ util.c 2004-07-03 20:15:41
-@@ -128,31 +128,39 @@ void overflow(char *str)
+--- orig/util.c 2005-01-20 23:05:34
++++ util.c 2005-01-21 18:56:05
+@@ -128,12 +128,20 @@ void overflow(char *str)
-int set_modtime(char *fname, time_t modtime)
+int set_times(char *fname, time_t modtime, time_t atime)
{
- if (dry_run)
- return 0;
-
if (verbose > 2) {
- rprintf(FINFO, "set modtime of %s to (%ld) %s",
+ char mtimebuf[200];
+ (long)atime, atimebuf);
}
+ if (dry_run)
+@@ -142,17 +150,17 @@ int set_modtime(char *fname, time_t modt
{
#ifdef HAVE_UTIMBUF
struct utimbuf tbuf;
t[0].tv_usec = 0;
t[1].tv_sec = modtime;
t[1].tv_usec = 0;
-@@ -1142,8 +1150,8 @@ int msleep(int t)
+@@ -1138,8 +1146,8 @@ int msleep(int t)
/**
* --modify-window).
*
* @retval 0 if the times should be treated as the same
-@@ -1152,7 +1160,7 @@ int msleep(int t)
+@@ -1148,7 +1156,7 @@ int msleep(int t)
*
* @retval -1 if the 2nd is later
**/
- XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
+ add_exclude(&exclude_list, getenv("CVSIGNORE"), cvs_flags);
}
---- orig/flist.c 2005-01-01 21:11:00
+--- orig/flist.c 2005-01-21 00:35:26
+++ flist.c 2004-08-12 18:59:28
-@@ -40,10 +40,9 @@ extern int module_id;
+@@ -40,11 +40,10 @@ extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
-extern int cvs_exclude;
-
extern int recurse;
+ extern int keep_dirs;
extern char curr_dir[MAXPATHLEN];
+extern unsigned int curr_dir_len;
- extern char *files_from;
extern int filesfrom_fd;
+ extern int one_file_system;
@@ -67,7 +66,6 @@ extern int list_only;
extern struct exclude_list_struct exclude_list;
FN_LOCAL_STRING(lp_exclude, exclude)
FN_LOCAL_STRING(lp_exclude_from, exclude_from)
FN_LOCAL_STRING(lp_include, include)
---- orig/options.c 2005-01-17 23:11:45
+--- orig/options.c 2005-01-20 23:05:34
+++ options.c 2005-01-16 23:34:15
-@@ -144,6 +144,7 @@ int list_only = 0;
+@@ -145,6 +145,7 @@ int list_only = 0;
char *batch_name = NULL;
static int daemon_opt; /* sets am_daemon after option error-reporting */
static int modify_window_set;
static char *dest_option = NULL;
static char *max_size_arg;
-@@ -291,6 +292,9 @@ void usage(enum logcode F)
+@@ -292,6 +293,9 @@ void usage(enum logcode F)
rprintf(F," -P equivalent to --partial --progress\n");
rprintf(F," -z, --compress compress file data\n");
rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n");
rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n");
rprintf(F," --exclude-from=FILE exclude patterns listed in FILE\n");
rprintf(F," --include=PATTERN don't exclude files matching PATTERN\n");
-@@ -320,7 +324,7 @@ void usage(enum logcode F)
+@@ -321,7 +325,7 @@ void usage(enum logcode F)
}
enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
-@@ -343,6 +347,7 @@ static struct poptOption long_options[]
+@@ -344,6 +348,7 @@ static struct poptOption long_options[]
{"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 },
{"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 },
{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
{"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 },
{"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 },
{"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 },
-@@ -393,6 +398,7 @@ static struct poptOption long_options[]
+@@ -394,6 +399,7 @@ static struct poptOption long_options[]
{"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 0, 0, 0 },
{"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 },
{"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 },
{0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
{"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 },
{"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 },
-@@ -622,10 +628,15 @@ int parse_arguments(int *argc, const cha
+@@ -623,10 +629,15 @@ int parse_arguments(int *argc, const cha
delete_mode = 1;
break;
case OPT_INCLUDE:
add_exclude(&exclude_list, poptGetOptArg(pc),
XFLG_DEF_INCLUDE);
-@@ -643,8 +654,8 @@ int parse_arguments(int *argc, const cha
+@@ -644,8 +655,8 @@ int parse_arguments(int *argc, const cha
goto options_rejected;
}
add_exclude_file(&exclude_list, arg, XFLG_FATAL_ERRORS
break;
case 'h':
-@@ -668,6 +679,19 @@ int parse_arguments(int *argc, const cha
+@@ -669,6 +680,19 @@ int parse_arguments(int *argc, const cha
am_sender = 1;
break;
case 'P':
do_progress = 1;
keep_partial = 1;
-@@ -966,7 +990,7 @@ int parse_arguments(int *argc, const cha
+@@ -970,7 +994,7 @@ int parse_arguments(int *argc, const cha
partial_dir = NULL;
else if (*partial_dir != '/') {
add_exclude(&exclude_list, partial_dir,
}
keep_partial = 1;
}
---- orig/rsync.h 2005-01-17 23:11:45
+--- orig/rsync.h 2005-01-21 00:35:26
+++ rsync.h 2005-01-17 00:16:04
@@ -109,9 +109,11 @@
#define PERMS_REPORT (1<<0)
#define PERMS_SKIP_MTIME (1<<1)
-@@ -513,11 +515,21 @@ struct map_struct {
+@@ -507,11 +509,21 @@ struct map_struct {
#define MATCHFLG_INCLUDE (1<<4) /* this is an include, not an exclude */
#define MATCHFLG_DIRECTORY (1<<5) /* this matches only directories */
#define MATCHFLG_CLEAR_LIST (1<<6) /* this item is the "!" token */
};
struct exclude_list_struct {
---- orig/rsync.yo 2005-01-17 23:11:46
+--- orig/rsync.yo 2005-01-20 19:47:08
+++ rsync.yo 2005-01-17 07:02:43
@@ -361,6 +361,9 @@ verb(
-P equivalent to --partial --progress
rule for this directory exclusion somewhere higher up in the list so that
it has a high enough priority to be effective (e.g., if your rules specify
a trailing --exclude=* rule, the auto-added rule will be ineffective).
-@@ -1110,30 +1141,318 @@ page describing the options available fo
+@@ -1110,30 +1141,320 @@ page describing the options available fo
enddit()
+
+Note that, when using the --recursive (-r) option (which is implied by
+-a), every subcomponent of every path is visited from the top down, so
-+include/exclude patterns get applied recursively to each subcomponent.
++include/exclude patterns get applied recursively to each subcomponent's
++full name (e.g. to include "/foo/bar/baz" the subcomponents "/foo" and
++"/foo/bar" must not be excluded).
+The exclude patterns actually short-circuit the directory traversal stage
+when rsync finds the files to send. If a pattern excludes a particular
+parent directory, it can render a deeper include pattern ineffectual
Let's say that we want to match two source files, one with an absolute
path of "/home/me/foo/bar", and one with a path of "/home/you/bar/baz".
-@@ -1165,114 +1484,59 @@ verb(
+@@ -1165,115 +1486,59 @@ verb(
Target file: /dest/you/bar/baz
)
-Note that, when using the --recursive (-r) option (which is implied by -a),
-every subcomponent of
-every path is visited from the top down, so include/exclude patterns get
--applied recursively to each subcomponent.
+-applied recursively to each subcomponent's full name (e.g. to include
+-"/foo/bar/baz" the subcomponents "/foo" and "/foo/bar" must not be excluded).
-The exclude patterns actually short-circuit the directory traversal stage
-when rsync finds the files to send. If a pattern excludes a particular
-parent directory, it can render a deeper include pattern ineffectual
)
manpagesection(BATCH MODE)
-@@ -1441,7 +1705,7 @@ it. The most common cause is incorrectly
+@@ -1442,7 +1707,7 @@ it. The most common cause is incorrectly
scripts (such as .cshrc or .profile) that contain output statements
for non-interactive logins.
#define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
#define RERR_WAITCHILD 21 /* some error returned by waitpid() */
---- orig/flist.c 2005-01-01 21:11:00
-+++ flist.c 2004-08-12 18:35:53
-@@ -44,6 +44,7 @@ extern int cvs_exclude;
-
- extern int recurse;
- extern char curr_dir[MAXPATHLEN];
+--- orig/flist.c 2005-01-21 00:35:26
++++ flist.c 2005-01-21 19:10:03
+@@ -64,6 +64,7 @@ extern int sanitize_paths;
+ extern int delete_excluded;
+ extern int orig_umask;
+ extern int list_only;
+extern char *fname_convert_cmd;
- extern char *files_from;
- extern int filesfrom_fd;
+ extern struct exclude_list_struct exclude_list;
+ extern struct exclude_list_struct server_exclude_list;
@@ -359,7 +360,10 @@ void send_file_entry(struct file_struct
io_write_phase = "send_file_entry";
flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
"send_file_list");
-@@ -1256,6 +1266,9 @@ struct file_list *send_file_list(int f,
+@@ -1252,6 +1262,9 @@ struct file_list *send_file_list(int f,
stats.num_files = flist->count;
}
+ cleanup_fname_convert();
+
if (verbose > 3)
- output_flist(flist);
+ output_flist(flist, f < 0 ? "delete" : who_am_i());
-@@ -1277,6 +1290,9 @@ struct file_list *recv_file_list(int f)
+@@ -1273,6 +1286,9 @@ struct file_list *recv_file_list(int f)
start_read = stats.total_read;
flist = flist_new(WITH_HLINK, "recv_file_list");
received_flist = flist;
-@@ -1330,6 +1346,9 @@ struct file_list *recv_file_list(int f)
+@@ -1326,6 +1342,9 @@ struct file_list *recv_file_list(int f)
io_error |= read_int(f);
}
+ cleanup_fname_convert();
+
if (verbose > 3)
- output_flist(flist);
+ output_flist(flist, who_am_i());
--- orig/fnameconv.c 2004-07-02 21:38:59
+++ fnameconv.c 2004-07-02 21:38:59
+ if (verbose > 2)
+ rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
+}
---- orig/generator.c 2005-01-15 21:18:09
+--- orig/generator.c 2005-01-20 23:05:34
+++ generator.c 2004-07-03 20:18:02
-@@ -247,6 +247,12 @@ static void generate_and_send_sums(int f
+@@ -232,6 +232,12 @@ static void generate_and_send_sums(int f
*
* @note This comment was added later by mbp who was trying to work it
* out. It might be wrong.
{ RERR_SIGNAL , "received SIGUSR1 or SIGINT" },
{ RERR_WAITCHILD , "some error returned by waitpid()" },
{ RERR_MALLOC , "error allocating core memory buffers" },
---- orig/main.c 2005-01-14 18:30:18
+--- orig/main.c 2005-01-17 23:11:45
+++ main.c 2004-07-22 00:31:47
@@ -334,7 +334,7 @@ static pid_t do_cmd(char *cmd, char *mac
whole_file = 1;
if (dir)
free(dir);
---- orig/options.c 2005-01-15 21:23:15
+--- orig/options.c 2005-01-20 23:05:34
+++ options.c 2005-01-15 21:28:07
-@@ -125,6 +125,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+@@ -126,6 +126,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
char *config_file = NULL;
char *shell_cmd = NULL;
char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
-@@ -289,6 +290,7 @@ void usage(enum logcode F)
+@@ -290,6 +291,7 @@ void usage(enum logcode F)
rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
rprintf(F," -P equivalent to --partial --progress\n");
rprintf(F," -z, --compress compress file data\n");
rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n");
rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n");
-@@ -384,6 +386,7 @@ static struct poptOption long_options[]
+@@ -385,6 +387,7 @@ static struct poptOption long_options[]
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
---- orig/syscall.c 2005-01-10 00:21:12
+--- orig/syscall.c 2005-01-19 20:11:10
+++ syscall.c 2004-07-02 21:39:00
-@@ -268,3 +268,34 @@ char *d_name(struct dirent *di)
+@@ -270,3 +270,34 @@ char *d_name(struct dirent *di)
return di->d_name;
#endif
}
+
+ return result;
+}
---- orig/util.c 2004-09-07 21:45:30
+--- orig/util.c 2005-01-20 23:05:34
+++ util.c 2004-07-03 20:18:02
-@@ -1217,3 +1217,55 @@ void *_realloc_array(void *ptr, unsigned
+@@ -1213,3 +1213,55 @@ void *_realloc_array(void *ptr, unsigned
return malloc(size * num);
return realloc(ptr, size * num);
}
AC_MSG_CHECKING([whether to call shutdown on all sockets])
case $host_os in
*cygwin* ) AC_MSG_RESULT(yes)
---- orig/main.c 2005-01-10 00:22:54
+--- orig/main.c 2005-01-17 23:11:45
+++ main.c 2004-10-08 20:15:28
@@ -56,6 +56,9 @@ extern int write_batch;
extern int batch_fd;
extern pid_t cleanup_child_pid;
extern char *files_from;
extern char *remote_filesfrom_file;
-@@ -806,33 +809,48 @@ static int start_client(int argc, char *
+@@ -805,33 +808,48 @@ static int start_client(int argc, char *
if ((rc = copy_argv(argv)))
return rc;
p = find_colon(argv[0]);
if (p) { /* source is remote */
if (remote_filesfrom_file
-@@ -864,12 +882,26 @@ static int start_client(int argc, char *
+@@ -863,12 +881,26 @@ static int start_client(int argc, char *
argv++;
} else { /* source is local */
am_sender = 1;
p = strchr(host,'/');
if (p) {
*p = '\0';
---- orig/options.c 2005-01-01 21:11:00
+--- orig/options.c 2005-01-20 23:05:34
+++ options.c 2004-11-27 18:31:46
-@@ -138,6 +138,14 @@ int quiet = 0;
+@@ -141,6 +141,14 @@ int quiet = 0;
int always_checksum = 0;
int list_only = 0;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
-@@ -161,6 +169,7 @@ static void print_rsync_version(enum log
+@@ -162,6 +170,7 @@ static void print_rsync_version(enum log
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
#ifdef HAVE_SOCKETPAIR
-@@ -183,6 +192,10 @@ static void print_rsync_version(enum log
+@@ -184,6 +193,10 @@ static void print_rsync_version(enum log
ipv6 = "";
#endif
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
rprintf(f,
-@@ -196,10 +209,10 @@ static void print_rsync_version(enum log
+@@ -197,10 +210,10 @@ static void print_rsync_version(enum log
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
* macros. */
+ rprintf(f, " %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums, %sssl\n",
have_inplace, ipv6,
(int) (sizeof dumstat->st_ino * 8),
-- (int) (sizeof (uint64) * 8));
-+ (int) (sizeof (uint64) * 8), ssl);
+- (int) (sizeof (int64) * 8));
++ (int) (sizeof (int64) * 8), ssl);
#ifdef MAINTAINER_MODE
rprintf(f, " panic action: \"%s\"\n",
get_panic_action());
-@@ -312,6 +325,13 @@ void usage(enum logcode F)
+@@ -313,6 +326,13 @@ void usage(enum logcode F)
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
#endif
rprintf(F," -h, --help show this help screen\n");
rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
-@@ -323,7 +343,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -324,7 +344,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED,
OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -410,6 +430,13 @@ static struct poptOption long_options[]
+@@ -411,6 +431,13 @@ static struct poptOption long_options[]
{"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 },
{"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 },
#endif
/* All these options switch us into daemon-mode option-parsing. */
{"address", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
{"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
-@@ -750,6 +777,12 @@ int parse_arguments(int *argc, const cha
+@@ -751,6 +778,12 @@ int parse_arguments(int *argc, const cha
basis_dir[basis_dir_cnt++] = (char *)arg;
break;
default:
/* A large opt value means that set_refuse_options()
* turned this option off (opt-BASE is its index). */
-@@ -944,6 +977,17 @@ int parse_arguments(int *argc, const cha
+@@ -948,6 +981,17 @@ int parse_arguments(int *argc, const cha
bwlimit_writemax = 512;
}
if (inplace) {
#if HAVE_FTRUNCATE
if (partial_dir) {
---- orig/rsync.h 2005-01-10 00:21:12
+--- orig/rsync.h 2005-01-21 00:35:26
+++ rsync.h 2004-10-08 21:01:33
@@ -32,6 +32,7 @@
#define BACKUP_SUFFIX "~"
-@@ -340,6 +341,11 @@ enum msgcode {
- #define uint64 unsigned off_t
+@@ -337,6 +338,11 @@ enum msgcode {
+ #define INT64_IS_OFF_T
#endif
+#if HAVE_OPENSSL
Matt McCutchen's Web Site / rsync / rsync-patches.git / commitdiff