Display and control your Android device
Fix utf-8 char path in windows
Yu-Chen Lin78a320a763d7
diff --git a/app/src/command.c b/app/src/command.cindex 63afccb4..abaa223d 100644--- a/app/src/command.c+++ b/app/src/command.c@@ -4,9 +4,6 @@#include <stdio.h>#include <stdlib.h>#include <string.h>-#include <sys/types.h>-#include <sys/stat.h>-#include <unistd.h>#include "config.h"#include "common.h"@@ -205,14 +202,3 @@ process_check_success(process_t proc, const char *name) {}return true;}--bool-is_regular_file(const char *path) {- struct stat path_stat;- int r = stat(path, &path_stat);- if (r) {- perror("stat");- return false;- }- return S_ISREG(path_stat.st_mode);-}diff --git a/app/src/sys/unix/command.c b/app/src/sys/unix/command.cindex fbcf2355..af5d4b2f 100644--- a/app/src/sys/unix/command.c+++ b/app/src/sys/unix/command.c@@ -15,6 +15,7 @@#include <signal.h>#include <stdlib.h>#include <sys/types.h>+#include <sys/stat.h>#include <sys/wait.h>#include <unistd.h>@@ -127,3 +128,14 @@ get_executable_path(void) {return NULL;#endif}++bool+is_regular_file(const char *path) {+ struct stat path_stat;++ if (stat(path, &path_stat)) {+ perror("stat");+ return false;+ }+ return S_ISREG(path_stat.st_mode);+}diff --git a/app/src/sys/win/command.c b/app/src/sys/win/command.cindex 55edaf8f..3846847e 100644--- a/app/src/sys/win/command.c+++ b/app/src/sys/win/command.c@@ -4,6 +4,8 @@#include "util/log.h"#include "util/str_util.h"+#include <sys/stat.h>+static intbuild_cmd(char *cmd, size_t len, const char *const argv[]) {// Windows command-line parsing is WTF:@@ -90,3 +92,22 @@ get_executable_path(void) {buf[len] = '\0';return utf8_from_wide_char(buf);}++bool+is_regular_file(const char *path) {+ wchar_t *wide_path = utf8_to_wide_char(path);+ if (!wide_path) {+ LOGC("Could not allocate wide char string");+ return false;+ }++ struct _stat path_stat;+ int r = _wstat(wide_path, &path_stat);+ SDL_free(wide_path);++ if (r) {+ perror("stat");+ return false;+ }+ return S_ISREG(path_stat.st_mode);+}