BSD 4_4 release

[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 abcfff2..98d6a83 100644 (file)
--- a/usr/src/usr.bin/ex/ex.h
+++ b/usr/src/usr.bin/ex/ex.h
@@ -1,9 +1,12 @@
-/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * 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.h        7.10 (Berkeley) %G%
+ *     @(#)ex.h        8.1 (Berkeley) 6/9/93

  */
 
 #ifdef V6
  */
 
 #ifdef V6


@@ -158,7 +161,9 @@ extern       struct option options[NOPTS + 1];
 #      define  BUFSIZ  512
 #  endif
 # endif
 #      define  BUFSIZ  512
 #  endif
 # endif

+# ifndef NULL

 #      define  NULL    0
 #      define  NULL    0

+# endif

 #      define  EOF     -1
 #endif
 
 #      define  EOF     -1
 #endif
 


@@ -332,6 +337,21 @@ 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


@@ -342,7 +362,7 @@ var line    *undadot;       /* If we saved all lines, dot reverts here */
 extern int     (*Outchar)();
 extern int     (*Pline)();
 extern int     (*Put_char)();
 extern int     (*Outchar)();
 extern int     (*Pline)();
 extern int     (*Put_char)();

-var    void    (*oldhup)();
+sig_t  oldhup;

 int    (*setlist())();
 int    (*setnorm())();
 int    (*setnorm())();
 int    (*setlist())();
 int    (*setnorm())();
 int    (*setnorm())();


@@ -391,15 +411,15 @@ int       normchar();
 int    normline();
 int    numbline();
 var    void (*oldquit)();
 int    normline();
 int    numbline();
 var    void (*oldquit)();

-int    onhup();
-int    onintr();
-int    onsusp();
+void   onhup();
+void   onintr();
+void   onsusp();

 int    putch();
 int    shift();
 int    termchar();
 int    vfilter();
 #ifdef CBREAK
 int    putch();
 int    shift();
 int    termchar();
 int    vfilter();
 #ifdef CBREAK

-int    vintr();
+void   vintr();

 #endif
 int    vputch();
 int    vshftop();
 #endif
 int    vputch();
 int    vshftop();