summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>1995-10-28 19:16:14 +0000
committerache <ache@FreeBSD.org>1995-10-28 19:16:14 +0000
commit88603439e6de8261f410c8c7419fe0484e92eeed (patch)
treed6126b660923a8fff113d8371fb1b9cbc5c4386b /gnu/usr.bin
parentc37ff62e9be62a7cd6340caca3316bb40062ac2d (diff)
downloadFreeBSD-src-88603439e6de8261f410c8c7419fe0484e92eeed.zip
FreeBSD-src-88603439e6de8261f410c8c7419fe0484e92eeed.tar.gz
Add setlocale LC_CTYPE
Fix icase searches for 8bit charsets
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/grep/grep.c6
-rw-r--r--gnu/usr.bin/grep/search.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gnu/usr.bin/grep/grep.c b/gnu/usr.bin/grep/grep.c
index dc33298..d7edf12 100644
--- a/gnu/usr.bin/grep/grep.c
+++ b/gnu/usr.bin/grep/grep.c
@@ -19,6 +19,9 @@
#include <errno.h>
#include <stdio.h>
+#ifdef __FreeBSD__
+#include <locale.h>
+#endif
#ifndef errno
extern int errno;
@@ -606,6 +609,9 @@ main(argc, argv)
extern char *optarg;
extern int optind;
+#ifdef __FreeBSD__
+ (void) setlocale(LC_CTYPE, "");
+#endif
prog = argv[0];
if (prog && strrchr(prog, '/'))
prog = strrchr(prog, '/') + 1;
diff --git a/gnu/usr.bin/grep/search.c b/gnu/usr.bin/grep/search.c
index 2b89338..5e17d03 100644
--- a/gnu/usr.bin/grep/search.c
+++ b/gnu/usr.bin/grep/search.c
@@ -46,7 +46,7 @@ extern char *memchr();
#define bcopy(s, d, n) memcpy((d), (s), (n))
#endif
-#ifdef isascii
+#if defined(isascii) && !defined(__FreeBSD__)
#define ISALNUM(C) (isascii(C) && isalnum(C))
#define ISUPPER(C) (isascii(C) && isupper(C))
#else
OpenPOWER on IntegriCloud