blob: 1a56798c9b79971f6a2d3a6bc792b01e32f16712 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
$NetBSD: patch-ap,v 1.1 2005/03/29 04:38:10 kim Exp $
--- glob.c.orig 2005-01-18 15:24:50.000000000 -0500
+++ glob.c 2005-03-28 23:22:44.000000000 -0500
@@ -63,7 +63,6 @@
#undef QUOTE
#undef TILDE
#undef META
-#undef CHAR
#undef ismeta
#undef Strchr
@@ -120,7 +119,7 @@
#define M_MASK 0xffff
#define M_ASCII 0x00ff
-#define CHAR(c) ((c)&M_ASCII)
+#define LCHAR(c) ((c)&M_ASCII)
#define META(c) ((c)|M_META)
#define M_ALL META('*')
#define M_END META(']')
@@ -427,11 +426,11 @@
*bufnext++ = m_not;
c = *qpatnext++;
do {
- *bufnext++ = CHAR(c);
+ *bufnext++ = LCHAR(c);
if (*qpatnext == RANGE &&
(c = qpatnext[1]) != RBRACKET) {
*bufnext++ = M_RNG;
- *bufnext++ = CHAR(c);
+ *bufnext++ = LCHAR(c);
qpatnext += 2;
}
} while ((c = *qpatnext++) != RBRACKET);
@@ -450,7 +449,7 @@
*bufnext++ = M_ALL;
break;
default:
- *bufnext++ = CHAR(c);
+ *bufnext++ = LCHAR(c);
break;
}
}
@@ -699,7 +698,7 @@
if (n > MB_LEN_MAX)
n = MB_LEN_MAX;
p = buf;
- while (p < buf + n && (*p++ = CHAR(*s++)) != 0)
+ while (p < buf + n && (*p++ = LCHAR(*s++)) != 0)
;
return one_mbtowc(pwc, buf, n);
#else
|
