head 1.7; access; symbols RELENG_4_0_0_RELEASE:1.7 RELENG_4:1.7.0.2 RELENG_4_BP:1.7 RELENG_3_4_0_RELEASE:1.5.2.1 RELENG_3_3_0_RELEASE:1.5.2.1 RELENG_3_2_PAO:1.5.0.4 RELENG_3_2_PAO_BP:1.5 RELENG_3_2_0_RELEASE:1.5 RELENG_3_1_0_RELEASE:1.5 RELENG_3:1.5.0.2 RELENG_3_BP:1.5 RELENG_2_2_8_RELEASE:1.1.1.1.8.3 RELENG_3_0_0_RELEASE:1.5 RELENG_2_2_7_RELEASE:1.1.1.1.8.3 RELENG_2_2_6_RELEASE:1.1.1.1.8.3 RELENG_2_2_5_RELEASE:1.1.1.1.8.3 bsd_44_lite_2:1.1.1.1 RELENG_2_2_2_RELEASE:1.1.1.1 RELENG_2_2_1_RELEASE:1.1.1.1 RELENG_2_2_0_RELEASE:1.1.1.1 RELENG_2_1_7_RELEASE:1.1.1.1 RELENG_2_1_6_1_RELEASE:1.1.1.1 RELENG_2_1_6_RELEASE:1.1.1.1 RELENG_2_2:1.1.1.1.0.8 RELENG_2_2_BP:1.1.1.1 RELENG_2_1_5_RELEASE:1.1.1.1 RELENG_2_1_0_RELEASE:1.1.1.1 RELENG_2_1_0:1.1.1.1.0.6 RELENG_2_1_0_BP:1.1.1.1 RELENG_2_0_5_RELEASE:1.1.1.1 RELENG_2_0_5:1.1.1.1.0.4 RELENG_2_0_5_BP:1.1.1.1 RELENG_2_0_5_ALPHA:1.1.1.1 RELEASE_2_0:1.1.1.1 BETA_2_0:1.1.1.1 ALPHA_2_0:1.1.1.1.0.2 bsd_44_lite:1.1.1.1 CSRG:1.1.1; locks; comment @ * @; 1.7 date 99.09.03.22.31.18; author hoek; state Exp; branches; next 1.6; 1.6 date 99.08.28.01.04.17; author peter; state Exp; branches; next 1.5; 1.5 date 98.07.25.05.58.04; author hoek; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 98.07.25.05.56.49; author hoek; state Exp; branches; next 1.3; 1.3 date 97.07.29.06.42.33; author charnier; state Exp; branches; next 1.2; 1.2 date 97.03.29.04.31.11; author imp; state Exp; branches; next 1.1; 1.1 date 94.05.27.12.30.44; author rgrimes; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 94.05.27.12.30.45; author rgrimes; state Exp; branches 1.1.1.1.8.1; next ; 1.1.1.1.8.1 date 97.07.30.06.43.57; author charnier; state Exp; branches; next 1.1.1.1.8.2; 1.1.1.1.8.2 date 97.08.29.05.29.37; author imp; state Exp; branches; next 1.1.1.1.8.3; 1.1.1.1.8.3 date 97.09.15.09.20.52; author jkh; state Exp; branches; next 1.1.1.1.8.4; 1.1.1.1.8.4 date 99.09.05.11.32.54; author peter; state Exp; branches; next ; 1.5.2.1 date 99.08.29.15.31.17; author peter; state Exp; branches; next ; desc @@ 1.7 log @Thorough revamp of how input commands are processed. This allows customization of user keys (documentation pending). The only key whose semantics have changed is the capital 'N' key, which now performs a repeat-search in the opposite direction (just like in vi). This commit is a little bulkier than what I had originally planned. I'm not completely happy with the direction it went, but it's definately an improvement, and the alternative is to continue becoming irrelevant compared to GNU less. (Does anyone even _use_ /usr/bin/more these days?) @ text @/* * Copyright (c) 1988 Mark Nudleman * Copyright (c) 1988, 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. */ #ifndef lint #if 0 static char sccsid[] = "@@(#)option.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = "$FreeBSD: src/usr.bin/more/option.c,v 1.6 1999/08/28 01:04:17 peter Exp $"; #endif /* not lint */ #include #include int top_scroll; /* Repaint screen from top */ int bs_mode; /* How to process backspaces */ int caseless; /* Do "caseless" searches */ int cbufs = 10; /* Current number of buffers */ int linenums = 1; /* Use line numbers */ int quit_at_eof; int squeeze; /* Squeeze multiple blank lines into one */ int tabstop = 8; /* Tab settings */ int tagoption; char *firstsearch; static void usage __P((void)); option(argc, argv) int argc; char **argv; { extern char *optarg; extern int optind; static int sc_window_set = 0; int ch; char *p; /* backward compatible processing for "+/search" */ char **a; for (a = argv; *a; ++a) if ((*a)[0] == '+' && (*a)[1] == '/') (*a)[0] = '-'; optind = 1; /* called twice, re-init getopt. */ while ((ch = getopt(argc, argv, "/:ceinst:ux:f")) != -1) switch((char)ch) { case '/': /* * Might be interesting to make this option search * through the whole list of files on the command line * until a match is found. Prior to this commit adding * the new comand interpreter, it would sort-of do * this, provided all the files listed on the command * line were of length zero bytes (well, with the * exception of the file actually containing a match, * I suppose). */ firstsearch = optarg; break; case 'c': top_scroll = 1; break; case 'e': quit_at_eof = 1; break; case 'i': caseless = 1; break; case 'n': linenums = 0; break; case 's': squeeze = 1; break; case 't': tagoption = 1; findtag(optarg); break; case 'u': bs_mode = 1; break; case 'x': tabstop = atoi(optarg); if (tabstop <= 0) tabstop = 8; break; case 'f': /* ignore -f, compatability with old more */ break; case '?': default: usage(); } return(optind); } static void usage() { fprintf(stderr, "usage: more [-ceinsu] [-t tag] [-x tabs] [-/ pattern] [file ...]\n"); exit(1); } @ 1.6 log @$Id$ -> $FreeBSD$ @ text @d40 1 a40 1 "$FreeBSD$"; d80 10 @ 1.5 log @Really delete -# option. @ text @d40 1 a40 1 "$Id: option.c,v 1.4 1998/07/25 05:56:49 hoek Exp $"; @ 1.5.2.1 log @$Id$ -> $FreeBSD$ @ text @d40 1 a40 1 "$FreeBSD$"; @ 1.4 log @Nuke obsolote and broken -# option. Order options. PR: bin/5996 Submitted by: Max Euston @ text @d40 1 a40 1 "$Id: option.c,v 1.3 1997/07/29 06:42:33 charnier Exp $"; a56 1 extern int sc_height; @ 1.3 log @Add usage(). @ text @d40 1 a40 1 "$Id$"; d78 1 a78 1 while ((ch = getopt(argc, argv, "0123456789/:ceinst:ux:f")) != -1) a79 15 case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': /* * kludge: more was originally designed to take * a number after a dash. */ if (!sc_window_set) { p = argv[optind - 1]; if (p[0] == '-' && p[1] == ch && !p[2]) sc_height = atoi(++p); else sc_height = atoi(argv[optind] + 1); sc_window_set = 1; } break; d123 1 a123 1 "usage: more [-ceinus] [-t tag] [-x tabs] [-/ pattern] [-#] [file ...]\n"); @ 1.2 log @compare return value from getopt against -1 rather than EOF, per the final posix standard on the topic. @ text @d36 1 d38 3 d59 2 d129 1 a129 3 fprintf(stderr, "usage: more [-ceinus] [-t tag] [-x tabs] [-/ pattern] [-#] [file ...]\n"); exit(1); d132 8 @ 1.1 log @Initial revision @ text @d72 1 a72 1 while ((ch = getopt(argc, argv, "0123456789/:ceinst:ux:f")) != EOF) @ 1.1.1.1 log @BSD 4.4 Lite Usr.bin Sources @ text @@ 1.1.1.1.8.1 log @MFC: Add usage(). @ text @a35 1 #if 0 a36 3 #endif static const char rcsid[] = "$Id$"; a54 2 static void usage __P((void)); d123 3 a125 1 usage(); a127 8 } static void usage() { fprintf(stderr, "usage: more [-ceinus] [-t tag] [-x tabs] [-/ pattern] [-#] [file ...]\n"); exit(1); @ 1.1.1.1.8.2 log @MFC: getopt returns -1 not EOF @ text @d40 1 a40 1 "$Id: option.c,v 1.1.1.1.8.1 1997/07/30 06:43:57 charnier Exp $"; d78 1 a78 1 while ((ch = getopt(argc, argv, "0123456789/:ceinst:ux:f")) != -1) @ 1.1.1.1.8.3 log @MFC: Lots of cosmetics (plus one gripe from bde about a comment in tail's sources, of all places). @ text @d40 1 a40 1 "$Id: option.c,v 1.1.1.1.8.2 1997/08/29 05:29:37 imp Exp $"; d78 1 a78 1 while ((ch = getopt(argc, argv, "0123456789/:ceinst:ux:f")) != -1) @ 1.1.1.1.8.4 log @$Id$ -> $FreeBSD$ @ text @d40 1 a40 1 "$FreeBSD$"; @