Ticket #11117: 0001-fat-correctly-read-lowercase-8.3-filenames.patch

src/add-ons/kernel/file_systems/fat/dir.c

@@ -184 +184 @@
     if (start_index == 0xffff) {
         start_index = iter->current_index;
         // korli : seen on FreeBSD /src/sys/fs/msdosfs/direntry.h
-        msdos_to_utf8(buffer, (uchar *)filename, len, buffer[0xc] & 0x18);
+        msdos_to_utf8(buffer, (uchar *)filename, len, buffer[0xc]);
     }
 
     if (oinfo) {

src/add-ons/kernel/file_systems/fat/encodings.cpp

@@ -1504 +1504 @@
 /* called to convert a short ms-dos filename to utf8.
    XXX: encoding is assumed to be standard US code page, never shift-JIS
 */
-status_t msdos_to_utf8(uchar *msdos, uchar *utf8, uint32 utf8len, bool toLower)
+status_t msdos_to_utf8(uchar *msdos, uchar *utf8, uint32 utf8len,
+    uint8 toLower)
 {
     uchar normalized[8+1+3+1];
     int32 i, pos;
@@ -1515 +1516 @@
     for (i=0;i<8;i++) {
         if (msdos[i] == ' ') break;
         normalized[pos++] = ((i == 0) && (msdos[i] == 5)) ? 0xe5 :
-            (toLower ? tolower(msdos[i]) : msdos[i]);
+            ((toLower & 0x08) ? tolower(msdos[i]) : msdos[i]);
     }
 
     if (msdos[8] != ' ') {
         normalized[pos++] = '.';
         for (i=8;i<11;i++) {
             if (msdos[i] == ' ') break;
-            normalized[pos++] = (toLower ? tolower(msdos[i]) : msdos[i]);
+            normalized[pos++] = ((toLower & 0x10) ? tolower(msdos[i]) :
+                msdos[i]);
         }
     }
 
@@ -1532 +1534 @@
             (char *)utf8, (int32 *)&utf8len);
 }
 
-bool requires_munged_short_name(const uchar *utf8name, const uchar nshort[11], int encoding)
+bool requires_munged_short_name(const uchar *utf8name, const uchar nshort[11],
+    int encoding)
 {
     int leading = 0;
     int trailing = 0;
@@ -1556 +1559 @@
             if (*utf8name == '.') return true;
             trailing++;
             if (trailing > 3) return true;
-            if ((nshort[leading + trailing - 1] == '_') && (*utf8name != '_')) return true;
+            if ((nshort[leading + trailing - 1] == '_') && (*utf8name != '_'))
+                return true;
         }
     }
 

src/add-ons/kernel/file_systems/fat/encodings.h

@@ -22 +22 @@
 status_t generate_short_name(const uchar *name, const uchar *uni,
         uint32 unilen, uchar nshort[11], int *encoding);
 
-status_t msdos_to_utf8(uchar *msdos, uchar *utf8, uint32 utf8len, bool toLower);
+status_t msdos_to_utf8(uchar *msdos, uchar *utf8, uint32 utf8len,
+    uint8 toLower);
 
 #ifdef __cplusplus
 }