"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

@@ -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)
 

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;
 }

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
 
 "$@"