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
Got rid of the "tweaked" versions of the uid and gid vars.
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
9c1013d
..
0abf6ce
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-116,7
+116,6
@@
int checksum_seed = 0;
int inplace = 0;
int delay_updates = 0;
long block_size = 0; /* "long" because popt can't set an int32. */
int inplace = 0;
int delay_updates = 0;
long block_size = 0; /* "long" because popt can't set an int32. */
-int flist_extra_ndx = 1; /* index of optional file-list items */
/** Network address family. **/
#ifdef INET6
/** Network address family. **/
#ifdef INET6
@@
-1219,11
+1218,6
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
need_messages_from_generator = 1;
}
need_messages_from_generator = 1;
}
- if (preserve_uid)
- preserve_uid = flist_extra_ndx++;
- if (preserve_gid)
- preserve_gid = flist_extra_ndx++;
-
*argv = poptGetArgs(pc);
*argc = count_args(*argv);
*argv = poptGetArgs(pc);
*argc = count_args(*argv);
@@
-1666,11
+1660,11
@@
void server_options(char **args,int *argc)
args[ac++] = "--delete";
if (delete_before > 1)
args[ac++] = "--delete-before";
args[ac++] = "--delete";
if (delete_before > 1)
args[ac++] = "--delete-before";
- if (delete_during) {
- args[ac++] =
delete_during == 2 ? "--delete-delay"
- : "--delete-during";
- }
- if (delete_after)
+ else if (delete_during == 2)
+ args[ac++] =
"--delete-delay";
+ else if (delete_during)
+ args[ac++] = "--delete-during";
+
else
if (delete_after)
args[ac++] = "--delete-after";
if (force_delete)
args[ac++] = "--force";
args[ac++] = "--delete-after";
if (force_delete)
args[ac++] = "--force";