|
|
@ -1,6 +1,6 @@ |
|
|
|
--- a/src/idn.c
|
|
|
|
+++ b/src/idn.c
|
|
|
|
@@ -171,7 +171,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -169,7 +169,7 @@ main (int argc, char *argv[])
|
|
|
|
(args_info.idna_to_unicode_given ? 1 : 0) + |
|
|
|
(args_info.nfkc_given ? 1 : 0) != 1) |
|
|
|
{ |
|
|
@ -9,16 +9,16 @@ |
|
|
|
usage (EXIT_FAILURE); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -182,7 +182,7 @@ main (int argc, char *argv[])
|
|
|
|
fprintf (stderr, _("Charset `%s'.\n"), stringprep_locale_charset ()); |
|
|
|
|
|
|
|
if (!args_info.quiet_given && args_info.inputs_num == 0) |
|
|
|
@@ -184,7 +184,7 @@ main (int argc, char *argv[])
|
|
|
|
if (!args_info.quiet_given |
|
|
|
&& args_info.inputs_num == 0 |
|
|
|
&& isatty (fileno (stdin))) |
|
|
|
- fprintf (stderr, _("Type each input string on a line by itself, "
|
|
|
|
+ fprintf (stderr, "%s", _("Type each input string on a line by itself, "
|
|
|
|
"terminated by a newline character.\n")); |
|
|
|
|
|
|
|
do |
|
|
|
@@ -197,7 +197,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -199,7 +199,7 @@ main (int argc, char *argv[])
|
|
|
|
if (feof (stdin)) |
|
|
|
break; |
|
|
|
|
|
|
@ -27,7 +27,7 @@ |
|
|
|
} |
|
|
|
|
|
|
|
if (readbuf[strlen (readbuf) - 1] == '\n') |
|
|
|
@@ -214,7 +214,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -216,7 +216,7 @@ main (int argc, char *argv[])
|
|
|
|
if (!q) |
|
|
|
{ |
|
|
|
free (p); |
|
|
@ -36,7 +36,7 @@ |
|
|
|
_("could not convert from UTF-8 to UCS-4")); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -239,7 +239,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -241,7 +241,7 @@ main (int argc, char *argv[])
|
|
|
|
if (!q) |
|
|
|
{ |
|
|
|
free (r); |
|
|
@ -45,7 +45,7 @@ |
|
|
|
_("could not convert from UTF-8 to UCS-4")); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -275,7 +275,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -277,7 +277,7 @@ main (int argc, char *argv[])
|
|
|
|
q = stringprep_utf8_to_ucs4 (p, -1, &len); |
|
|
|
free (p); |
|
|
|
if (!q) |
|
|
@ -54,7 +54,7 @@ |
|
|
|
_("could not convert from UTF-8 to UCS-4")); |
|
|
|
|
|
|
|
if (args_info.debug_given) |
|
|
|
@@ -334,7 +334,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -336,7 +336,7 @@ main (int argc, char *argv[])
|
|
|
|
r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); |
|
|
|
free (q); |
|
|
|
if (!r) |
|
|
@ -63,7 +63,7 @@ |
|
|
|
_("could not convert from UCS-4 to UTF-8")); |
|
|
|
|
|
|
|
p = stringprep_utf8_to_locale (r); |
|
|
|
@@ -358,7 +358,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -360,7 +360,7 @@ main (int argc, char *argv[])
|
|
|
|
q = stringprep_utf8_to_ucs4 (p, -1, NULL); |
|
|
|
free (p); |
|
|
|
if (!q) |
|
|
@ -72,7 +72,7 @@ |
|
|
|
_("could not convert from UCS-4 to UTF-8")); |
|
|
|
|
|
|
|
if (args_info.debug_given) |
|
|
|
@@ -436,7 +436,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -438,7 +438,7 @@ main (int argc, char *argv[])
|
|
|
|
if (!q) |
|
|
|
{ |
|
|
|
free (p); |
|
|
@ -81,7 +81,7 @@ |
|
|
|
_("could not convert from UCS-4 to UTF-8")); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -492,7 +492,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -494,7 +494,7 @@ main (int argc, char *argv[])
|
|
|
|
r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); |
|
|
|
free (q); |
|
|
|
if (!r) |
|
|
@ -90,7 +90,7 @@ |
|
|
|
_("could not convert from UTF-8 to UCS-4")); |
|
|
|
|
|
|
|
p = stringprep_utf8_to_locale (r); |
|
|
|
@@ -521,7 +521,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -523,7 +523,7 @@ main (int argc, char *argv[])
|
|
|
|
if (!q) |
|
|
|
{ |
|
|
|
free (p); |
|
|
@ -99,7 +99,7 @@ |
|
|
|
_("could not convert from UTF-8 to UCS-4")); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -535,7 +535,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -537,7 +537,7 @@ main (int argc, char *argv[])
|
|
|
|
r = stringprep_utf8_nfkc_normalize (p, -1); |
|
|
|
free (p); |
|
|
|
if (!r) |
|
|
@ -108,7 +108,7 @@ |
|
|
|
|
|
|
|
if (args_info.debug_given) |
|
|
|
{ |
|
|
|
@@ -545,7 +545,7 @@ main (int argc, char *argv[])
|
|
|
|
@@ -547,7 +547,7 @@ main (int argc, char *argv[])
|
|
|
|
if (!q) |
|
|
|
{ |
|
|
|
free (r); |
|
|
|