X-Git-Url: http://winboard.nl/cgi-bin?p=polyglot.git;a=blobdiff_plain;f=pipex_win32.c;h=24199b71e086b3e5887436044f704f82def6d5b1;hp=8d9e893e43c51808d58e3e8074af8ffe9aba643b;hb=1087eb7b2d8447adf9a7deb549d4004a87b46b10;hpb=e15efca6667b2673b4c1a5879a6917eab6800e58

diff --git a/pipex_win32.c b/pipex_win32.c
index 8d9e893..24199b7 100644
--- a/pipex_win32.c
+++ b/pipex_win32.c
@@ -59,13 +59,17 @@ static DWORD WINAPI ThreadProc(LPVOID lpParam){
 
 // pipex_open()
 
-void pipex_open(pipex_t *pipex, const char *szName, const char *szProcFile) {
+void pipex_open(pipex_t *pipex,
+                const char *szName,
+                const char *szWorkingDir,
+                const char *szProcFile) {
     DWORD dwMode, dwThreadId;
     HANDLE hStdinRead, hStdinWrite, hStdoutRead, hStdoutWrite, hThread;
     SECURITY_ATTRIBUTES sa;
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
     int fdInput;
+    char *szCurrentDir;
     pipex->state=0;
     pipex->name=szName;
     pipex->hProcess=NULL;
@@ -88,6 +92,13 @@ void pipex_open(pipex_t *pipex, const char *szName, const char *szProcFile) {
         si.hStdInput = hStdinRead;
         si.hStdOutput = hStdoutWrite;
         si.hStdError = hStdoutWrite;
+        if((szCurrentDir = _getcwd( NULL, 0 )) == NULL )
+            my_fatal("pipex_open(): no current directory: %s\n",
+                     strerror(errno));
+        if(_chdir(szWorkingDir)){
+            my_fatal("pipex_open(): cannot change directory: %s\n",
+                     strerror(errno));
+        }
         if(CreateProcess(NULL,
                          (LPSTR) szProcFile,
                          NULL,
@@ -109,6 +120,7 @@ void pipex_open(pipex_t *pipex, const char *szName, const char *szProcFile) {
         }else{
             my_fatal("pipex_open(): %s",win32_error());
         }
+        _chdir(szCurrentDir);
     }
     if (pipex->bConsole) {
         SetConsoleMode(pipex->hInput,
@@ -144,9 +156,11 @@ void pipex_open(pipex_t *pipex, const char *szName, const char *szProcFile) {
     if(!hThread){
         my_fatal("pipex_open(): %s",win32_error());
     }
+    pipex->dwWriteIndex=0;
     pipex_set_active(pipex);
 }
 
+
 // pipex_wait_event(pipex)
 
 void pipex_wait_event(pipex_t *pipex[]){
@@ -167,7 +181,6 @@ void pipex_wait_event(pipex_t *pipex[]){
                            );
 }
 
-
 // pipex_send_eof()
 
 void pipex_send_eof(pipex_t *pipex)  {
@@ -206,10 +219,7 @@ static void pipex_set_eof_input(pipex_t *pipex){
     EnterCriticalSection(&(pipex->CriticalSection));
     (pipex->state)|=PIPEX_EOF;
     LeaveCriticalSection(&(pipex->CriticalSection));
-        // not quit the right place
-    my_log("%s->Adapter: EOF\n",pipex->name);
-
-}
+ }
 
 // pipex_active()
 
@@ -322,6 +332,8 @@ bool pipex_eof(pipex_t *pipex){
 bool pipex_readln_nb(pipex_t *pipex, char *szLineStr) {
   int nFeedEnd;
   int ret;
+  int src, dst;
+  char c;
   EnterCriticalSection(&(pipex->CriticalSection));
   if ((pipex->lpFeedEnd) == NULL) {
     ret=FALSE;
@@ -329,10 +341,18 @@ bool pipex_readln_nb(pipex_t *pipex, char *szLineStr) {
     nFeedEnd = pipex->lpFeedEnd - pipex->lpBuffer;
     memcpy(szLineStr, pipex->lpBuffer, nFeedEnd+1);
     szLineStr[nFeedEnd] = '\0';
-        // temp hack: we use the fact that strtok modifies its first argument
-    strtok(szLineStr,"\r\n");
+    
+        // temp hack: stolen from util.c
+        // remove CRs and LFs
+    src = 0;
+    dst = 0;
+    while ((c=szLineStr[src++]) != '\0') {
+        if (c != '\r' && c != '\n') szLineStr[dst++] = c;
+    }
+    szLineStr[dst] = '\0';    
     ASSERT(strchr(szLineStr,'\n')==NULL)
     ASSERT(strchr(szLineStr,'\r')==NULL)
+        
     nFeedEnd ++;
     pipex->nReadEnd -= nFeedEnd;
     memcpy(pipex->lpBuffer, pipex->lpBuffer + nFeedEnd, pipex->nReadEnd+1);
@@ -372,6 +392,7 @@ bool pipex_readln(pipex_t *pipex, char *szLineStr) {
           WaitForSingleObject(pipex->hEvent,INFINITE);
       }
   }
+  my_log("%s->Adapter: EOF\n",pipex->name);
   szLineStr[0]='\0';
   return FALSE;
 }
@@ -425,22 +446,50 @@ void pipex_set_affinity(pipex_t *pipex, int value){
     }
 }
 
+// pipex_write()
+
+void pipex_write(pipex_t *pipex, const char *szLineStr) {
+    int size,written;
+    size=sizeof(pipex->szWriteBuffer)-pipex->dwWriteIndex;
+    written=snprintf(pipex->szWriteBuffer + pipex->dwWriteIndex,
+                     size,
+                     "%s",
+                     szLineStr);
+        // snprintf returns how many bytes should have been written
+        // (not including the trailing zero)
+        // old versions of glibc and msvcrt return -1 in
+        // case of truncated output.
+    if(written>=size || written<0){
+        my_fatal("engine_send(): write_buffer overflow\n");
+    }
+    pipex->dwWriteIndex+=written;
+    
+}
+
+
 // pipex_writeln()
 
 void pipex_writeln(pipex_t *pipex, const char *szLineStr) {
   DWORD dwBytes;
-  int nStrLen;
-  char szWriteBuffer[LINE_INPUT_MAX_CHAR];
-  my_log("Adapter->%s: %s\n",pipex->name,szLineStr);
+  DWORD dwLengthWriteBuffer;
+  pipex_write(pipex, szLineStr);
+  my_log("Adapter->%s: %s\n",pipex->name,pipex->szWriteBuffer);
   if(pipex->bPipe){
-      nStrLen = strlen(szLineStr);
-      memcpy(szWriteBuffer, szLineStr, nStrLen);
-      szWriteBuffer[nStrLen] = '\r';
-      szWriteBuffer[nStrLen + 1] = '\n';
-      WriteFile(pipex->hOutput, szWriteBuffer, nStrLen + 2, &dwBytes, NULL);
+      dwLengthWriteBuffer = strlen(pipex->szWriteBuffer);
+      if(dwLengthWriteBuffer>=sizeof(pipex->szWriteBuffer)-3){
+          my_fatal("pipex_writeln(): write buffer overflow\n");
+      }
+      pipex->szWriteBuffer[dwLengthWriteBuffer] = '\r';
+      pipex->szWriteBuffer[dwLengthWriteBuffer + 1] = '\n';
+          // for easy debugging
+      pipex->szWriteBuffer[dwLengthWriteBuffer + 2] = '\0';  
+      WriteFile(pipex->hOutput, pipex->szWriteBuffer,
+                dwLengthWriteBuffer + 2,
+                &dwBytes, NULL);
   }else{
-      printf("%s\n",szLineStr);
+      printf("%s\n",pipex->szWriteBuffer);
       fflush(stdout);
   }
+  pipex->dwWriteIndex = 0;
 }
 #endif