nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FbCommands.cc: Implement ExecuteCmd for Windows

Browse source
This commit is contained in:
Ryan Pavlik 2011-10-28 12:50:30 -05:00
parent 4ded38f43f
commit d4f682c7bd
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/FbCommands.cc
View file

@ -113,15 +113,26 @@ ExecuteCmd::ExecuteCmd(const string &cmd, int screen_num):m_cmd(cmd), m_screen_n
}
void ExecuteCmd::execute() {
#ifndef __EMX__
run();
#else // __EMX__
spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", m_cmd.c_str(), static_cast<void*>(NULL));
#endif // !__EMX__
}
int ExecuteCmd::run() {
#if defined(__EMX__) || defined(_WIN32)
#ifndef PATH_MAX
#define PATH_MAX 1024
#endif
char comspec[PATH_MAX] = {0};
char * env_var = getenv("COMSPEC");
if (env_var != NULL) {
strncpy(comspec, env_var, PATH_MAX - 1);
comspec[PATH_MAX - 1] = '\0';
} else {
strncpy(comspec, "cmd.exe", 7);
comspec[7] = '\0';
}
return spawnlp(P_NOWAIT, comspec, comspec, "/c", m_cmd.c_str(), static_cast<void*>(NULL));
#else
pid_t pid = fork();
if (pid)
return pid;
@ -161,6 +172,7 @@ int ExecuteCmd::run() {
exit(EXIT_SUCCESS);
return pid; // compiler happy -> we are happy ;)
#endif
}
FbTk::Command<void> *ExportCmd::parse(const string &command, const string &args,