The branch, master has been updated
via dee09932 Create usage.c for smaller awk-dep rebuilds.
from 47351c2b Use RSYNC_GITVER in more output
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit dee099328610e22e75967313d878010f4fed6cbb
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Aug 3 11:33:32 2020 -0700
Create usage.c for smaller awk-dep rebuilds.
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 5 +-
exclude.c | 3 +-
options.c | 235 ------------------------------------------------------
usage.c | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 264 insertions(+), 240 deletions(-)
create mode 100644 usage.c
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index 2c30ee5d..d935651a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,7 @@ zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o
zlib/inftrees.o \
OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
util.o util2.o main.o checksum.o match.o syscall.o log.o backup.o
delete.o
OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
- fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
+ usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
OBJS3=progress.o pipe.o @ASM@
DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o
authenticate.o
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
@@ -99,8 +99,7 @@ rsync$(EXEEXT): $(OBJS)
$(OBJS): $(HEADERS)
$(CHECK_OBJS): $(HEADERS)
tls.o xattrs.o: lib/sysxattrs.h
-options.o: latest-year.h help-rsync.h help-rsyncd.h git-version.h
-exclude.o: default-cvsignore.h
+usage.o: latest-year.h help-rsync.h help-rsyncd.h git-version.h
default-cvsignore.h
loadparm.o: default-dont-compress.h daemon-parm.h
flist.o: rounding.h
diff --git a/exclude.c b/exclude.c
index 10b56e76..e0957443 100644
--- a/exclude.c
+++ b/exclude.c
@@ -21,7 +21,6 @@
*/
#include "rsync.h"
-#include "default-cvsignore.h"
#include "ifuncs.h"
extern int am_server;
@@ -1053,7 +1052,7 @@ static void get_cvs_excludes(uint32 rflags)
return;
initialized = 1;
- parse_filter_str(&cvs_filter_list, DEFAULT_CVSIGNORE,
+ parse_filter_str(&cvs_filter_list, default_cvsignore(),
rule_template(rflags | (protocol_version >= 30 ?
FILTRULE_PERISHABLE : 0)),
0);
diff --git a/options.c b/options.c
index dc3dcee9..1857f70a 100644
--- a/options.c
+++ b/options.c
@@ -22,16 +22,12 @@
#include "rsync.h"
#include "itypes.h"
#include "ifuncs.h"
-#include "latest-year.h"
-#include "git-version.h"
#include <popt.h>
extern int module_id;
extern int local_server;
extern int sanitize_paths;
extern unsigned int module_dirlen;
-extern struct name_num_obj valid_checksums;
-extern struct name_num_obj valid_compressions;
extern filter_rule_list filter_list;
extern filter_rule_list daemon_filter_list;
@@ -576,225 +572,6 @@ void negate_output_levels(void)
debug_levels[j] *= -1;
}
-static char *istring(const char *fmt, int val)
-{
- char *str;
- if (asprintf(&str, fmt, val) < 0)
- out_of_memory("istring");
- return str;
-}
-
-static void print_info_flags(enum logcode f)
-{
- STRUCT_STAT *dumstat;
- char line_buf[75];
- int line_len, j;
- char *info_flags[] = {
-
- "*Capabilities",
-
- istring("%d-bit files", (int)(sizeof (OFF_T) * 8)),
- istring("%d-bit inums", (int)(sizeof dumstat->st_ino * 8)), /*
Don't check ino_t! */
- istring("%d-bit timestamps", (int)(sizeof (time_t) * 8)),
- istring("%d-bit long ints", (int)(sizeof (int64) * 8)),
-
-#ifndef HAVE_SOCKETPAIR
- "no "
-#endif
- "socketpairs",
-
-#ifndef SUPPORT_HARD_LINKS
- "no "
-#endif
- "hardlinks",
-
-#ifndef CAN_HARDLINK_SPECIAL
- "no "
-#endif
- "hardlink-specials",
-
-#ifndef SUPPORT_LINKS
- "no "
-#endif
- "symlinks",
-
-#ifndef INET6
- "no "
-#endif
- "IPv6",
-
-#ifndef SUPPORT_ATIMES
- "no "
-#endif
- "atimes",
-
- "batchfiles",
-
-#ifndef HAVE_FTRUNCATE
- "no "
-#endif
- "inplace",
-
-#ifndef HAVE_FTRUNCATE
- "no "
-#endif
- "append",
-
-#ifndef SUPPORT_ACLS
- "no "
-#endif
- "ACLs",
-
-#ifndef SUPPORT_XATTRS
- "no "
-#endif
- "xattrs",
-
-#ifdef RSYNC_USE_PROTECTED_ARGS
- "default "
-#else
- "optional "
-#endif
- "protect-args",
-
-#ifndef ICONV_OPTION
- "no "
-#endif
- "iconv",
-
-#ifndef CAN_SET_SYMLINK_TIMES
- "no "
-#endif
- "symtimes",
-
-#ifndef SUPPORT_PREALLOCATION
- "no "
-#endif
- "prealloc",
-
-#ifndef HAVE_MKTIME
- "no "
-#endif
- "stop-at",
-
-#ifndef SUPPORT_CRTIMES
- "no "
-#endif
- "crtimes",
-
- "*Optimizations",
-
-#ifndef HAVE_SIMD
- "no "
-#endif
- "SIMD",
-
-#ifndef HAVE_ASM
- "no "
-#endif
- "asm",
-
-#ifndef USE_OPENSSL
- "no "
-#endif
- "openssl-crypto",
-
- NULL
- };
-
- for (line_len = 0, j = 0; ; j++) {
- char *str = info_flags[j], *next_nfo = str ? info_flags[j+1] :
NULL;
- int str_len = str && *str != '*' ? strlen(str) : 1000;
- int need_comma = next_nfo && *next_nfo != '*' ? 1 : 0;
- if (line_len && line_len + 1 + str_len + need_comma >=
(int)sizeof line_buf) {
- rprintf(f, " %s\n", line_buf);
- line_len = 0;
- }
- if (!str)
- break;
- if (*str == '*') {
- rprintf(f, "%s:\n", str+1);
- continue;
- }
- line_len += snprintf(line_buf+line_len, sizeof line_buf -
line_len, " %s%s", str, need_comma ? "," : "");
- }
-}
-
-const char *rsync_version(void)
-{
- return RSYNC_GITVER;
-}
-
-static void print_rsync_version(enum logcode f)
-{
- char tmpbuf[256], *subprotocol = "";
-
-#if SUBPROTOCOL_VERSION != 0
- subprotocol = istring(".PR%d", SUBPROTOCOL_VERSION);
-#endif
- rprintf(f, "%s version %s protocol version %d%s\n",
- RSYNC_NAME, rsync_version(), PROTOCOL_VERSION, subprotocol);
-
- rprintf(f, "Copyright (C) 1996-" LATEST_YEAR " by Andrew Tridgell,
Wayne Davison, and others.\n");
- rprintf(f, "Web site: https://rsync.samba.org/\n";);
-
- print_info_flags(f);
-
- rprintf(f, "Checksum list:\n");
- get_default_nno_list(&valid_checksums, tmpbuf, sizeof tmpbuf, '(');
- rprintf(f, " %s\n", tmpbuf);
-
- rprintf(f, "Compress list:\n");
- get_default_nno_list(&valid_compressions, tmpbuf, sizeof tmpbuf, '(');
- rprintf(f, " %s\n", tmpbuf);
-
-#ifdef MAINTAINER_MODE
- rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-#endif
-
-#if SIZEOF_INT64 < 8
- rprintf(f, "WARNING: no 64-bit integers on this platform!\n");
-#endif
- if (sizeof (int64) != SIZEOF_INT64) {
- rprintf(f,
- "WARNING: size mismatch in SIZEOF_INT64 define (%d !=
%d)\n",
- (int) SIZEOF_INT64, (int) sizeof (int64));
- }
-
- rprintf(f,"\n");
- rprintf(f,"rsync comes with ABSOLUTELY NO WARRANTY. This is free
software, and you\n");
- rprintf(f,"are welcome to redistribute it under certain conditions.
See the GNU\n");
- rprintf(f,"General Public Licence for details.\n");
-}
-
-
-void usage(enum logcode F)
-{
- print_rsync_version(F);
-
- rprintf(F,"\n");
- rprintf(F,"rsync is a file transfer program capable of efficient remote
update\n");
- rprintf(F,"via a fast differencing algorithm.\n");
-
- rprintf(F,"\n");
- rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... DEST\n");
- rprintf(F," or rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n");
- rprintf(F," or rsync [OPTION]... SRC [SRC]... [USER@]HOST::DEST\n");
- rprintf(F," or rsync [OPTION]... SRC [SRC]...
rsync://[USER@]HOST[:PORT]/DEST\n");
- rprintf(F," or rsync [OPTION]... [USER@]HOST:SRC [DEST]\n");
- rprintf(F," or rsync [OPTION]... [USER@]HOST::SRC [DEST]\n");
- rprintf(F," or rsync [OPTION]... rsync://[USER@]HOST[:PORT]/SRC
[DEST]\n");
- rprintf(F,"The ':' usages connect via remote shell, while '::' & 'rsync://'
usages connect\n");
- rprintf(F,"to an rsync daemon, and require SRC or DEST to start with a
module name.\n");
- rprintf(F,"\n");
- rprintf(F,"Options\n");
-#include "help-rsync.h"
- rprintf(F,"\n");
- rprintf(F,"Use \"rsync --daemon --help\" to see the daemon-mode command-line
options.\n");
- rprintf(F,"Please see the rsync(1) and rsyncd.conf(5) man pages for full
documentation.\n");
- rprintf(F,"See https://rsync.samba.org/ for updates, bug reports, and
answers\n");
-}
-
enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE,
OPT_CHMOD,
@@ -1055,18 +832,6 @@ static struct poptOption long_options[] = {
{0,0,0,0, 0, 0, 0}
};
-static void daemon_usage(enum logcode F)
-{
- print_rsync_version(F);
-
- rprintf(F,"\n");
- rprintf(F,"Usage: rsync --daemon [OPTION]...\n");
-#include "help-rsyncd.h"
- rprintf(F,"\n");
- rprintf(F,"If you were not trying to invoke rsync as a daemon, avoid using
any of the\n");
- rprintf(F,"daemon-specific rsync options. See also the rsyncd.conf(5) man
page.\n");
-}
-
static struct poptOption long_daemon_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 },
diff --git a/usage.c b/usage.c
new file mode 100644
index 00000000..66857bb4
--- /dev/null
+++ b/usage.c
@@ -0,0 +1,261 @@
+/*
+ * Some usage & version related functions.
+ *
+ * Copyright (C) 2002-2020 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
+ */
+
+#include "rsync.h"
+#include "latest-year.h"
+#include "git-version.h"
+#include "default-cvsignore.h"
+
+extern struct name_num_obj valid_checksums;
+extern struct name_num_obj valid_compressions;
+
+static char *istring(const char *fmt, int val)
+{
+ char *str;
+ if (asprintf(&str, fmt, val) < 0)
+ out_of_memory("istring");
+ return str;
+}
+
+static void print_info_flags(enum logcode f)
+{
+ STRUCT_STAT *dumstat;
+ char line_buf[75];
+ int line_len, j;
+ char *info_flags[] = {
+
+ "*Capabilities",
+
+ istring("%d-bit files", (int)(sizeof (OFF_T) * 8)),
+ istring("%d-bit inums", (int)(sizeof dumstat->st_ino * 8)), /*
Don't check ino_t! */
+ istring("%d-bit timestamps", (int)(sizeof (time_t) * 8)),
+ istring("%d-bit long ints", (int)(sizeof (int64) * 8)),
+
+#ifndef HAVE_SOCKETPAIR
+ "no "
+#endif
+ "socketpairs",
+
+#ifndef SUPPORT_HARD_LINKS
+ "no "
+#endif
+ "hardlinks",
+
+#ifndef CAN_HARDLINK_SPECIAL
+ "no "
+#endif
+ "hardlink-specials",
+
+#ifndef SUPPORT_LINKS
+ "no "
+#endif
+ "symlinks",
+
+#ifndef INET6
+ "no "
+#endif
+ "IPv6",
+
+#ifndef SUPPORT_ATIMES
+ "no "
+#endif
+ "atimes",
+
+ "batchfiles",
+
+#ifndef HAVE_FTRUNCATE
+ "no "
+#endif
+ "inplace",
+
+#ifndef HAVE_FTRUNCATE
+ "no "
+#endif
+ "append",
+
+#ifndef SUPPORT_ACLS
+ "no "
+#endif
+ "ACLs",
+
+#ifndef SUPPORT_XATTRS
+ "no "
+#endif
+ "xattrs",
+
+#ifdef RSYNC_USE_PROTECTED_ARGS
+ "default "
+#else
+ "optional "
+#endif
+ "protect-args",
+
+#ifndef ICONV_OPTION
+ "no "
+#endif
+ "iconv",
+
+#ifndef CAN_SET_SYMLINK_TIMES
+ "no "
+#endif
+ "symtimes",
+
+#ifndef SUPPORT_PREALLOCATION
+ "no "
+#endif
+ "prealloc",
+
+#ifndef HAVE_MKTIME
+ "no "
+#endif
+ "stop-at",
+
+#ifndef SUPPORT_CRTIMES
+ "no "
+#endif
+ "crtimes",
+
+ "*Optimizations",
+
+#ifndef HAVE_SIMD
+ "no "
+#endif
+ "SIMD",
+
+#ifndef HAVE_ASM
+ "no "
+#endif
+ "asm",
+
+#ifndef USE_OPENSSL
+ "no "
+#endif
+ "openssl-crypto",
+
+ NULL
+ };
+
+ for (line_len = 0, j = 0; ; j++) {
+ char *str = info_flags[j], *next_nfo = str ? info_flags[j+1] :
NULL;
+ int str_len = str && *str != '*' ? strlen(str) : 1000;
+ int need_comma = next_nfo && *next_nfo != '*' ? 1 : 0;
+ if (line_len && line_len + 1 + str_len + need_comma >=
(int)sizeof line_buf) {
+ rprintf(f, " %s\n", line_buf);
+ line_len = 0;
+ }
+ if (!str)
+ break;
+ if (*str == '*') {
+ rprintf(f, "%s:\n", str+1);
+ continue;
+ }
+ line_len += snprintf(line_buf+line_len, sizeof line_buf -
line_len, " %s%s", str, need_comma ? "," : "");
+ }
+}
+
+void print_rsync_version(enum logcode f)
+{
+ char tmpbuf[256], *subprotocol = "";
+
+#if SUBPROTOCOL_VERSION != 0
+ subprotocol = istring(".PR%d", SUBPROTOCOL_VERSION);
+#endif
+ rprintf(f, "%s version %s protocol version %d%s\n",
+ RSYNC_NAME, rsync_version(), PROTOCOL_VERSION, subprotocol);
+
+ rprintf(f, "Copyright (C) 1996-" LATEST_YEAR " by Andrew Tridgell,
Wayne Davison, and others.\n");
+ rprintf(f, "Web site: https://rsync.samba.org/\n";);
+
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
