file: Support unicode urls on windows #6501

foopoiuyt · 2021-01-21T00:04:13Z

Support file: urls with utf-8 filenames on Windows when _UNICODE is defined.

jay · 2021-01-21T04:47:15Z

https://dev.azure.com/daniel0244/5571c33c-81e1-43d7-93ee-d3d4152f27b2/_apis/build/builds/4396/logs/99

2021-01-21T00:23:08.4699191Z file.c: In function 'file_upload':
2021-01-21T00:23:08.4700646Z file.c:280:55: error: macro "open" passed 3 arguments, but takes just 2
2021-01-21T00:23:08.4701344Z    fd = open(file->path, mode, data->set.new_file_perms);
2021-01-21T00:23:08.4701886Z                                                        ^
2021-01-21T00:23:08.4704068Z file.c:280:6: error: assignment to 'int' from 'int (__attribute__((cdecl)) *)(const char *, int,  ...)' {aka 'int (*)(const char *, int,  ...)'} makes integer from pointer without a cast [-Wint-conversion]
2021-01-21T00:23:08.4705100Z    fd = open(file->path, mode, data->set.new_file_perms);
2021-01-21T00:23:08.4705770Z       ^

That is because open takes 2 or 3 arguments. To fix it you could do # define open curlx_win32_open and then make curlx_win32_open variadic. The alternative is a variadic macro but I don't think that's supported with all compilers.

emilengler · 2021-01-21T05:37:42Z

lib/curl_setup.h

@@ -356,9 +358,11 @@
 #    define fstat(fdes,stp)            _fstat(fdes, stp)
 #    define stat(fname,stp)            curlx_win32_stat(fname, stp)
 #    define struct_stat                struct _stat
+#    define open(fname,oflag)          curlx_win32_open(fname, oflag)


Please don't redfine a POSIX syscall

emilengler · 2021-01-21T05:37:42Z

lib/curl_multibyte.c

+    return result;
+#endif
+
+  return (open)(filename, oflag);


Why even define the function on non Windows platforms?

It's not, this is in a #if defined(USE_WIN32_LARGE_FILES) || defined(USE_WIN32_SMALL_FILES) block.

MarcelRaad · 2021-01-21T09:04:13Z

lib/curl_multibyte.c

+int curlx_win32_open(const char *filename, int oflag)
+{
+#ifdef _UNICODE
+  int result = 0;


The error value is defined as -1 and 0 might be a valid result: https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/open-wopen?view=msvc-160#return-value

Thanks, totally missed it (and the later check as mentioned below).

MarcelRaad · 2021-01-21T22:27:11Z

lib/curl_multibyte.c

@@ -82,6 +82,29 @@ char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w)

 #if defined(USE_WIN32_LARGE_FILES) || defined(USE_WIN32_SMALL_FILES)

+int curlx_win32_open(const char *filename, int oflag, ...)
+{
+    int pmode = 0;


Indentation is wrong here.

MarcelRaad · 2021-01-21T22:28:16Z

lib/curl_multibyte.c

+  if(filename_w)
+    result = _wopen(filename_w, oflag, pmode);
+  free(filename_w);
+  if(result)


This should be if(result != -1) now.

jay · 2021-01-22T06:17:15Z

lib/curl_setup.h

@@ -356,9 +359,12 @@
 #    define fstat(fdes,stp)            _fstat(fdes, stp)
 #    define stat(fname,stp)            curlx_win32_stat(fname, stp)
 #    define struct_stat                struct _stat
+#    define open(fname,oflag,...)      curlx_win32_open(fname, oflag \
+                                       , ## __VA_ARGS__)


I would do away with __VA_ARGS__ I don't think all compilers support it

jay · 2021-02-09T07:59:39Z

Thanks

jay added the Windows Windows-specific label Jan 21, 2021

emilengler suggested changes Jan 21, 2021

View changes

MarcelRaad reviewed Jan 21, 2021

View changes

foopoiuyt force-pushed the windows_unicode_file branch 3 times, most recently from 63585f8 to 1106ff3 Compare Jan 21, 2021

MarcelRaad reviewed Jan 21, 2021

View changes

foopoiuyt force-pushed the windows_unicode_file branch from 1106ff3 to 6dc311a Compare Jan 21, 2021

jay reviewed Jan 22, 2021

View changes

foopoiuyt force-pushed the windows_unicode_file branch 5 times, most recently from 9a9a4fc to cf951b5 Compare Jan 22, 2021

jay added the next-feature-window label Jan 24, 2021

jay approved these changes Jan 24, 2021

View changes

jay changed the title ~~WIP: file: Support unicode urls on windows~~ file: Support unicode urls on windows Jan 24, 2021

nardl approved these changes Jan 24, 2021

View changes

MarcelRaad approved these changes Jan 25, 2021

View changes

file: Support unicode urls on windows

2f71f51

jay force-pushed the windows_unicode_file branch from cf951b5 to 2f71f51 Compare Feb 3, 2021

jay closed this in 1269c80 Feb 9, 2021

jay removed the next-feature-window label Feb 9, 2021

file: Support unicode urls on windows #6501

file: Support unicode urls on windows #6501

foopoiuyt commented Jan 21, 2021

jay commented Jan 21, 2021

emilengler Jan 21, 2021

emilengler Jan 21, 2021

MarcelRaad Jan 21, 2021

MarcelRaad Jan 21, 2021

foopoiuyt Jan 21, 2021

MarcelRaad Jan 21, 2021

MarcelRaad Jan 21, 2021

jay Jan 22, 2021 •

edited

jay commented Feb 9, 2021

file: Support unicode urls on windows #6501

file: Support unicode urls on windows #6501

Conversation

foopoiuyt commented Jan 21, 2021

jay commented Jan 21, 2021

emilengler Jan 21, 2021

Choose a reason for hiding this comment

emilengler Jan 21, 2021

Choose a reason for hiding this comment

MarcelRaad Jan 21, 2021

Choose a reason for hiding this comment

MarcelRaad Jan 21, 2021

Choose a reason for hiding this comment

foopoiuyt Jan 21, 2021

Choose a reason for hiding this comment

MarcelRaad Jan 21, 2021

Choose a reason for hiding this comment

MarcelRaad Jan 21, 2021

Choose a reason for hiding this comment

jay Jan 22, 2021 • edited

Choose a reason for hiding this comment

jay commented Feb 9, 2021

jay Jan 22, 2021 •

edited