diff options
author | Jim Meyering <jim@meyering.net> | 1997-10-27 04:58:22 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1997-10-27 04:58:22 +0000 |
commit | f831d9c32db624ad646087e079afbd6c7783c632 (patch) | |
tree | 13545e066af26aa26efcc88802731c9aa76b5972 | |
parent | 94c4bdd4c8ab257860bcc583639af73727eb2d58 (diff) | |
download | coreutils-f831d9c32db624ad646087e079afbd6c7783c632.tar.xz |
Convert to upper case before comparing.
This makes join -i work with sort -f.
-rw-r--r-- | lib/memcasecmp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c index a4d2e96a9..2a255f19d 100644 --- a/lib/memcasecmp.c +++ b/lib/memcasecmp.c @@ -1,5 +1,5 @@ /* Case-insensitive buffer comparator. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 1997 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,16 +25,16 @@ #include <ctype.h> #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -#define IN_CTYPE_DOMAIN(c) 1 +# define IN_CTYPE_DOMAIN(c) 1 #else -#define IN_CTYPE_DOMAIN(c) isascii(c) +# define IN_CTYPE_DOMAIN(c) isascii(c) #endif -#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c)) +#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c)) #if _LIBC || STDC_HEADERS -# define TOLOWER(c) tolower (c) +# define TOUPPER(c) toupper (c) #else -# define TOLOWER(c) (ISUPPER (c) ? tolower (c) : (c)) +# define TOUPPER(c) (ISLOWER (c) ? toupper (c) : (c)) #endif #include "memcasecmp.h" @@ -54,8 +54,8 @@ memcasecmp (vs1, vs2, n) { unsigned char u1 = *s1++; unsigned char u2 = *s2++; - if (TOLOWER (u1) != TOLOWER (u2)) - return TOLOWER (u1) - TOLOWER (u2); + if (TOUPPER (u1) != TOUPPER (u2)) + return TOUPPER (u1) - TOUPPER (u2); } return 0; } |