Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=12334
This commit is contained in:
David Anderson 2007-04-09 15:40:37 +00:00
parent 11869bc0be
commit c276918e96
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
checkin_notes
View File

@ -3279,11 +3279,11 @@ David 6 Apr 2007
sim.C,h sim.C,h
David 6 Apr 2007 David 6 Apr 2007
- core client: sanity check on work request size - core client: sanity check on work request size
(from John McLeod) (from John McLeod)
client/ client/
work_fetch.C work_fetch.C
David 8 Apr 2007 David 8 Apr 2007
- updater: - updater:
@ -3313,3 +3313,11 @@ David 8 Apr 2007
util.C,h util.C,h
tools/ tools/
updater.C updater.C
David 9 Apr 2007
- win compile fixes
client/
auto_update.C
lib/
util.C

7
client/auto_update.C
View File

@ -174,7 +174,12 @@ void AUTO_UPDATE::install() {
char version_dir[1024]; char version_dir[1024];
char cwd[256]; char cwd[256];
char* argv[10]; char* argv[10];
int retval, argc, pid; int retval, argc;
#ifdef _WIN32
HANDLE pid;
#else
int pid;
#endif
msg_printf(NULL, MSG_INFO, "Installing new version of BOINC: %d.%d.%d", msg_printf(NULL, MSG_INFO, "Installing new version of BOINC: %d.%d.%d",
version.major, version.minor, version.release version.major, version.minor, version.release

6
lib/util.C
View File

@ -417,6 +417,7 @@ int run_program(
PROCESS_INFORMATION process_info; PROCESS_INFORMATION process_info;
STARTUPINFO startup_info; STARTUPINFO startup_info;
char cmdline[1024], path[1024]; char cmdline[1024], path[1024];
unsigned long status;
memset(&process_info, 0, sizeof(process_info)); memset(&process_info, 0, sizeof(process_info));
memset(&startup_info, 0, sizeof(startup_info)); memset(&startup_info, 0, sizeof(startup_info));
@ -443,7 +444,7 @@ int run_program(
if (retval) return retval; if (retval) return retval;
if (nsecs) { if (nsecs) {
boinc_sleep(nsecs); boinc_sleep(nsecs);
if (GetExitCodeProcess(pid_handle, &status)) { if (GetExitCodeProcess(process_info.hProcess, &status)) {
if (status != STILL_ACTIVE) { if (status != STILL_ACTIVE) {
return -1; return -1;
} }
@ -479,7 +480,7 @@ int run_program(
#ifdef _WIN32 #ifdef _WIN32
void kill_program(HANDLE pid) { void kill_program(HANDLE pid) {
TerminateProcess(pid); TerminateProcess(pid, 0);
} }
#else #else
void kill_program(int pid) { void kill_program(int pid) {
@ -498,6 +499,7 @@ int get_exit_status(HANDLE pid_handle) {
} }
} }
return (int) status; return (int) status;
}
#else #else
int get_exit_status(int pid) { int get_exit_status(int pid) {
int status; int status;