sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace last occurance of collate_range_cmp call with its code

Browse source
This commit is contained in:
Andrey A. Chernov 1996-10-31 15:14:25 +00:00
parent 7dad1dc466
commit e3fb033222
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=4217
1 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
shells/tcsh/files/patch-ad
View file

@ -1,5 +1,31 @@
*** glob.c.orig Sun May 14 00:49:21 1995 *** 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 **** *** 646,652 ****
++pat; ++pat;
@ -9,7 +35,7 @@
ok = 1; ok = 1;
pat += 2; pat += 2;
} }
--- 646,654 ---- --- 663,671 ----
++pat; ++pat;
while (((c = *pat++) & M_MASK) != M_END) { while (((c = *pat++) & M_MASK) != M_END) {
if ((*pat & M_MASK) == M_RNG) { if ((*pat & M_MASK) == M_RNG) {
@ -20,7 +46,17 @@
pat += 2; pat += 2;
} }
*** sh.glob.c.orig Sun May 14 00:49:17 1995 *** 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 **** *** 1038,1045 ****
if (match) if (match)
@ -31,7 +67,7 @@
pattern++; pattern++;
} }
else else
--- 1038,1046 ---- --- 1039,1047 ----
if (match) if (match)
continue; continue;
if (rangec == '-' && *(pattern-2) != '[' && *pattern != ']') { if (rangec == '-' && *(pattern-2) != '[' && *pattern != ']') {