OS-2727 psignal and psiginfo don't handle NULL arguments correctly

OS-2728 psignal(3C) header file could be <signal.h>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

3 files changed, 29 insertions, 27 deletions

diff --git a/usr/src/lib/libc/port/gen/psiginfo.c b/usr/src/lib/libc/port/gen/psiginfo.c
index 1675db36ee..6775fef969 100644
--- a/usr/src/lib/libc/port/gen/psiginfo.c
+++ b/usr/src/lib/libc/port/gen/psiginfo.c
@@ -27,8 +27,6 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Print the name of the siginfo indicated by "sig", along with the
  * supplied message
@@ -50,16 +48,23 @@ psiginfo(siginfo_t *sip, char *s)
 {
 	char buf[256];
 	char *c;
+	size_t l = 0;
 	const struct siginfolist *listp;
 
-	if (sip == 0)
+	if (sip == NULL)
 		return;
 
+	if (s != NULL && *s != '\0') {
+		l = snprintf(buf, sizeof (buf), _libc_gettext("%s : "), s);
+		if (l > sizeof (buf))
+			l = sizeof (buf);
+	}
+
 
 	if (sip->si_code <= 0) {
-		(void) snprintf(buf, sizeof (buf),
-		    _libc_gettext("%s : %s ( from process  %d )\n"),
-		    s, strsignal(sip->si_signo), sip->si_pid);
+		(void) snprintf(buf + l, sizeof (buf) - l,
+		    _libc_gettext("%s ( from process  %d )\n"),
+		    strsignal(sip->si_signo), sip->si_pid);
 	} else if (((listp = &_sys_siginfolist[sip->si_signo-1]) != NULL) &&
 	    sip->si_code <= listp->nsiginfo) {
 		c = _libc_gettext(listp->vsiginfo[sip->si_code-1]);
@@ -68,21 +73,20 @@ psiginfo(siginfo_t *sip, char *s)
 		case SIGBUS:
 		case SIGILL:
 		case SIGFPE:
-			(void) snprintf(buf, sizeof (buf),
-			    _libc_gettext("%s : %s ( [%p] %s)\n"),
-			    s, strsignal(sip->si_signo),
+			(void) snprintf(buf + l, sizeof (buf) - l,
+			    _libc_gettext("%s ( [%p] %s)\n"),
+			    strsignal(sip->si_signo),
 			    sip->si_addr, c);
 			break;
 		default:
-			(void) snprintf(buf, sizeof (buf),
-			    _libc_gettext("%s : %s (%s)\n"),
-			    s, strsignal(sip->si_signo), c);
+			(void) snprintf(buf + l, sizeof (buf) - l,
+			    _libc_gettext("%s (%s)\n"),
+			    strsignal(sip->si_signo), c);
 			break;
 		}
 	} else {
-		(void) snprintf(buf, sizeof (buf),
-		    _libc_gettext("%s : %s\n"),
-		    s, strsignal(sip->si_signo));
+		(void) snprintf(buf + l, sizeof (buf) - l,
+		    _libc_gettext("%s\n"), strsignal(sip->si_signo));
 	}
 	(void) write(2, buf, strlen(buf));
 }
diff --git a/usr/src/lib/libc/port/gen/psignal.c b/usr/src/lib/libc/port/gen/psignal.c
index 201beaacd7..2a61cd9610 100644
--- a/usr/src/lib/libc/port/gen/psignal.c
+++ b/usr/src/lib/libc/port/gen/psignal.c
@@ -37,8 +37,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Print the name of the signal indicated by "sig", along with the
  * supplied message
@@ -61,14 +59,15 @@ void
 psignal(int sig, const char *s)
 {
 	char *c;
-	size_t n;
+	size_t n = 0;
 	char buf[256];
 
 	if (sig < 0 || sig >= NSIG)
 		sig = 0;
 	c = strsignal(sig);
-	n = strlen(s);
-	if (n) {
+	if (s != NULL)
+		n = strlen(s);
+	if (n != 0) {
 		(void) snprintf(buf, sizeof (buf), "%s: %s\n", s, c);
 	} else {
 		(void) snprintf(buf, sizeof (buf), "%s\n", c);
diff --git a/usr/src/man/man3c/psignal.3c b/usr/src/man/man3c/psignal.3c
index 213c45f07f..81252ee0dd 100644
--- a/usr/src/man/man3c/psignal.3c
+++ b/usr/src/man/man3c/psignal.3c
@@ -1,15 +1,16 @@
 '\" te
 .\" Copyright 1989 AT&T.  Copyright (c) 2005, Sun Microsystems, Inc.  All Rights Reserved.
+.\" Copyright (c) 2014, Joyent, Inc.  All rights reserved.
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PSIGNAL 3C "Mar 31, 2005"
+.TH PSIGNAL 3C "Aug 14, 2014"
 .SH NAME
 psignal, psiginfo \- system signal messages
 .SH SYNOPSIS
 .LP
 .nf
-#include <siginfo.h>
+#include <signal.h>
 
 \fBvoid\fR \fBpsignal\fR(\fBint\fR \fIsig\fR, \fBconst char *\fR\fIs\fR);
 .fi
@@ -20,7 +21,6 @@ psignal, psiginfo \- system signal messages
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpsignal()\fR and \fBpsiginfo()\fR functions produce messages on the
 standard error output describing a signal.  The \fIsig\fR argument is a signal
@@ -28,14 +28,14 @@ that may have been  passed as the first argument to a signal handler.  The
 \fIpinfo\fR argument is a pointer to a \fBsiginfo\fR structure that may have
 been passed as the second argument to an enhanced signal handler.  See
 \fBsigaction\fR(2). The argument string \fIs\fR is printed first, followed by a
-colon and a blank, followed by the message and a \fBNEWLINE\fR character.
+colon and a blank, followed by the message and a \fBNEWLINE\fR character. If
+\fBs\fR is the value \fBNULL\fR or an empty string, then nothing is printed for
+the user's string and the colon and blank are omitted.
 .SH USAGE
-.sp
 .LP
 Messages printed from these functions are in the native language specified by
 the \fBLC_MESSAGES\fR locale category.  See \fBsetlocale\fR(3C).
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -51,7 +51,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsigaction\fR(2), \fBgettext\fR(3C), \fBperror\fR(3C), \fBsetlocale\fR(3C),
 \fBsiginfo.h\fR(3HEAD), \fBsignal.h\fR(3HEAD), \fBattributes\fR(5)