diff options
author | Heiko Hund | 2012-02-10 15:13:42 +0100 |
---|---|---|
committer | David Sommerseth | 2012-02-13 17:11:50 +0100 |
commit | 71bbbd76c62630c88441237d72fe5b61f0b45b2a (patch) | |
tree | 715f8c8183c6e47bb26f0a10c0f6b14f9b9f83a2 /misc.h | |
parent | 2ee0dc2bd72ec318fcc227af54e5ca7e1384a6cc (diff) | |
download | openvpn-71bbbd76c62630c88441237d72fe5b61f0b45b2a.zip openvpn-71bbbd76c62630c88441237d72fe5b61f0b45b2a.tar.gz |
handle Windows unicode paths
Openvpn for Windows is not compiled as a Unicode binary and thus cannot
handle paths which contain non-ASCII characters using the argv vector.
Characters that are not present in the system codepage are simply replaced
with a question mark, e.g. if started as 'openvpn --config домой.ovpn'
the file '?????.ovpn' is tried to be opened as configuration.
The same applies to paths in config files which need to be UTF-8
encoded if they contain non ASCII characters. The option line
'key лев.pem' will lead to openvpn trying to open 'лев.pem' on a
system with codepage 1252.
This patch makes openvpn read the command line in UCS-2 and convert
it to UTF-8 internally. Windows stores names in the filesystem in UCS-2.
When using a paths openvpn converts it from UTF-8 to UCS-2 and uses the
wide character Windows API function.
Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'misc.h')
-rw-r--r-- | misc.h | 31 |
1 files changed, 31 insertions, 0 deletions
@@ -136,6 +136,7 @@ int openvpn_execve (const struct argv *a, const struct env_set *es, const unsign bool openvpn_execve_check (const struct argv *a, const struct env_set *es, const unsigned int flags, const char *error_message); bool openvpn_execve_allowed (const unsigned int flags); int openvpn_system (const char *command, const struct env_set *es, unsigned int flags); +int openvpn_access (const char *path, int mode); static inline bool openvpn_run_script (const struct argv *a, const struct env_set *es, const unsigned int flags, const char *hook) @@ -146,6 +147,36 @@ openvpn_run_script (const struct argv *a, const struct env_set *es, const unsign return openvpn_execve_check(a, es, flags | S_SCRIPT, msg); }; +#ifdef TARGET_WIN32 +FILE * openvpn_fopen (const char *path, const char *mode); +#else +static inline FILE * +openvpn_fopen (const char *path, const char *mode) +{ + return fopen (path, mode); +} +#endif + +#ifdef TARGET_WIN32 +int openvpn_open (const char *path, int flags, mode_t mode); +#else +static inline int +openvpn_open (const char *path, int flags, mode_t mode) +{ + return open (path, flags, mode); +} +#endif + +#ifdef TARGET_WIN32 +int openvpn_stat (const char *path, struct stat *buf); +#else +static inline int +openvpn_stat (const char *path, struct stat *buf) +{ + return stat (path, buf); +} +#endif + #ifdef HAVE_STRERROR /* a thread-safe version of strerror */ const char* strerror_ts (int errnum, struct gc_arena *gc); |