diff options
| author | Aurélien Aptel <aurelien.aptel@gmail.com> | 2013-07-16 16:22:13 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2014-02-19 18:22:28 +0100 |
| commit | 5f99b0915da12a2455555de4e9ac27d06fc92346 (patch) | |
| tree | 942ee27377930689af2b6bf528807acca884b1d4 | |
| parent | 6d0ff6d2f0366e2b8f6d5dc3b15ddb3abb57163a (diff) | |
| download | samba-5f99b0915da12a2455555de4e9ac27d06fc92346.tar.gz samba-5f99b0915da12a2455555de4e9ac27d06fc92346.tar.xz samba-5f99b0915da12a2455555de4e9ac27d06fc92346.zip | |
clitar.c: operation INCLUDE_LIST same as INCLUDE
use local variable during argument parsing to separate
the 2 cases.
Signed-off-by: Aurélien Aptel <aurelien.aptel@gmail.com>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | source3/client/clitar.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c index d3d17d8841..f00ffda6b9 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -60,8 +60,7 @@ enum tar_operation { enum tar_selection { TAR_NO_SELECTION, - TAR_INCLUDE, /* I flag, default */ - TAR_INCLUDE_LIST, /* F flag */ + TAR_INCLUDE, /* I and F flag, default */ TAR_EXCLUDE, /* X flag */ }; @@ -166,7 +165,6 @@ static void tar_dump(struct tar *t) const char* sel[] = { XSET(TAR_NO_SELECTION), XSET(TAR_INCLUDE), - XSET(TAR_INCLUDE_LIST), XSET(TAR_EXCLUDE), }; @@ -1028,6 +1026,7 @@ int tar_process(struct tar *t) int tar_parse_args(struct tar* t, const char *flag, const char **val, int valsize) { TALLOC_CTX *ctx = talloc_tos(); + bool list = false; /* index of next value to use */ int ival = 0; @@ -1080,7 +1079,8 @@ int tar_parse_args(struct tar* t, const char *flag, const char **val, int valsiz DBG(0,("Only one of I,X,F must be specified\n")); return 0; } - t->mode.selection = TAR_INCLUDE_LIST; + t->mode.selection = TAR_INCLUDE; + list = true; break; /* blocksize */ @@ -1175,7 +1175,7 @@ int tar_parse_args(struct tar* t, const char *flag, const char **val, int valsiz /* handle PATHs... */ /* flag F -> read file list */ - if (t->mode.selection == TAR_INCLUDE_LIST) { + if (list) { if (valsize - ival != 1) { DBG(0,("Option F must be followed by exactly one filename.\n")); return 0; |