cvs commit: apache-1.3/src/os/win32 util_win32.c

[ben]

ben         98/06/29 16:14:20

  Modified:    src/os/win32 util_win32.c
  Log:
  Yet more PATH_INFO fixes.
  
  Revision  Changes    Path
  1.19      +8 -5      apache-1.3/src/os/win32/util_win32.c
  
  Index: util_win32.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/util_win32.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- util_win32.c      1998/06/27 17:24:11     1.18
  +++ util_win32.c      1998/06/29 23:14:19     1.19
  @@ -55,15 +55,19 @@
                if(*s == '\\')
                    *s='/';
        }
  -        return;
  +        return TRUE;
       }
       if (szFilePart != buf+3) {
           char b2[_MAX_PATH];
  +     char b3[_MAX_PATH];
           ap_assert(szFilePart > buf+3);
   
  -        szFilePart[-1]='\0';
  -        sub_canonical_filename(b2, sizeof b2, buf);
  +     memcpy(b3,szFile,s-szFile);
  +     b3[s-szFile]='\0';
   
  +//        szFilePart[-1]='\0';
  +        sub_canonical_filename(b2, sizeof b2, b3);
  +
        ap_assert(strlen(b2)+1 < nCanon);
           strcpy(szCanon, b2);
           strcat(szCanon, "/");
  @@ -124,8 +128,7 @@
        ;
       *d='\0';
   
  -    if(sub_canonical_filename(buf, sizeof buf, b2) && nSlashes)
  -     nSlashes=1;
  +    sub_canonical_filename(buf, sizeof buf, b2);
   
       buf[0]=tolower(buf[0]);