Attachment 1437 Details for Bug 1427 – better: make -q show only critical messages in ssh and scp

[patch] better: make -q show only critical messages in ssh and scp

ssh-q-fatalonly.patch (text/plain), 2.91 KB, created by Mikel Ward on 2008-01-07 17:26:52 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mikel Ward

Created: 2008-01-07 17:26:52 AEDT

Size: 2.91 KB

patch

obsolete

>Index: clientloop.c
>===================================================================
>RCS file: /cvs/openssh/clientloop.c,v
>retrieving revision 1.171
>diff -u -t -w -r1.171 clientloop.c
>--- clientloop.c	28 Dec 2007 22:37:10 -0000	1.171
>+++ clientloop.c	7 Jan 2008 06:22:18 -0000
>@@ -1591,7 +1591,7 @@
>          * In interactive mode (with pseudo tty) display a message indicating
>          * that the connection has been closed.
>          */
>-        if (have_pty && options.log_level != SYSLOG_LEVEL_QUIET) {
>+        if (have_pty && options.log_level > SYSLOG_LEVEL_QUIET) {
>                 snprintf(buf, sizeof buf, "Connection to %.64s closed.\r\n", host);
>                 buffer_append(&stderr_buffer, buf, strlen(buf));
>         }
>Index: log.c
>===================================================================
>RCS file: /cvs/openssh/log.c,v
>retrieving revision 1.53
>diff -u -t -w -r1.53 log.c
>--- log.c	20 May 2007 05:08:16 -0000	1.53
>+++ log.c	7 Jan 2008 06:22:18 -0000
>@@ -222,7 +222,7 @@
>         argv0 = av0;
> 
>         switch (level) {
>-        case SYSLOG_LEVEL_QUIET:
>+        case SYSLOG_LEVEL_NONE:
>         case SYSLOG_LEVEL_FATAL:
>         case SYSLOG_LEVEL_ERROR:
>         case SYSLOG_LEVEL_INFO:
>Index: log.h
>===================================================================
>RCS file: /cvs/openssh/log.h,v
>retrieving revision 1.19
>diff -u -t -w -r1.19 log.h
>--- log.h	18 Aug 2006 14:32:21 -0000	1.19
>+++ log.h	7 Jan 2008 06:22:18 -0000
>@@ -35,7 +35,7 @@
> }       SyslogFacility;
> 
> typedef enum {
>-        SYSLOG_LEVEL_QUIET,
>+        SYSLOG_LEVEL_NONE,
>         SYSLOG_LEVEL_FATAL,
>         SYSLOG_LEVEL_ERROR,
>         SYSLOG_LEVEL_INFO,
>@@ -43,7 +43,8 @@
>         SYSLOG_LEVEL_DEBUG1,
>         SYSLOG_LEVEL_DEBUG2,
>         SYSLOG_LEVEL_DEBUG3,
>-        SYSLOG_LEVEL_NOT_SET = -1
>+        SYSLOG_LEVEL_NOT_SET = -1,
>+        SYSLOG_LEVEL_QUIET = SYSLOG_LEVEL_FATAL
> }       LogLevel;
> 
> void     log_init(char *, LogLevel, SyslogFacility, int);
>Index: scp.1
>===================================================================
>RCS file: /cvs/openssh/scp.1,v
>retrieving revision 1.41
>diff -u -t -w -r1.41 scp.1
>--- scp.1	8 Aug 2007 04:29:58 -0000	1.41
>+++ scp.1	7 Jan 2008 06:22:18 -0000
>@@ -178,7 +178,8 @@
> Preserves modification times, access times, and modes from the
> original file.
> .It Fl q
>-Disables the progress meter.
>+Quiet mode.
>+Disables the progress meter and any other non-critical messages.
> .It Fl r
> Recursively copy entire directories.
> .It Fl S Ar program
>Index: ssh.1
>===================================================================
>RCS file: /cvs/openssh/ssh.1,v
>retrieving revision 1.229
>diff -u -t -w -r1.229 ssh.1
>--- ssh.1	12 Jun 2007 14:00:59 -0000	1.229
>+++ ssh.1	7 Jan 2008 06:22:18 -0000
>@@ -506,7 +506,7 @@
> per-host basis in the configuration file.
> .It Fl q
> Quiet mode.
>-Causes all warning and diagnostic messages to be suppressed.
>+Disables any non-critical messages.
> .It Fl R Xo
> .Sm off
> .Oo Ar bind_address : Oc

Actions: View | Diff

Attachments on bug 1427: 1434 | 1435 | 1436 | 1437