mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-01-24 23:08:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

- Improved -s support.

Browse Source 
- Handle setup_iconv() call in parse_arguments() so it gets set early.
This commit is contained in:
Wayne Davison
2007-09-18 01:11:54 +00:00
parent 71605b0f4d
commit a4453606cc
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
options.c
View File

@@ -878,7 +878,7 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
set_refuse_options("log-file*");
#ifdef ICONV_OPTION
if (!am_daemon && (arg = getenv("RSYNC_ICONV")) != NULL && *arg)
if (!am_daemon && !protect_args && (arg = getenv("RSYNC_ICONV")) != NULL && *arg)
iconv_opt = strdup(arg);
#endif
@@ -1240,22 +1240,23 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
exit_cleanup(0);
}
if (protect_args) {
if (!frommain)
protect_args = 0;
else if (am_server)
return 1;
}
#ifdef ICONV_OPTION
if (iconv_opt) {
if (iconv_opt && protect_args != 2) {
if (!am_server && strcmp(iconv_opt, "-") == 0)
iconv_opt = NULL;
else
need_unsorted_flist = 1;
}
setup_iconv();
#endif
if (protect_args == 1) {
if (!frommain)
protect_args = 0;
else if (am_server)
return 1;
}
#ifndef SUPPORT_LINKS
if (preserve_links && !am_sender) {
snprintf(err_buf, sizeof err_buf,
@@ -1663,6 +1664,10 @@ void server_options(char **args, int *argc_p)
x = 1;
argstr[0] = '-';
if (protect_args)
argstr[x++] = 's';
for (i = 0; i < verbose; i++)
argstr[x++] = 'v';
@@ -1765,6 +1770,22 @@ void server_options(char **args, int *argc_p)
if (x != 1)
args[ac++] = argstr;
#ifdef ICONV_OPTION
if (iconv_opt) {
char *set = strchr(iconv_opt, ',');
if (set)
set++;
else
set = iconv_opt;
if (asprintf(&arg, "--iconv=%s", set) < 0)
goto oom;
args[ac++] = arg;
}
#endif
if (protect_args) /* initial args break here */
args[ac++] = NULL;
if (list_only > 1)
args[ac++] = "--list-only";
@@ -1800,19 +1821,6 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--log-format=X";
}
#ifdef ICONV_OPTION
if (iconv_opt) {
char *set = strchr(iconv_opt, ',');
if (set)
set++;
else
set = iconv_opt;
if (asprintf(&arg, "--iconv=%s", set) < 0)
goto oom;
args[ac++] = arg;
}
#endif
if (block_size) {
if (asprintf(&arg, "-B%lu", block_size) < 0)
goto oom;