Commit d4880f17 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  This file will go away.  For this moment, the s/FindFirstFile/apr_stat/
  fixes parsing of utf-8 resources against the NTFS filesystem.  The only
  remaining utf-8 change is to the config parser [which is simple - any
  unicode config file (FFFE/FEFF lead word) will be utf-8 encrypted].


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87946 13f79535-47bb-0310-9956-ffa450edef68
parent 8e7c29c7

os/win32/util_win32.c

+4 −9
Original line number Diff line number Diff line
@@ -94,8 +94,6 @@ AP_DECLARE(char *) ap_os_systemcase_filename(apr_pool_t *pPool, 
    char *p, *q, *t;

    BOOL bDone = FALSE;

    BOOL bFileExists = TRUE;

    HANDLE hFind;

    WIN32_FIND_DATA wfd;



    if (!szFile || strlen(szFile) == 0 || strlen(szFile) >= sizeof(buf))

        return apr_pstrdup(pPool, "");
@@ -179,17 +177,14 @@ AP_DECLARE(char *) ap_os_systemcase_filename(apr_pool_t *pPool, 
         *       a leading slash.

         */

        if (bFileExists && !OnlyDots((*q == '.' ? q : q+1))) {

            hFind = FindFirstFile(pInputName, &wfd);

            

            if (hFind == INVALID_HANDLE_VALUE) {

            apr_finfo_t fs;

            if (apr_stat(&fs, pInputName, APR_FINFO_NAME, pPool) != APR_SUCCESS) {

                bFileExists = FALSE;

            }

            else {

                FindClose(hFind);



                if (*q == '\\')

                    *(t++) = '\\';

                t = strchr(strcpy(t, wfd.cFileName), '\0');

                t = strchr(strcpy(t, fs.name), '\0');

            }

        }