From c550d7526ae2d28b482d22de93983490ae381b7f Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Tue, 9 Sep 2003 20:06:11 +0000
Subject: [PATCH] "Stefan Paletta" <stefanp@cabal1.com>: fix mkpkg and
 fl_stparse

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1350 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE | 1 +
 misc/tools-source/fl_stparse.c          | 7 ++++---
 package/base/sysfiles/mkpkg.sh          | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 121bac9ec..65aaac85d 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -6,6 +6,7 @@
  - Dennis Wecker: sylpheed
  - Piotr Esden-Tempski: curl dietlibc fix V2
  - added xinerama option to xfree86
+ - Stefan Paletta: fix mkpkg and fl_stparse
 
 *) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2)
 
diff --git a/misc/tools-source/fl_stparse.c b/misc/tools-source/fl_stparse.c
index d724fdf1b..59f376672 100644
--- a/misc/tools-source/fl_stparse.c
+++ b/misc/tools-source/fl_stparse.c
@@ -127,7 +127,7 @@ int main(int argc, char ** argv) {
 		return 1;
 	}
 
-	while (fgets(line, 1024, stdin) != NULL) {
+	do {
 
 		if ( sscanf(line, "%d fork() = %d", &pid, &newpid) == 2 ||
 		     sscanf(line, "%d vfork() = %d", &pid, &newpid) == 2 ||
@@ -142,7 +142,8 @@ int main(int argc, char ** argv) {
 			continue;
 		}
 
-		if ( sscanf(line, "%d _exit(%d", &pid, &newpid) == 2 ) {
+		if ( sscanf(line, "%d _exit(%d", &pid, &newpid) == 2 ||
+		     sscanf(line, "%d exit_group(%d", &pid, &newpid) == 2 ) {
 			freeproc(pid);
 			continue;
 		}
@@ -191,6 +192,6 @@ int main(int argc, char ** argv) {
 			continue;
 		}
 
-	}
+	} while (fgets(line, 1024, stdin) != NULL);
 	return 0;
 }
diff --git a/package/base/sysfiles/mkpkg.sh b/package/base/sysfiles/mkpkg.sh
index 81edfad38..98eeeabfe 100644
--- a/package/base/sysfiles/mkpkg.sh
+++ b/package/base/sysfiles/mkpkg.sh
@@ -18,7 +18,7 @@ slog=`mktemp` wlog=`mktemp` flog=`mktemp`
 
 strace -o $slog -F -f -q -e open,creat,`
 	`mkdir,mknod,link,symlink,rename,utime,chdir,`
-	`execve,fork,vfork,_exit -p $$ &
+	`execve,fork,vfork,_exit,exit_group -p $$ &
 strace_pid=$!; sleep 1; cd $PWD
 
 "$@"