diff options
| author | ache <ache@FreeBSD.org> | 2003-08-03 04:47:34 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2003-08-03 04:47:34 +0000 |
| commit | c7d2e2b2a7bb4a51a1d1c3fd9b0ed6d8d07fe291 (patch) | |
| tree | 1a63f40a62e8075f95136405b65db6351e93b14b /gnu | |
| parent | 1dac9aa79dd064cfc065c3667a3b72f0cebbc2ce (diff) | |
| download | FreeBSD-src-c7d2e2b2a7bb4a51a1d1c3fd9b0ed6d8d07fe291.zip FreeBSD-src-c7d2e2b2a7bb4a51a1d1c3fd9b0ed6d8d07fe291.tar.gz | |
Remove collate_range_cmp() stabilization, it conflicts with ranges
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/man/man/glob.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gnu/usr.bin/man/man/glob.c b/gnu/usr.bin/man/man/glob.c index 65eb1fa..1dff84a 100644 --- a/gnu/usr.bin/man/man/glob.c +++ b/gnu/usr.bin/man/man/glob.c @@ -15,6 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* $FreeBSD$ */ + /* To whomever it may concern: I have never seen the code which most Unix programs use to perform this function. I wrote this from scratch based on specifications for the pattern matching. --RMS. */ @@ -112,19 +114,14 @@ int noglob_dot_filenames = 1; static int glob_match_after_star (); #ifdef __FreeBSD__ -static int collate_range_cmp (a, b) +static int collate_range_cmp(a, b) int a, b; { - int r; static char s[2][2]; - if ((unsigned char)a == (unsigned char)b) - return 0; s[0][0] = a; s[1][0] = b; - if ((r = strcoll(s[0], s[1])) == 0) - r = (unsigned char)a - (unsigned char)b; - return r; + return (strcoll(s[0], s[1])); } #endif |
