Attachment 3364 Details for Bug 3135 – correct patch

[patch] correct patch

bz3135.diff (text/plain), 1.69 KB, created by Damien Miller on 2020-03-13 13:51:36 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2020-03-13 13:51:36 AEDT

Size: 1.69 KB

patch

obsolete

>diff --git a/sftp.1 b/sftp.1
>index 6d69472e1..9f21695e1 100644
>--- a/sftp.1
>+++ b/sftp.1
>@@ -30,7 +30,7 @@
> .Nd OpenSSH secure file transfer
> .Sh SYNOPSIS
> .Nm sftp
>-.Op Fl 46aCfpqrv
>+.Op Fl 46aCfNpqrv
> .Op Fl B Ar buffer_size
> .Op Fl b Ar batchfile
> .Op Fl c Ar cipher
>@@ -275,6 +275,10 @@ For full details of the options listed below, and their possible values, see
> .El
> .It Fl P Ar port
> Specifies the port to connect to on the remote host.
>+.It Fl N
>+Disables quiet mode, e.g. to override the implicit quiet mode set by the
>+.Fl b
>+flag.
> .It Fl p
> Preserves modification times, access times, and modes from the
> original files transferred.
>diff --git a/sftp.c b/sftp.c
>index fc809dc6e..f60500369 100644
>--- a/sftp.c
>+++ b/sftp.c
>@@ -2375,7 +2375,7 @@ usage(void)
> int
> main(int argc, char **argv)
> {
>-	int in, out, ch, err, tmp, port = -1;
>+	int in, out, ch, err, tmp, port = -1, noisy = 0;
> 	char *host = NULL, *user, *cp, *file2 = NULL;
> 	int debug_level = 0;
> 	char *file1 = NULL, *sftp_server = NULL;
>@@ -2409,7 +2409,7 @@ main(int argc, char **argv)
> 	infile = stdin;
> 
> 	while ((ch = getopt(argc, argv,
>-	    "1246afhpqrvCc:D:i:l:o:s:S:b:B:F:J:P:R:")) != -1) {
>+	    "1246afhNpqrvCc:D:i:l:o:s:S:b:B:F:J:P:R:")) != -1) {
> 		switch (ch) {
> 		/* Passed through to ssh(1) */
> 		case '4':
>@@ -2473,6 +2473,9 @@ main(int argc, char **argv)
> 		case 'f':
> 			global_fflag = 1;
> 			break;
>+		case 'N':
>+			noisy = 1; /* Used to clear quiet mode after getopt */
>+			break;
> 		case 'p':
> 			global_pflag = 1;
> 			break;
>@@ -2511,6 +2514,9 @@ main(int argc, char **argv)
> 	if (!isatty(STDERR_FILENO))
> 		showprogress = 0;
> 
>+	if (noisy)
>+		quiet = 0;
>+
> 	log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
> 
> 	if (sftp_direct == NULL) {

Actions: View | Diff

Attachments on bug 3135: 3363 | 3364