Changeset 1248 in kBuild for trunk

Timestamp:

Oct 23, 2007 12:46:50 PM (17 years ago)

Author:

bird

Message:

Substitute spacy names with the alternate one.

File:

• trunk/src/lib/nt_fullpath.c (modified) (5 diffs)

trunk/src/lib/nt_fullpath.c

@@ -151 +151 @@
         char *pszEnd;
         int iLongNameDiff;
+        size_t cch;
 
 
@@ -157 +158 @@
         while (*pszEnd && *pszEnd != '/' && *pszEnd != '\\')
             pszEnd++;
+        cch = pszEnd - psz;
 
         /* replace the end with "?\0" */
@@ -171 +173 @@
             cchLast = psz - pszPath;
             memcpy(s_szLast, pszPath, cchLast + 1);
+            s_szLast[cchLast + 1] = '\0';
             pszEnd[0] = chSaved0;
             return;
@@ -182 +185 @@
                 cchLast = psz - pszPath;
                 memcpy(s_szLast, pszPath, cchLast + 1);
+                s_szLast[cchLast + 1] = '\0';
                 pszEnd[0] = chSaved0;
                 return;
             }
         }
-        strcpy(psz, !iLongNameDiff ? FindFileData.cFileName : FindFileData.cAlternateFileName);
         pszEnd[0] = chSaved0;
+        if (    iLongNameDiff                           /* matched the short name */
+            ||  !FindFileData.cAlternateFileName[0]     /* no short name */
+            || !memchr(psz, ' ', cch))                  /* no spaces in the matching name */
+            memcpy(psz, !iLongNameDiff ? FindFileData.cFileName : FindFileData.cAlternateFileName, cch);
+        else
+        {
+            /* replace spacy name with the short name. */
+            const size_t cchAlt = strlen(FindFileData.cAlternateFileName);
+            const size_t cchDelta = cch - cchAlt;
+            my_assert(cchAlt > 0);
+            if (!cchDelta)
+                memcpy(psz, FindFileData.cAlternateFileName, cch);
+            else
+            {
+                size_t cbLeft = strlen(pszEnd) + 1;
+                if ((psz - pszPath) + cbLeft + cchAlt <= _MAX_PATH)
+                {
+                    memmove(psz + cchAlt, pszEnd, cbLeft);
+                    pszEnd -= cchDelta;
+                    memcpy(psz, FindFileData.cAlternateFileName, cchAlt);
+                }
+                else
+                    fprintf(stderr, "kBuild: case & space fixed filename is growing too long (%d bytes)! '%s'\n",
+                            (psz - pszPath) + cbLeft + cchAlt, pszPath);
+            }
+        }
+        my_assert(pszEnd[0] == chSaved0);
         FindClose(hDir);
 
@@ -386 +416 @@
     /*
      * The simple case, the file / dir / whatever exists and can be
-     * queried without problems.
+     * queried without problems and spaces.
      */
     if (nt_get_filename_info(pszPath, pszFull, cchFull) == 0)
     {
+        /** @todo make nt_get_filename_info return spaceless path. */
+        if (strchr(pszPath, ' '))
+            w32_fixcase(pszPath);
 #if 0
         fprintf(stderr, "nt #%d - %s\n", ++s_cHits, pszFull);