Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

run_program() fixes #2748

Merged
merged 4 commits into from
Mar 17, 2019
Merged

run_program() fixes #2748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8d727a
mgr: fix argv in calls to run_program()
JuhaSointusalo Oct 9, 2018
f3a4f62
scr: fix argv in calls to run_program()
JuhaSointusalo Oct 9, 2018
4e46c73
lib: fix run_program() on Windows
JuhaSointusalo Oct 9, 2018
11cfa26
client: don't quote the path to client in GPU detection
JuhaSointusalo Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions client/gpu_detect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,6 @@ int COPROCS::launch_child_process_to_detect_gpus() {
#else
int prog;
#endif
char quoted_client_path[MAXPATHLEN];
char quoted_data_dir[MAXPATHLEN+2];
char data_dir[MAXPATHLEN];
int retval = 0;
Expand All @@ -625,22 +624,17 @@ int COPROCS::launch_child_process_to_detect_gpus() {
boinc_getcwd(data_dir);

#ifdef _WIN32
strlcpy(quoted_client_path, "\"", sizeof(quoted_client_path));
strlcat(quoted_client_path, client_path, sizeof(quoted_client_path));
strlcat(quoted_client_path, "\"", sizeof(quoted_client_path));

strlcpy(quoted_data_dir, "\"", sizeof(quoted_data_dir));
strlcat(quoted_data_dir, data_dir, sizeof(quoted_data_dir));
strlcat(quoted_data_dir, "\"", sizeof(quoted_data_dir));
#else
strlcpy(quoted_client_path, client_path, sizeof(quoted_client_path));
strlcpy(quoted_data_dir, data_dir, sizeof(quoted_data_dir));
#endif

if (log_flags.coproc_debug) {
msg_printf(0, MSG_INFO,
"[coproc] launching child process at %s",
quoted_client_path
client_path
);
if (!is_path_absolute(client_path)) {
msg_printf(0, MSG_INFO,
Expand All @@ -656,7 +650,7 @@ int COPROCS::launch_child_process_to_detect_gpus() {

int argc = 4;
char* const argv[5] = {
const_cast<char *>(quoted_client_path),
const_cast<char *>(client_path),
const_cast<char *>("--detect_gpus"),
const_cast<char *>("--dir"),
const_cast<char *>(quoted_data_dir),
Expand Down
8 changes: 4 additions & 4 deletions clientgui/AdvancedFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,18 +1582,18 @@ void CAdvancedFrame::OnLaunchNewInstance(wxCommandEvent& WXUNUSED(event)) {
#else
int prog;
#endif
wxString strExecutable = wxGetApp().GetRootDirectory() + wxGetApp().GetExecutableName();
wxCharBuffer mbStrExecutable = strExecutable.mb_str();
int argc = 2;
char* const argv[3] = {
const_cast<char *>("boincmgr"),
mbStrExecutable.data(),
const_cast<char *>("--multiple"),
NULL
};

wxString strExecutable = wxGetApp().GetRootDirectory() + wxGetApp().GetExecutableName();

run_program(
wxGetApp().GetRootDirectory().mb_str(),
strExecutable.mb_str(),
mbStrExecutable,
argc,
argv,
2.0,
Expand Down
10 changes: 6 additions & 4 deletions clientgui/MainDocument.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1793,17 +1793,19 @@ int CMainDocument::WorkShowGraphics(RESULT* rp) {
);
}
#else
char* argv[2];

// If graphics app is already running, don't launch a second instance
//
if (previous_gfx_app) return 0;
argv[0] = 0;

char* argv[2] = {
rp->graphics_exec_path,
NULL
};

iRetVal = run_program(
rp->slot_path,
rp->graphics_exec_path,
0,
1,
argv,
0,
id
Expand Down
8 changes: 2 additions & 6 deletions clientscr/screensaver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ int CScreensaver::launch_screensaver(RESULT* rp, GFXAPP_ID& graphics_application
}
#else
char* argv[3];
argv[0] = "app_graphics"; // not used
argv[0] = rp->graphics_exec_path;
argv[1] = "--fullscreen";
argv[2] = 0;
retval = run_program(
Expand Down Expand Up @@ -392,18 +392,14 @@ int CScreensaver::launch_default_screensaver(char *dir_path, GFXAPP_ID& graphics
BOINCTRACE(_T("launch_default_screensaver returned %d\n"), retval);

#else
// For unknown reasons, the graphics application exits with
// "RegisterProcess failed (error = -50)" unless we pass its
// full path twice in the argument list to execv on Macs.

char* argv[4];
char full_path[1024];

strlcpy(full_path, dir_path, sizeof(full_path));
strlcat(full_path, PATH_SEPARATOR, sizeof(full_path));
strlcat(full_path, THE_DEFAULT_SS_EXECUTABLE, sizeof(full_path));

argv[0] = full_path; // not used
argv[0] = full_path;
argv[1] = "--fullscreen";
argv[2] = 0;
argv[3] = 0;
Expand Down
13 changes: 7 additions & 6 deletions lib/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ int read_file_string(

#ifdef _WIN32
int run_program(
const char* dir, const char* /*file*/, int argc, char *const argv[], double nsecs, HANDLE& id
const char* dir, const char* file, int argc, char *const argv[], double nsecs, HANDLE& id
) {
int retval;
PROCESS_INFORMATION process_info;
Expand All @@ -427,12 +427,13 @@ int run_program(
memset(&startup_info, 0, sizeof(startup_info));
startup_info.cb = sizeof(startup_info);

safe_strcpy(cmdline, "");
for (int i=0; i<argc; i++) {
// lpApplicationName needs to be NULL for CreateProcess to search path
// but argv[0] may be full path or just filename
// 'file' should be something runnable so use that as program name
snprintf(cmdline, sizeof(cmdline), "\"%s\"", file);
for (int i=1; i<argc; i++) {
safe_strcat(cmdline, " ");
safe_strcat(cmdline, argv[i]);
if (i<argc-1) {
safe_strcat(cmdline, " ");
}
}

retval = CreateProcessA(
Expand Down