cvs commit: apache-apr/apr/file_io/win32 pipe.c readwrite.c

[rbb]

rbb         99/06/23 14:09:19

  Modified:    apr/file_io/win32 pipe.c readwrite.c
  Log:
  This gets pipes working again.
  
  Revision  Changes    Path
  1.2       +1 -1      apache-apr/apr/file_io/win32/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/win32/pipe.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pipe.c    1999/06/03 19:43:45     1.1
  +++ pipe.c    1999/06/23 21:09:18     1.2
  @@ -73,7 +73,7 @@
       (*out)->cntxt = cont;
       (*out)->fname = ap_pstrdup(cont, "PIPE");
   
  -    if (CreatePipe((*in)->filehand, (*out)->filehand, NULL, 0) == -1) {
  +    if (CreatePipe(&(*in)->filehand, &(*out)->filehand, NULL, 0) == -1) {
           return errno;
       }
   
  
  
  
  1.2       +3 -1      apache-apr/apr/file_io/win32/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/win32/readwrite.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- readwrite.c       1999/06/03 19:43:45     1.1
  +++ readwrite.c       1999/06/23 21:09:18     1.2
  @@ -63,17 +63,19 @@
   ap_status_t ap_read(const struct file_t *thefile, void *buf, ap_ssize_t 
*nbytes)
   {
        DWORD bread;
  +    int lasterror;
   
       if (thefile->filehand == INVALID_HANDLE_VALUE) {
           *nbytes = -1;
           return APR_EBADF;
       }
       
  -    if (ReadFile(thefile->filehand, buf, *nbytes, &bread, NULL)) {\
  +    if (ReadFile(thefile->filehand, buf, *nbytes, &bread, NULL)) {
                *nbytes = bread;
            return APR_SUCCESS;
        }
        *nbytes = -1;
  +    lasterror = GetLastError();
        return APR_EEXIST;
   }