Changeset 279 for EcnlProtoTool/trunk/ntshell/fatfs/ff.c

Timestamp:

Apr 29, 2017, 4:33:37 PM (7 years ago)

Author:

coas-nagasima

Message:

ファイルを追加、更新。

File:

• EcnlProtoTool/trunk/ntshell/fatfs/ff.c (modified) (17 diffs)

EcnlProtoTool/trunk/ntshell/fatfs/ff.c

@@ -314 +314 @@
 #endif
 #define _DF1S   0
+
+#elif _CODE_PAGE == 65001 /* UTF-8 */
+#if _LFN_UNICODE
+#error Cannot use LFN_UNICODE feature without valid code page.
+#endif
+#define _DF1S   0
+
+void Utf16_to_Utf8(unsigned char *ret_code, int *ret_size, UINT chr)
+{
+        ret_code[0] = ret_code[1] = ret_code[2] = ret_code[3] = 0;
+
+        if (chr <= 0x7f) {  // ASCII互換
+                ret_code[0] = chr;
+                *ret_size = 1;
+                return;
+        }
+
+        if (chr <= 0x7ff) {
+                ret_code[1] = (0x80 | (chr & 0x3f));
+                ret_code[0] = (0xc0 | (chr >> 6));
+                *ret_size = 2;
+                return;
+        }
+
+        if (chr <= 0xffff) {
+                ret_code[2] = (0x80 | (chr & 0x3f));
+                ret_code[1] = (0x80 | ((chr >> 6) & 0x3f));
+                ret_code[0] = (0xe0 | ((chr >> 12) & 0x0f));
+                *ret_size = 3;
+                return;
+        }
+
+        if (chr <= 0x1fffff) {
+                ret_code[3] = (0x80 | (chr & 0x3f));
+                ret_code[2] = (0x80 | ((chr >> 6) & 0x3f));
+                ret_code[1] = (0x80 | ((chr >> 12) & 0x3f));
+                ret_code[0] = (0xf0 | ((chr >> 18) & 0x07));
+                *ret_size = 4;
+                return;
+        }
+
+        if (chr <= 0x3ffffff) {
+                ret_code[4] = (0x80 | (chr & 0x3f));
+                ret_code[3] = (0x80 | ((chr >> 6) & 0x3f));
+                ret_code[2] = (0x80 | ((chr >> 12) & 0x3f));
+                ret_code[1] = (0x80 | ((chr >> 18) & 0x3f));
+                ret_code[0] = (0xf8 | ((chr >> 24) & 0x03));
+                *ret_size = 5;
+                return;
+        }
+
+        ret_code[5] = (0x80 | (chr & 0x3f));
+        ret_code[4] = (0x80 | ((chr >> 6) & 0x3f));
+        ret_code[3] = (0x80 | ((chr >> 12) & 0x3f));
+        ret_code[2] = (0x80 | ((chr >> 18) & 0x3f));
+        ret_code[1] = (0x80 | ((chr >> 24) & 0x3f));
+        ret_code[0] = (0xfc | ((chr >> 30) & 0x01));
+        *ret_size = 6;
+        return;
+}
+
+//2バイトのUTF-16コードが得られる
+WCHAR Utf8_to_Utf16(const char *src, int *code_size)
+{
+        int i;
+        unsigned int uc = 0;
+        unsigned char len = 0;
+
+        len = 0;
+        if ((src[0] & 0x80) == 0) { uc = src[0] & 0x7F; len = 0; }
+        else if ((src[0] & 0xE0) == 0xC0) { uc = src[0] & 0x1F; len = 1; }
+        else if ((src[0] & 0xF0) == 0xE0) { uc = src[0] & 0x0F; len = 2; }
+        else if ((src[0] & 0xF8) == 0xF0) { uc = src[0] & 0x07; len = 3; }
+        else if ((src[0] & 0xFC) == 0xF8) { uc = src[0] & 0x03; len = 4; }
+        else if ((src[0] & 0xFE) == 0xFC) { uc = src[0] & 0x01; len = 5; }
+
+        i = 1;
+        while ((i <= len) && ((src[i] & 0xC0) == 0x80)) {
+                uc = (uc << 6) | (src[i] & 0x3F);
+                i++;
+        }
+
+        //消費文字数設定
+        *code_size = i;
+
+        //現状、2バイト限定
+        return uc;
+}
 
 #else
@@ -1712 +1800 @@
         WCHAR w, *lfn;
 #endif
+#if _CODE_PAGE == 65001
+        unsigned char utf8_code[6];
+        int code_size;
+#endif
 
         p = fno->fname;
@@ -1748 +1840 @@
                         while ((w = *lfn++) != 0) {             /* Get an LFN character */
 #if !_LFN_UNICODE
+#if _CODE_PAGE == 65001
+                                Utf16_to_Utf8(utf8_code, &code_size, w);
+                                for (int j = 0; j < code_size - 1; j++) {
+                                        p[i++] = utf8_code[j];
+                                }
+                                w = utf8_code[code_size - 1];
+#else
                                 w = ff_convert(w, 0);           /* Unicode -> OEM */
                                 if (!w) { i = 0; break; }       /* No LFN if it could not be converted */
@@ -1753 +1852 @@
                                         p[i++] = (TCHAR)(w >> 8);
 #endif
+#endif
                                 if (i >= fno->lfsize - 1) { i = 0; break; }     /* No LFN if buffer overflow */
                                 p[i++] = (TCHAR)w;
@@ -1778 +1878 @@
 
 #if !_LFN_UNICODE
+#if _CODE_PAGE == 65001
+        int code_size;
+        chr = Utf8_to_Utf16(*ptr, &code_size);
+        (*ptr) += code_size;
+#else
         chr = (BYTE)*(*ptr)++;                                  /* Get a byte */
         if (IsLower(chr)) chr -= 0x20;                  /* To upper ASCII char */
         if (IsDBCS1(chr) && IsDBCS2(**ptr))             /* Get DBC 2nd byte if needed */
                 chr = chr << 8 | (BYTE)*(*ptr)++;
+#endif
 #ifdef _EXCVT
         if (chr >= 0x80) chr = ExCvt[chr - 0x80];       /* To upper SBCS extended char */
@@ -1851 +1957 @@
         UINT i, ni, si, di;
         const TCHAR *p;
-
+#if _CODE_PAGE == 65001
+        char utf8_code[6];
+        int code_size;
+#endif
         /* Create LFN in Unicode */
         for (p = *path; *p == '/' || *p == '\\'; p++) ; /* Strip duplicated separator */
@@ -1862 +1971 @@
                         return FR_INVALID_NAME;
 #if !_LFN_UNICODE
+#if _CODE_PAGE == 65001
+                w = Utf8_to_Utf16(&p[si - 1], &code_size);
+                si += code_size - 1;
+#else
                 w &= 0xFF;
                 if (IsDBCS1(w)) {                               /* Check if it is a DBC 1st byte (always false on SBCS cfg) */
@@ -1871 +1984 @@
                 w = ff_convert(w, 1);                   /* Convert ANSI/OEM to Unicode */
                 if (!w) return FR_INVALID_NAME; /* Reject invalid code */
+#endif
 #endif
                 if (w < 0x80 && chk_chr("\"*:<>\?|\x7F", w)) /* Reject illegal characters for LFN */
@@ -1925 +2039 @@
                         if (w) w = ExCvt[w - 0x80];     /* Convert extended character to upper (SBCS) */
 #else
+#if _CODE_PAGE == 65001
+                        Utf16_to_Utf8(utf8_code, &code_size, ff_wtoupper(w));
+#else
                         w = ff_convert(ff_wtoupper(w), 0);      /* Upper converted Unicode -> OEM code */
 #endif
+#endif
                         cf |= NS_LFN;                           /* Force create LFN entry */
                 }
-
+#if _CODE_PAGE == 65001
+                else
+                        code_size = 1;
+#endif
+
+#if _CODE_PAGE == 65001
+                if (code_size > 1) {            /* Is this DBC? (always false at SBCS cfg) */
+                        if (i >= ni - 1) {
+                                cf |= NS_LOSS | NS_LFN; i = ni; continue;
+                        }
+                        for (int j = 0; j < code_size; j++) {
+                                dp->fn[i++] = (BYTE)utf8_code[j];
+                        }
+                }
+                else {                                          /* SBC */
+                        if (!w || chk_chr("+,;=[]", w)) {       /* Replace illegal characters for SFN */
+                                w = '_'; cf |= NS_LOSS | NS_LFN;/* Lossy conversion */
+                        }
+                        else {
+                                if (IsUpper(w)) {               /* ASCII large capital */
+                                        b |= 2;
+                                }
+                                else {
+                                        if (IsLower(w)) {       /* ASCII small capital */
+                                                b |= 1; w -= 0x20;
+                                        }
+                                }
+                        }
+                        dp->fn[i++] = (BYTE)w;
+                }
+#else
                 if (_DF1S && w >= 0x100) {              /* Is this DBC? (always false at SBCS cfg) */
                         if (i >= ni - 1) {
@@ -1949 +2097 @@
                 }
                 dp->fn[i++] = (BYTE)w;
+#endif
         }
 
@@ -3178 +3327 @@
 }
 
-
+FRESULT f_seek(FIL* fp, DWORD ofs, BYTE mode)
+{
+  switch (mode) {
+  case F_SEEK_SET:
+    return f_lseek((fp), ofs);
+  case F_SEEK_CUR:
+    return f_lseek((fp), (fp)->fptr + ofs);
+  case F_SEEK_END:
+    return f_lseek((fp), (fp)->fsize - ofs);
+  default:
+    return FR_INVALID_PARAMETER;
+  }
+}
 
 #if _FS_MINIMIZE <= 1
@@ -3719 +3880 @@
         DWORD dw;
         DEFINE_NAMEBUF;
+        TCHAR *temp_new_path = 0;
 
 
@@ -3742 +3904 @@
                                 else
                                         res = FR_INVALID_DRIVE;
-                                if (res == FR_OK) res = FR_EXIST;               /* The new object name is already existing */
+                                if (res == FR_OK) {
+                                        res = FR_EXIST;         /* The new object name is already existing */
+                                        dir = djn.dir;
+                                        if (dir[DIR_Attr] & AM_DIR) {   /* The new object is a directory */
+                                                temp_new_path = (TCHAR *)ff_memalloc((_MAX_LFN + 1) * sizeof(WCHAR));
+                                                snprintf(temp_new_path, _MAX_LFN, "%s/%s", path_new, basename((char *)path_old));
+                                                res = follow_path(&djn, temp_new_path);
+                                        }
+                                }
                                 if (res == FR_NO_FILE) {                                /* It is a valid path and no name collision */
                                         res = dir_register(&djn);                       /* Register the new entry */
@@ -3777 +3947 @@
         }
 
+        if (temp_new_path != 0) ff_memfree(temp_new_path);
+
         LEAVE_FF(djo.fs, res);
 }
@@ -3912 +4084 @@
         WCHAR w;
         DWORD tm;
-
+#if _CODE_PAGE == 65001
+        int code_size;
+        char utf8_code[6];
+#endif
 
         /* Get logical drive number */
@@ -3925 +4100 @@
                 i = j = 0;
                 do {
+#if _CODE_PAGE == 65001
+                        w = ff_wtoupper(Utf8_to_Utf16(&label[i], &code_size));
+                        i += code_size;
+                        Utf16_to_Utf8(utf8_code, &code_size, w);
+                        if (!w || chk_chr("\"*+,.:;<=>\?[]|\x7F", w) || j >= sizeof(vn) - code_size) /* Reject invalid characters for volume label */
+                                LEAVE_FF(dj.fs, FR_INVALID_NAME);
+                        for (int k = 0; k < code_size; k++)
+                                vn[j++] = utf8_code[k];
+#else
 #if _USE_LFN && _LFN_UNICODE
                         w = ff_convert(ff_wtoupper(label[i++]), 0);
@@ -3946 +4130 @@
                         if (w >= 0x100) vn[j++] = (BYTE)(w >> 8);
                         vn[j++] = (BYTE)w;
+#endif
                 } while (i < sl);
                 while (j < 11) vn[j++] = ' ';   /* Fill remaining name field */