Factored out the the fork+exec.

git-svn-id: http://svn.complang.org/ragel/trunk@322 052ea7fc-9027-0410-9066-f65837a77df0

diff --git a/ragel/main.cpp b/ragel/main.cpp
index 38d4c9e..746bee8 100644 (file)
--- a/ragel/main.cpp
+++ b/ragel/main.cpp
@@ -484,35 +484,24 @@ void cleanExit( char *intermed, int status )
        exit( status );
 }
 
-int execFrontend( const char *argv0, char *inputFileName, char *intermed )
-{
-       /* The frontend program name. */
-       char *progName = "ragel";
-
-       frontendArgs.insert( 0, progName );
-       frontendArgs.insert( 1, "-f" );
-       frontendArgs.append( "-o" );
-       frontendArgs.append( intermed );
-       frontendArgs.append( inputFileName );
-       frontendArgs.append( 0 );
-
-       
-       char **pathChecks = makePathChecks( argv0, progName );
-
 #ifndef WIN32
+
+int forkAndExec( char *progName, char **pathChecks, 
+               ArgsVector &args, char *intermed )
+{
        pid_t pid = fork();
        if ( pid < 0 ) {
                /* Error, no child created. */
-               error() << "failed to fork frontend" << endl;
+               error() << "failed to fork for " << progName << endl;
                cleanExit( intermed, 1 );
        }
        else if ( pid == 0 ) {
                /* child */
                while ( *pathChecks != 0 ) {
-                       execv( *pathChecks, frontendArgs.data );
+                       execv( *pathChecks, args.data );
                        pathChecks += 1;
                }
-               error() << "failed to exec frontend" << endl;
+               error() << "failed to exec " << progName << endl;
                cleanExit( intermed, 1 );
        }
 
@@ -522,7 +511,7 @@ int execFrontend( const char *argv0, char *inputFileName, char *intermed )
 
        /* What happened with the child. */
        if ( ! WIFEXITED( status ) ) {
-               error() << "frontend did not exit normally" << endp;
+               error() << progName << " did not exit normally" << endl;
                cleanExit( intermed, 1 );
        }
        
@@ -530,12 +519,30 @@ int execFrontend( const char *argv0, char *inputFileName, char *intermed )
                cleanExit( intermed, WEXITSTATUS(status) );
 
        return status;
-#else
-       return 0;
+}
+
+#endif
+
+void execFrontend( const char *argv0, char *inputFileName, char *intermed )
+{
+       /* The frontend program name. */
+       char *progName = "ragel";
+
+       frontendArgs.insert( 0, progName );
+       frontendArgs.insert( 1, "-f" );
+       frontendArgs.append( "-o" );
+       frontendArgs.append( intermed );
+       frontendArgs.append( inputFileName );
+       frontendArgs.append( 0 );
+
+       char **pathChecks = makePathChecks( argv0, progName );
+
+#ifndef WIN32
+       forkAndExec( progName, pathChecks, frontendArgs, intermed );
 #endif
 }
 
-int execBackend( const char *argv0, char *intermed, char *outputFileName )
+void execBackend( const char *argv0, char *intermed, char *outputFileName )
 {
        /* Locate the backend program */
        char *progName = 0;
@@ -552,8 +559,6 @@ int execBackend( const char *argv0, char *intermed, char *outputFileName )
                        break;
        }
 
-       char **pathChecks = makePathChecks( argv0, progName );
-
        backendArgs.insert( 0, progName );
        if ( outputFileName != 0 ) {
                backendArgs.append( "-o" );
@@ -562,39 +567,10 @@ int execBackend( const char *argv0, char *intermed, char *outputFileName )
        backendArgs.append( intermed );
        backendArgs.append( 0 );
 
-#ifndef WIN32
-       pid_t pid = fork();
-       if ( pid < 0 ) {
-               /* Error, no child created. */
-               error() << "failed to fork backend" << endl;
-               cleanExit( intermed, 1 );
-       }
-       else if ( pid == 0 ) {
-               /* child */
-               while ( *pathChecks != 0 ) {
-                       execv( *pathChecks, backendArgs.data );
-                       pathChecks += 1;
-               }
-               error() << "failed to exec backend" << endl;
-               cleanExit( intermed, 1 );
-       }
-
-       /* Parent process, wait for the child. */
-       int status;
-       wait( &status );
-
-       /* What happened with the child. */
-       if ( ! WIFEXITED( status ) ) {
-               error() << "backend did not exit normally" << endl;
-               cleanExit( intermed, 1 );
-       }
-       
-       if ( WEXITSTATUS(status) != 0 )
-               cleanExit( intermed, WEXITSTATUS(status) );
+       char **pathChecks = makePathChecks( argv0, progName );
 
-       return status;
-#else
-       return 0;
+#ifndef WIN32
+       forkAndExec( progName, pathChecks, backendArgs, intermed );
 #endif
 }