add offsets, new fields

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

diff --git a/usr/src/usr.bin/ex/ex.h b/usr/src/usr.bin/ex/ex.h
index 2e7f25d..63de93b 100644 (file)
--- a/usr/src/usr.bin/ex/ex.h
+++ b/usr/src/usr.bin/ex/ex.h
@@ -1,5 +1,11 @@
-/* Copyright (c) 1981 Regents of the University of California */
-/* sccs id:    @(#)ex.h        7.3     %G%  */
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)ex.h        7.7.1.1 (Berkeley) %G%
+ */
+

 #ifdef V6
 #include <retrofit.h>
 #endif
 #ifdef V6
 #include <retrofit.h>
 #endif


@@ -41,7 +47,7 @@
  * of additional terminal descriptions you add to the termcap data base.
  */
 
  * of additional terminal descriptions you add to the termcap data base.
  */
 

-#include <sys/types.h>
+#include <sys/param.h>

 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>


@@ -130,7 +136,11 @@ extern      struct option options[NOPTS + 1];
 # ifdef        VMUNIX
 #      define  BUFSIZ  1024
 # else
 # ifdef        VMUNIX
 #      define  BUFSIZ  1024
 # else

+#  ifdef u370
+#      define  BUFSIZ  4096
+#  else

 #      define  BUFSIZ  512
 #      define  BUFSIZ  512

+#  endif

 # endif
 #      define  NULL    0
 #      define  EOF     -1
 # endif
 #      define  NULL    0
 #      define  EOF     -1


@@ -146,6 +156,7 @@ extern       struct option options[NOPTS + 1];
  */
 #define        QUOTE   0200
 #define        TRIM    0177
  */
 #define        QUOTE   0200
 #define        TRIM    0177

+#undef CTRL

 #define        CTRL(c) ('c' & 037)
 #define        NL      CTRL(j)
 #define        CR      CTRL(m)
 #define        CTRL(c) ('c' & 037)
 #define        NL      CTRL(j)
 #define        CR      CTRL(m)


@@ -172,7 +183,7 @@ var short   erfile;         /* Error message file unit */
 #endif
 var    line    *fendcore;      /* First address in line pointer space */
 var    char    file[FNSIZE];   /* Working file name */
 #endif
 var    line    *fendcore;      /* First address in line pointer space */
 var    char    file[FNSIZE];   /* Working file name */

-var    char    genbuf[LBSIZE]; /* Working buffer when manipulating linebuf */
+var    char    genbuf[MAXBSIZE]; /* Working buffer when manipulating linebuf */

 var    bool    hush;           /* Command line option - was given, hush up! */
 var    char    *globp;         /* (Untyped) input string to command mode */
 var    bool    holdcm;         /* Don't cursor address */
 var    bool    hush;           /* Command line option - was given, hush up! */
 var    char    *globp;         /* (Untyped) input string to command mode */
 var    bool    holdcm;         /* Don't cursor address */


@@ -216,6 +227,7 @@ var bool    vcatch;         /* Want to catch an error (open/visual) */
 var    jmp_buf vreslab;        /* For error throws to a visual catch */
 var    bool    writing;        /* 1 if in middle of a file write */
 var    int     xchng;          /* Suppresses multiple "No writes" in !cmd */
 var    jmp_buf vreslab;        /* For error throws to a visual catch */
 var    bool    writing;        /* 1 if in middle of a file write */
 var    int     xchng;          /* Suppresses multiple "No writes" in !cmd */

+var    long    bsize;          /* Block size for disk i/o */

 
 /*
  * Macros
 
 /*
  * Macros


@@ -302,21 +314,6 @@ var        line    *undadot;       /* If we saved all lines, dot reverts here */
 #define        UNDNONE         3
 #define        UNDPUT          4
 
 #define        UNDNONE         3
 #define        UNDPUT          4
 

-#ifdef CRYPT
-/*
- * Various miscellaneous flags and buffers needed by the encryption routines.
- */
-#define        KSIZE   9       /* key size for encryption */
-#define        KEYPROMPT       "Key: "
-var    int     xflag;          /* True if we are in encryption mode */
-var    int     xtflag;         /* True if the temp file is being encrypted */
-var    int     kflag;          /* True if the key has been accepted */
-var    char    perm[768];
-var    char    tperm[768];
-var    char    *key;
-var    char    crbuf[CRSIZE];
-char   *getpass();
-#endif

 
 /*
  * Function type definitions
 
 /*
  * Function type definitions