rip out EDITOR and EDIT_PGM defines

SCCS-vsn: usr.bin/more/command.c 5.3
SCCS-vsn: usr.bin/more/main.c 5.3

diff --git a/usr/src/usr.bin/more/command.c b/usr/src/usr.bin/more/command.c
index 7655a81..b82859d 100644 (file)
--- a/usr/src/usr.bin/more/command.c
+++ b/usr/src/usr.bin/more/command.c
@@ -20,7 +20,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

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


@@ -51,9 +51,7 @@ extern char *first_cmd;
 extern char *every_first_cmd;
 extern char version[];
 extern char *current_file;
 extern char *every_first_cmd;
 extern char version[];
 extern char *current_file;

-#if EDITOR

 extern char *editor;
 extern char *editor;

-#endif

 extern int screen_trashed;     /* The screen has been overwritten */
 
 static char cmdbuf[120];       /* Buffer for holding a multi-char command */
 extern int screen_trashed;     /* The screen has been overwritten */
 
 static char cmdbuf[120];       /* Buffer for holding a multi-char command */


@@ -684,7 +682,6 @@ commands()
                        /*
                         * Invoke an editor on the input file.
                         */
                        /*
                         * Invoke an editor on the input file.
                         */

-#if EDITOR

                        if (ispipe)
                        {
                                error("Cannot edit standard input");
                        if (ispipe)
                        {
                                error("Cannot edit standard input");


@@ -705,10 +702,6 @@ commands()
                        ch_init(0, 0);
                        clr_linenum();
                        break;
                        ch_init(0, 0);
                        clr_linenum();
                        break;

-#else
-                       error("Command not available");
-                       break;
-#endif

 
                case A_NEXT_FILE:
                        /*
 
                case A_NEXT_FILE:
                        /*

diff --git a/usr/src/usr.bin/more/main.c b/usr/src/usr.bin/more/main.c
index 9cb4a3d..edeb09b 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.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.3 (Berkeley) %G%";

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


@@ -63,9 +63,7 @@ public int    force_logfile = 0;
 public char *  namelogfile = NULL;
 #endif
 
 public char *  namelogfile = NULL;
 #endif
 

-#if EDITOR

 public char *  editor;
 public char *  editor;

-#endif

 
 #if TAGS
 extern char *  tagfile;
 
 #if TAGS
 extern char *  tagfile;


@@ -73,7 +71,6 @@ extern char * tagpattern;
 extern int     tagoption;
 #endif
 
 extern int     tagoption;
 #endif
 

-

 /*
  * Edit a new file.
  * Filename "-" means standard input.
 /*
  * Edit a new file.
  * Filename "-" means standard input.


@@ -333,11 +330,9 @@ main(argc, argv)
                argv[0][1] != '\0')
                scan_option(*argv++);
 
                argv[0][1] != '\0')
                scan_option(*argv++);
 

-#if EDITOR

        editor = getenv("EDITOR");
        if (editor == NULL || *editor == '\0')
                editor = EDIT_PGM;
        editor = getenv("EDITOR");
        if (editor == NULL || *editor == '\0')
                editor = EDIT_PGM;

-#endif

 
        /*
         * Set up list of files to be examined.
 
        /*
         * Set up list of files to be examined.