Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package bwm-ng for openSUSE:Factory checked 
in at 2021-04-24 23:09:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bwm-ng (Old)
 and      /work/SRC/openSUSE:Factory/.bwm-ng.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "bwm-ng"

Sat Apr 24 23:09:14 2021 rev:5 rq:888166 version:0.6.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/bwm-ng/bwm-ng.changes    2019-09-09 
23:56:52.765234162 +0200
+++ /work/SRC/openSUSE:Factory/.bwm-ng.new.12324/bwm-ng.changes 2021-04-24 
23:10:25.771503101 +0200
@@ -1,0 +2,8 @@
+Fri Apr 16 19:42:28 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de>
+
+- Update to version 0.6.3
+  * Fix potential write to unallocated memory.
+  * Output bits per second in csv
+  * Add support for newer netstat (2016+)
+
+-------------------------------------------------------------------

Old:
----
  bwm-ng-0.6.2.tar.gz

New:
----
  bwm-ng-0.6.3.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ bwm-ng.spec ++++++
--- /var/tmp/diff_new_pack.0xjBsI/_old  2021-04-24 23:10:26.215503729 +0200
+++ /var/tmp/diff_new_pack.0xjBsI/_new  2021-04-24 23:10:26.219503734 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package bwm-ng
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
 
 
 Name:           bwm-ng
-Version:        0.6.2
+Version:        0.6.3
 Release:        0
 Summary:        Realtime Bandwidth Monitor
 License:        GPL-2.0-or-later
 Group:          System/Monitoring
 URL:            https://www.gropp.org/?id=projects&sub=bwm-ng
-Source0:        
https://github.com/vgropp/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0:        https://www.gropp.org/bwm-ng/bwm-ng-%{version}.tar.gz
 Source1:        %{name}-icons.tar
 Source2:        %{name}.desktop
 BuildRequires:  glibc-devel

++++++ bwm-ng-0.6.2.tar.gz -> bwm-ng-0.6.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/.gitignore new/bwm-ng-0.6.3/.gitignore
--- old/bwm-ng-0.6.2/.gitignore 2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/.gitignore 2021-01-10 15:52:39.000000000 +0100
@@ -27,3 +27,4 @@
 src/retrieve.o
 stamp-h1
 src/libstatgrab.o
+.idea
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/AUTHORS new/bwm-ng-0.6.3/AUTHORS
--- old/bwm-ng-0.6.2/AUTHORS    2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/AUTHORS    2021-01-10 15:52:39.000000000 +0100
@@ -1,10 +1,10 @@
 -- AUTHORS of bwm-ng
 
 Author/Project leader:
-    Volker Gropp <vgropp(at)pefra.de>
+    Volker Gropp <bwm-ng(at)gropp.org>
 
 Main developers:
-    Volker Gropp <vgropp(at)pefra.de>
+    Volker Gropp <bwm-ng(at)gropp.org>
 
 Contributors:
        all authors from github merge requests and:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/ChangeLog new/bwm-ng-0.6.3/ChangeLog
--- old/bwm-ng-0.6.2/ChangeLog  2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/ChangeLog  2021-01-10 15:52:39.000000000 +0100
@@ -1,3 +1,12 @@
+2021-01-10 (0.6.3) Volker Gropp <bwmng(at)gropp.org>
+
+       * remove outdated copyright and email
+       * Merge pull request #25 from fweimer/patch-1 AC_QEF_C_NORETURN: 
Include <stdlib.h> for exit
+       * Merge pull request #27 from ofalk/master Fix potential write to 
unallocated memory.
+       * Merge pull request #28 from vgropp/#2-fix-csv-bits feat: #2 output 
bits in csv
+       * Merge pull request #29 from vgropp/#2-fix-csv-bits fix(doc): #2 
output bits in csv
+       * Merge pull request #32 from vgropp/new-netstat-#5 feat: add support 
for newer (2016+) linux netstat #5
+
 2019-01-01 14:50 (0.6.2) Volker Gropp <bwmng(at)gropp.org>
 
        * Merge pull request #22 from vgropp/issue-#13 to fix windows build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/NEWS new/bwm-ng-0.6.3/NEWS
--- old/bwm-ng-0.6.2/NEWS       2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/NEWS       2021-01-10 15:52:39.000000000 +0100
@@ -1,13 +1,8 @@
-Changes in 0.6.2:
-
-- Merge pull request #22 from vgropp/issue-#13 to fix windows build
-- Merge pull request #20 from dreibh/master CSV file output: fix for timestamp 
inaccuracy and Y-2038 problem
-- Merge pull request #21 from vgropp/travisci add travisci
-- Merge pull request #17 from Himura2la/master Add the started time in "sum" 
mode
-- Merge pull request #18 from Himura2la/fix-dynamic Fix DYNAMIC and ANSIOUT in 
config
-- Merge pull request #10 from SoapGentoo/fixes Use `static inline` instead of 
`inline`
-- Merge pull request #9 from adventureloop/master Always fflush the pipe 
-- Merge pull request #7 from samueloph/fsf_address_clean Update FSF address
-- Merge pull request #6 from samueloph/master Fix typos
-- fix nan and inf values on fast refresh (fixes debian bug #532331)
+Changes in 0.6.3:
 
+   * remove outdated copyright and email
+   * Merge pull request #25 from fweimer/patch-1 AC_QEF_C_NORETURN: Include 
<stdlib.h> for exit
+   * Merge pull request #27 from ofalk/master Fix potential write to 
unallocated memory.
+   * Merge pull request #28 from vgropp/#2-fix-csv-bits feat: #2 output bits 
in csv
+   * Merge pull request #29 from vgropp/#2-fix-csv-bits fix(doc): #2 output 
bits in csv
+   * Merge pull request #32 from vgropp/new-netstat-#5 feat: add support for 
newer (2016+) linux netstat #5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/README new/bwm-ng-0.6.3/README
--- old/bwm-ng-0.6.2/README     2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/README     2021-01-10 15:52:39.000000000 +0100
@@ -1,5 +1,5 @@
-bwm-ng v0.6.2
-Copyright (C) 2004-2019 Volker Gropp (bw...@gropp.org)
+bwm-ng v0.6.3
+Copyright (C) 2004-2021 Volker Gropp (bw...@gropp.org)
 http://www.gropp.org/?id=projects&sub=bwm-ng
 
 What is this?
@@ -78,7 +78,7 @@
 
 csv output format: 
 Type rate:
-unix 
timestamp;iface_name;bytes_out/s;bytes_in/s;bytes_total/s;bytes_in;bytes_out;packets_out/s;packets_in/s;packets_total/s;packets_in;packets_out;errors_out/s;errors_in/s;errors_in;errors_out\n
+unix 
timestamp;iface_name;bytes_out/s;bytes_in/s;bytes_total/s;bytes_in;bytes_out;packets_out/s;packets_in/s;packets_total/s;packets_in;packets_out;errors_out/s;errors_in/s;errors_in;errors_out;bits_out/s;bits_in/s;bits_total/s;bits_in;bits_out\n
 Type svg, sum, max:
 unix 
timestamp;iface_name;bytes_out;bytes_in;bytes_total;packets_out;packets_in;packets_total;errors_out;errors_in\n
 Use --count 0 to skip the all zero output after start.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/acinclude.m4 
new/bwm-ng-0.6.3/acinclude.m4
--- old/bwm-ng-0.6.2/acinclude.m4       2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/acinclude.m4       2021-01-10 15:52:39.000000000 +0100
@@ -148,7 +148,7 @@
 AC_MSG_CHECKING(whether the C compiler (${CC-cc}) accepts noreturn attribute)
 AC_CACHE_VAL(qef_cv_c_noreturn,
 [qef_cv_c_noreturn=no
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
 void f (void) __attribute__ ((noreturn));
 void f (void)
 {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/configure.in 
new/bwm-ng-0.6.3/configure.in
--- old/bwm-ng-0.6.2/configure.in       2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/configure.in       2021-01-10 15:52:39.000000000 +0100
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([bwm-ng],[0.6.2],[bw...@gropp.org],[bwm-ng])
+AC_INIT([bwm-ng],[0.6.3],[bw...@gropp.org],[bwm-ng])
 AC_CONFIG_SRCDIR(src/bwm-ng.c)
 AM_INIT_AUTOMAKE([gnu])
 AC_CONFIG_HEADERS(config.h)
@@ -676,6 +676,26 @@
 fi
 ])
 
+AC_ARG_WITH([netstatlinuxnew],AS_HELP_STRING([--with-netstatlinuxnew],[enable 
linux newer versions ie 2016+ like netstat -i (ARG=PATH)]),[
+if [ test $withval != "no" ]; then
+    if [ test $withval != "yes" ]; then
+        echo "GNU net-tools like version forced: $withval"
+        AC_DEFINE_UNQUOTED([HAVE_NETSTAT_PATH],[$withval],[set path to 
netstat])
+    else
+        echo "GNU net-tools like version forced"
+    fi
+    AC_DEFINE_UNQUOTED([NETSTAT_LINUX_NEW],[1],[use GNU net-tools netstat new 
versions])
+    if [ test $NETSTAT_ADDED -eq 0 ]; then
+       INPUT_SYSTEM="$INPUT_SYSTEM netstat.$OBJEXT"
+       NETSTAT_ADDED=1
+        fi
+    NETSTAT_DEFINED="1"
+else
+    NETSTAT_DEFINED="1"
+    echo "disable netstat: GNU net-tools like new versions"
+fi
+])
+
 
 AC_ARG_WITH([netstatsolaris],AS_HELP_STRING([--with-netstatsolaris],[enable 
solaris like netstat -i (ARG=PATH)]),[
 if [ test $withval != "no" ]; then
@@ -727,6 +747,15 @@
     AC_CHECK_PROGS([NETSTAT_CMD],[netstat])
     if [ test "${NETSTAT_CMD}" ]; then
         AC_MSG_CHECKING([for netstat version])
+        net_test=`${NETSTAT_CMD} -ia 2>/dev/null | ${EGREP} "Iface +MTU +RX-OK 
+RX-ERR +RX-DRP +RX-OVR +TX-OK +TX-ERR +TX-DRP +TX-OVR +Flg"`
+        if [ test "${net_test}" ]; then
+                       AC_MSG_RESULT([GNU net-tools like newer version found])
+                               AC_DEFINE_UNQUOTED([NETSTAT_LINUX_NEW],[1],[use 
GNU net-tools netstat newer versions])
+                               if [ test $NETSTAT_ADDED -eq 0 ]; then
+                                        INPUT_SYSTEM="$INPUT_SYSTEM 
netstat.$OBJEXT"
+                                        NETSTAT_ADDED=1
+                               fi
+        else
         net_test=`${NETSTAT_CMD} -ia 2>/dev/null | ${EGREP} "Iface +MTU +Met 
+RX-OK +RX-ERR +RX-DRP +RX-OVR +TX-OK +TX-ERR +TX-DRP +TX-OVR +Flg"`
         if [ test "${net_test}" ]; then
                        AC_MSG_RESULT([GNU net-tools like version found])
@@ -792,6 +821,7 @@
                     fi
                 fi
             fi
+          fi
         fi
     fi
 fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/bwm-ng.c 
new/bwm-ng-0.6.3/src/bwm-ng.c
--- old/bwm-ng-0.6.2/src/bwm-ng.c       2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/bwm-ng.c       2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng                                                                    *
  *                                                                            *
- *  Copyright (C) 2004-2006 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/bwm-ng.h 
new/bwm-ng-0.6.3/src/bwm-ng.h
--- old/bwm-ng-0.6.2/src/bwm-ng.h       2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/bwm-ng.h       2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng                                                                    *
  *                                                                            *
- *  Copyright (C) 2004 Volker Gropp (vgr...@pefra.de)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/curses_tools.c 
new/bwm-ng-0.6.3/src/curses_tools.c
--- old/bwm-ng-0.6.2/src/curses_tools.c 2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/curses_tools.c 2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng curses stuff                                                       *
  *                                                                            *
- *  Copyright (C) 2004 Volker Gropp (vgr...@pefra.de)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/curses_tools.h 
new/bwm-ng-0.6.3/src/curses_tools.h
--- old/bwm-ng-0.6.2/src/curses_tools.h 2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/curses_tools.h 2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng                                                                    *
  *                                                                            *
- *  Copyright (C) 2004 Volker Gropp (vgr...@pefra.de)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/defines.h 
new/bwm-ng-0.6.3/src/defines.h
--- old/bwm-ng-0.6.2/src/defines.h      2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/defines.h      2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng                                                                    *
  *                                                                            *
- *  Copyright (C) 2004 Volker Gropp (vgr...@pefra.de)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
@@ -41,7 +39,7 @@
 #define SYSCTL
 #endif
 
-#if NETSTAT_LINUX || NETSTAT_BSD || NETSTAT_BSD_BYTES || NETSTAT_SOLARIS || 
NETSTAT_NETBSD
+#if NETSTAT_LINUX_NEW || NETSTAT_LINUX || NETSTAT_BSD || NETSTAT_BSD_BYTES || 
NETSTAT_SOLARIS || NETSTAT_NETBSD
 #define NETSTAT 1
 #endif
 
@@ -319,7 +317,7 @@
 #endif
 #endif
 
-#define print_version printf("Bandwidth Monitor NG (" PACKAGE_NAME ") v" 
VERSION "\nCopyright (C) 2004-2007 Volker Gropp <" PACKAGE_BUGREPORT ">\n"); 
+#define print_version printf("Bandwidth Monitor NG (" PACKAGE_NAME ") v" 
VERSION); 
 
 #ifndef EXIT_SUCCESS
 #define EXIT_SUCCESS 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/global_vars.h 
new/bwm-ng-0.6.3/src/global_vars.h
--- old/bwm-ng-0.6.2/src/global_vars.h  2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/global_vars.h  2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng global variables                                                   *
  *                                                                            *
- *  Copyright (C) 2007 Volker Gropp (bw...@gropp.org)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
@@ -95,4 +93,4 @@
 
 #endif
 
-EXTERN char start_time[30];
\ No newline at end of file
+EXTERN char start_time[30];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/help.c new/bwm-ng-0.6.3/src/help.c
--- old/bwm-ng-0.6.2/src/help.c 2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/help.c 2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng online help                                                        *
  *                                                                            *
- *  Copyright (C) 2004 Volker Gropp (vgr...@pefra.de)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/help.h new/bwm-ng-0.6.3/src/help.h
--- old/bwm-ng-0.6.2/src/help.h 2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/help.h 2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng help header                                                        *
  *                                                                            *
- *  Copyright (C) 2004 Volker Gropp (vgr...@pefra.de)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/devstat.c 
new/bwm-ng-0.6.3/src/input/devstat.c
--- old/bwm-ng-0.6.2/src/input/devstat.c        2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/devstat.c        2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrieve stuff                                         *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/devstat.h 
new/bwm-ng-0.6.3/src/input/devstat.h
--- old/bwm-ng-0.6.2/src/input/devstat.h        2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/devstat.h        2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrive stuff                                          *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/getifaddrs.c 
new/bwm-ng-0.6.3/src/input/getifaddrs.c
--- old/bwm-ng-0.6.2/src/input/getifaddrs.c     2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/getifaddrs.c     2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrieve stuff                                         *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/getifaddrs.h 
new/bwm-ng-0.6.3/src/input/getifaddrs.h
--- old/bwm-ng-0.6.2/src/input/getifaddrs.h     2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/getifaddrs.h     2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrive stuff                                          *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/ioservice.c 
new/bwm-ng-0.6.3/src/input/ioservice.c
--- old/bwm-ng-0.6.2/src/input/ioservice.c      2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/ioservice.c      2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrieve stuff                                         *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/ioservice.h 
new/bwm-ng-0.6.3/src/input/ioservice.h
--- old/bwm-ng-0.6.2/src/input/ioservice.h      2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/ioservice.h      2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrive stuff                                          *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/libkstat.c 
new/bwm-ng-0.6.3/src/input/libkstat.c
--- old/bwm-ng-0.6.2/src/input/libkstat.c       2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/libkstat.c       2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrieve stuff                                         *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/libkstat.h 
new/bwm-ng-0.6.3/src/input/libkstat.h
--- old/bwm-ng-0.6.2/src/input/libkstat.h       2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/libkstat.h       2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrive stuff                                          *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/libstatgrab.c 
new/bwm-ng-0.6.3/src/input/libstatgrab.c
--- old/bwm-ng-0.6.2/src/input/libstatgrab.c    2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/libstatgrab.c    2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrieve stuff                                         *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/libstatgrab.h 
new/bwm-ng-0.6.3/src/input/libstatgrab.h
--- old/bwm-ng-0.6.2/src/input/libstatgrab.h    2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/libstatgrab.h    2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrive stuff                                          *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/netstat.c 
new/bwm-ng-0.6.3/src/input/netstat.c
--- old/bwm-ng-0.6.2/src/input/netstat.c        2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/netstat.c        2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrieve stuff                                         *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
@@ -78,7 +76,7 @@
                        " -b"
 #endif
 #endif
-#if NETSTAT_LINUX
+#if NETSTAT_LINUX || NETSTAT_LINUX_NEW
                   show_all_if ? NETSTAT_PATH " -ia" : NETSTAT_PATH " -i"
 #endif
 #if NETSTAT_SOLARIS
@@ -97,7 +95,7 @@
     str_buf=(char *)malloc(MAX_LINE_BUFFER);
 #endif
     buffer=(char *)malloc(MAX_LINE_BUFFER);
-#ifdef NETSTAT_LINUX
+#if NETSTAT_LINUX || NETSTAT_LINUX_NEW
     /* we skip first 2 lines if not bsd at any mode */
     if ((fgets(buffer,MAX_LINE_BUFFER,f) == NULL ) || 
(fgets(buffer,MAX_LINE_BUFFER,f) == NULL )) 
                deinit(1, "read of netstat failed: %s\n",strerror(errno));
@@ -114,6 +112,9 @@
 #ifdef NETSTAT_LINUX           
         
sscanf(buffer,"%s%*i%*i%llu%llu%*i%*i%llu%llu",name,&tmp_if_stats.packets.in,&tmp_if_stats.errors.in,&tmp_if_stats.packets.out,&tmp_if_stats.errors.out);
 #endif
+#ifdef NETSTAT_LINUX_NEW
+        
sscanf(buffer,"%s%*i%llu%llu%*i%*i%llu%llu",name,&tmp_if_stats.packets.in,&tmp_if_stats.errors.in,&tmp_if_stats.packets.out,&tmp_if_stats.errors.out);
+#endif
 #if NETSTAT_BSD_BYTES 
         if (count_tokens(buffer)>10) /* including address */
                
sscanf(buffer,"%s%*i%*s%*s%llu%llu%llu%llu%llu%llu",name,&tmp_if_stats.packets.in,&tmp_if_stats.errors.in,&tmp_if_stats.bytes.in,&tmp_if_stats.packets.out,&tmp_if_stats.errors.out,&tmp_if_stats.bytes.out);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/netstat.h 
new/bwm-ng-0.6.3/src/input/netstat.h
--- old/bwm-ng-0.6.2/src/input/netstat.h        2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/netstat.h        2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrive stuff                                          *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/proc_diskstats.c 
new/bwm-ng-0.6.3/src/input/proc_diskstats.c
--- old/bwm-ng-0.6.2/src/input/proc_diskstats.c 2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/proc_diskstats.c 2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrieve stuff                                         *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/proc_diskstats.h 
new/bwm-ng-0.6.3/src/input/proc_diskstats.h
--- old/bwm-ng-0.6.2/src/input/proc_diskstats.h 2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/proc_diskstats.h 2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrive stuff                                          *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/proc_net_dev.c 
new/bwm-ng-0.6.3/src/input/proc_net_dev.c
--- old/bwm-ng-0.6.2/src/input/proc_net_dev.c   2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/proc_net_dev.c   2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrieve stuff                                         *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/proc_net_dev.h 
new/bwm-ng-0.6.3/src/input/proc_net_dev.h
--- old/bwm-ng-0.6.2/src/input/proc_net_dev.h   2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/proc_net_dev.h   2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrive stuff                                          *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/retrieve.c 
new/bwm-ng-0.6.3/src/input/retrieve.c
--- old/bwm-ng-0.6.2/src/input/retrieve.c       2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/retrieve.c       2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrieve stuff                                         *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/retrieve.h 
new/bwm-ng-0.6.3/src/input/retrieve.h
--- old/bwm-ng-0.6.2/src/input/retrieve.h       2019-01-01 14:53:09.000000000 
+0100
+++ new/bwm-ng-0.6.3/src/input/retrieve.h       2021-01-10 15:52:39.000000000 
+0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrive stuff                                          *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/sysctl.c 
new/bwm-ng-0.6.3/src/input/sysctl.c
--- old/bwm-ng-0.6.2/src/input/sysctl.c 2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/input/sysctl.c 2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrieve stuff                                         *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/sysctl.h 
new/bwm-ng-0.6.3/src/input/sysctl.h
--- old/bwm-ng-0.6.2/src/input/sysctl.h 2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/input/sysctl.h 2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrive stuff                                          *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/win32.c 
new/bwm-ng-0.6.3/src/input/win32.c
--- old/bwm-ng-0.6.2/src/input/win32.c  2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/input/win32.c  2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrieve stuff                                         *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/input/win32.h 
new/bwm-ng-0.6.3/src/input/win32.h
--- old/bwm-ng-0.6.2/src/input/win32.h  2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/input/win32.h  2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng parsing and retrive stuff                                          *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/options.c 
new/bwm-ng-0.6.3/src/options.c
--- old/bwm-ng-0.6.2/src/options.c      2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/options.c      2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng handle cmdline and config file options                             *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
@@ -337,6 +335,10 @@
         pwd_entry=getpwuid(getuid());
         if (pwd_entry!=NULL) {
             str=(char*)malloc(strlen(pwd_entry->pw_dir)+14);
+            if(!str) {
+              printf("Fatal: failed to allocate %zu bytes reading user 
directory for config file.\n", strlen(pwd_entry->pw_dir)+14);
+              exit(EXIT_FAILURE);
+            }
             
snprintf(str,strlen(pwd_entry->pw_dir)+14,"%s/.bwm-ng.conf",pwd_entry->pw_dir);
             read_config(str);
             free(str);
@@ -494,4 +496,3 @@
                output_unit=BYTES_OUT;
     return;
 }
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/options.h 
new/bwm-ng-0.6.3/src/options.h
--- old/bwm-ng-0.6.2/src/options.h      2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/options.h      2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng options header                                                     *
  *                                                                            *
- *  Copyright (C) 2004-2007 Volker Gropp (bw...@gropp.org)                    *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/output.c 
new/bwm-ng-0.6.3/src/output.c
--- old/bwm-ng-0.6.2/src/output.c       2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/output.c       2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng output                                                             *
  *                                                                            *
- *  Copyright (C) 2004 Volker Gropp (vgr...@pefra.de)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
@@ -524,8 +522,8 @@
                        if (output_method==PLAIN_OUT && ansi_output) 
printf("\033[%d;2H",y);
             printf("%15s:",if_name); /* output the name */
             printf("%s ", values2str(0,stats,full_stats,multiplier,buffer,49));
-                               printf("%s 
",values2str(1,stats,full_stats,multiplier,buffer,49));
-                               
printf("%s\n",values2str(2,stats,full_stats,multiplier,buffer,49));
+                       printf("%s 
",values2str(1,stats,full_stats,multiplier,buffer,49));
+                       
printf("%s\n",values2str(2,stats,full_stats,multiplier,buffer,49));
             break;
 #ifdef HTML                    
                case HTML_OUT:
@@ -544,57 +542,66 @@
 #ifdef CSV
         case CSV_OUT:
                                tmp_out_file=out_file==NULL ? stdout : out_file;
-            gettimeofday(&now, NULL);
-            fprintf(tmp_out_file,"%1.6f%c%s%c",(((double)now.tv_sec * 
1000000.0) + (double)now.tv_usec) / 1000000.0,csv_char,if_name,csv_char);
+                gettimeofday(&now, NULL);
+                fprintf(tmp_out_file,"%1.6f%c%s%c",(((double)now.tv_sec * 
1000000.0) + (double)now.tv_usec) / 1000000.0,csv_char,if_name,csv_char);
                                if (output_type == RATE_OUT || output_type == 
SUM_OUT) {
-                                       if (output_type == RATE_OUT) {
-                                               stats_csv = &stats;
+                if (output_type == RATE_OUT) {
+                    stats_csv = &stats;
 #if !NETSTAT_BSD_BYTES && !NETSTAT_NETBSD && NETSTAT
-                      if (input_method!=NETSTAT_IN)
+                    if (input_method!=NETSTAT_IN)
 #endif
-                   /* output Bytes/s */
-                   
fprintf(tmp_out_file,"%.2f%c%.2f%c%.2f%c%llu%c%llu%c",(double)(stats_csv->bytes.out*multiplier),csv_char,(double)(stats_csv->bytes.in*multiplier),csv_char,(double)((stats_csv->bytes.out+stats_csv->bytes.in)*multiplier),csv_char,stats_csv->bytes.in,csv_char,stats_csv->bytes.out,csv_char);
-                   /* show packets/s and errors/s */
-                
fprintf(tmp_out_file,"%.2f%c%.2f%c%.2f%c%llu%c%llu",(double)stats_csv->packets.out*multiplier,csv_char,(double)stats_csv->packets.in*multiplier,csv_char,(double)(stats_csv->packets.out+stats_csv->packets.in)*multiplier,csv_char,stats_csv->packets.in,csv_char,stats_csv->packets.out);
-                     
fprintf(tmp_out_file,"%c%.2f%c%.2f%c%llu%c%llu\n",csv_char,stats_csv->errors.out*multiplier,csv_char,stats_csv->errors.in*multiplier,csv_char,stats_csv->errors.in,csv_char,stats_csv->errors.out);
-                                       fflush(tmp_out_file);   
-
-                                       } else {
-                                               stats_csv = &full_stats.sum;
+                    /* output Bytes/s */
+                    
fprintf(tmp_out_file,"%.2f%c%.2f%c%.2f%c%llu%c%llu%c",(double)(stats_csv->bytes.out*multiplier),csv_char,(double)(stats_csv->bytes.in*multiplier),
+                        
csv_char,(double)((stats_csv->bytes.out+stats_csv->bytes.in)*multiplier),csv_char,stats_csv->bytes.in,csv_char,stats_csv->bytes.out,csv_char);
+                    /* show packets/s */
+                    
fprintf(tmp_out_file,"%.2f%c%.2f%c%.2f%c%llu%c%llu%c",(double)stats_csv->packets.out*multiplier,csv_char,(double)stats_csv->packets.in*multiplier,
+                        
csv_char,(double)(stats_csv->packets.out+stats_csv->packets.in)*multiplier,csv_char,stats_csv->packets.in,csv_char,stats_csv->packets.out,csv_char);
+                    /* errors/s */
+                    
fprintf(tmp_out_file,"%.2f%c%.2f%c%llu%c%llu%c",stats_csv->errors.out*multiplier,csv_char,stats_csv->errors.in*multiplier,csv_char,stats_csv->errors.in,
+                        csv_char,stats_csv->errors.out,csv_char);
+                    /* show bits/s */
+#if !NETSTAT_BSD_BYTES && !NETSTAT_NETBSD && NETSTAT
+                    if (input_method!=NETSTAT_IN)
+#endif
+                    
fprintf(tmp_out_file,"%.2f%c%.2f%c%.2f%c%llu%c%llu\n",(double)(stats_csv->bytes.out*multiplier*8),csv_char,(double)(stats_csv->bytes.in*multiplier*8),
+                        
csv_char,(double)((stats_csv->bytes.out+stats_csv->bytes.in)*multiplier*8),csv_char,stats_csv->bytes.in*8,csv_char,stats_csv->bytes.out*8);
+                    fflush(tmp_out_file);
+                } else {
+                    stats_csv = &full_stats.sum;
 #if !NETSTAT_BSD_BYTES && !NETSTAT_NETBSD && NETSTAT
-                                               if (input_method!=NETSTAT_IN)
+                    if (input_method!=NETSTAT_IN)
 #endif                    
-                                                /* output Bytes */
-                                                
fprintf(tmp_out_file,"%llu%c%llu%c%llu%c",stats_csv->bytes.out,csv_char,stats_csv->bytes.in,csv_char,(stats_csv->bytes.out+stats_csv->bytes.in),csv_char);
-                                               /* show packets and errors */
-                                               
fprintf(tmp_out_file,"%llu%c%llu%c%llu",stats_csv->packets.out,csv_char,stats_csv->packets.in,csv_char,(stats_csv->packets.out+stats_csv->packets.in));
-                                               
fprintf(tmp_out_file,"%c%llu%c%llu\n",csv_char,stats_csv->errors.out,csv_char,stats_csv->errors.in);
-                                       fflush(tmp_out_file);   
-                                               }
-                               } else { /* MAX_OUT or AVG_OUT */
-                                       if (output_type == MAX_OUT)
-                                               stats_csv_d = full_stats.max;
-                                       else {
-                                               stats_csv_d.bytes.out = 
full_stats.avg.item_sum.bytes.out/full_stats.avg.items;
-                                               stats_csv_d.bytes.in = 
full_stats.avg.item_sum.bytes.in/full_stats.avg.items;
-                                               stats_csv_d.bytes.total = 
full_stats.avg.item_sum.bytes.total/full_stats.avg.items;
-                                               stats_csv_d.packets.out = 
full_stats.avg.item_sum.packets.out/full_stats.avg.items;
-                                               stats_csv_d.packets.in = 
full_stats.avg.item_sum.packets.in/full_stats.avg.items;
-                                               stats_csv_d.packets.total = 
full_stats.avg.item_sum.packets.total/full_stats.avg.items;
-                                               stats_csv_d.errors.out = 
full_stats.avg.item_sum.errors.out/full_stats.avg.items;
-                                               stats_csv_d.errors.in = 
full_stats.avg.item_sum.errors.in/full_stats.avg.items;
-                                               stats_csv_d.errors.total = 
full_stats.avg.item_sum.errors.total/full_stats.avg.items;
-                                       }
+                     /* output Bytes */
+                     
fprintf(tmp_out_file,"%llu%c%llu%c%llu%c",stats_csv->bytes.out,csv_char,stats_csv->bytes.in,csv_char,(stats_csv->bytes.out+stats_csv->bytes.in),csv_char);
+                    /* show packets and errors */
+                    
fprintf(tmp_out_file,"%llu%c%llu%c%llu",stats_csv->packets.out,csv_char,stats_csv->packets.in,csv_char,(stats_csv->packets.out+stats_csv->packets.in));
+                    
fprintf(tmp_out_file,"%c%llu%c%llu\n",csv_char,stats_csv->errors.out,csv_char,stats_csv->errors.in);
+                fflush(tmp_out_file);
+                    }
+            } else { /* MAX_OUT or AVG_OUT */
+                if (output_type == MAX_OUT)
+                    stats_csv_d = full_stats.max;
+                else {
+                    stats_csv_d.bytes.out = 
full_stats.avg.item_sum.bytes.out/full_stats.avg.items;
+                    stats_csv_d.bytes.in = 
full_stats.avg.item_sum.bytes.in/full_stats.avg.items;
+                    stats_csv_d.bytes.total = 
full_stats.avg.item_sum.bytes.total/full_stats.avg.items;
+                    stats_csv_d.packets.out = 
full_stats.avg.item_sum.packets.out/full_stats.avg.items;
+                    stats_csv_d.packets.in = 
full_stats.avg.item_sum.packets.in/full_stats.avg.items;
+                    stats_csv_d.packets.total = 
full_stats.avg.item_sum.packets.total/full_stats.avg.items;
+                    stats_csv_d.errors.out = 
full_stats.avg.item_sum.errors.out/full_stats.avg.items;
+                    stats_csv_d.errors.in = 
full_stats.avg.item_sum.errors.in/full_stats.avg.items;
+                    stats_csv_d.errors.total = 
full_stats.avg.item_sum.errors.total/full_stats.avg.items;
+                }
 #if !NETSTAT_BSD_BYTES && !NETSTAT_NETBSD && NETSTAT
-               if (input_method!=NETSTAT_IN)
+                if (input_method!=NETSTAT_IN)
 #endif
-                   /* output Bytes/s */
-                   
fprintf(tmp_out_file,"%.2Lf%c%.2Lf%c%.2Lf%c",stats_csv_d.bytes.out,csv_char,stats_csv_d.bytes.in,csv_char,stats_csv_d.bytes.total,csv_char);
-               /* show packets/s and errors/s */
-               
fprintf(tmp_out_file,"%.2Lf%c%.2Lf%c%.2Lf",stats_csv_d.packets.out,csv_char,stats_csv_d.packets.in,csv_char,stats_csv_d.packets.total);
-               
fprintf(tmp_out_file,"%c%.2Lf%c%.2Lf\n",csv_char,stats_csv_d.errors.out,csv_char,stats_csv_d.errors.in);
-                                       fflush(tmp_out_file);   
-                               }
+                /* output Bytes/s */
+                
fprintf(tmp_out_file,"%.2Lf%c%.2Lf%c%.2Lf%c",stats_csv_d.bytes.out,csv_char,stats_csv_d.bytes.in,csv_char,stats_csv_d.bytes.total,csv_char);
+                /* show packets/s and errors/s */
+                
fprintf(tmp_out_file,"%.2Lf%c%.2Lf%c%.2Lf",stats_csv_d.packets.out,csv_char,stats_csv_d.packets.in,csv_char,stats_csv_d.packets.total);
+                
fprintf(tmp_out_file,"%c%.2Lf%c%.2Lf\n",csv_char,stats_csv_d.errors.out,csv_char,stats_csv_d.errors.in);
+                           fflush(tmp_out_file);
+                       }
             break;
 #endif                 
     }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/output.h 
new/bwm-ng-0.6.3/src/output.h
--- old/bwm-ng-0.6.2/src/output.h       2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/output.h       2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng output                                                             *
  *                                                                            *
- *  Copyright (C) 2004 Volker Gropp (vgr...@pefra.de)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/process.c 
new/bwm-ng-0.6.3/src/process.c
--- old/bwm-ng-0.6.2/src/process.c      2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/process.c      2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng process data                                                       *
  *                                                                            *
- *  Copyright (C) 2004 Volker Gropp (vgr...@pefra.de)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/process.h 
new/bwm-ng-0.6.3/src/process.h
--- old/bwm-ng-0.6.2/src/process.h      2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/process.h      2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng process data                                                       *
  *                                                                            *
- *  Copyright (C) 2004 Volker Gropp (vgr...@pefra.de)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/bwm-ng-0.6.2/src/types.h new/bwm-ng-0.6.3/src/types.h
--- old/bwm-ng-0.6.2/src/types.h        2019-01-01 14:53:09.000000000 +0100
+++ new/bwm-ng-0.6.3/src/types.h        2021-01-10 15:52:39.000000000 +0100
@@ -1,8 +1,6 @@
 /******************************************************************************
  *  bwm-ng                                                                    *
  *                                                                            *
- *  Copyright (C) 2004 Volker Gropp (vgr...@pefra.de)                         *
- *                                                                            *
  *  for more info read README.                                                *
  *                                                                            *
  *  This program is free software; you can redistribute it and/or modify      *

Reply via email to