From c94ecb536771c784671f5fc73fcc88cf57ca6c95 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Tue, 28 Aug 2007 19:06:02 +0000 Subject: [PATCH] - update documentation - implement wait for linux svn path=/trunk/; revision=28626 --- reactos/tools/sysreg/os_support.cpp | 11 +++++++++-- reactos/tools/sysreg/os_support.h | 1 + reactos/tools/sysreg/txtmode.cfg | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/reactos/tools/sysreg/os_support.cpp b/reactos/tools/sysreg/os_support.cpp index 07c3f524740..fea82c84232 100644 --- a/reactos/tools/sysreg/os_support.cpp +++ b/reactos/tools/sysreg/os_support.cpp @@ -93,7 +93,7 @@ namespace System_ } #else /********************************************************************************************************************/ - OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs) + OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool wait) { ProcessID pid; @@ -107,7 +107,14 @@ namespace System_ execv(procname, procargs); return 0; } - + else + { + /* parent process */ + if (wait) + { + waitpid(pid, NULL, WNOHANG); + } + } return pid; } diff --git a/reactos/tools/sysreg/os_support.h b/reactos/tools/sysreg/os_support.h index 3f1531aa021..85cb2c9708f 100644 --- a/reactos/tools/sysreg/os_support.h +++ b/reactos/tools/sysreg/os_support.h @@ -16,6 +16,7 @@ #include #include #include +#include #endif #include "user_types.h" diff --git a/reactos/tools/sysreg/txtmode.cfg b/reactos/tools/sysreg/txtmode.cfg index 636e004c6ee..b7f28b9a7e7 100644 --- a/reactos/tools/sysreg/txtmode.cfg +++ b/reactos/tools/sysreg/txtmode.cfg @@ -17,7 +17,8 @@ ROS_EMU_PATH=/usr/bin/qemu ; ROS_HDD_IMAGE ; ; The hdd image to use for running the emulator. If this variable is not -; set, SysReg will create a HDD with name "ros.img" using the qemu-img tool. It will search +; set, SysReg will create a HDD with name "ros.hd" in the ROS_OUTPUT +; directory using the qemu-img tool. It will search ; this tool in the directory of emulator and abort if the tool cannot be found ROS_HDD_IMAGE=~/reactos/qemu/ReactOS.hd ;ROS_HDD_IMAGE=E:\reactos\qemu\ReactOS.hd