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
Show symlink targets
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
0316be7
..
cc0533d
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-74,8
+74,8
@@
int modify_window=0;
#endif
int blocking_io=0;
#endif
int blocking_io=0;
-/**
Network address family
. **/
-
int af = AF_INET
;
+/**
Global options set from command line
. **/
+
struct global_opts global_opts
;
int read_batch=0; /* dw */
int write_batch=0; /* dw */
int read_batch=0; /* dw */
int write_batch=0; /* dw */
@@
-111,6
+111,7
@@
static void print_rsync_version(int f)
char const *got_socketpair = "no ";
char const *hardlinks = "no ";
char const *links = "no ";
char const *got_socketpair = "no ";
char const *hardlinks = "no ";
char const *links = "no ";
+ char const *ipv6 = "no ";
#ifdef HAVE_SOCKETPAIR
got_socketpair = "";
#ifdef HAVE_SOCKETPAIR
got_socketpair = "";
@@
-124,16
+125,19
@@
static void print_rsync_version(int f)
links = "";
#endif
links = "";
#endif
+#if INET6
+ ipv6 = "";
+#endif
+
rprintf(f, "%s version %s protocol version %d\n",
rprintf(f, "%s version %s protocol version %d\n",
- RSYNC_NAME, VERSION, PROTOCOL_VERSION);
+ RSYNC_NAME,
RSYNC_
VERSION, PROTOCOL_VERSION);
rprintf(f,
"Copyright (C) 1996-2001 by Andrew Tridgell and others\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
rprintf(f,
"Copyright (C) 1996-2001 by Andrew Tridgell and others\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
- "%shard links, %ssymlinks, batchfiles\n\n",
+ "%shard links, %ssymlinks, batchfiles
, %sIPv6
\n\n",
(int) (sizeof(OFF_T) * 8),
(int) (sizeof(OFF_T) * 8),
- got_socketpair,
- hardlinks, links);
+ got_socketpair, hardlinks, links, ipv6);
#ifdef NO_INT64
rprintf(f, "WARNING: no 64-bit integers on this platform!\n");
#ifdef NO_INT64
rprintf(f, "WARNING: no 64-bit integers on this platform!\n");
@@
-310,8
+314,8
@@
static struct poptOption long_options[] = {
{"read-batch", 'f', POPT_ARG_STRING, &batch_ext, 'f'},
{"write-batch", 'F', POPT_ARG_NONE, &write_batch, 0},
#ifdef INET6
{"read-batch", 'f', POPT_ARG_STRING, &batch_ext, 'f'},
{"write-batch", 'F', POPT_ARG_NONE, &write_batch, 0},
#ifdef INET6
- {0, '4', POPT_ARG_VAL, &
af,
AF_INET },
- {0, '6', POPT_ARG_VAL, &
af,
AF_INET6 },
+ {0, '4', POPT_ARG_VAL, &
global_opts.af_hint,
AF_INET },
+ {0, '6', POPT_ARG_VAL, &
global_opts.af_hint,
AF_INET6 },
#endif
{0,0,0,0}
};
#endif
{0,0,0,0}
};