Index: head/usr.bin/look/look.1 =================================================================== --- head/usr.bin/look/look.1 (revision 132393) +++ head/usr.bin/look/look.1 (revision 132394) @@ -1,118 +1,112 @@ .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: .\" This product includes software developed by the University of .\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)look.1 8.1 (Berkeley) 6/14/93 .\" $FreeBSD$ .\" .Dd July 17, 2004 .Dt LOOK 1 .Os .Sh NAME .Nm look .Nd display lines beginning with a given string .Sh SYNOPSIS .Nm .Op Fl df .Op Fl t Ar termchar .Ar string .Op Ar .Sh DESCRIPTION The .Nm utility displays any lines in .Ar file which contain .Ar string as a prefix. As .Nm performs a binary search, the lines in .Ar file must be sorted. .Pp If .Ar file is not specified, the file .Pa /usr/share/dict/words is used, only alphanumeric characters are compared and the case of alphabetic characters is ignored. .Pp The following options are available: .Bl -tag -width indent .It Fl d Dictionary character set and order, i.e., only alphanumeric characters are compared. .It Fl f Ignore the case of alphabetic characters. .It Fl t Specify a string termination character, i.e., only the characters in .Ar string up to and including the first occurrence of .Ar termchar are compared. .El .Pp The .Nm utility exits 0 if one or more lines were found and displayed, 1 if no lines were found, and >1 if an error occurred. .Sh FILES .Bl -tag -width /usr/share/dict/words -compact .It Pa /usr/share/dict/words the dictionary .El .Sh SEE ALSO .Xr grep 1 , .Xr sort 1 .Sh COMPATIBILITY The original manual page stated that tabs and blank characters participated in comparisons when the .Fl d option was specified. This was incorrect and the current man page matches the historic implementation. .Sh HISTORY A .Nm utility appeared in .At v7 . .Sh BUGS -The -.Nm -utility does not recognize multibyte characters. -.Pp -Lines are not compared according to the current locale's collating -order. Input files must be sorted with .Ev LC_COLLATE set to .Ql C . Index: head/usr.bin/look/look.c =================================================================== --- head/usr.bin/look/look.c (revision 132393) +++ head/usr.bin/look/look.c (revision 132394) @@ -1,335 +1,350 @@ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * David Hitz of Auspex Systems, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1991, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint #if 0 static char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95"; #endif #endif /* not lint */ #include __FBSDID("$FreeBSD$"); /* * look -- find lines in a sorted list. * * The man page said that TABs and SPACEs participate in -d comparisons. * In fact, they were ignored. This implements historic practice, not * the manual page. */ #include #include #include -#include #include #include #include #include #include #include #include #include #include +#include +#include #include "pathnames.h" static char _path_words[] = _PATH_WORDS; -/* - * FOLD and DICT convert characters to a normal form for comparison, - * according to the user specified flags. - * - * DICT expects integers because it uses a non-character value to - * indicate a character which should not participate in comparisons. - */ #define EQUAL 0 #define GREATER 1 #define LESS (-1) -#define NO_COMPARE (-2) -#define FOLD(c) (isupper(c) ? tolower(c) : (unsigned char) (c)) -#define DICT(c) (isalnum(c) ? (c) & 0xFF /* int */ : NO_COMPARE) - int dflag, fflag; -char *binary_search(unsigned char *, unsigned char *, unsigned char *); -int compare(unsigned char *, unsigned char *, unsigned char *); -char *linear_search(unsigned char *, unsigned char *, unsigned char *); -int look(unsigned char *, unsigned char *, unsigned char *); -void print_from(unsigned char *, unsigned char *, unsigned char *); +char *binary_search(wchar_t *, unsigned char *, unsigned char *); +int compare(wchar_t *, unsigned char *, unsigned char *); +char *linear_search(wchar_t *, unsigned char *, unsigned char *); +int look(wchar_t *, unsigned char *, unsigned char *); +wchar_t *prepkey(const char *, wchar_t); +void print_from(wchar_t *, unsigned char *, unsigned char *); static void usage(void); int main(int argc, char *argv[]) { struct stat sb; - int ch, fd, termchar, match; - unsigned char *back, *front, *string, *p; + int ch, fd, match; + wchar_t termchar; + unsigned char *back, *front; unsigned const char *file; + wchar_t *key; (void) setlocale(LC_CTYPE, ""); file = _path_words; - termchar = '\0'; + termchar = L'\0'; while ((ch = getopt(argc, argv, "dft:")) != -1) switch(ch) { case 'd': dflag = 1; break; case 'f': fflag = 1; break; case 't': - termchar = *optarg; + if (mbrtowc(&termchar, optarg, MB_LEN_MAX, NULL) != + strlen(optarg)) + errx(2, "invalid termination character"); break; case '?': default: usage(); } argc -= optind; argv += optind; if (argc == 0) usage(); if (argc == 1) /* But set -df by default. */ dflag = fflag = 1; - string = *argv++; + key = prepkey(*argv++, termchar); if (argc >= 2) file = *argv++; - if (termchar != '\0' && (p = strchr(string, termchar)) != NULL) - *++p = '\0'; match = 1; do { if ((fd = open(file, O_RDONLY, 0)) < 0 || fstat(fd, &sb)) err(2, "%s", file); if (sb.st_size > SIZE_T_MAX) errx(2, "%s: %s", file, strerror(EFBIG)); if ((front = mmap(NULL, (size_t)sb.st_size, PROT_READ, MAP_SHARED, fd, (off_t)0)) == MAP_FAILED) err(2, "%s", file); back = front + sb.st_size; - match *= (look(string, front, back)); + match *= (look(key, front, back)); close(fd); } while (argc-- > 2 && (file = *argv++)); exit(match); } -int -look(unsigned char *string, unsigned char *front, unsigned char *back) +wchar_t * +prepkey(const char *string, wchar_t termchar) { - int ch; - unsigned char *readp, *writep; + const char *readp; + wchar_t *key, *writep; + wchar_t ch; + size_t clen; - /* Reformat string string to avoid doing it multiple times later. */ - for (readp = writep = string; (ch = *readp++);) { + /* + * Reformat search string and convert to wide character representation + * to avoid doing it multiple times later. + */ + if ((key = malloc(sizeof(wchar_t) * (strlen(string) + 1))) == NULL) + err(2, NULL); + readp = string; + writep = key; + while ((clen = mbrtowc(&ch, readp, MB_LEN_MAX, NULL)) != 0) { + if (clen == (size_t)-1 || clen == (size_t)-2) + errc(2, EILSEQ, NULL); if (fflag) - ch = FOLD(ch); - if (dflag) - ch = DICT(ch); - if (ch != NO_COMPARE) - *(writep++) = ch; + ch = towlower(ch); + if (!dflag || iswalnum(ch)) + *writep++ = ch; + readp += clen; } - *writep = '\0'; + *writep = L'\0'; + if (termchar != L'\0' && (writep = wcschr(key, termchar)) != NULL) + *++writep = L'\0'; + return (key); +} +int +look(wchar_t *string, unsigned char *front, unsigned char *back) +{ + front = binary_search(string, front, back); front = linear_search(string, front, back); if (front) print_from(string, front, back); return (front ? 0 : 1); } /* * Binary search for "string" in memory between "front" and "back". * * This routine is expected to return a pointer to the start of a line at * *or before* the first word matching "string". Relaxing the constraint * this way simplifies the algorithm. * * Invariants: * front points to the beginning of a line at or before the first * matching string. * * back points to the beginning of a line at or after the first * matching line. * * Base of the Invariants. * front = NULL; * back = EOF; * * Advancing the Invariants: * * p = first newline after halfway point from front to back. * * If the string at "p" is not greater than the string to match, * p is the new front. Otherwise it is the new back. * * Termination: * * The definition of the routine allows it return at any point, * since front is always at or before the line to print. * * In fact, it returns when the chosen "p" equals "back". This * implies that there exists a string is least half as long as * (back - front), which in turn implies that a linear search will * be no more expensive than the cost of simply printing a string or two. * * Trying to continue with binary search at this point would be * more trouble than it's worth. */ #define SKIP_PAST_NEWLINE(p, back) \ while (p < back && *p++ != '\n'); char * -binary_search(unsigned char *string, unsigned char *front, unsigned char *back) +binary_search(wchar_t *string, unsigned char *front, unsigned char *back) { unsigned char *p; p = front + (back - front) / 2; SKIP_PAST_NEWLINE(p, back); /* * If the file changes underneath us, make sure we don't * infinitely loop. */ while (p < back && back > front) { if (compare(string, p, back) == GREATER) front = p; else back = p; p = front + (back - front) / 2; SKIP_PAST_NEWLINE(p, back); } return (front); } /* * Find the first line that starts with string, linearly searching from front * to back. * * Return NULL for no such line. * * This routine assumes: * * o front points at the first character in a line. * o front is before or at the first line to be printed. */ char * -linear_search(unsigned char *string, unsigned char *front, unsigned char *back) +linear_search(wchar_t *string, unsigned char *front, unsigned char *back) { while (front < back) { switch (compare(string, front, back)) { case EQUAL: /* Found it. */ return (front); break; case LESS: /* No such string. */ return (NULL); break; case GREATER: /* Keep going. */ break; } SKIP_PAST_NEWLINE(front, back); } return (NULL); } /* * Print as many lines as match string, starting at front. */ void -print_from(unsigned char *string, unsigned char *front, unsigned char *back) +print_from(wchar_t *string, unsigned char *front, unsigned char *back) { for (; front < back && compare(string, front, back) == EQUAL; ++front) { for (; front < back && *front != '\n'; ++front) if (putchar(*front) == EOF) err(2, "stdout"); if (putchar('\n') == EOF) err(2, "stdout"); } } /* * Return LESS, GREATER, or EQUAL depending on how the string1 compares with * string2 (s1 ??? s2). * * o Matches up to len(s1) are EQUAL. * o Matches up to len(s2) are GREATER. * * Compare understands about the -f and -d flags, and treats comparisons * appropriately. * * The string "s1" is null terminated. The string s2 is '\n' terminated (or * "back" terminated). */ int -compare(unsigned char *s1, unsigned char *s2, unsigned char *back) +compare(wchar_t *s1, unsigned char *s2, unsigned char *back) { - int ch; + wchar_t ch1, ch2; + size_t len2; - for (; *s1 && s2 < back && *s2 != '\n'; ++s1, ++s2) { - ch = *s2; + for (; *s1 && s2 < back && *s2 != '\n'; ++s1, s2 += len2) { + ch1 = *s1; + len2 = mbrtowc(&ch2, s2, back - s2, NULL); + if (len2 == (size_t)-1 || len2 == (size_t)-2) { + ch2 = *s2; + len2 = 1; + } if (fflag) - ch = FOLD(ch); - if (dflag) - ch = DICT(ch); - - if (ch == NO_COMPARE) { - ++s2; /* Ignore character in comparison. */ + ch2 = towlower(ch2); + if (dflag && !iswalnum(ch2)) { + /* Ignore character in comparison. */ + --s1; continue; } - if (*s1 != ch) - return (*s1 < ch ? LESS : GREATER); + if (ch1 != ch2) + return (ch1 < ch2 ? LESS : GREATER); } return (*s1 ? GREATER : EQUAL); } static void usage(void) { (void)fprintf(stderr, "usage: look [-df] [-t char] string [file ...]\n"); exit(2); }