Libc-1082.50.1.tar.gz

[apple/libc.git] / gen / FreeBSD / vis.c

diff --git a/gen/FreeBSD/vis.c b/gen/FreeBSD/vis.c
index 94d1b22f0c8a6f184724062a72165335d2bf9abb..3a4b67c4ca24faaf9a8db6de70f9d313265931e7 100644 (file)
--- a/gen/FreeBSD/vis.c
+++ b/gen/FreeBSD/vis.c
@@ -33,6 +33,8 @@ static char sccsid[] = "@(#)vis.c     8.1 (Berkeley) 7/19/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/gen/vis.c,v 1.14 2007/01/09 00:27:56 imp Exp $");
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/gen/vis.c,v 1.14 2007/01/09 00:27:56 imp Exp $");
 

+#include "xlocale_private.h"
+

 #include <sys/types.h>
 #include <limits.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <limits.h>
 #include <ctype.h>


@@ -50,18 +52,20 @@ vis(dst, c, flag, nextc)
        int c, nextc;
        int flag;
 {
        int c, nextc;
        int flag;
 {

+       locale_t loc = __current_locale();
+

        c = (unsigned char)c;
 
        if (flag & VIS_HTTPSTYLE) {
                /* Described in RFC 1808 */
        c = (unsigned char)c;
 
        if (flag & VIS_HTTPSTYLE) {
                /* Described in RFC 1808 */

-               if (!(isalnum(c) /* alpha-numeric */
+               if (!(isalnum_l(c, loc) /* alpha-numeric */

                    /* safe */
                    || c == '$' || c == '-' || c == '_' || c == '.' || c == '+'
                    /* extra */
                    || c == '!' || c == '*' || c == '\'' || c == '('
                    || c == ')' || c == ',')) {
                        *dst++ = '%';
                    /* safe */
                    || c == '$' || c == '-' || c == '_' || c == '.' || c == '+'
                    /* extra */
                    || c == '!' || c == '*' || c == '\'' || c == '('
                    || c == ')' || c == ',')) {
                        *dst++ = '%';

-                       snprintf(dst, 4, (c < 16 ? "0%X" : "%X"), c);
+                       snprintf_l(dst, 4, loc, (c < 16 ? "0%X" : "%X"), c);

                        dst += 2;
                        goto done;
                }
                        dst += 2;
                        goto done;
                }


@@ -70,7 +74,7 @@ vis(dst, c, flag, nextc)
        if ((flag & VIS_GLOB) &&
            (c == '*' || c == '?' || c == '[' || c == '#'))
                ;
        if ((flag & VIS_GLOB) &&
            (c == '*' || c == '?' || c == '[' || c == '#'))
                ;

-       else if (isgraph(c) ||
+       else if (isgraph_l(c, loc) ||

           ((flag & VIS_SP) == 0 && c == ' ') ||
           ((flag & VIS_TAB) == 0 && c == '\t') ||
           ((flag & VIS_NL) == 0 && c == '\n') ||
           ((flag & VIS_SP) == 0 && c == ' ') ||
           ((flag & VIS_TAB) == 0 && c == '\t') ||
           ((flag & VIS_NL) == 0 && c == '\n') ||


@@ -126,7 +130,7 @@ vis(dst, c, flag, nextc)
                        goto done;
                }
        }
                        goto done;
                }
        }

-       if (((c & 0177) == ' ') || isgraph(c) || (flag & VIS_OCTAL)) {
+       if (((c & 0177) == ' ') || isgraph_l(c, loc) || (flag & VIS_OCTAL)) {

                *dst++ = '\\';
                *dst++ = ((u_char)c >> 6 & 07) + '0';
                *dst++ = ((u_char)c >> 3 & 07) + '0';
                *dst++ = '\\';
                *dst++ = ((u_char)c >> 6 & 07) + '0';
                *dst++ = ((u_char)c >> 3 & 07) + '0';


@@ -139,7 +143,7 @@ vis(dst, c, flag, nextc)
                c &= 0177;
                *dst++ = 'M';
        }
                c &= 0177;
                *dst++ = 'M';
        }

-       if (iscntrl(c)) {
+       if (iscntrl_l(c, loc)) {

                *dst++ = '^';
                if (c == 0177)
                        *dst++ = '?';
                *dst++ = '^';
                if (c == 0177)
                        *dst++ = '?';