Fix remaining case sensitivity issues

Closes #1
VitaSmith · Jan 4, 2021 · 35794da · 35794da
1 parent dc16822
commit 35794da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/.vs/cdecrypt.vcxproj b/.vs/cdecrypt.vcxproj
@@ -131,7 +131,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;AES_ROM_TABLES;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <DisableSpecificWarnings>4200;4201</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4200;4201;6384</DisableSpecificWarnings>
       <UndefinePreprocessorDefinitions>NDEBUG</UndefinePreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -154,7 +154,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;AES_ROM_TABLES;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <DisableSpecificWarnings>4200;4201</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4200;4201;6384</DisableSpecificWarnings>
       <UndefinePreprocessorDefinitions>NDEBUG</UndefinePreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -178,7 +178,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;AES_ROM_TABLES;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <DisableSpecificWarnings>4200;4201</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4200;4201;6384</DisableSpecificWarnings>
       <UndefinePreprocessorDefinitions>NDEBUG</UndefinePreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -204,7 +204,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;AES_ROM_TABLES;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <DisableSpecificWarnings>4200;4201</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4200;4201;6384</DisableSpecificWarnings>
       <UndefinePreprocessorDefinitions>NDEBUG</UndefinePreprocessorDefinitions>
     </ClCompile>
     <Link>

diff --git a/cdecrypt.c b/cdecrypt.c
@@ -460,16 +460,22 @@ int main_utf8(int argc, char** argv)
     uint8_t iv[16];
     memset(iv, 0, sizeof(iv));
 
-    sprintf(str, "%s%c%08X.app", argv[1], PATH_SEP, getbe32(&tmd->Contents[0].ID));
+    for (uint32_t k = 0; k < (array_size(pattern) / 2); k++) {
+        sprintf(str, pattern[k], argv[1], PATH_SEP, getbe32(&tmd->Contents[0].ID));
+        if (is_file(str))
+            break;
+    }
 
     uint32_t cnt_len = read_file(str, &cnt);
     if (cnt_len == 0) {
-        sprintf(str, "%s%c%08X", argv[1], PATH_SEP, getbe32(&tmd->Contents[0].ID));
+        for (uint32_t k = (array_size(pattern) / 2); k < array_size(pattern); k++) {
+            sprintf(str, pattern[k], argv[1], PATH_SEP, getbe32(&tmd->Contents[0].ID));
+            if (is_file(str))
+                break;
+        }
         cnt_len = read_file(str, &cnt);
-        if (cnt_len == 0) {
-            fprintf(stderr, "ERROR: Failed to open content: %02X\n", getbe32(&tmd->Contents[0].ID));
+        if (cnt_len == 0)
             goto out;
-        }
     }
 
     if (getbe64(&tmd->Contents[0].Size) != (uint64_t)cnt_len) {