diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1996-10-31 15:14:25 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1996-10-31 15:14:25 +0000 |
| commit | e3fb033222be45d9dc040b42f054c5be97d6951c (patch) | |
| tree | 734824715881980f3da5e8e4e971cbb2195ad490 | |
| parent | 7dad1dc466fdd1379f03e329e0c3900456512e73 (diff) | |
| download | ports-e3fb033222be45d9dc040b42f054c5be97d6951c.tar.gz ports-e3fb033222be45d9dc040b42f054c5be97d6951c.zip | |
Replace last occurance of collate_range_cmp call with its code
Notes
Notes:
svn path=/head/; revision=4217
| -rw-r--r-- | shells/tcsh/files/patch-ad | 44 |
1 files changed, 40 insertions, 4 deletions
diff --git a/shells/tcsh/files/patch-ad b/shells/tcsh/files/patch-ad index 51307f0845bc..b5217d0cde2c 100644 --- a/shells/tcsh/files/patch-ad +++ b/shells/tcsh/files/patch-ad @@ -1,5 +1,31 @@ *** glob.c.orig Sun May 14 00:49:21 1995 ---- glob.c Tue Aug 13 01:42:43 1996 +--- glob.c Thu Oct 31 18:04:28 1996 +*************** +*** 139,144 **** +--- 139,161 ---- + #define M_SET META('[') + #define ismeta(c) (((c)&M_META) != 0) + ++ int collate_range_cmp (c1, c2) ++ int c1, c2; ++ { ++ static char s1[2], s2[2]; ++ int ret; ++ ++ c1 &= UCHAR_MAX; ++ c2 &= UCHAR_MAX; ++ if (c1 == c2) ++ return (0); ++ s1[0] = c1; ++ s2[0] = c2; ++ if ((ret = strcoll(s1, s2)) != 0) ++ return (ret); ++ return (c1 - c2); ++ } ++ + /* + * Need to dodge two kernel bugs: + * opendir("") != opendir(".") *************** *** 646,652 **** ++pat; @@ -9,7 +35,7 @@ ok = 1; pat += 2; } ---- 646,654 ---- +--- 663,671 ---- ++pat; while (((c = *pat++) & M_MASK) != M_END) { if ((*pat & M_MASK) == M_RNG) { @@ -20,7 +46,17 @@ pat += 2; } *** sh.glob.c.orig Sun May 14 00:49:17 1995 ---- sh.glob.c Tue Aug 13 01:41:34 1996 +--- sh.glob.c Thu Oct 31 18:04:28 1996 +*************** +*** 85,90 **** +--- 85,91 ---- + static void pword __P((int)); + static void psave __P((int)); + static void backeval __P((Char *, bool)); ++ extern int collate_range_cmp __P((int, int)); + + static Char * + globtilde(nv, s) *************** *** 1038,1045 **** if (match) @@ -31,7 +67,7 @@ pattern++; } else ---- 1038,1046 ---- +--- 1039,1047 ---- if (match) continue; if (rangec == '-' && *(pattern-2) != '[' && *pattern != ']') { |