Author: janderwald
Date: Tue Aug 28 23:06:02 2007
New Revision: 28626
URL:
http://svn.reactos.org/svn/reactos?rev=28626&view=rev
Log:
- update documentation
- implement wait for linux
Modified:
trunk/reactos/tools/sysreg/os_support.cpp
trunk/reactos/tools/sysreg/os_support.h
trunk/reactos/tools/sysreg/txtmode.cfg
Modified: trunk/reactos/tools/sysreg/os_support.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp…
==============================================================================
--- trunk/reactos/tools/sysreg/os_support.cpp (original)
+++ trunk/reactos/tools/sysreg/os_support.cpp Tue Aug 28 23:06:02 2007
@@ -93,7 +93,7 @@
}
#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 @@
execv(procname, procargs);
return 0;
}
-
+ else
+ {
+ /* parent process */
+ if (wait)
+ {
+ waitpid(pid, NULL, WNOHANG);
+ }
+ }
return pid;
}
Modified: trunk/reactos/tools/sysreg/os_support.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?…
==============================================================================
--- trunk/reactos/tools/sysreg/os_support.h (original)
+++ trunk/reactos/tools/sysreg/os_support.h Tue Aug 28 23:06:02 2007
@@ -16,6 +16,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <signal.h>
+#include <sys/wait.h>
#endif
#include "user_types.h"
Modified: trunk/reactos/tools/sysreg/txtmode.cfg
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r…
==============================================================================
--- trunk/reactos/tools/sysreg/txtmode.cfg (original)
+++ trunk/reactos/tools/sysreg/txtmode.cfg Tue Aug 28 23:06:02 2007
@@ -17,7 +17,8 @@
; 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