BSD 4_3_Reno release

[unix-history] / usr / src / lib / libc / gen / psignal.c

diff --git a/usr/src/lib/libc/gen/psignal.c b/usr/src/lib/libc/gen/psignal.c
index 9929948..589adbf 100644 (file)
--- a/usr/src/lib/libc/gen/psignal.c
+++ b/usr/src/lib/libc/gen/psignal.c
@@ -1,12 +1,25 @@
 /*
 /*

- * 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) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. Neither the name of the University nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)psignal.c  5.2 (Berkeley) 3/9/86";
-#endif LIBC_SCCS and not lint
+static char sccsid[] = "@(#)psignal.c  5.4 (Berkeley) 6/1/90";
+#endif /* LIBC_SCCS and not lint */

 
 /*
  * Print the name of the signal indicated
 
 /*
  * Print the name of the signal indicated


@@ -17,20 +30,21 @@ static char sccsid[] = "@(#)psignal.c       5.2 (Berkeley) 3/9/86";
 extern char *sys_siglist[];
 
 psignal(sig, s)
 extern char *sys_siglist[];
 
 psignal(sig, s)

-       unsigned sig;
+       unsigned int sig;

        char *s;
 {
        register char *c;
        char *s;
 {
        register char *c;

-       register n;
+       register int n;

 
 

-       c = "Unknown signal";

        if (sig < NSIG)
                c = sys_siglist[sig];
        if (sig < NSIG)
                c = sys_siglist[sig];

+       else
+               c = "Unknown signal";

        n = strlen(s);
        if (n) {
        n = strlen(s);
        if (n) {

-               write(2, s, n);
-               write(2, ": ", 2);
+               (void)write(2, s, n);
+               (void)write(2, ": ", 2);

        }
        }

-       write(2, c, strlen(c));
-       write(2, "\n", 1);
+       (void)write(2, c, strlen(c));
+       (void)write(2, "\n", 1);

 }
 }