backward compatible processing for "+/pattern"

[unix-history] / usr / src / usr.bin / more / decode.c

diff --git a/usr/src/usr.bin/more/decode.c b/usr/src/usr.bin/more/decode.c
index a171b4d..5272ac9 100644 (file)
--- a/usr/src/usr.bin/more/decode.c
+++ b/usr/src/usr.bin/more/decode.c
@@ -3,15 +3,13 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * This code is derived from software contributed to Berkeley by
- * Mark Nudleman.
- * 

  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
  * advertising materials, and other materials related to such
  * distribution and use acknowledge that the software was developed
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
  * advertising materials, and other materials related to such
  * distribution and use acknowledge that the software was developed

- * by the University of California, Berkeley.  The name of the
+ * by Mark Nudleman and the University of California, Berkeley.  The
+ * name of Mark Nudleman or the

  * University may not be used to endorse or promote products derived
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * University may not be used to endorse or promote products derived
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR


@@ -20,7 +18,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)decode.c   5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)decode.c   5.6 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -37,29 +35,24 @@ static char sccsid[] = "@(#)decode.c        5.3 (Berkeley) %G%";
  * with the command string.
  *
  * The default commands are described by cmdtable.
  * with the command string.
  *
  * The default commands are described by cmdtable.

- * User-defined commands are read into usertable.

  */
 
  */
 

-#include "less.h"
-#include "cmd.h"
+#include <sys/param.h>
+#include <sys/file.h>
+#include <stdio.h>
+#include <less.h>

 
 /*
  * Command table is ordered roughly according to expected
  * frequency of use, so the common commands are near the beginning.
  */
 
 /*
  * Command table is ordered roughly according to expected
  * frequency of use, so the common commands are near the beginning.
  */

-static char cmdtable[] =
-{
+#define        CONTROL(c)              ((c)&037)
+
+static char cmdtable[] = {

        '\r',0,                         A_F_LINE,
        '\n',0,                         A_F_LINE,
        '\r',0,                         A_F_LINE,
        '\n',0,                         A_F_LINE,

-       'e',0,                          A_F_LINE,

        'j',0,                          A_F_LINE,
        'j',0,                          A_F_LINE,

-       CONTROL('E'),0,                 A_F_LINE,
-       CONTROL('N'),0,                 A_F_LINE,

        'k',0,                          A_B_LINE,
        'k',0,                          A_B_LINE,

-       'y',0,                          A_B_LINE,
-       CONTROL('Y'),0,                 A_B_LINE,
-       CONTROL('K'),0,                 A_B_LINE,
-       CONTROL('P'),0,                 A_B_LINE,

        'd',0,                          A_F_SCROLL,
        CONTROL('D'),0,                 A_F_SCROLL,
        'u',0,                          A_B_SCROLL,
        'd',0,                          A_F_SCROLL,
        CONTROL('D'),0,                 A_F_SCROLL,
        'u',0,                          A_B_SCROLL,


@@ -67,23 +60,15 @@ static char cmdtable[] =
        ' ',0,                          A_F_SCREEN,
        'f',0,                          A_F_SCREEN,
        CONTROL('F'),0,                 A_F_SCREEN,
        ' ',0,                          A_F_SCREEN,
        'f',0,                          A_F_SCREEN,
        CONTROL('F'),0,                 A_F_SCREEN,

-       CONTROL('V'),0,                 A_F_SCREEN,

        'b',0,                          A_B_SCREEN,
        CONTROL('B'),0,                 A_B_SCREEN,
        'b',0,                          A_B_SCREEN,
        CONTROL('B'),0,                 A_B_SCREEN,

-       CONTROL('['),'v',0,             A_B_SCREEN,

        'R',0,                          A_FREPAINT,
        'r',0,                          A_REPAINT,
        'R',0,                          A_FREPAINT,
        'r',0,                          A_REPAINT,

-       CONTROL('R'),0,                 A_REPAINT,

        CONTROL('L'),0,                 A_REPAINT,
        'g',0,                          A_GOLINE,
        CONTROL('L'),0,                 A_REPAINT,
        'g',0,                          A_GOLINE,

-       '<',0,                          A_GOLINE,
-       CONTROL('['),'<',0,             A_GOLINE,

        'p',0,                          A_PERCENT,
        '%',0,                          A_PERCENT,
        'G',0,                          A_GOEND,
        'p',0,                          A_PERCENT,
        '%',0,                          A_PERCENT,
        'G',0,                          A_GOEND,

-       CONTROL('['),'>',0,             A_GOEND,
-       '>',0,                          A_GOEND,
-

        '0',0,                          A_DIGIT,
        '1',0,                          A_DIGIT,
        '2',0,                          A_DIGIT,
        '0',0,                          A_DIGIT,
        '1',0,                          A_DIGIT,
        '2',0,                          A_DIGIT,


@@ -102,40 +87,39 @@ static char cmdtable[] =
        'n',0,                          A_AGAIN_SEARCH,
        'm',0,                          A_SETMARK,
        '\'',0,                         A_GOMARK,
        'n',0,                          A_AGAIN_SEARCH,
        'm',0,                          A_SETMARK,
        '\'',0,                         A_GOMARK,

-       CONTROL('X'),CONTROL('X'),0,    A_GOMARK,

        'E',0,                          A_EXAMINE,
        'E',0,                          A_EXAMINE,

-       ':','e',0,                      A_EXAMINE,
-       CONTROL('X'),CONTROL('V'),0,    A_EXAMINE,

        'N',0,                          A_NEXT_FILE,
        'N',0,                          A_NEXT_FILE,

-       'P',0,                          A_PREV_FILE,

        ':','n',0,                      A_NEXT_FILE,
        ':','n',0,                      A_NEXT_FILE,

+       'P',0,                          A_PREV_FILE,

        ':','p',0,                      A_PREV_FILE,
        ':','p',0,                      A_PREV_FILE,

-       '-',0,                          A_TOGGLE_OPTION,
-       '_',0,                          A_DISP_OPTION,

        'v',0,                          A_VISUAL,
        'v',0,                          A_VISUAL,

-       '!',0,                          A_SHELL,
-       '+',0,                          A_FIRSTCMD,

 
 

-       'H',0,                          A_HELP,

        'h',0,                          A_HELP,
        'h',0,                          A_HELP,

-       'V',0,                          A_VERSION,

        'q',0,                          A_QUIT,
        ':','q',0,                      A_QUIT,
        'q',0,                          A_QUIT,
        ':','q',0,                      A_QUIT,

-       'Z','Z',0,                      A_QUIT
+       ':','t',0,                      A_TAGFILE,
+       'Z','Z',0,                      A_QUIT,

 };
 
 char *cmdendtable = cmdtable + sizeof(cmdtable);
 
 };
 
 char *cmdendtable = cmdtable + sizeof(cmdtable);
 

-static char usertable[MAX_USERCMD];
-char *userendtable = usertable;
+#define        MAX_CMDLEN      16

 
 static char kbuf[MAX_CMDLEN+1];
 static char *kp = kbuf;
 
 
 static char kbuf[MAX_CMDLEN+1];
 static char *kp = kbuf;
 

+/*
+ * Indicate that we're not in a prefix command
+ * by resetting the command buffer pointer.
+ */
+noprefix()
+{
+       kp = kbuf;
+}
+

 /*
  * Decode a command character and return the associated action.
  */
 /*
  * Decode a command character and return the associated action.
  */

-       public int

 cmd_decode(c)
        int c;
 {
 cmd_decode(c)
        int c;
 {


@@ -147,51 +131,26 @@ cmd_decode(c)
        *kp++ = c;
        *kp = '\0';
 
        *kp++ = c;
        *kp = '\0';
 

-       /*
-        * Look first for any user-defined commands.
-        */
-       action = cmd_search(usertable, userendtable);
-       /*
-        * If didn't find user-defined command,
-        * try the normal default commands.
-        */
-       if (action == A_INVALID)
-               action = cmd_search(cmdtable, cmdendtable);
+       action = cmd_search(cmdtable, cmdendtable);

 
 

+       /* This is not a prefix character. */

        if (action != A_PREFIX)
        if (action != A_PREFIX)

-               /*
-                * This is not a prefix character.
-                */

                noprefix();
                noprefix();

-
-       return (action);
-}
-
-/*
- * Indicate that we're not in a prefix command
- * by resetting the command buffer pointer.
- */
-       public void
-noprefix()
-{
-       kp = kbuf;
+       return(action);

 }
 
 /*
  * Search a command table for the current command string (in kbuf).
  */
 }
 
 /*
  * Search a command table for the current command string (in kbuf).
  */

-       static int
+static

 cmd_search(table, endtable)
        char *table;
        char *endtable;
 {
 cmd_search(table, endtable)
        char *table;
        char *endtable;
 {

-       register char *p;
-       register char *q;
+       register char *p, *q;

 
 

-       for (p = table, q = kbuf;  p < endtable;  p++, q++)
-       {
-               if (*p == *q)
-               {
+       for (p = table, q = kbuf;  p < endtable;  p++, q++) {
+               if (*p == *q) {

                        /*
                         * Current characters match.
                         * If we're at the end of the string, we've found it.
                        /*
                         * Current characters match.
                         * If we're at the end of the string, we've found it.


@@ -200,82 +159,28 @@ cmd_search(table, endtable)
                         * in the command table.
                         */
                        if (*p == '\0')
                         * in the command table.
                         */
                        if (*p == '\0')

-                               return (p[1]);
-               } else if (*q == '\0')
-               {
+                               return(p[1]);
+               }
+               else if (*q == '\0') {

                        /*
                         * Hit the end of the user's command,
                         * but not the end of the string in the command table.
                         * The user's command is incomplete.
                         */
                        /*
                         * Hit the end of the user's command,
                         * but not the end of the string in the command table.
                         * The user's command is incomplete.
                         */

-                       return (A_PREFIX);
-               } else
-               {
+                       return(A_PREFIX);
+               } else {

                        /*
                         * Not a match.
                         * Skip ahead to the next command in the
                         * command table, and reset the pointer
                         * to the user's command.
                         */
                        /*
                         * Not a match.
                         * Skip ahead to the next command in the
                         * command table, and reset the pointer
                         * to the user's command.
                         */

-                       while (*p++ != '\0') ;
+                       while (*p++ != '\0');

                        q = kbuf-1;
                }
        }
        /*
         * No match found in the entire command table.
         */
                        q = kbuf-1;
                }
        }
        /*
         * No match found in the entire command table.
         */

-       return (A_INVALID);
-}
-
-/*
- * Initialize the user command table.
- */
-       public void
-init_cmd()
-{
-       char *homedir;
-       int f;
-       int n;
-       char filename[MAXPATHLEN];
-       extern char *getenv();
-
-       /*
-        * Try to open "$HOME/.less"
-        * If we can't, return without doing anything.
-        */
-       homedir = getenv("HOME");
-       if (homedir == NULL)
-               return;
-       (void)sprintf(filename, "%s/%s", homedir, ".less");
-       f = open(filename, O_RDONLY);
-       if (f < 0)
-               return;
-
-       /*
-        * Read the file into the user table.
-        * {{ Minimal error checking is done here.
-        *    A garbage .less file will produce strange results.
-        *    To avoid a large amount of error checking code here, we
-        *    rely on the lesskey program to generate a good .less file. }}
-        */
-       n = read(f, (char *)usertable, MAX_USERCMD);
-       if (n < 3 || usertable[n-2] != '\0')
-       {
-               /*
-                * Several error cases are lumped together here:
-                * - Cannot read user file (n < 0).
-                * - User file is too short (a valid file must
-                *   have at least 3 chars: one char command string,
-                *   the terminating null byte, and the action byte).
-                * - The final entry in the user file is bad (it
-                *   doesn't have a null byte in the proper place).
-                * Many other error cases are not caught, such as
-                * invalid format in any except the last entry,
-                * invalid action codes, command strings too long, etc.
-                */
-               error("invalid user key file");
-               n = 0;
-       }
-       userendtable = usertable + n;
-       close(f);
+       return(A_INVALID);

 }
 }