[Nickle] nickle: Branch 'master' - 2 commits

Keith Packard keithp at keithp.com
Sun Jan 29 20:20:21 PST 2012


 configure.in     |    2 +-
 debian/changelog |    6 ++++++
 file.c           |    2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 8515fa7a571f4e7bf0e66e09b1b73e747fa597c6
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Nov 28 22:27:33 2011 -0800

    Switch version to 2.72 in preparation for an eventual release
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.in b/configure.in
index ac54f95..832e15e 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ dnl for licensing information.
 
 AC_PREREQ([2.68])
 
-AC_INIT([nickle],[2.71],[http://nickle.org],[nickle])
+AC_INIT([nickle],[2.72],[http://nickle.org],[nickle])
 
 AC_CONFIG_SRCDIR([nickle.h])
 AC_CONFIG_HEADERS([config.h])
diff --git a/debian/changelog b/debian/changelog
index f1b0193..0ebbde7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nickle (2.72-1) unstable; urgency=low
+
+  * don't infinite loop when wait3 returns 0
+
+ -- Keith Packard <keithp at keithp.com>  Fri, 25 Nov 2011 12:15:26 -0800
+
 nickle (2.71-1) unstable; urgency=low
 
   * Update old-school variable length struct allocation to ansi-C
commit 395b70966490f406c7b40a41d18c8f7b93c057a8
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Nov 25 12:11:07 2011 -0800

    wait3 returns 0 when there's nothing left to do
    
    Don't keep looping when wait3 is done
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/file.c b/file.c
index 8dbdd7c..de51268 100644
--- a/file.c
+++ b/file.c
@@ -467,6 +467,8 @@ ProcessInterrupt ()
 	int		status;
 
 	pid = wait3 (&status, WNOHANG, NULL);
+	if (pid == 0)
+	    break;
 	if (pid < 0 && errno == ECHILD)
 	    break;
     }


More information about the Nickle mailing list