lyxserver cleanup patch + andre's small patches

[lyx.git] / src / support / syscall.C

diff --git a/src/support/syscall.C b/src/support/syscall.C
index 26bd1a16fd67e307a5cf600b42503e3fd054bbf9..60afc4293545cf498a58119a2240b5497e49452d 100644 (file)
--- a/src/support/syscall.C
+++ b/src/support/syscall.C
@@ -15,9 +15,15 @@
 #include "syscontr.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
+#include "support/filetools.h"
+#include "support/os.h"
 
 using std::endl;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strerror;
+#endif
+
 
 Systemcalls::Systemcalls() {
        pid = 0; // No child yet
@@ -25,12 +31,7 @@ Systemcalls::Systemcalls() {
 
 Systemcalls::Systemcalls(Starttype how, string const & what, Callbackfct cback)
 {
-       start   = how;
-       command = what;
-       cbk     = cback;
-       pid     = static_cast<pid_t>(0);
-       retval  = 0;
-       startscript();
+       startscript(how, what, cback);
 }
 
 Systemcalls::~Systemcalls() {
@@ -95,7 +96,7 @@ void Systemcalls::kill(int /*tolerance*/) {
        if (wait_for_death) {
                // Here, we should add the PID to a list of
                // waiting processes to kill if they are not
-               // dead without tolerance seconds
+               // dead within tolerance seconds
 
                // CHECK Implement this using the timer of
                // the singleton systemcontroller (Asger)
@@ -113,7 +114,8 @@ void Systemcalls::waitForChild() {
        while (wait) {
                pid_t waitrpid = waitpid(pid, &status, WUNTRACED);
                if (waitrpid == -1) {
-                       lyxerr << "LyX: Error waiting for child:" << strerror(errno) << endl;
+                       lyxerr << "LyX: Error waiting for child:"
+                              << strerror(errno) << endl;
                        wait = false;
                } else if (WIFEXITED(status)) {
                        // Child exited normally. Update return value.
@@ -142,16 +144,20 @@ void Systemcalls::waitForChild() {
 
 pid_t Systemcalls::fork()
 {
+       #ifndef __EMX__
        pid_t cpid= ::fork();
        if (cpid == 0) { // child
+       #endif
+               // TODO: Consider doing all of this before the fork, otherwise me
+               // might have troubles with multi-threaded access. (Baruch 20010228)
                string childcommand(command); // copy
                string rest = split(command, childcommand, ' ');
                const int MAX_ARGV = 255;
                char *syscmd = 0; 
                char *argv[MAX_ARGV];
                int  index = 0;
-               bool more;
-               do {
+               bool more = true;
+               while (more) {
                        childcommand = frontStrip(childcommand);
                        if (syscmd == 0) {
                                syscmd = new char[childcommand.length() + 1];
@@ -169,14 +175,21 @@ pid_t Systemcalls::fork()
                        more = !rest.empty();
                        if (more) 
                                rest = split(rest, childcommand, ' ');
-               } while (more);
+               }
                argv[index] = 0;
                // replace by command. Expand using PATH-environment-var.
+#ifndef __EMX__
                execvp(syscmd, argv);
                // If something goes wrong, we end up here:
-               lyxerr << "LyX: execvp failed: " << strerror(errno) << endl;
+               lyxerr << "LyX: execvp failed: "
+                      << strerror(errno) << endl;
        } else if (cpid < 0) { // error
-               lyxerr << "LyX: Could not fork: " << strerror(errno) << endl;
+#else
+       pid_t cpid = spawnvp(P_SESSION|P_DEFAULT|P_MINIMIZE|P_BACKGROUND, syscmd, argv);
+       if (cpid < 0) { // error
+#endif
+               lyxerr << "LyX: Could not fork: "
+                      << strerror(errno) << endl;
        } else { // parent
                return cpid;
        }
@@ -187,7 +200,7 @@ pid_t Systemcalls::fork()
 // Reuse of instance
 
 int Systemcalls::startscript(Starttype how, string const & what, 
-                            Callbackfct cback)
+                             Callbackfct cback)
 {
        start   = how;
        command = what;
@@ -196,25 +209,11 @@ int Systemcalls::startscript(Starttype how, string const & what,
        retval  = 0;
 
        if (how == SystemDontWait) {
-#ifndef __EMX__
-               command += " &";
-#else
-               // OS/2 cmd.exe has another use for '&'
-               // This is not NLS safe, but it's OK, I think.
-               string sh = OnlyFilename(GetEnvPath("EMXSHELL"));
-               if (sh.empty()) {
-                       // COMSPEC is set, unless user unsets 
-                       sh = OnlyFilename(GetEnvPath("COMSPEC"));
-                       if (sh.empty())
-                               sh = "cmd.exe";
-               }
-               sh = lowercase(sh);
-               if (contains(sh, "cmd.exe")
-                   || contains(sh, "4os2.exe"))
-                       command = "start /min/n " + command;
-               else
+               if (os::shell() == os::UNIX) {
                        command += " &";
-#endif
+               } else {
+                       command = "start /min/n " + command;
+               }
        }
 
         return startscript();
@@ -232,7 +231,7 @@ int Systemcalls::startscript(Starttype how, string const & what,
 int SimulateTimer;
 void back(string cmd, int retval)
 {
-       printf("Done: %s gave %d\n", cmd.c_str(), retval);
+       ::printf("Done: %s gave %d\n", cmd.c_str(), retval);
        SimulateTimer = 0;
 }