From 8faf765632f986bd5279871e61e6fed8aa989e44 Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Wed, 20 Sep 2017 12:41:31 +0200 Subject: [PATCH] Fix bug #52059: httpd/makefsdata assumes UNICODE Patch by Gisle Vanem And fixup one variable name (currName -> curName) --- src/apps/httpd/makefsdata/makefsdata.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apps/httpd/makefsdata/makefsdata.c b/src/apps/httpd/makefsdata/makefsdata.c index 1efe89d6..9af8bc9d 100644 --- a/src/apps/httpd/makefsdata/makefsdata.c +++ b/src/apps/httpd/makefsdata/makefsdata.c @@ -421,7 +421,7 @@ int process_sub(FILE *data_file, FILE *struct_file) ret = tinydir_readfile_n(&dir, &file, i); if (ret == 0) { -#if (defined _MSC_VER || defined __MINGW32__) +#if (defined _MSC_VER || defined __MINGW32__) && (defined _UNICODE) size_t i; char currName[256]; wcstombs_s(&i, currName, sizeof(currName), file.name, sizeof(currName)); @@ -461,12 +461,12 @@ int process_sub(FILE *data_file, FILE *struct_file) if (ret == 0) { if (!file.is_dir) { -#if (defined _MSC_VER || defined __MINGW32__) +#if (defined _MSC_VER || defined __MINGW32__) && (defined _UNICODE) size_t i; char curName[256]; wcstombs_s(&i, curName, sizeof(curName), file.name, sizeof(curName)); #else - const char *currName = file.name; + const char *curName = file.name; #endif if (strcmp(curName, "fsdata.tmp") == 0) {