|
Line
Link Here
|
| 0 |
-- libidn-1.33-orig/src/idn.c |
0 |
++ libidn-1.33-format-security/src/idn.c |
|
Lines 170-176
main (int argc, char *argv[])
Link Here
|
| 170 |
(args_info.idna_to_unicode_given ? 1 : 0) + |
170 |
(args_info.idna_to_unicode_given ? 1 : 0) + |
| 171 |
(args_info.nfkc_given ? 1 : 0) != 1) |
171 |
(args_info.nfkc_given ? 1 : 0) != 1) |
| 172 |
{ |
172 |
{ |
| 173 |
error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); |
173 |
error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be specified")); |
| 174 |
usage (EXIT_FAILURE); |
174 |
usage (EXIT_FAILURE); |
| 175 |
} |
175 |
} |
| 176 |
|
176 |
|
|
Lines 185-191
main (int argc, char *argv[])
Link Here
|
| 185 |
if (!args_info.quiet_given |
185 |
if (!args_info.quiet_given |
| 186 |
&& args_info.inputs_num == 0 |
186 |
&& args_info.inputs_num == 0 |
| 187 |
&& isatty (fileno (stdin))) |
187 |
&& isatty (fileno (stdin))) |
| 188 |
fprintf (stderr, _("Type each input string on a line by itself, " |
188 |
fprintf (stderr, "%s", _("Type each input string on a line by itself, " |
| 189 |
"terminated by a newline character.\n")); |
189 |
"terminated by a newline character.\n")); |
| 190 |
|
190 |
|
| 191 |
do |
191 |
do |
|
Lines 197-203
main (int argc, char *argv[])
Link Here
|
| 197 |
if (feof (stdin)) |
197 |
if (feof (stdin)) |
| 198 |
break; |
198 |
break; |
| 199 |
|
199 |
|
| 200 |
error (EXIT_FAILURE, errno, _("input error")); |
200 |
error (EXIT_FAILURE, errno, "%s", _("input error")); |
| 201 |
} |
201 |
} |
| 202 |
|
202 |
|
| 203 |
if (strlen (line) > 0) |
203 |
if (strlen (line) > 0) |
|
Lines 215-221
main (int argc, char *argv[])
Link Here
|
| 215 |
if (!q) |
215 |
if (!q) |
| 216 |
{ |
216 |
{ |
| 217 |
free (p); |
217 |
free (p); |
| 218 |
error (EXIT_FAILURE, 0, |
218 |
error (EXIT_FAILURE, 0, "%s", |
| 219 |
_("could not convert from UTF-8 to UCS-4")); |
219 |
_("could not convert from UTF-8 to UCS-4")); |
| 220 |
} |
220 |
} |
| 221 |
|
221 |
|
|
Lines 240-246
main (int argc, char *argv[])
Link Here
|
| 240 |
if (!q) |
240 |
if (!q) |
| 241 |
{ |
241 |
{ |
| 242 |
free (r); |
242 |
free (r); |
| 243 |
error (EXIT_FAILURE, 0, |
243 |
error (EXIT_FAILURE, 0, "%s", |
| 244 |
_("could not convert from UTF-8 to UCS-4")); |
244 |
_("could not convert from UTF-8 to UCS-4")); |
| 245 |
} |
245 |
} |
| 246 |
|
246 |
|
|
Lines 277-283
main (int argc, char *argv[])
Link Here
|
| 277 |
q = stringprep_utf8_to_ucs4 (p, -1, &len); |
277 |
q = stringprep_utf8_to_ucs4 (p, -1, &len); |
| 278 |
free (p); |
278 |
free (p); |
| 279 |
if (!q) |
279 |
if (!q) |
| 280 |
error (EXIT_FAILURE, 0, |
280 |
error (EXIT_FAILURE, 0, "%s", |
| 281 |
_("could not convert from UTF-8 to UCS-4")); |
281 |
_("could not convert from UTF-8 to UCS-4")); |
| 282 |
|
282 |
|
| 283 |
if (args_info.debug_given) |
283 |
if (args_info.debug_given) |
|
Lines 336-342
main (int argc, char *argv[])
Link Here
|
| 336 |
r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); |
336 |
r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); |
| 337 |
free (q); |
337 |
free (q); |
| 338 |
if (!r) |
338 |
if (!r) |
| 339 |
error (EXIT_FAILURE, 0, |
339 |
error (EXIT_FAILURE, 0, "%s", |
| 340 |
_("could not convert from UCS-4 to UTF-8")); |
340 |
_("could not convert from UCS-4 to UTF-8")); |
| 341 |
|
341 |
|
| 342 |
p = stringprep_utf8_to_locale (r); |
342 |
p = stringprep_utf8_to_locale (r); |
|
Lines 360-366
main (int argc, char *argv[])
Link Here
|
| 360 |
q = stringprep_utf8_to_ucs4 (p, -1, NULL); |
360 |
q = stringprep_utf8_to_ucs4 (p, -1, NULL); |
| 361 |
free (p); |
361 |
free (p); |
| 362 |
if (!q) |
362 |
if (!q) |
| 363 |
error (EXIT_FAILURE, 0, |
363 |
error (EXIT_FAILURE, 0, "%s", |
| 364 |
_("could not convert from UCS-4 to UTF-8")); |
364 |
_("could not convert from UCS-4 to UTF-8")); |
| 365 |
|
365 |
|
| 366 |
if (args_info.debug_given) |
366 |
if (args_info.debug_given) |
|
Lines 438-444
main (int argc, char *argv[])
Link Here
|
| 438 |
if (!q) |
438 |
if (!q) |
| 439 |
{ |
439 |
{ |
| 440 |
free (p); |
440 |
free (p); |
| 441 |
error (EXIT_FAILURE, 0, |
441 |
error (EXIT_FAILURE, 0, "%s", |
| 442 |
_("could not convert from UCS-4 to UTF-8")); |
442 |
_("could not convert from UCS-4 to UTF-8")); |
| 443 |
} |
443 |
} |
| 444 |
|
444 |
|
|
Lines 494-500
main (int argc, char *argv[])
Link Here
|
| 494 |
r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); |
494 |
r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); |
| 495 |
free (q); |
495 |
free (q); |
| 496 |
if (!r) |
496 |
if (!r) |
| 497 |
error (EXIT_FAILURE, 0, |
497 |
error (EXIT_FAILURE, 0, "%s", |
| 498 |
_("could not convert from UTF-8 to UCS-4")); |
498 |
_("could not convert from UTF-8 to UCS-4")); |
| 499 |
|
499 |
|
| 500 |
p = stringprep_utf8_to_locale (r); |
500 |
p = stringprep_utf8_to_locale (r); |
|
Lines 523-529
main (int argc, char *argv[])
Link Here
|
| 523 |
if (!q) |
523 |
if (!q) |
| 524 |
{ |
524 |
{ |
| 525 |
free (p); |
525 |
free (p); |
| 526 |
error (EXIT_FAILURE, 0, |
526 |
error (EXIT_FAILURE, 0, "%s", |
| 527 |
_("could not convert from UTF-8 to UCS-4")); |
527 |
_("could not convert from UTF-8 to UCS-4")); |
| 528 |
} |
528 |
} |
| 529 |
|
529 |
|
|
Lines 537-543
main (int argc, char *argv[])
Link Here
|
| 537 |
r = stringprep_utf8_nfkc_normalize (p, -1); |
537 |
r = stringprep_utf8_nfkc_normalize (p, -1); |
| 538 |
free (p); |
538 |
free (p); |
| 539 |
if (!r) |
539 |
if (!r) |
| 540 |
error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); |
540 |
error (EXIT_FAILURE, 0, "%s", _("could not do NFKC normalization")); |
| 541 |
|
541 |
|
| 542 |
if (args_info.debug_given) |
542 |
if (args_info.debug_given) |
| 543 |
{ |
543 |
{ |
|
Lines 547-553
main (int argc, char *argv[])
Link Here
|
| 547 |
if (!q) |
547 |
if (!q) |
| 548 |
{ |
548 |
{ |
| 549 |
free (r); |
549 |
free (r); |
| 550 |
error (EXIT_FAILURE, 0, |
550 |
error (EXIT_FAILURE, 0, "%s", |
| 551 |
_("could not convert from UTF-8 to UCS-4")); |
551 |
_("could not convert from UTF-8 to UCS-4")); |
| 552 |
} |
552 |
} |
| 553 |
|
553 |
|
