[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-214-gf84a8f0

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  f84a8f027c1b5989b7bbbe1cde8748909314734d (commit)
      from  8583f18c3f7829a3d7c3413fd1446679b26f6652 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=f84a8f027c1b5989b7bbbe1cde8748909314734d


commit f84a8f027c1b5989b7bbbe1cde8748909314734d
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Nov 23 13:18:26 2012 +0100

    ifconfig: Output formatting.

diff --git a/ChangeLog b/ChangeLog
index 2bcb796..9d0cad3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2012-11-23  Mats Erik Andersson  <address@hidden>
 
+       ifconfig: Output formatting.
+
+       * ifconfig/options.c (formats) <gnu format>:
+       Test with `ifdisplay?' to suppress empty lines
+       for dormant interfaces.
+       <net-tools format>: Remove a newline for txqlen.
+       <netstat format>: Use `exists?' on `ifstat?',
+       leaving statistics empty if `ifstat?' fails.
+
+2012-11-23  Mats Erik Andersson  <address@hidden>
+
        ifconfig: Initial hwaddr support for BSD.
 
        * ifconfig/options.c (formats) <unix format>:
diff --git a/ifconfig/options.c b/ifconfig/options.c
index 43f4902..6e6317d 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -65,7 +65,8 @@ struct format formats[] = {
   /* This is the standard GNU output.  */
   {"gnu",
    "Standard GNU output format.",
-   "${first?}{}{${\\n}}${format}{gnu-one-entry}"},
+   "${ifdisplay?}{${first?}{}{${\\n}}${format}{gnu-one-entry}}"
+  },
   {"gnu-one-entry",
    "Same as GNU, but without additional newlines between the entries.",
    "${format}{check-existence}"
@@ -111,7 +112,6 @@ struct format formats[] = {
    "${newline}"
    "          RX bytes:${rxbytes}  TX bytes:${txbytes}"
    "}}{"
-   "${newline}"
    "${exists?}{txqlen?}{${txqlen?}{ ${tab}{10}txqueuelen:${txqlen}}${\\n}}}"
    "${newline}"
    "${exists?}{map?}{${map?}{${irq?}{"
@@ -129,10 +129,12 @@ struct format formats[] = {
    "${first?}{Iface    MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR 
TX-DRP TX-OVR Flg${newline}}"
    "${format}{check-existence}"
    "${name}${tab}{6}${mtu}{%6d} ${metric}{%3d}"
+   /* Insert blanks without ifstat.  */
+   "${exists?}{ifstat?}{"
    "${ifstat?}{"
    " ${rxpackets}{%8lu} ${rxerrors}{%6lu} ${rxdropped}{%6lu} 
${rxfifoerr}{%6lu}"
    " ${txpackets}{%8lu} ${txerrors}{%6lu} ${txdropped}{%6lu} 
${txfifoerr}{%6lu}"
-   "}{   - no statistics available -}"
+   "}{   - no statistics available -}}"
    "${tab}{76} ${flags?}{${flags}{short}}{[NO FLAGS]}"
    "${newline}"
   },

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |   11 +++++++++++
 ifconfig/options.c |    8 +++++---
 2 files changed, 16 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils