new signals

SCCS-vsn: usr.bin/sccs/sccs.c 5.8
SCCS-vsn: old/tc/tc.c 4.4
SCCS-vsn: usr.bin/tcopy/tcopy.c 5.13
SCCS-vsn: games/sail/sync.c 5.5

diff --git a/usr/src/games/sail/sync.c b/usr/src/games/sail/sync.c
index 9a65bf4..62cdc84 100644 (file)
--- a/usr/src/games/sail/sync.c
+++ b/usr/src/games/sail/sync.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include "externs.h"
 #endif /* not lint */
 
 #include "externs.h"


@@ -121,7 +121,7 @@ Write(type, ship, isstr, a, b, c, d)
 
 Sync()
 {
 
 Sync()
 {

-       int (*sighup)(), (*sigint)();
+       sig_t sighup, sigint;

        register n;
        int type, shipnum, isstr, a, b, c, d;
        char buf[80];
        register n;
        int type, shipnum, isstr, a, b, c, d;
        char buf[80];

diff --git a/usr/src/old/tc/tc.c b/usr/src/old/tc/tc.c
index 17e625d..f7fee3a 100644 (file)
--- a/usr/src/old/tc/tc.c
+++ b/usr/src/old/tc/tc.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)tc.c        4.3 (Berkeley) %G%";
+static char *sccsid = "@(#)tc.c        4.4 (Berkeley) %G%";

 /*
  * Simulate typesetter on 4014
 */
 /*
  * Simulate typesetter on 4014
 */


@@ -53,8 +53,7 @@ int alpha;
 extern char *asctab[128];
 extern char *spectab[128];
 int erase = 1;
 extern char *asctab[128];
 extern char *spectab[128];
 int erase = 1;

-int    (*sigint)();
-int    (*sigquit)();
+sig_t sigint, sigquit;

 
 main(argc,argv)
 int argc;
 
 main(argc,argv)
 int argc;


@@ -62,7 +61,7 @@ char **argv;
 {
        register i, j;
        register char *k;
 {
        register i, j;
        register char *k;

-       extern ex();
+       extern void ex();

 
        while((--argc > 0) && ((++argv)[0][0]=='-')){
                switch(argv[0][1]){
 
        while((--argc > 0) && ((++argv)[0][0]=='-')){
                switch(argv[0][1]){


@@ -262,6 +261,8 @@ init(){
        skip = 0;
        sendpt();
 }
        skip = 0;
        sendpt();
 }

+
+void

 ex(){
        yy = MAXY;
        xx = 0;
 ex(){
        yy = MAXY;
        xx = 0;

diff --git a/usr/src/usr.bin/sccs/sccs.c b/usr/src/usr.bin/sccs/sccs.c
index 17cbed4..aea0fb6 100644 (file)
--- a/usr/src/usr.bin/sccs/sccs.c
+++ b/usr/src/usr.bin/sccs/sccs.c
@@ -22,7 +22,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)sccs.c     5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)sccs.c     5.8 (Berkeley) %G%";

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


@@ -1302,7 +1302,7 @@ dodiff(getv, gfile)
        register int pid;
        auto int st;
        extern int errno;
        register int pid;
        auto int st;
        extern int errno;

-       int (*osig)();
+       sig_t osig;

        register char *p;
        register char **ap;
        bool makescript = FALSE;
        register char *p;
        register char **ap;
        bool makescript = FALSE;

diff --git a/usr/src/usr.bin/tcopy/tcopy.c b/usr/src/usr.bin/tcopy/tcopy.c
index f94e877..4b4d091 100644 (file)
--- a/usr/src/usr.bin/tcopy/tcopy.c
+++ b/usr/src/usr.bin/tcopy/tcopy.c
@@ -22,7 +22,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)tcopy.c    5.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)tcopy.c    5.13 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -48,8 +48,10 @@ main(argc, argv)
        extern int optind, errno;
        register int lastnread, nread, nw, inp, outp;
        enum {READ, VERIFY, COPY, COPYVERIFY} op = READ;
        extern int optind, errno;
        register int lastnread, nread, nw, inp, outp;
        enum {READ, VERIFY, COPY, COPYVERIFY} op = READ;

-       int ch, needeof, intr(), (*oldsig)();
+       sig_t oldsig;
+       int ch, needeof;

        char *buff, *inf, *getspace();
        char *buff, *inf, *getspace();

+       void intr();

 
        guesslen = 1;
        while ((ch = getopt(argc, argv, "cs:v")) != EOF)
 
        guesslen = 1;
        while ((ch = getopt(argc, argv, "cs:v")) != EOF)


@@ -248,6 +250,7 @@ r2:         if (inn != outn) {
        exit(1);
 }
 
        exit(1);
 }
 

+void

 intr()
 {
        if (record)
 intr()
 {
        if (record)