diff options
author | Heiko Hund <heiko.hund@sophos.com> | 2012-02-10 15:13:42 +0100 |
---|---|---|
committer | David Sommerseth <davids@redhat.com> | 2012-02-13 17:11:50 +0100 |
commit | 71bbbd76c62630c88441237d72fe5b61f0b45b2a (patch) | |
tree | 715f8c8183c6e47bb26f0a10c0f6b14f9b9f83a2 /packet_id.c | |
parent | 2ee0dc2bd72ec318fcc227af54e5ca7e1384a6cc (diff) | |
download | openvpn-71bbbd76c62630c88441237d72fe5b61f0b45b2a.tar.gz openvpn-71bbbd76c62630c88441237d72fe5b61f0b45b2a.tar.xz openvpn-71bbbd76c62630c88441237d72fe5b61f0b45b2a.zip |
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 'packet_id.c')
-rw-r--r-- | packet_id.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet_id.c b/packet_id.c index 024b4f3..ba8973a 100644 --- a/packet_id.c +++ b/packet_id.c @@ -362,9 +362,9 @@ packet_id_persist_load (struct packet_id_persist *p, const char *filename) if (!packet_id_persist_enabled (p)) { /* open packet-id persist file for both read and write */ - p->fd = open (filename, - O_CREAT | O_RDWR | O_BINARY, - S_IRUSR | S_IWUSR); + p->fd = openvpn_open (filename, + O_CREAT | O_RDWR | O_BINARY, + S_IRUSR | S_IWUSR); if (p->fd == -1) { msg (D_PID_PERSIST | M_ERRNO, |