taurusxin
/
ncmdump
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix: filename issue with MinGW

This commit is contained in:
TaurusXin 2024-03-21 13:31:24 +08:00
parent 7ddc315069
commit d65dad255b
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main.cpp
View File

@ -48,22 +48,14 @@ void processFilesInFolder(const fs::path& folderPath) {
} }
#if defined(_WIN32) #if defined(_WIN32)
int wmain(int argc, wchar_t* utf16argv[]) int wmain(int argc, wchar_t* argv[])
#else #else
int main(int argc, char **argv) int main(int argc, char **argv)
#endif #endif
{ {
#if defined(_WIN32) #if defined(_WIN32)
#if defined(__MINGW64__)
SetConsoleOutputCP(CP_UTF8); SetConsoleOutputCP(CP_UTF8);
#endif #endif
char **argv = (char**)malloc(sizeof(char *) * argc);
for (int i = 0; i < argc; ++i) {
int utf8_size = WideCharToMultiByte(CP_UTF8, 0, utf16argv[i], -1, NULL, 0, NULL, NULL);
argv[i] = (char*)malloc(utf8_size);
WideCharToMultiByte(CP_UTF8, 0, utf16argv[i], -1, argv[i], utf8_size, NULL, NULL);
}
#endif
if (argc <= 1) { if (argc <= 1) {
displayHelp(); displayHelp();
@ -75,10 +67,17 @@ int main(int argc, char **argv)
bool folderProvided = false; bool folderProvided = false;
#if defined(_WIN32)
#define COMPARE_STR(s1, s2) (wcscmp(s1, s2) == 0)
#define HELP_SHORT L"-h"
#define HELP_LONG L"--help"
#define FOLDER L"-d"
#else
#define COMPARE_STR(s1, s2) (strcmp(s1, s2) == 0) #define COMPARE_STR(s1, s2) (strcmp(s1, s2) == 0)
#define HELP_SHORT "-h" #define HELP_SHORT "-h"
#define HELP_LONG "--help" #define HELP_LONG "--help"
#define FOLDER "-d" #define FOLDER "-d"
#endif
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
if (COMPARE_STR(argv[i], HELP_SHORT) || COMPARE_STR(argv[i], HELP_LONG)) { if (COMPARE_STR(argv[i], HELP_SHORT) || COMPARE_STR(argv[i], HELP_LONG)) {
displayHelp(); displayHelp();
@ -95,7 +94,14 @@ int main(int argc, char **argv)
return 1; return 1;
} }
} else { } else {
#if defined(_WIN32)
int utf8_size = WideCharToMultiByte(CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL);
char* u8str = new char[utf8_size];
WideCharToMultiByte(CP_UTF8, 0, argv[i], -1, u8str, utf8_size, NULL, NULL);
fs::path path(u8str);
#else
fs::path path(argv[i]); fs::path path(argv[i]);
#endif
files.push_back(path); files.push_back(path);
} }
} }