BSD 4_4 release

[unix-history] / usr / src / usr.bin / ex / ex_argv.h

diff --git a/usr/src/usr.bin/ex/ex_argv.h b/usr/src/usr.bin/ex/ex_argv.h
index 963eda2..4a172e0 100644 (file)
--- a/usr/src/usr.bin/ex/ex_argv.h
+++ b/usr/src/usr.bin/ex/ex_argv.h
@@ -1,5 +1,14 @@
-/* Copyright (c) 1980 Regents of the University of California */
-/* sccs id:    @(#)ex_argv.h   6.1 %G%  */
+/*-
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This module is believed to contain source code proprietary to AT&T.
+ * Use and redistribution is subject to the Berkeley Software License
+ * Agreement and your Software Agreement with AT&T (Western Electric).
+ *
+ *     @(#)ex_argv.h   8.1 (Berkeley) 6/9/93
+ */
+

 /*
  * The current implementation of the argument list is poor,
  * using an argv even for internally done "next" commands.
 /*
  * The current implementation of the argument list is poor,
  * using an argv even for internally done "next" commands.


@@ -7,16 +16,16 @@
  * space.  The statically allocated glob structure could be replaced
  * by a dynamically allocated argument area space.
  */
  * space.  The statically allocated glob structure could be replaced
  * by a dynamically allocated argument area space.
  */

-char   **argv;
-char   **argv0;
-char   *args;
-char   *args0;
-short  argc;
-short  argc0;
-short  morargc;                /* Used with "More files to edit..." */
+var char       **argv;
+var char       **argv0;
+var char       *args;
+var char       *args0;
+var short      argc;
+var short      argc0;
+var short      morargc;                /* Used with "More files to edit..." */

 
 

-int    firstln;                /* From +lineno */
-char   *firstpat;              /* From +/pat   */
+var int        firstln;                /* From +lineno */
+var char       *firstpat;              /* From +/pat   */

 
 /* Yech... */
 struct glob {
 
 /* Yech... */
 struct glob {


@@ -24,4 +33,5 @@ struct        glob {
        short   argc0;                  /* Number of arguments in argv */
        char    *argv[NARGS + 1];       /* WHAT A WASTE! */
        char    argspac[NCARGS + sizeof (int)];
        short   argc0;                  /* Number of arguments in argv */
        char    *argv[NARGS + 1];       /* WHAT A WASTE! */
        char    argspac[NCARGS + sizeof (int)];

-} frob;
+};
+var struct     glob frob;