From mboxrd@z Thu Jan 1 00:00:00 1970
Message-Id: <200604092153.k39Lr3UW032469@pwslaptop.csr.com>
From: Peter Stephenson
To: zsh-workers@sunsite.dk (Zsh hackers list)
Subject: Re: PATCH: multibyte characters in patterns.
Date: Sun, 09 Apr 2006 22:53:03 +0100
X-Seq: zsh-workers 22409
Peter Stephenson wrote:
> It's very likely the result is still typographically challenged.
This fixes compilation with --disable-multibyte.
Index: Src/pattern.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/pattern.c,v
retrieving revision 1.30
diff -u -r1.30 pattern.c
--- Src/pattern.c 9 Apr 2006 21:47:22 -0000 1.30
+++ Src/pattern.c 9 Apr 2006 21:52:13 -0000
@@ -1043,11 +1043,7 @@
union upat up;
char *nptr, *str0, *ptr, *patprev;
zrange_t from, to;
-#ifdef MULTIBYTE_SUPPORT
char *charstart;
-#else
- char cbuf[2];
-#endif
flags = 0;
str0 = patprev = patparse;
@@ -2133,7 +2129,7 @@
#else
#define ISUPPER(x) isupper(x)
#define ISLOWER(x) islower(x)
-#define TOUPPER(x) toupperr(x)
+#define TOUPPER(x) toupper(x)
#define TOLOWER(x) tolower(x)
#define ISDIGIT(x) idigit(x)
#endif
@@ -2722,7 +2718,10 @@
if (P_OP(next) == P_EXACTLY && P_LS_LEN(next) &&
!(patglobflags & 0xff)) {
char *nextop = P_LS_STR(next);
+#ifdef MULTIBYTE_SUPPORT
+ /* else second argument of CHARREF isn't used */
int nextlen = P_LS_LEN(next);
+#endif
/*
* If that P_EXACTLY is last (common in simple patterns,
* such as *.c), then it can be only be matched at one
--
Peter Stephenson
Web page still at http://www.pwstephenson.fsnet.co.uk/