Hello community, here is the log from the commit of package bwm-ng for openSUSE:Factory checked in at 2019-08-23 11:06:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bwm-ng (Old) and /work/SRC/openSUSE:Factory/.bwm-ng.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bwm-ng" Fri Aug 23 11:06:30 2019 rev:3 rq:725290 version:0.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/bwm-ng/bwm-ng.changes 2017-06-12 15:35:44.888295868 +0200 +++ /work/SRC/openSUSE:Factory/.bwm-ng.new.7948/bwm-ng.changes 2019-08-23 11:06:38.490483734 +0200 @@ -1,0 +2,15 @@ +Wed Aug 14 19:46:57 UTC 2019 - Antoine Belvire <antoine.belv...@opensuse.org> + +- Update to version 0.6.2: + * Fix for timestamp inaccuracy and Y-2038 problem. + * Add the started time in "sum" mode. + * Fix DYNAMIC and ANSIOUT in config. + * Use `static inline` instead of `inline`. + * Always fflush the pipe. + * Update FSF address. + * Fix typos. + * Fix nan and inf values on fast refresh (deb#532331). +- Remove bwm-ng-fix_gcc7_inline.patch: Fixed upstream. +- Refresh spec file. + +------------------------------------------------------------------- Old: ---- bwm-ng-0.6.1.tar.gz bwm-ng-fix_gcc7_inline.patch New: ---- bwm-ng-0.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bwm-ng.spec ++++++ --- /var/tmp/diff_new_pack.EMcZrH/_old 2019-08-23 11:06:39.870483510 +0200 +++ /var/tmp/diff_new_pack.EMcZrH/_new 2019-08-23 11:06:39.874483509 +0200 @@ -1,7 +1,7 @@ # # spec file for package bwm-ng # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,34 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: bwm-ng -Version: 0.6.1 +Version: 0.6.2 Release: 0 Summary: Realtime Bandwidth Monitor -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Monitoring Url: http://www.gropp.org/?id=projects&sub=bwm-ng Source0: https://github.com/vgropp/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}-icons.tar Source2: %{name}.desktop -Patch1: bwm-ng-fix_gcc7_inline.patch -%if 0%{?suse_version} -BuildRequires: hicolor-icon-theme -BuildRequires: update-desktop-files -%endif -BuildRequires: autoconf -BuildRequires: automake BuildRequires: glibc-devel +BuildRequires: hicolor-icon-theme BuildRequires: libstatgrab-devel >= 0.91 BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: net-tools -#BuildRequires: pkgconfig -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Bandwidth Monitor NG is a small and simple console-based live bandwidth monitor @@ -56,7 +48,6 @@ %prep %setup -q -a 1 -%patch1 %build autoreconf -fi @@ -92,13 +83,9 @@ # install Desktop file install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop -%if 0%{?suse_version} - %suse_update_desktop_file %{name} -%endif - %files -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS bwm-ng.css bwm-ng.conf-example +%doc AUTHORS ChangeLog NEWS README THANKS bwm-ng.css bwm-ng.conf-example +%license COPYING %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{ext_man} %{_datadir}/applications/%{name}.desktop ++++++ bwm-ng-0.6.1.tar.gz -> bwm-ng-0.6.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/.travis.yml new/bwm-ng-0.6.2/.travis.yml --- old/bwm-ng-0.6.1/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/bwm-ng-0.6.2/.travis.yml 2019-01-01 14:53:09.000000000 +0100 @@ -0,0 +1,2 @@ +language: c +script: ./autogen.sh && ./configure && make diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/AUTHORS new/bwm-ng-0.6.2/AUTHORS --- old/bwm-ng-0.6.1/AUTHORS 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/AUTHORS 2019-01-01 14:53:09.000000000 +0100 @@ -7,6 +7,7 @@ Volker Gropp <vgropp(at)pefra.de> Contributors: + all authors from github merge requests and: Tim Bishop <t...@freebsd.org> Alexey Zakharov Ricardo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/COPYING new/bwm-ng-0.6.2/COPYING --- old/bwm-ng-0.6.1/COPYING 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/COPYING 2019-01-01 14:53:09.000000000 +0100 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA Also add information on how to contact you by electronic and paper mail. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/ChangeLog new/bwm-ng-0.6.2/ChangeLog --- old/bwm-ng-0.6.1/ChangeLog 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/ChangeLog 2019-01-01 14:53:09.000000000 +0100 @@ -1,3 +1,16 @@ +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 + * 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) + 2015-07-25 13:40 (0.6.1) Volker Gropp <bwmng(at)gropp.org> * cleanups for 0.6.1 release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/NEWS new/bwm-ng-0.6.2/NEWS --- old/bwm-ng-0.6.1/NEWS 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/NEWS 2019-01-01 14:53:09.000000000 +0100 @@ -1,17 +1,13 @@ -Changes in 0.6.1: +Changes in 0.6.2: - - fix g++5 warnings and errors - - libstatgrab no longer default configure option, remove dependency on most distributions - - fix to work with libstatgrab-0.90 - - usleep return value check Creator: Alexey Zakharov - - fix Wrong TX value in plain data (bug ID 1797088). - - fix Dynamic multiplier for bits is now set to x1000 (1kbit = 1000 bits, 1Mbit = 10^6 bits, ...), - instead of x1024, which applies only for bytes. - - fix some little typos in the man page. Creator: Ricardo - - delete unused interfaces from internal interface-list - - code cleanup due to gcc flags - - fix bug with attached patch: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=506503 - - fix missing flush to tmp file in csv output - - fix same values for rx and tx on plain output - - add csv output specs to man page +- 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/README new/bwm-ng-0.6.2/README --- old/bwm-ng-0.6.1/README 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/README 2019-01-01 14:53:09.000000000 +0100 @@ -1,5 +1,5 @@ -bwm-ng v0.6.1 -Copyright (C) 2004-2015 Volker Gropp (bw...@gropp.org) +bwm-ng v0.6.2 +Copyright (C) 2004-2019 Volker Gropp (bw...@gropp.org) http://www.gropp.org/?id=projects&sub=bwm-ng What is this? @@ -34,7 +34,7 @@ =================== network routines sucessfully tested on: -Linux 2.4*, Linux 2.6* +Linux 2.4 and above* FreeBSD 4.8, 5.3, 6.2* MacOS X 10.1 and above* Solaris 10 x86* @@ -53,6 +53,8 @@ INSTALL ======= +Autotools are used to build this. Run the autogen.sh to generate the configure script. + For detailed decription please read INSTALL ./configure --help for a list of options @@ -148,5 +150,5 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * ****************************************************************************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/THANKS new/bwm-ng-0.6.2/THANKS --- old/bwm-ng-0.6.1/THANKS 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/THANKS 2019-01-01 14:53:09.000000000 +0100 @@ -19,4 +19,4 @@ Markus Nospers <markus(at)nospers de> -Thanks to all mailing me and help me improving bwm-ng +Thanks to all merge requests, mailing me and help me improving bwm-ng diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/autogen.sh new/bwm-ng-0.6.2/autogen.sh --- old/bwm-ng-0.6.1/autogen.sh 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/autogen.sh 2019-01-01 14:53:09.000000000 +0100 @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # Be Bourne compatible. (stolen from autoconf) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/configure.in new/bwm-ng-0.6.2/configure.in --- old/bwm-ng-0.6.1/configure.in 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/configure.in 2019-01-01 14:53:09.000000000 +0100 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([bwm-ng],[0.6.1],[bw...@gropp.org],[bwm-ng]) +AC_INIT([bwm-ng],[0.6.2],[bw...@gropp.org],[bwm-ng]) AC_CONFIG_SRCDIR(src/bwm-ng.c) AM_INIT_AUTOMAKE([gnu]) AC_CONFIG_HEADERS(config.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/bwm-ng.c new/bwm-ng-0.6.2/src/bwm-ng.c --- old/bwm-ng-0.6.1/src/bwm-ng.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/bwm-ng.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ @@ -26,7 +26,7 @@ /* handle interrupt signal */ void sigint(int sig) FUNCATTR_NORETURN; -inline void init(void); +static inline void init(void); /* clear stuff and exit */ #ifdef __STDC__ @@ -98,7 +98,7 @@ deinit(0, NULL); } -inline void init(void) { +static inline void init(void) { if_count=0; delay=500; #if EXTENDED_STATS @@ -175,7 +175,8 @@ #if IOSERVICE_IN long_darwin_disk_names = 0; #endif - + time_t t = time(NULL); + strftime(start_time, sizeof(start_time), "%c", localtime(&t)); } /* do the main thing */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/bwm-ng.h new/bwm-ng-0.6.2/src/bwm-ng.h --- old/bwm-ng-0.6.1/src/bwm-ng.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/bwm-ng.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/curses_tools.c new/bwm-ng-0.6.2/src/curses_tools.c --- old/bwm-ng-0.6.1/src/curses_tools.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/curses_tools.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ @@ -50,18 +50,12 @@ if (iface_list==NULL && show_all_if==1) show_all_if=2; /* get stats so all values are uptodate */ get_iface_stats(0); - /* a short sleep, else we get "nan" values due to very short - delay till next get_iface_stats */ - usleep(100); break; case 's': case 'S': sumhidden=!sumhidden; /* get stats so all values are uptodate */ get_iface_stats(0); - /* a short sleep, else we get "nan" values due to very short - delay till next get_iface_stats */ - usleep(100); break; case 'n': case 'N': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/curses_tools.h new/bwm-ng-0.6.2/src/curses_tools.h --- old/bwm-ng-0.6.1/src/curses_tools.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/curses_tools.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/defines.h new/bwm-ng-0.6.2/src/defines.h --- old/bwm-ng-0.6.1/src/defines.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/defines.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ @@ -31,6 +31,7 @@ #include <limits.h> #include <signal.h> #include <string.h> +#include <time.h> #include "../config.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/global_vars.h new/bwm-ng-0.6.2/src/global_vars.h --- old/bwm-ng-0.6.1/src/global_vars.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/global_vars.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ @@ -94,3 +94,5 @@ EXTERN t_iface_stats if_stats_total; #endif + +EXTERN char start_time[30]; \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/help.c new/bwm-ng-0.6.2/src/help.c --- old/bwm-ng-0.6.1/src/help.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/help.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,16 +17,16 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ #include "global_vars.h" #include "help.h" -inline void print_help_line(const char *short_c,const char * long_c,const char *descr); +static inline void print_help_line(const char *short_c,const char * long_c,const char *descr); -inline void print_help_line(const char *short_c,const char * long_c,const char *descr) { +static inline void print_help_line(const char *short_c,const char * long_c,const char *descr) { #ifdef LONG_OPTIONS printf(" %-23s",long_c); #else @@ -49,12 +49,12 @@ printf("Options:\n"); print_help_line("-t <msec>","-t, --timeout <msec>","displays stats every <msec> (1msec = 1/1000sec)"); print_help_line("","","default: 500"); - print_help_line("-d","-d, --dynamic [value]","show values dynamicly (Byte KB or MB)"); + print_help_line("-d","-d, --dynamic [value]","show values dynamically (Byte KB or MB)"); print_help_line("-a [mode]","-a, --allif [mode]","where mode is one of:"); print_help_line("","","0=show only up (and selected) interfaces"); print_help_line("","","1=show all up interfaces (default)"); print_help_line("","","2=show all and down interfaces"); - print_help_line("-I <list>","-I, --interfaces <list>","show only interfaces in <list> (comma seperated), or"); + print_help_line("-I <list>","-I, --interfaces <list>","show only interfaces in <list> (comma separated), or"); print_help_line("","","if list is prefaced with % show all but interfaces"); print_help_line("","","in list"); print_help_line("-S","-S, --sumhidden [value]","count hidden interfaces for total"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/help.h new/bwm-ng-0.6.2/src/help.h --- old/bwm-ng-0.6.1/src/help.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/help.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/devstat.c new/bwm-ng-0.6.2/src/input/devstat.c --- old/bwm-ng-0.6.1/src/input/devstat.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/devstat.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/devstat.h new/bwm-ng-0.6.2/src/input/devstat.h --- old/bwm-ng-0.6.1/src/input/devstat.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/devstat.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/getifaddrs.c new/bwm-ng-0.6.2/src/input/getifaddrs.c --- old/bwm-ng-0.6.1/src/input/getifaddrs.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/getifaddrs.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/getifaddrs.h new/bwm-ng-0.6.2/src/input/getifaddrs.h --- old/bwm-ng-0.6.1/src/input/getifaddrs.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/getifaddrs.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/ioservice.c new/bwm-ng-0.6.2/src/input/ioservice.c --- old/bwm-ng-0.6.1/src/input/ioservice.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/ioservice.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/ioservice.h new/bwm-ng-0.6.2/src/input/ioservice.h --- old/bwm-ng-0.6.1/src/input/ioservice.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/ioservice.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/libkstat.c new/bwm-ng-0.6.2/src/input/libkstat.c --- old/bwm-ng-0.6.1/src/input/libkstat.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/libkstat.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/libkstat.h new/bwm-ng-0.6.2/src/input/libkstat.h --- old/bwm-ng-0.6.1/src/input/libkstat.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/libkstat.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/libstatgrab.c new/bwm-ng-0.6.2/src/input/libstatgrab.c --- old/bwm-ng-0.6.1/src/input/libstatgrab.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/libstatgrab.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/libstatgrab.h new/bwm-ng-0.6.2/src/input/libstatgrab.h --- old/bwm-ng-0.6.1/src/input/libstatgrab.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/libstatgrab.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/netstat.c new/bwm-ng-0.6.2/src/input/netstat.c --- old/bwm-ng-0.6.1/src/input/netstat.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/netstat.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/netstat.h new/bwm-ng-0.6.2/src/input/netstat.h --- old/bwm-ng-0.6.1/src/input/netstat.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/netstat.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/proc_diskstats.c new/bwm-ng-0.6.2/src/input/proc_diskstats.c --- old/bwm-ng-0.6.1/src/input/proc_diskstats.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/proc_diskstats.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/proc_diskstats.h new/bwm-ng-0.6.2/src/input/proc_diskstats.h --- old/bwm-ng-0.6.1/src/input/proc_diskstats.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/proc_diskstats.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/proc_net_dev.c new/bwm-ng-0.6.2/src/input/proc_net_dev.c --- old/bwm-ng-0.6.1/src/input/proc_net_dev.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/proc_net_dev.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/proc_net_dev.h new/bwm-ng-0.6.2/src/input/proc_net_dev.h --- old/bwm-ng-0.6.1/src/input/proc_net_dev.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/proc_net_dev.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/retrieve.c new/bwm-ng-0.6.2/src/input/retrieve.c --- old/bwm-ng-0.6.1/src/input/retrieve.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/retrieve.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/retrieve.h new/bwm-ng-0.6.2/src/input/retrieve.h --- old/bwm-ng-0.6.1/src/input/retrieve.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/retrieve.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/sysctl.c new/bwm-ng-0.6.2/src/input/sysctl.c --- old/bwm-ng-0.6.1/src/input/sysctl.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/sysctl.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/sysctl.h new/bwm-ng-0.6.2/src/input/sysctl.h --- old/bwm-ng-0.6.1/src/input/sysctl.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/sysctl.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/win32.c new/bwm-ng-0.6.2/src/input/win32.c --- old/bwm-ng-0.6.1/src/input/win32.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/win32.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/input/win32.h new/bwm-ng-0.6.2/src/input/win32.h --- old/bwm-ng-0.6.1/src/input/win32.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/input/win32.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/options.c new/bwm-ng-0.6.2/src/options.c --- old/bwm-ng-0.6.1/src/options.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/options.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ @@ -30,12 +30,12 @@ char *trim_whitespace(char *str); int read_config(const char *config_file); #endif -inline int str2output_unit(char *optarg); +static inline int str2output_unit(char *optarg); #if EXTENDED_STATS -inline int str2output_type(char *optarg); +static inline int str2output_type(char *optarg); #endif -inline int str2out_method(char *optarg); -inline int str2in_method(char *optarg); +static inline int str2out_method(char *optarg); +static inline int str2in_method(char *optarg); #ifdef CONFIG_FILE /****************************************************************************** @@ -65,7 +65,7 @@ /******************************************************************************/ #endif -inline int str2output_unit(char *optarg) { +static inline int str2output_unit(char *optarg) { if (optarg) { if (!strcasecmp(optarg,"bytes")) return BYTES_OUT; if (!strcasecmp(optarg,"bits")) return BITS_OUT; @@ -76,7 +76,7 @@ } #if EXTENDED_STATS -inline int str2output_type(char *optarg) { +static inline int str2output_type(char *optarg) { if (optarg) { if (!strcasecmp(optarg,"rate")) return RATE_OUT; if (!strcasecmp(optarg,"max")) return MAX_OUT; @@ -87,7 +87,7 @@ } #endif -inline int str2out_method(char *optarg) { +static inline int str2out_method(char *optarg) { if (optarg) { if (!strcasecmp(optarg,"plain")) return PLAIN_OUT; #ifdef HAVE_CURSES @@ -109,7 +109,7 @@ } -inline int str2in_method(char *optarg) { +static inline int str2in_method(char *optarg) { if (optarg) { #ifdef PROC_NET_DEV if (!strcasecmp(optarg,"proc")) return PROC_IN; @@ -209,9 +209,9 @@ } else if( strcasecmp( token, "INPUT" ) == 0 ) { if (value) input_method=str2in_method(value); } else if( strcasecmp( token, "ANSIOUT" ) == 0 ) { - if (value) ansi_output=value[0]=='0' ? 1 : 0; + if (value) ansi_output=value[0]=='0' ? 0 : 1; } else if( strcasecmp( token, "DYNAMIC" ) == 0 ) { - if (value) dynamic=value[0]=='0' ? 1 : 0; + if (value) dynamic=value[0]=='0' ? 0 : 1; } else if( strcasecmp( token, "UNIT" ) == 0 ) { if (value) output_unit=str2output_unit(value); #if EXTENDED_STATS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/options.h new/bwm-ng-0.6.2/src/options.h --- old/bwm-ng-0.6.1/src/options.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/options.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/output.c new/bwm-ng-0.6.2/src/output.c --- old/bwm-ng-0.6.1/src/output.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/output.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ @@ -25,13 +25,13 @@ #include "output.h" inline static const char *output_type2str(void); -inline const char *input2str(void); -inline const char *show_all_if2str(void); -inline ullong direction2value(char mode,struct inout_long stats); +static inline const char *input2str(void); +static inline const char *show_all_if2str(void); +static inline ullong direction2value(char mode,struct inout_long stats); #if EXTENDED_STATS -inline double direction_max2value(char mode,struct inouttotal_double stats,int items); +static inline double direction_max2value(char mode,struct inouttotal_double stats,int items); #endif -inline char *dyn_byte_value2str(double value,char *str,int buf_size); +static inline char *dyn_byte_value2str(double value,char *str,int buf_size); char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size); inline static const char *output_type2str(void) { @@ -59,7 +59,7 @@ } -inline const char *input2str(void) { +static inline const char *input2str(void) { switch (input_method) { #ifdef SYSCTL case SYSCTL_IN: @@ -121,7 +121,7 @@ return ""; } -inline const char *show_all_if2str(void) { +static inline const char *show_all_if2str(void) { switch (show_all_if) { case 1: return " (all)"; @@ -234,6 +234,7 @@ fprintf(tmp_out_file,"<div class=\"bwm-ng-header\">bwm-ng bwm-ng v" VERSION " (refresh %is); input: ",html_refresh); fprintf(tmp_out_file,"%s", input2str()); fprintf(tmp_out_file,"%s", show_all_if2str()); + if (output_type==SUM_OUT) fprintf(tmp_out_file,"<br>Started: %s", start_time); fprintf(tmp_out_file,"</div><table class=\"bwm-ng-output\">"); fprintf(tmp_out_file,"<tr class=\"bwm-ng-head\"><td class=\"bwm-ng-name\">Interface</td><td>Rx</td><td>Tx</td><td>Total</td></tr>"); break; @@ -241,10 +242,12 @@ case PLAIN_OUT_ONCE: case PLAIN_OUT: if (output_method==PLAIN_OUT && ansi_output) printf("\033[1;2H"); - printf("bwm-ng v" VERSION " (delay %2.3fs); ",(float)delay/1000); - if (output_method==PLAIN_OUT) printf("press 'ctrl-c' to end this%s",(ansi_output ? "\033[2;2H" : "")); else printf("input: "); - printf("%s", input2str()); - printf("%s\n",show_all_if2str()); + + printf("bwm-ng v" VERSION " (delay %2.3fs); ", (float)delay/1000); + if (output_method==PLAIN_OUT && output_type==SUM_OUT) printf("started: %s; ", start_time); + if (output_method==PLAIN_OUT) printf(ansi_output ? "\033[2;2H" : "\n"); + printf("input: %s%s", input2str(), show_all_if2str()); + if (output_method==PLAIN_OUT) printf("; press 'ctrl-c' to end this\n"); if (output_method==PLAIN_OUT) { if (ansi_output) printf("\033[3;2H"); @@ -262,7 +265,7 @@ } -inline ullong direction2value(char mode,struct inout_long stats) { +static inline ullong direction2value(char mode,struct inout_long stats) { switch (mode) { case 0: return stats.in; @@ -275,7 +278,7 @@ } #if EXTENDED_STATS -inline double direction_max2value(char mode,struct inouttotal_double stats,int items) { +static inline double direction_max2value(char mode,struct inouttotal_double stats,int items) { switch (mode) { case 0: return (double)(stats.in/items); @@ -288,7 +291,7 @@ } #endif -inline char *dyn_byte_value2str(double value,char *str,int buf_size) { +static inline char *dyn_byte_value2str(double value,char *str,int buf_size) { if (dynamic) { if (value<1024) snprintf(str,buf_size,"%15.2f ",value); @@ -306,7 +309,7 @@ return str; } -inline char *dyn_bit_value2str(double value,char *str,int buf_size) { +static inline char *dyn_bit_value2str(double value,char *str,int buf_size) { if (dynamic) { if (value<1000) snprintf(str,buf_size,"%15.2f ",value); @@ -418,6 +421,7 @@ /* do the actual output */ void print_values(unsigned int y,unsigned int x,const char *if_name,t_iface_speed_stats stats,float multiplier,t_iface_stats full_stats) { char buffer[50]; + struct timeval now; #if CSV || HTML FILE *tmp_out_file; #endif @@ -540,7 +544,8 @@ #ifdef CSV case CSV_OUT: tmp_out_file=out_file==NULL ? stdout : out_file; - fprintf(tmp_out_file,"%i%c%s%c",(int)time(NULL),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; @@ -552,6 +557,7 @@ /* 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; @@ -563,6 +569,7 @@ /* 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/output.h new/bwm-ng-0.6.2/src/output.h --- old/bwm-ng-0.6.1/src/output.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/output.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/process.c new/bwm-ng-0.6.2/src/process.c --- old/bwm-ng-0.6.1/src/process.c 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/process.c 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ @@ -26,19 +26,19 @@ short show_iface(char *instr, char *searchstr,char iface_is_up); #if HAVE_GETTIMEOFDAY -inline long tvdiff(struct timeval newer, struct timeval older); +static inline long tvdiff(struct timeval newer, struct timeval older); float get_time_delay(int iface_num); #endif -inline ullong calc_new_values(ullong new, ullong old); +static inline ullong calc_new_values(ullong new, ullong old); t_iface_speed_stats convert2calced_values(t_iface_speed_stats new, t_iface_speed_stats old); t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_speed_stats old); #if EXTENDED_STATS -inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data); -inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data); -inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier); +static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data); +static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data); +static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier); void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float multiplier); -inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values); -inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier); +static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values); +static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier); #endif /* returns the whether to show the iface or not @@ -74,7 +74,7 @@ #if HAVE_GETTIMEOFDAY /* Returns: the time difference in milliseconds. */ -inline long tvdiff(struct timeval newer, struct timeval older) { +static inline long tvdiff(struct timeval newer, struct timeval older) { return labs((newer.tv_sec-older.tv_sec)*1000+ (newer.tv_usec-older.tv_usec)/1000); } @@ -82,9 +82,12 @@ /* returns the milliseconds since old stat */ float get_time_delay(int iface_num) { struct timeval now; - float ret; + float ret = 0.0f; gettimeofday(&now,NULL); - ret=(float)1000/tvdiff(now,if_stats[iface_num].time); + long diff = tvdiff(now,if_stats[iface_num].time); + if (diff > 0) { + ret=(float)1000/diff; + } if_stats[iface_num].time.tv_sec=now.tv_sec; if_stats[iface_num].time.tv_usec=now.tv_usec; return ret; @@ -92,7 +95,7 @@ #endif /* basically new-old, but handles "overflow" of source aswell */ -inline ullong calc_new_values(ullong new, ullong old) { +static inline ullong calc_new_values(ullong new, ullong old) { /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */ return (new>=old) ? (ullong)(new-old) : (ullong)(( #ifdef HAVE_LIBKSTAT @@ -133,13 +136,13 @@ #if EXTENDED_STATS /* sub old values from cached for avg stats */ -inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { +static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { values->in-=data.in; values->out-=data.out; values->total-=data.total; } -inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { +static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { values->in+=data.in; values->out+=data.out; values->total+=data.total; @@ -148,7 +151,7 @@ /* put new-old bytes in inout_long struct into a inouttotal_double struct * and add values to cached .value struct */ -inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) { +static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) { data->in=calced_stats.in*multiplier; data->out=calced_stats.out*multiplier; data->total=(calced_stats.in+calced_stats.out)*multiplier; @@ -198,13 +201,13 @@ } /* add current in and out bytes to totals struct */ -inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) { +static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) { stats->in+=new_stats_values.in; stats->out+=new_stats_values.out; } /* lookup old max values and save new if higher */ -inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) { +static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) { if (multiplier*calced_stats.in > stats->in) stats->in=multiplier*calced_stats.in; if (multiplier*calced_stats.out>stats->out) @@ -322,9 +325,12 @@ t_iface_speed_stats calced_stats; #if HAVE_GETTIMEOFDAY struct timeval now; - float multiplier; + float multiplier=0.0f; gettimeofday(&now,NULL); - multiplier=(float)1000/tvdiff(now,if_stats_total.time); + long diff = tvdiff(now,if_stats_total.time); + if (diff > 0) { + multiplier=(float)1000/tvdiff(now,if_stats_total.time); + } if_stats_total.time.tv_sec=now.tv_sec; if_stats_total.time.tv_usec=now.tv_usec; #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/process.h new/bwm-ng-0.6.2/src/process.h --- old/bwm-ng-0.6.1/src/process.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/process.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,7 +17,7 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bwm-ng-0.6.1/src/types.h new/bwm-ng-0.6.2/src/types.h --- old/bwm-ng-0.6.1/src/types.h 2015-07-25 13:50:45.000000000 +0200 +++ new/bwm-ng-0.6.2/src/types.h 2019-01-01 14:53:09.000000000 +0100 @@ -17,12 +17,13 @@ * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * * *****************************************************************************/ #ifndef __TYPES_H #define __TYPES_H +#include <sys/time.h> #include "../config.h" #ifdef HAVE_UNSIGNED_LONG_LONG
