Version 0.21

Merge pull request #22 from nbassler/master
Fix ETA not updating properly and bad total throughput display
2026-02-21 22:42:29 +00:00 · 2016-08-24 15:21:30 +02:00 · 2016-08-24 15:58:56 +02:00 · 2016-08-21 19:48:54 +02:00 · 2016-08-04 09:27:48 +02:00 · 2016-08-04 09:14:52 +02:00
5 changed files with 25 additions and 6 deletions
--- a/6
+++ b/6
@@ -18,6 +18,12 @@ Martijn van Brummelen
 RELEASE NOTES
 =============

+v0.21
+- Fix ETA not updating properly and bad total throughput display. Thanks (Niels Bassler).
+
+v0.20
+- Fix build when panel header is not in /usr/include (Thanks Vincent Untz).
+
 v0.19
 - Fix building on Fedora(Unknown off64_t) bug #19.
 - Use PRNG instead of zero's bug #7. Thanks xambroz.
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ([2.64])
-AC_INIT(nwipe, 0.18, git@brumit.nl)
-AM_INIT_AUTOMAKE(nwipe, 0.18)
+AC_INIT(nwipe, 0.21, git@brumit.nl)
+AM_INIT_AUTOMAKE(nwipe, 0.21)
 AC_OUTPUT(Makefile src/Makefile man/Makefile)
 AC_CONFIG_SRCDIR([src/nwipe.c])
 AC_CONFIG_HEADERS([config.h])
@@ -21,7 +21,14 @@ PKG_CHECK_MODULES(
 		CFLAGS="${CFLAGS} ${PANEL_CFLAGS}"
 		LIBS="${LIBS} ${PANEL_LIBS}"
 	],
-	[AC_CHECK_LIB([panel], [main], ,[AC_MSG_ERROR([ncurses panel library not found])])]
+	[AC_CHECK_LIB([panel], [main], [
+		LIBS="-lpanel $LIBS"
+		AC_CHECK_HEADERS(panel.h,, [
+		    AC_CHECK_HEADERS(ncurses/panel.h, [
+			AC_DEFINE([PANEL_IN_SUBDIR], [ncurses/], [Look for ncurses headers in subdir])
+			], [AC_MSG_ERROR([ncurses panel headers not found])])
+		])
+	    ], [AC_MSG_ERROR([ncurses panel library not found])])]
 )

 PKG_CHECK_MODULES(
--- a/src/gui.c
+++ b/src/gui.c
@@ -2036,6 +2036,9 @@ int compute_stats(void *ptr)
 	int i;
 	
 	time_t nwipe_time_now = time( NULL );
+
+	nwipe_misc_thread_data->throughput = 0;
+	nwipe_misc_thread_data->maxeta = 0;
 	
 	/* Enumerate all contexts to compute statistics. */
 	for( i = 0 ; i < count ; i++ )
--- a/src/nwipe.h
+++ b/src/nwipe.h
@@ -70,12 +70,15 @@ extern int log_current_element;
 extern int log_elements_allocated;
 extern pthread_mutex_t mutex1;

-/* Ncurses headers. Assume panel.h is in same place.*/
+/* Ncurses headers. */
 #ifdef NCURSES_IN_SUBDIR
    #include <ncurses/ncurses.h>
-    #include <ncurses/panel.h>
 #else
    #include <ncurses.h>
+#endif
+#ifdef PANEL_IN_SUBDIR
+    #include <ncurses/panel.h>
+#else
    #include <panel.h>
 #endif

--- a/src/version.c
+++ b/src/version.c
@@ -4,7 +4,7 @@
 * used by configure to dynamically assign those values 
 * to documentation files.
 */
-const char *version_string = "0.19";
+const char *version_string = "0.21";
 const char *program_name   = "nwipe";
 const char *author_name    = "Martijn van Brummelen";
 const char *email_address  = "git@brumit.nl";
Author	SHA1	Message	Date
Martijn van Brummelen	9c63eef565	Version 0.21	2016-08-24 15:21:30 +02:00
Martijn van Brummelen	db9e7ef1aa	Merge pull request #22 from nbassler/master Fix ETA not updating properly and bad total throughput display	2016-08-24 15:58:56 +02:00
Niels Bassler	7039f381af	Fix total throughtput display, which showed cummulative throughput, and not current througput. Fix also ETA, which would never decrease.	2016-08-21 19:48:54 +02:00
Martijn van Brummelen	c6fa743f15	Update README/Version	2016-08-04 09:27:48 +02:00
Martijn van Brummelen	61e8e4663f	Merge branch 'vuntz-panel-headers'	2016-08-04 09:14:52 +02:00
Martijn van Brummelen	ea198137de	Merge branch 'panel-headers' of https://github.com/vuntz/nwipe into vuntz-panel-headers	2016-08-04 09:14:37 +02:00
Vincent Untz	51d33b9f61	Fix build when panel header is not in /usr/include When there's no pkg-config file for the panel library, the build breaks if the header is not in /usr/include. At least in openSUSE, we have /usr/include/ncurses.h and /usr/include/ncurses/panel.h.	2014-09-09 18:19:05 +02:00