Changeset 22529

Timestamp:

2010-07-30T15:35:04+12:00 (14 years ago)

Author:

sjm84

Message:

Fixed Windows from trying to write a file into a possibly inaccessible place

File:

• main/trunk/search4j/libsearch4j.cpp (modified) (3 diffs)

main/trunk/search4j/libsearch4j.cpp

@@ -70 +70 @@
 int process_and_catch_output( string command, string &output ) {
     
-    #ifdef WINDOWS
-
-    char cmd[1024] = "cmd.exe /c ";
-    strcat(cmd, command.c_str());
-    strcat(cmd, " > cmd_output.txt 2>&1");
-    //cerr << "command: " << cmd << endl;
-    int code = process( cmd, false );
-    if ( code!= 0 )
-        return code;
-    
-    string line;
-    ifstream myfile("cmd_output.txt");
-    if ( !myfile.is_open() ) {
-        return -1;
-    }
-
-    while ( !myfile.eof() ) {
-        getline(myfile,line);
-        output.append( line );
-    }
-
-    myfile.close();
-    
-    _unlink( "cmd_output.txt" );
-    
-    return code;
-
-    #else
-    
     FILE *pPipe;
 
@@ -106 +77 @@
 
     //if ( verbose ) cout << "process(): running '" << command << "'" << endl;
+#ifdef WINDOWS
+    if( (pPipe = _popen( cmd, "rt" )) == NULL ) {
+        _pclose( pPipe );
+#else
     if( (pPipe = popen( cmd, "r" )) == NULL ) {
-        //if ( verbose ) cout << "could not start process" << endl;
         pclose( pPipe );
+#endif
         return -1;
     }
-
     //if ( verbose ) cout << "started process" << endl;
 
@@ -130 +104 @@
 
     /* Close pipe and return return value of pPipe. */
+#ifdef WINDOWS
+    int code = _pclose( pPipe );
+#else
     int code = pclose( pPipe );
+#endif
+
     return code;
-
-    #endif
 
 }