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