summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>1998-10-04 07:09:38 +0000
committerRichard Sharpe <sharpe@samba.org>1998-10-04 07:09:38 +0000
commit832ca93117e4dca90080c3117e26c5c9b81f930f (patch)
tree61c88bbc3f6dde479be61cc796e17d24c4711a29
parentaf4a13b37a1dbf7df8b246abc4f816f48d71c007 (diff)
downloadsamba-832ca93117e4dca90080c3117e26c5c9b81f930f.tar.gz
samba-832ca93117e4dca90080c3117e26c5c9b81f930f.tar.bz2
samba-832ca93117e4dca90080c3117e26c5c9b81f930f.zip
Added E Jay Berkenbilt's fixes
(This used to be commit fcdc9bc2089822b02b30cd55054a60ed4e696e70)
-rw-r--r--docs/manpages/smbclient.15
-rw-r--r--source3/client/client.c4
-rw-r--r--source3/client/clitar.c3
3 files changed, 10 insertions, 2 deletions
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index e58e94607c..2ce3e6831c 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -402,6 +402,7 @@ consists of one or more of
.BR X ,
.BR b ,
.BR g ,
+.BR q ,
.BR N
or
.BR a ;
@@ -466,6 +467,10 @@ only with the
.B c
flag.
+.B q
+Quiet. Keeps tar from printing diagnostics as it works. This is the
+same as tarmode quiet.
+
.B N
Newer than. Must be followed by the name of a file whose date is
compared against files found on the share during a create. Only files
diff --git a/source3/client/client.c b/source3/client/client.c
index c94c3ccb8c..c4f763db77 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3304,7 +3304,7 @@ struct
{"exit",cli_send_logout,"logoff the server",{COMPL_NONE,COMPL_NONE}},
{"newer",cmd_newer,"<file> only mget files newer than the specified local file",{COMPL_LOCAL,COMPL_NONE}},
{"archive",cmd_archive,"<level>\n0=ignore archive bit\n1=only get archive files\n2=only get archive files and reset archive bit\n3=get all files and reset archive bit",{COMPL_NONE,COMPL_NONE}},
- {"tar",cmd_tar,"tar <c|x>[IXbgNan] current directory to/from <file name>",{COMPL_NONE,COMPL_NONE}},
+ {"tar",cmd_tar,"tar <c|x>[IXFqbgNan] current directory to/from <file name>",{COMPL_NONE,COMPL_NONE}},
{"blocksize",cmd_block,"blocksize <number> (default 20)",{COMPL_NONE,COMPL_NONE}},
{"tarmode",cmd_tarmode,
"<full|inc|reset|noreset> tar's behaviour towards archive bits",{COMPL_NONE,COMPL_NONE}},
@@ -3740,7 +3740,7 @@ static void usage(char *pname)
DEBUG(0,("\t-W workgroup set the workgroup name\n"));
DEBUG(0,("\t-c command string execute semicolon separated commands\n"));
DEBUG(0,("\t-t terminal code terminal i/o code {sjis|euc|jis7|jis8|junet|hex}\n"));
- DEBUG(0,("\t-T<c|x>IXgbNan command line tar\n"));
+ DEBUG(0,("\t-T<c|x>IXFqgbNan command line tar\n"));
DEBUG(0,("\t-D directory start from directory\n"));
DEBUG(0,("\n"));
}
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 0a9b7fd1a8..c841ff982c 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -2715,6 +2715,9 @@ int tar_parseargs(int argc, char *argv[], char *Optarg, int Optind)
case 'a':
tar_reset=True;
break;
+ case 'q':
+ tar_noisy=False;
+ break;
case 'I':
if (tar_clipfl) {
DEBUG(0,("Only one of I,X,F must be specified\n"));