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
Moved a couple auto-filter rules from options.c into compat.c so
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
3a5a1fa
..
4017f81
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-3,12
+3,11
@@
*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2000, 2001, 2002 Martin Pool <mbp@samba.org>
*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2000, 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002
, 2003, 2004, 2005, 2006
Wayne Davison
+ * Copyright (C) 2002
-2007
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
*
* 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 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-225,7
+224,7
@@
static void print_rsync_version(enum logcode f)
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
- rprintf(f, "Copyright (C) 1996-200
6
by Andrew Tridgell, Wayne Davison, and others.\n");
+ rprintf(f, "Copyright (C) 1996-200
7
by Andrew Tridgell, Wayne Davison, and others.\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %d-bit system inums, %d-bit internal inums,\n",
(int)(sizeof (OFF_T) * 8),
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %d-bit system inums, %d-bit internal inums,\n",
(int)(sizeof (OFF_T) * 8),
@@
-1288,10
+1287,6
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
snprintf(err_buf, sizeof err_buf,
"--suffix cannot be a null string without --backup-dir\n");
return 0;
snprintf(err_buf, sizeof err_buf,
"--suffix cannot be a null string without --backup-dir\n");
return 0;
- } else if (make_backups && delete_mode && !delete_excluded) {
- snprintf(backup_dir_buf, sizeof backup_dir_buf,
- "P *%s", backup_suffix);
- parse_rule(&filter_list, backup_dir_buf, 0, 0);
}
if (make_backups && !backup_dir)
omit_dir_times = 1;
}
if (make_backups && !backup_dir)
omit_dir_times = 1;
@@
-1404,10
+1399,6
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
clean_fname(partial_dir, 1);
if (!*partial_dir || strcmp(partial_dir, ".") == 0)
partial_dir = NULL;
clean_fname(partial_dir, 1);
if (!*partial_dir || strcmp(partial_dir, ".") == 0)
partial_dir = NULL;
- else if (*partial_dir != '/' && !am_server) {
- parse_rule(&filter_list, partial_dir,
- MATCHFLG_NO_PREFIXES|MATCHFLG_DIRECTORY, 0);
- }
if (!partial_dir && refused_partial) {
create_refuse_error(refused_partial);
return 0;
if (!partial_dir && refused_partial) {
create_refuse_error(refused_partial);
return 0;