rip out TAGS option, make default

SCCS-vsn: usr.bin/more/main.c 5.4
SCCS-vsn: usr.bin/more/option.c 5.2
SCCS-vsn: usr.bin/more/tags.c 5.2

diff --git a/usr/src/usr.bin/more/main.c b/usr/src/usr.bin/more/main.c
index edeb09b..29105e7 100644 (file)
--- a/usr/src/usr.bin/more/main.c
+++ b/usr/src/usr.bin/more/main.c
@@ -27,7 +27,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

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

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


@@ -65,11 +65,9 @@ public char *        namelogfile = NULL;
 
 public char *  editor;
 
 
 public char *  editor;
 

-#if TAGS

 extern char *  tagfile;
 extern char *  tagpattern;
 extern int     tagoption;
 extern char *  tagfile;
 extern char *  tagpattern;
 extern int     tagoption;

-#endif

 
 /*
  * Edit a new file.
 
 /*
  * Edit a new file.


@@ -378,7 +376,6 @@ main(argc, argv)
        /*
         * Select the first file to examine.
         */
        /*
         * Select the first file to examine.
         */

-#if TAGS

        if (tagoption)
        {
                /*
        if (tagoption)
        {
                /*


@@ -400,7 +397,6 @@ main(argc, argv)
                if (tagsearch())
                        quit();
        } else
                if (tagsearch())
                        quit();
        } else

-#endif

        if (ac < 1)
                edit("-");      /* Standard input */
        else 
        if (ac < 1)
                edit("-");      /* Standard input */
        else 

diff --git a/usr/src/usr.bin/more/option.c b/usr/src/usr.bin/more/option.c
index 0f48787..1136ab8 100644 (file)
--- a/usr/src/usr.bin/more/option.c
+++ b/usr/src/usr.bin/more/option.c
@@ -20,7 +20,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)option.c   5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)option.c   5.2 (Berkeley) %G%";

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


@@ -80,11 +80,9 @@ extern char *namelogfile;
 extern int force_logfile;
 extern int logfile;
 #endif
 extern int force_logfile;
 extern int logfile;
 #endif

-#if TAGS

 extern char *tagfile;
 extern char *tagpattern;
 public int tagoption = 0;
 extern char *tagfile;
 extern char *tagpattern;
 public int tagoption = 0;

-#endif

 
 static char *opt_P();
 
 
 static char *opt_P();
 


@@ -238,7 +236,6 @@ toggle_option(s, do_toggle)
                else
                        (void) opt_P(s);
                return;
                else
                        (void) opt_P(s);
                return;

-#if TAGS

        case 't':
                /*
                 * Special case for -t.
        case 't':
                /*
                 * Special case for -t.


@@ -255,7 +252,6 @@ toggle_option(s, do_toggle)
                        (void) tagsearch();
                }
                return;
                        (void) tagsearch();
                }
                return;

-#endif

 #if LOGFILE
        case 'L':
                /*
 #if LOGFILE
        case 'L':
                /*


@@ -391,10 +387,8 @@ single_char_option(c)
 
        if (c == 'P')
                return (0);
 
        if (c == 'P')
                return (0);

-#if TAGS

        if (c == 't')
                return (0);
        if (c == 't')
                return (0);

-#endif

 #if LOGFILE
        if (c == 'l' || c == 'L')
                return (0);
 #if LOGFILE
        if (c == 'l' || c == 'L')
                return (0);


@@ -479,7 +473,6 @@ scan_option(s)
                s = optstring(s, c);
                goto next;
 #endif
                s = optstring(s, c);
                goto next;
 #endif

-#if TAGS

        case 't':
        {
                char *p;
        case 't':
        {
                char *p;


@@ -489,7 +482,6 @@ scan_option(s)
                findtag(p);
                goto next;
        }
                findtag(p);
                goto next;
        }

-#endif

        case 'P':
                s = opt_P(s);
                goto next;
        case 'P':
                s = opt_P(s);
                goto next;

diff --git a/usr/src/usr.bin/more/tags.c b/usr/src/usr.bin/more/tags.c
index 4992981..d7d92a0 100644 (file)
--- a/usr/src/usr.bin/more/tags.c
+++ b/usr/src/usr.bin/more/tags.c
@@ -20,7 +20,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)tags.c     5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)tags.c     5.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -28,8 +28,6 @@ static char sccsid[] = "@(#)tags.c    5.1 (Berkeley) %G%";
 
 #define        WHITESP(c)      ((c)==' ' || (c)=='\t')
 
 
 #define        WHITESP(c)      ((c)==' ' || (c)=='\t')
 

-#if TAGS
-

 public char *tagfile;
 public char *tagpattern;
 
 public char *tagfile;
 public char *tagpattern;
 


@@ -193,5 +191,3 @@ tagsearch()
        jump_loc(linepos);
        return (0);
 }
        jump_loc(linepos);
        return (0);
 }

-
-#endif