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 99a1e60..589adbf 100644 (file)
--- a/usr/src/lib/libc/gen/psignal.c
+++ b/usr/src/lib/libc/gen/psignal.c
@@ -2,19 +2,30 @@
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)psignal.c  5.4 (Berkeley) 6/1/90";

 #endif /* LIBC_SCCS and not lint */
 
 /*
  * Print the name of the signal indicated
  * along with the supplied message.
  */
 #endif /* LIBC_SCCS and not lint */
 
 /*
  * Print the name of the signal indicated
  * along with the supplied message.
  */

-#include <sys/signal.h>
-#include <unistd.h>
+#include <signal.h>

 
 extern char *sys_siglist[];
 
 
 extern char *sys_siglist[];
 


@@ -31,9 +42,9 @@ psignal(sig, s)
                c = "Unknown signal";
        n = strlen(s);
        if (n) {
                c = "Unknown signal";
        n = strlen(s);
        if (n) {

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

        }
        }

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

 }
 }