Muldersoft/cURL-build-win32
Muldersoft/cURL-build-win32
1
0
Fork 0
Code Issues Pull Requests Projects Releases 19 Wiki Activity

Small fix to our Unicode-aware version of the Curl_execpath() function.

Browse Source
This commit is contained in:
LoRd_MuldeR 2024-11-13 00:06:54 +01:00
parent 7df958ca6b
commit a844bdf514
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patch/curl_tool_util.diff
View File

@ -1,8 +1,9 @@
src/tool_util.c | 33 +++++++++++++-------------------- src/tool_util.c | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-) src/tool_util.h | 2 +-
2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/tool_util.c b/src/tool_util.c diff --git a/src/tool_util.c b/src/tool_util.c
index e657dacf0..926e43644 100644 index e657dacf0..7044ca008 100644
--- a/src/tool_util.c --- a/src/tool_util.c
+++ b/src/tool_util.c +++ b/src/tool_util.c
@@ -191,28 +191,21 @@ int tool_ftruncate64(int fd, curl_off_t where) @@ -191,28 +191,21 @@ int tool_ftruncate64(int fd, curl_off_t where)
@ -10,6 +11,7 @@ index e657dacf0..926e43644 100644
#ifdef _WIN32 #ifdef _WIN32
-FILE *Curl_execpath(const char *filename, char **pathp) -FILE *Curl_execpath(const char *filename, char **pathp)
+#define BUFFSIZE 512U
+FILE *Curl_execpath(const TCHAR *filename, TCHAR **pathp) +FILE *Curl_execpath(const TCHAR *filename, TCHAR **pathp)
{ {
- static char filebuffer[512]; - static char filebuffer[512];
@ -22,8 +24,7 @@ index e657dacf0..926e43644 100644
- if(len > 0 && len < sizeof(filebuffer)) { - if(len > 0 && len < sizeof(filebuffer)) {
- /* We got a valid filename - get the directory part */ - /* We got a valid filename - get the directory part */
- char *lastdirchar = strrchr(filebuffer, DIR_CHAR[0]); - char *lastdirchar = strrchr(filebuffer, DIR_CHAR[0]);
+ static const size_t BUFFSIZE = 512; + static TCHAR filebuffer[BUFFSIZE];
+ TCHAR filebuffer[BUFFSIZE];
+ unsigned long len = GetModuleFileName(0, filebuffer, BUFFSIZE); + unsigned long len = GetModuleFileName(0, filebuffer, BUFFSIZE);
+ if((len > 0) && (len < BUFFSIZE)) { + if((len > 0) && (len < BUFFSIZE)) {
+ TCHAR *lastdirchar = _tcsrchr(filebuffer, TEXT('\\')); + TCHAR *lastdirchar = _tcsrchr(filebuffer, TEXT('\\'));
@ -47,9 +48,6 @@ index e657dacf0..926e43644 100644
} }
} }
src/tool_util.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tool_util.h b/src/tool_util.h diff --git a/src/tool_util.h b/src/tool_util.h
index 9fec7e873..93d7ef9fc 100644 index 9fec7e873..93d7ef9fc 100644
--- a/src/tool_util.h --- a/src/tool_util.h