Mercurial > vim
annotate src/os_mac_conv.c @ 34627:5071d4c3ff2e v9.1.0202
patch 9.1.0202: leaking memory in add_user() on failure
Commit: https://github.com/vim/vim/commit/7a2f217988afa1c35b9c093a9d3477198ea250b9
Author: Christian Brabandt <cb@256bit.org>
Date: Sun Mar 24 09:50:03 2024 +0100
patch 9.1.0202: leaking memory in add_user() on failure
Problem: leaking memory in add_user() (LuMingYinDetect)
Solution: free user_copy pointer instead of the user ptr
add_user() is called with a user pointer and the user pointer comes
from these functions:
- return value from the getpwent() function (Unix).
- return value from the getpwnam() function (Unix).
- return value from the NetUserEnum() function (MS Windows).
For the first 2 callers, the man page for those functions directly says,
one should not free the returned pointer (since it comes from static
memory).
For the third caller (on MS Windows), the returned buffer is already
freed directly after calling the add_user() function in
NetApiBufferFree(), so this would lead to a double free().
This all indicates, the user ptr is wrongly freed in the add_user()
function and the intention was to free the user_copy pointer instead in
case of an error.
So let's just use that now.
fixes: #14250
closes: #14260
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 24 Mar 2024 10:00:09 +0100 |
| parents | 50555279168b |
| children |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
10025
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 18 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 /* | |
| 10 * os_mac_conv.c: Code specifically for Mac string conversions. | |
| 11 * | |
| 12 * This code has been put in a separate file to avoid the conflicts that are | |
| 13 * caused by including both the X11 and Carbon header files. | |
| 14 */ | |
| 15 | |
| 16 #define NO_X11_INCLUDES | |
| 2891 | 17 |
| 18 | 18 #include "vim.h" |
|
7811
7fda54504fee
commit https://github.com/vim/vim/commit/3e96c3d241ab657cf4df0913ea8de50a6cb90730
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
19 |
|
21745
35921b7fc07a
patch 8.2.1422: the Mac GUI implementation is outdated
Bram Moolenaar <Bram@vim.org>
parents:
18810
diff
changeset
|
20 #if !defined(PROTO) |
|
2309
543ea69d037f
Add clipboard support in Mac console. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
1621
diff
changeset
|
21 # include <CoreServices/CoreServices.h> |
|
543ea69d037f
Add clipboard support in Mac console. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
1621
diff
changeset
|
22 #endif |
|
543ea69d037f
Add clipboard support in Mac console. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
1621
diff
changeset
|
23 |
| 18 | 24 |
| 766 | 25 #if defined(MACOS_CONVERT) || defined(PROTO) |
|
2309
543ea69d037f
Add clipboard support in Mac console. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
1621
diff
changeset
|
26 |
| 766 | 27 # ifdef PROTO |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
28 // A few dummy types to be able to generate function prototypes. |
| 766 | 29 typedef int UniChar; |
| 30 typedef int *TECObjectRef; | |
| 31 typedef int CFStringRef; | |
| 32 # endif | |
| 33 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
3143
diff
changeset
|
34 static char_u *mac_utf16_to_utf8(UniChar *from, size_t fromLen, size_t *actualLen); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
3143
diff
changeset
|
35 static UniChar *mac_utf8_to_utf16(char_u *from, size_t fromLen, size_t *actualLen); |
| 168 | 36 |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
37 // Converter for composing decomposed HFS+ file paths |
| 168 | 38 static TECObjectRef gPathConverter; |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
39 // Converter used by mac_utf16_to_utf8 |
| 168 | 40 static TECObjectRef gUTF16ToUTF8Converter; |
| 41 | |
| 18 | 42 /* |
| 43 * A Mac version of string_convert_ext() for special cases. | |
| 44 */ | |
| 45 char_u * | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
46 mac_string_convert( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
47 char_u *ptr, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
48 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
49 int *lenp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
50 int fail_on_error, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
51 int from_enc, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
52 int to_enc, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
53 int *unconvlenp) |
| 18 | 54 { |
| 55 char_u *retval, *d; | |
| 56 CFStringRef cfstr; | |
| 57 int buflen, in, out, l, i; | |
| 58 CFStringEncoding from; | |
| 59 CFStringEncoding to; | |
| 60 | |
| 61 switch (from_enc) | |
| 62 { | |
| 63 case 'l': from = kCFStringEncodingISOLatin1; break; | |
| 64 case 'm': from = kCFStringEncodingMacRoman; break; | |
| 65 case 'u': from = kCFStringEncodingUTF8; break; | |
| 66 default: return NULL; | |
| 67 } | |
| 68 switch (to_enc) | |
| 69 { | |
| 70 case 'l': to = kCFStringEncodingISOLatin1; break; | |
| 71 case 'm': to = kCFStringEncodingMacRoman; break; | |
| 72 case 'u': to = kCFStringEncodingUTF8; break; | |
| 73 default: return NULL; | |
| 74 } | |
| 75 | |
| 76 if (unconvlenp != NULL) | |
| 77 *unconvlenp = 0; | |
| 78 cfstr = CFStringCreateWithBytes(NULL, ptr, len, from, 0); | |
| 79 | |
| 3143 | 80 if (cfstr == NULL) |
| 168 | 81 fprintf(stderr, "Encoding failed\n"); |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
82 // When conversion failed, try excluding bytes from the end, helps when |
|
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
83 // there is an incomplete byte sequence. Only do up to 6 bytes to avoid |
|
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
84 // looping a long time when there really is something unconvertible. |
| 18 | 85 while (cfstr == NULL && unconvlenp != NULL && len > 1 && *unconvlenp < 6) |
| 86 { | |
| 87 --len; | |
| 88 ++*unconvlenp; | |
| 89 cfstr = CFStringCreateWithBytes(NULL, ptr, len, from, 0); | |
| 90 } | |
| 91 if (cfstr == NULL) | |
| 92 return NULL; | |
| 168 | 93 |
| 18 | 94 if (to == kCFStringEncodingUTF8) |
| 95 buflen = len * 6 + 1; | |
| 96 else | |
| 97 buflen = len + 1; | |
| 98 retval = alloc(buflen); | |
| 99 if (retval == NULL) | |
| 100 { | |
| 101 CFRelease(cfstr); | |
| 102 return NULL; | |
| 103 } | |
| 168 | 104 |
| 105 #if 0 | |
| 106 CFRange convertRange = CFRangeMake(0, CFStringGetLength(cfstr)); | |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
107 // Determine output buffer size |
| 168 | 108 CFStringGetBytes(cfstr, convertRange, to, NULL, FALSE, NULL, 0, (CFIndex *)&buflen); |
| 109 retval = (buflen > 0) ? alloc(buflen) : NULL; | |
|
31804
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31752
diff
changeset
|
110 if (retval == NULL) |
|
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31752
diff
changeset
|
111 { |
| 168 | 112 CFRelease(cfstr); |
| 113 return NULL; | |
| 114 } | |
| 115 | |
| 116 if (lenp) | |
| 117 *lenp = buflen / sizeof(char_u); | |
| 118 | |
| 119 if (!CFStringGetBytes(cfstr, convertRange, to, NULL, FALSE, retval, buflen, NULL)) | |
| 120 #endif | |
| 501 | 121 if (!CFStringGetCString(cfstr, (char *)retval, buflen, to)) |
| 18 | 122 { |
| 123 CFRelease(cfstr); | |
| 124 if (fail_on_error) | |
| 125 { | |
| 126 vim_free(retval); | |
| 127 return NULL; | |
| 128 } | |
| 129 | |
| 168 | 130 fprintf(stderr, "Trying char-by-char conversion...\n"); |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
131 // conversion failed for the whole string, but maybe it will work |
|
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
132 // for each character |
| 18 | 133 for (d = retval, in = 0, out = 0; in < len && out < buflen - 1;) |
| 134 { | |
| 135 if (from == kCFStringEncodingUTF8) | |
| 474 | 136 l = utf_ptr2len(ptr + in); |
| 18 | 137 else |
| 138 l = 1; | |
| 139 cfstr = CFStringCreateWithBytes(NULL, ptr + in, l, from, 0); | |
| 140 if (cfstr == NULL) | |
| 141 { | |
| 142 *d++ = '?'; | |
| 143 out++; | |
| 144 } | |
| 145 else | |
| 146 { | |
| 501 | 147 if (!CFStringGetCString(cfstr, (char *)d, buflen - out, to)) |
| 18 | 148 { |
| 149 *d++ = '?'; | |
| 150 out++; | |
| 151 } | |
| 152 else | |
| 153 { | |
| 501 | 154 i = STRLEN(d); |
| 18 | 155 d += i; |
| 156 out += i; | |
| 157 } | |
| 158 CFRelease(cfstr); | |
| 159 } | |
| 160 in += l; | |
| 161 } | |
| 162 *d = NUL; | |
| 163 if (lenp != NULL) | |
| 164 *lenp = out; | |
| 165 return retval; | |
| 166 } | |
| 167 CFRelease(cfstr); | |
| 168 if (lenp != NULL) | |
| 501 | 169 *lenp = STRLEN(retval); |
| 168 | 170 |
| 18 | 171 return retval; |
| 172 } | |
| 173 | |
| 174 /* | |
| 175 * Conversion from Apple MacRoman char encoding to UTF-8 or latin1, using | |
| 176 * standard Carbon framework. | |
| 177 * Input: "ptr[*sizep]". | |
| 178 * "real_size" is the size of the buffer that "ptr" points to. | |
| 179 * output is in-place, "sizep" is adjusted. | |
| 180 * Returns OK or FAIL. | |
| 181 */ | |
| 182 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
183 macroman2enc( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
184 char_u *ptr, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
185 long *sizep, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
186 long real_size) |
| 18 | 187 { |
| 188 CFStringRef cfstr; | |
| 189 CFRange r; | |
| 190 CFIndex len = *sizep; | |
| 191 | |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
192 // MacRoman is an 8-bit encoding, no need to move bytes to |
|
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
193 // conv_rest[]. |
| 18 | 194 cfstr = CFStringCreateWithBytes(NULL, ptr, len, |
| 195 kCFStringEncodingMacRoman, 0); | |
| 196 /* | |
| 197 * If there is a conversion error, try using another | |
| 198 * conversion. | |
| 199 */ | |
| 200 if (cfstr == NULL) | |
| 201 return FAIL; | |
| 202 | |
| 203 r.location = 0; | |
| 204 r.length = CFStringGetLength(cfstr); | |
| 205 if (r.length != CFStringGetBytes(cfstr, r, | |
| 206 (enc_utf8) ? kCFStringEncodingUTF8 : kCFStringEncodingISOLatin1, | |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
207 0, // no lossy conversion |
|
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
208 0, // not external representation |
| 18 | 209 ptr + *sizep, real_size - *sizep, &len)) |
| 210 { | |
| 211 CFRelease(cfstr); | |
| 212 return FAIL; | |
| 213 } | |
| 214 CFRelease(cfstr); | |
| 215 mch_memmove(ptr, ptr + *sizep, len); | |
| 216 *sizep = len; | |
| 217 | |
| 218 return OK; | |
| 219 } | |
| 220 | |
| 221 /* | |
| 222 * Conversion from UTF-8 or latin1 to MacRoman. | |
| 223 * Input: "from[fromlen]" | |
| 224 * Output: "to[maxtolen]" length in "*tolenp" | |
| 225 * Unconverted rest in rest[*restlenp]. | |
| 226 * Returns OK or FAIL. | |
| 227 */ | |
| 228 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
229 enc2macroman( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
230 char_u *from, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
231 size_t fromlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
232 char_u *to, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
233 int *tolenp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
234 int maxtolen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
235 char_u *rest, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
236 int *restlenp) |
| 18 | 237 { |
| 238 CFStringRef cfstr; | |
| 239 CFRange r; | |
| 240 CFIndex l; | |
| 241 | |
| 242 *restlenp = 0; | |
| 243 cfstr = CFStringCreateWithBytes(NULL, from, fromlen, | |
| 244 (enc_utf8) ? kCFStringEncodingUTF8 : kCFStringEncodingISOLatin1, | |
| 245 0); | |
| 246 while (cfstr == NULL && *restlenp < 3 && fromlen > 1) | |
| 247 { | |
| 248 rest[*restlenp++] = from[--fromlen]; | |
| 249 cfstr = CFStringCreateWithBytes(NULL, from, fromlen, | |
| 250 (enc_utf8) ? kCFStringEncodingUTF8 : kCFStringEncodingISOLatin1, | |
| 251 0); | |
| 252 } | |
| 253 if (cfstr == NULL) | |
| 254 return FAIL; | |
| 255 | |
| 256 r.location = 0; | |
| 257 r.length = CFStringGetLength(cfstr); | |
| 258 if (r.length != CFStringGetBytes(cfstr, r, | |
| 259 kCFStringEncodingMacRoman, | |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
260 0, // no lossy conversion |
|
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
261 0, // not external representation (since vim |
|
26771
fc859aea8cec
patch 8.2.3914: various spelling mistakes in comments
Bram Moolenaar <Bram@vim.org>
parents:
22417
diff
changeset
|
262 // handles this internally) |
| 18 | 263 to, maxtolen, &l)) |
| 264 { | |
| 265 CFRelease(cfstr); | |
| 266 return FAIL; | |
| 267 } | |
| 268 CFRelease(cfstr); | |
| 269 *tolenp = l; | |
| 270 return OK; | |
| 271 } | |
| 20 | 272 |
| 168 | 273 /* |
| 274 * Initializes text converters | |
| 275 */ | |
| 276 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
277 mac_conv_init(void) |
| 168 | 278 { |
| 279 TextEncoding utf8_encoding; | |
| 280 TextEncoding utf8_hfsplus_encoding; | |
| 281 TextEncoding utf8_canon_encoding; | |
| 282 TextEncoding utf16_encoding; | |
| 283 | |
| 284 utf8_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, | |
| 285 kTextEncodingDefaultVariant, kUnicodeUTF8Format); | |
| 286 utf8_hfsplus_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, | |
| 287 kUnicodeHFSPlusCompVariant, kUnicodeUTF8Format); | |
| 288 utf8_canon_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, | |
| 289 kUnicodeCanonicalCompVariant, kUnicodeUTF8Format); | |
| 290 utf16_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, | |
| 291 kTextEncodingDefaultVariant, kUnicode16BitFormat); | |
| 292 | |
| 293 if (TECCreateConverter(&gPathConverter, utf8_encoding, | |
| 294 utf8_hfsplus_encoding) != noErr) | |
| 295 gPathConverter = NULL; | |
| 296 | |
| 297 if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding, | |
| 298 utf8_canon_encoding) != noErr) | |
| 179 | 299 { |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
300 // On pre-10.3, Unicode normalization is not available so |
|
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
301 // fall back to non-normalizing converter |
| 179 | 302 if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding, |
| 303 utf8_encoding) != noErr) | |
| 304 gUTF16ToUTF8Converter = NULL; | |
| 305 } | |
| 168 | 306 } |
| 307 | |
| 308 /* | |
| 309 * Destroys text converters | |
| 310 */ | |
| 311 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
312 mac_conv_cleanup(void) |
| 168 | 313 { |
| 314 if (gUTF16ToUTF8Converter) | |
| 315 { | |
| 316 TECDisposeConverter(gUTF16ToUTF8Converter); | |
| 317 gUTF16ToUTF8Converter = NULL; | |
| 318 } | |
| 319 | |
| 320 if (gPathConverter) | |
| 321 { | |
| 322 TECDisposeConverter(gPathConverter); | |
| 323 gPathConverter = NULL; | |
| 324 } | |
| 325 } | |
| 326 | |
| 327 /* | |
| 328 * Conversion from UTF-16 UniChars to 'encoding' | |
| 1621 | 329 * The function signature uses the real type of UniChar (as typedef'ed in |
| 330 * CFBase.h) to avoid clashes with X11 header files in the .pro file | |
| 168 | 331 */ |
| 332 char_u * | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
333 mac_utf16_to_enc( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
334 unsigned short *from, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
335 size_t fromLen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
336 size_t *actualLen) |
| 168 | 337 { |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
338 // Following code borrows somewhat from os_mswin.c |
| 168 | 339 vimconv_T conv; |
| 340 size_t utf8_len; | |
| 341 char_u *utf8_str; | |
| 342 char_u *result = NULL; | |
| 343 | |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
344 // Convert to utf-8 first, works better with iconv |
| 168 | 345 utf8_len = 0; |
| 346 utf8_str = mac_utf16_to_utf8(from, fromLen, &utf8_len); | |
| 347 | |
| 348 if (utf8_str) | |
| 349 { | |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
350 // We might be called before we have p_enc set up. |
| 168 | 351 conv.vc_type = CONV_NONE; |
| 352 | |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
353 // If encoding (p_enc) is any unicode, it is actually in utf-8 (vim |
|
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
354 // internal unicode is always utf-8) so don't convert in such cases |
| 168 | 355 |
| 356 if ((enc_canon_props(p_enc) & ENC_UNICODE) == 0) | |
| 357 convert_setup(&conv, (char_u *)"utf-8", | |
| 358 p_enc? p_enc: (char_u *)"macroman"); | |
| 359 if (conv.vc_type == CONV_NONE) | |
| 360 { | |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
361 // p_enc is utf-8, so we're done. |
| 168 | 362 result = utf8_str; |
| 363 } | |
| 364 else | |
| 365 { | |
| 366 result = string_convert(&conv, utf8_str, (int *)&utf8_len); | |
| 367 vim_free(utf8_str); | |
| 368 } | |
| 369 | |
| 370 convert_setup(&conv, NULL, NULL); | |
| 371 | |
| 372 if (actualLen) | |
| 373 *actualLen = utf8_len; | |
| 374 } | |
| 375 else if (actualLen) | |
| 376 *actualLen = 0; | |
| 377 | |
| 378 return result; | |
| 379 } | |
| 380 | |
| 381 /* | |
| 382 * Conversion from 'encoding' to UTF-16 UniChars | |
| 1621 | 383 * The function return uses the real type of UniChar (as typedef'ed in |
| 384 * CFBase.h) to avoid clashes with X11 header files in the .pro file | |
| 168 | 385 */ |
| 1621 | 386 unsigned short * |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
387 mac_enc_to_utf16( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
388 char_u *from, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
389 size_t fromLen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
390 size_t *actualLen) |
| 168 | 391 { |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
392 // Following code borrows somewhat from os_mswin.c |
| 168 | 393 vimconv_T conv; |
| 394 size_t utf8_len; | |
| 395 char_u *utf8_str; | |
| 396 UniChar *result = NULL; | |
| 397 Boolean should_free_utf8 = FALSE; | |
| 398 | |
| 399 do | |
| 400 { | |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
401 // Use MacRoman by default, we might be called before we have p_enc |
|
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
402 // set up. Convert to utf-8 first, works better with iconv(). Does |
|
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
403 // nothing if 'encoding' is "utf-8". |
| 168 | 404 conv.vc_type = CONV_NONE; |
| 405 if ((enc_canon_props(p_enc) & ENC_UNICODE) == 0 && | |
| 406 convert_setup(&conv, p_enc ? p_enc : (char_u *)"macroman", | |
| 407 (char_u *)"utf-8") == FAIL) | |
| 408 break; | |
| 409 | |
| 410 if (conv.vc_type != CONV_NONE) | |
| 411 { | |
| 412 utf8_len = fromLen; | |
| 413 utf8_str = string_convert(&conv, from, (int *)&utf8_len); | |
| 414 should_free_utf8 = TRUE; | |
| 415 } | |
| 416 else | |
| 417 { | |
| 418 utf8_str = from; | |
| 419 utf8_len = fromLen; | |
| 420 } | |
| 421 | |
| 422 if (utf8_str == NULL) | |
| 423 break; | |
| 424 | |
| 425 convert_setup(&conv, NULL, NULL); | |
| 426 | |
| 427 result = mac_utf8_to_utf16(utf8_str, utf8_len, actualLen); | |
| 428 | |
| 429 if (should_free_utf8) | |
| 430 vim_free(utf8_str); | |
| 431 return result; | |
| 432 } | |
| 433 while (0); | |
| 434 | |
| 435 if (actualLen) | |
| 436 *actualLen = 0; | |
| 437 | |
| 438 return result; | |
| 439 } | |
| 440 | |
| 441 /* | |
| 442 * Converts from UTF-16 UniChars to CFString | |
| 1621 | 443 * The void * return type is actually a CFStringRef |
| 168 | 444 */ |
| 1621 | 445 void * |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
446 mac_enc_to_cfstring( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
447 char_u *from, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
448 size_t fromLen) |
| 168 | 449 { |
| 450 UniChar *utf16_str; | |
| 451 size_t utf16_len; | |
| 452 CFStringRef result = NULL; | |
| 453 | |
| 454 utf16_str = mac_enc_to_utf16(from, fromLen, &utf16_len); | |
| 455 if (utf16_str) | |
| 456 { | |
| 457 result = CFStringCreateWithCharacters(NULL, utf16_str, utf16_len/sizeof(UniChar)); | |
| 458 vim_free(utf16_str); | |
| 459 } | |
| 460 | |
| 1621 | 461 return (void *)result; |
| 168 | 462 } |
| 463 | |
| 464 /* | |
| 465 * Converts a decomposed HFS+ UTF-8 path to precomposed UTF-8 | |
| 466 */ | |
| 467 char_u * | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
468 mac_precompose_path( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
469 char_u *decompPath, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
470 size_t decompLen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
471 size_t *precompLen) |
| 168 | 472 { |
| 473 char_u *result = NULL; | |
| 474 size_t actualLen = 0; | |
| 475 | |
| 476 if (gPathConverter) | |
| 477 { | |
| 478 result = alloc(decompLen); | |
| 479 if (result) | |
| 480 { | |
| 481 if (TECConvertText(gPathConverter, decompPath, | |
| 482 decompLen, &decompLen, result, | |
| 483 decompLen, &actualLen) != noErr) | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12879
diff
changeset
|
484 VIM_CLEAR(result); |
| 168 | 485 } |
| 486 } | |
| 487 | |
| 488 if (precompLen) | |
| 489 *precompLen = actualLen; | |
| 490 | |
| 491 return result; | |
| 492 } | |
| 493 | |
| 494 /* | |
| 495 * Converts from UTF-16 UniChars to precomposed UTF-8 | |
| 496 */ | |
| 766 | 497 static char_u * |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
498 mac_utf16_to_utf8( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
499 UniChar *from, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
500 size_t fromLen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
501 size_t *actualLen) |
| 168 | 502 { |
| 503 ByteCount utf8_len; | |
| 504 ByteCount inputRead; | |
| 505 char_u *result; | |
| 506 | |
| 507 if (gUTF16ToUTF8Converter) | |
| 508 { | |
| 509 result = alloc(fromLen * 6 + 1); | |
| 510 if (result && TECConvertText(gUTF16ToUTF8Converter, (ConstTextPtr)from, | |
| 511 fromLen, &inputRead, result, | |
| 512 (fromLen*6+1)*sizeof(char_u), &utf8_len) == noErr) | |
| 513 { | |
| 514 TECFlushText(gUTF16ToUTF8Converter, result, (fromLen*6+1)*sizeof(char_u), &inputRead); | |
| 515 utf8_len += inputRead; | |
| 516 } | |
| 517 else | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12879
diff
changeset
|
518 VIM_CLEAR(result); |
| 168 | 519 } |
| 520 else | |
| 521 { | |
| 522 result = NULL; | |
| 523 } | |
| 524 | |
| 525 if (actualLen) | |
| 526 *actualLen = result ? utf8_len : 0; | |
| 527 | |
| 528 return result; | |
| 529 } | |
| 530 | |
| 531 /* | |
| 532 * Converts from UTF-8 to UTF-16 UniChars | |
| 533 */ | |
| 766 | 534 static UniChar * |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
535 mac_utf8_to_utf16( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
536 char_u *from, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
537 size_t fromLen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
538 size_t *actualLen) |
| 168 | 539 { |
| 540 CFStringRef utf8_str; | |
| 541 CFRange convertRange; | |
| 542 UniChar *result = NULL; | |
| 543 | |
| 544 utf8_str = CFStringCreateWithBytes(NULL, from, fromLen, | |
| 545 kCFStringEncodingUTF8, FALSE); | |
| 546 | |
|
31804
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31752
diff
changeset
|
547 if (utf8_str == NULL) |
|
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31752
diff
changeset
|
548 { |
| 168 | 549 if (actualLen) |
| 550 *actualLen = 0; | |
| 551 return NULL; | |
| 552 } | |
| 553 | |
| 554 convertRange = CFRangeMake(0, CFStringGetLength(utf8_str)); | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
13244
diff
changeset
|
555 result = ALLOC_MULT(UniChar, convertRange.length); |
| 168 | 556 |
| 557 CFStringGetCharacters(utf8_str, convertRange, result); | |
| 558 | |
| 559 CFRelease(utf8_str); | |
| 560 | |
| 561 if (actualLen) | |
| 562 *actualLen = convertRange.length * sizeof(UniChar); | |
| 563 | |
| 564 return result; | |
| 565 } | |
| 1621 | 566 |
| 567 /* | |
| 568 * Sets LANG environment variable in Vim from Mac locale | |
| 569 */ | |
| 570 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
571 mac_lang_init(void) |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7811
diff
changeset
|
572 { |
|
31752
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
573 if (mch_getenv((char_u *)"LANG") != NULL) |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
574 return; |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
575 |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
576 char buf[50]; |
|
22417
68115baaf9e4
patch 8.2.1757: Mac: default locale is lacking the encoding
Bram Moolenaar <Bram@vim.org>
parents:
22379
diff
changeset
|
577 |
|
31752
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
578 // $LANG is not set, either because it was unset or Vim was started |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
579 // from the Dock. Query the system locale. |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
580 if (LocaleRefGetPartString(NULL, |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
581 kLocaleLanguageMask | kLocaleLanguageVariantMask | |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
582 kLocaleRegionMask | kLocaleRegionVariantMask, |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
583 sizeof(buf) - 10, buf) == noErr && *buf) |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
584 { |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
585 if (strcasestr(buf, "utf-8") == NULL) |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
586 strcat(buf, ".UTF-8"); |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
587 vim_setenv((char_u *)"LANG", (char_u *)buf); |
| 1621 | 588 # ifdef HAVE_LOCALE_H |
|
31752
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
589 setlocale(LC_ALL, ""); |
| 1621 | 590 # endif |
|
30310
029c59bf78f1
patch 9.0.0491: no good reason to build without the float feature
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
591 # if defined(LC_NUMERIC) |
|
31752
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
592 // Make sure strtod() uses a decimal point, not a comma. |
|
3365a601e73b
patch 9.0.1208: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
593 setlocale(LC_NUMERIC, "C"); |
|
22379
e1e24b1dba6e
patch 8.2.1738: Mac: str2float() recognizes comma instead of decimal point
Bram Moolenaar <Bram@vim.org>
parents:
21745
diff
changeset
|
594 # endif |
| 1621 | 595 } |
| 596 } | |
|
18810
44b855153d8e
patch 8.1.2393: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
597 #endif // MACOS_CONVERT |