 @@ -1,14 +1,14 @@
-/*	$NetBSD: wall.c,v 1.29 2011/09/06 18:45:21 joerg Exp $	*/
+/*	$NetBSD: wall.c,v 1.30 2015/11/21 14:59:51 christos Exp $	*/
 /*
  * Copyright (c) 1988, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)wall.c	8.2 (Berkeley) 11/16/93";
 #endif
-__RCSID("$NetBSD: wall.c,v 1.29 2011/09/06 18:45:21 joerg Exp $");
+__RCSID("$NetBSD: wall.c,v 1.30 2015/11/21 14:59:51 christos Exp $");
 #endif /* not lint */
 /*
  * This program is not related to David Wall, whose Stanford Ph.D. thesis
  * is entitled "Mechanisms for Broadcast and Selective Broadcast".
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <ctype.h>
 @@ -58,83 +58,80 @@ __RCSID("$NetBSD: wall.c,v 1.29 2011/09/
 #include <errno.h>
 #include <paths.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 #include "utmpentry.h"
 #include "term_chk.h"
 static void	addgroup(char *);
-static void	makemsg(const char *);
+static void	makemsg(struct iovec *, const char *, int);
 __dead static void	usage(void);
 static struct wallgroup {
 	gid_t	gid;
 	char	*name;
 	char	**mem;
 	struct wallgroup *next;
 } *grouplist;
 static int nobanner;
 static size_t mbufsize;
 static char *mbuf;
 /* ARGSUSED */
 int
 main(int argc, char **argv)
+{
 	int ch;
 	struct iovec iov;
 	char *p, **mem;
 	struct utmpentry *ep;
 	gid_t egid;
 	struct wallgroup *wg;
 	struct passwd *pw;
 	int nobanner;
 	setprogname(argv[0]);
 	egid = getegid();
 	if (setegid(getgid()) == -1)
-		err(1, "setegid");
+		err(EXIT_FAILURE, "setegid");
 	pw = getpwnam("nobody");
 	if (pw == NULL)
 		errx(EXIT_FAILURE, "Can't find passwd entry for `nobody'");
 	(void)check_sender(NULL, getuid(), egid);
 	nobanner = 0;
 	while ((ch = getopt(argc, argv, "g:n")) != -1)
 		switch (ch) {
 		case 'n':
 			/* undoc option for shutdown: suppress banner */
 			if (geteuid() == 0 || (pw && getuid() == pw->pw_uid))
 				nobanner = 1;
 			break;
 		case 'g':
 			addgroup(optarg);
 			break;
 		case '?':
 		default:
 			usage();
+		}
 	argc -= optind;
 	argv += optind;
 	if (argc > 1)
 		usage();
-	makemsg(*argv);
+	makemsg(&iov, *argv, nobanner);
 	iov.iov_base = mbuf;
 	iov.iov_len = mbufsize;
 	(void)getutentries(NULL, &ep);
 	(void)setegid(egid);
 	for (; ep; ep = ep->next) {
 		if (grouplist) {
 			int ingroup;
 			ingroup = 0;
 			pw = getpwnam(ep->name);
 			if (!pw)
 				continue;
 			for (wg = grouplist; wg && !ingroup; wg = wg->next) {
 				if (wg->gid == pw->pw_gid)
 					ingroup = 1;
 @@ -143,133 +140,144 @@ main(int argc, char **argv)
 						ingroup = 1;
+			}
 			if (ingroup == 0)
 				continue;
+		}
 		/* skip [xgk]dm/xserver entries (":0", ":1", etc.) */
 		if (ep->line[0] == ':' && isdigit((unsigned char)ep->line[1]))
 			continue;
 		if ((p = ttymsg(&iov, 1, ep->line, 60*5)) != NULL)
 			warnx("%s", p);
+	}
-	exit(0);
+	return EXIT_SUCCESS;
+}
 static void
 addgroup(char *name)
+{
-	int i;
+	size_t i;
 	struct group *grp;
 	struct wallgroup *g;
 	grp = getgrnam(name);
 	if ((grp = getgrnam(name)) == NULL)
-		errx(1, "unknown group `%s'", name);
+		errx(EXIT_FAILURE, "unknown group `%s'", name);
 	for (i = 0; grp->gr_mem[i]; i++)
 		continue;
-	g = (struct wallgroup *)malloc(sizeof *g);
+	g = malloc(sizeof(*g));
 	if (g == NULL)
-		err(1, "malloc");
+		err(EXIT_FAILURE, "malloc");
 	g->gid = grp->gr_gid;
 	g->name = name;
-	g->mem = (char **)malloc(i + 1);
+	g->mem = calloc(i + 1, sizeof(*g->mem));
 	if (g->mem == NULL)
-		err(1, "malloc");
+		err(EXIT_FAILURE, "calloc");
 	for (i = 0; grp->gr_mem[i] != NULL; i++) {
 		g->mem[i] = strdup(grp->gr_mem[i]);
 		if (g->mem[i] == NULL)
-			err(1, "malloc");
+			err(EXIT_FAILURE, "strdup");
+	}
 	g->mem[i] = NULL;
 	g->next = grouplist;
 	grouplist = g;
+}
 static void
-makemsg(const char *fname)
+makebanner(FILE *fp)
+{
-	int ch, cnt;
+	const char *whom, *tty;
 	char hostname[MAXHOSTNAMELEN + 1], lbuf[100];
 	time_t now;
 	struct tm *lt;
 	struct passwd *pw;
 	if (!(whom = getlogin()))
 		whom = (pw = getpwuid(getuid())) ? pw->pw_name : "???";
 	(void)gethostname(hostname, sizeof(hostname));
 	hostname[sizeof(hostname) - 1] = '\0';
 	(void)time(&now);
 	lt = localtime(&now);
 	/*
 	 * all this stuff is to blank out a square for the message;
 	 * we wrap message lines at column 79, not 80, because some
 	 * terminals wrap after 79, some do not, and we can't tell.
 	 * Which means that we may leave a non-blank character
 	 * in column 80, but that can't be helped.
 	 */
 	(void)fprintf(fp, "\r%79s\r\n", " ");
 	(void)snprintf(lbuf, sizeof lbuf,
 	    "Broadcast Message from %s@%s", whom, hostname);
 	(void)fprintf(fp, "%-79.79s\007\007\r\n", lbuf);
 	tty = ttyname(STDERR_FILENO);
 	if (tty == NULL)
 		tty = "??";
 	(void)snprintf(lbuf, sizeof lbuf, "        (%s) at %d:%02d %s...", tty,
 	    lt->tm_hour, lt->tm_min, lt->tm_zone);
 	(void)fprintf(fp, "%-79.79s\r\n", lbuf);
+}
 static void
 makemsg(struct iovec *iov, const char *fname, int nobanner)
+{
 	int ch, cnt;
 	struct stat sbuf;
 	time_t now;
 	FILE *fp;
 	int fd;
-	const char *whom, *tty;
+	char *p, tmpname[MAXPATHLEN], lbuf[100];
-	char *p, tmpname[MAXPATHLEN], lbuf[100],
+	size_t mbufsize;
-	    hostname[MAXHOSTNAMELEN+1];
+	char *mbuf;
 	(void)snprintf(tmpname, sizeof tmpname, "%s/wall.XXXXXX", _PATH_TMP);
 	if ((fd = mkstemp(tmpname)) == -1)
-		err(1, "can't open temporary file");
+		err(EXIT_FAILURE, "can't open temporary file");
 	(void)unlink(tmpname);
 	if (!(fp = fdopen(fd, "r+")))
-		err(1, "can't open temporary file");
+		err(EXIT_FAILURE, "can't open temporary file");
 	if (!nobanner)
 		makebanner(fp);
 	if (!nobanner) {
 		if (!(whom = getlogin()))
 			whom = (pw = getpwuid(getuid())) ? pw->pw_name : "???";
 		(void)gethostname(hostname, sizeof(hostname));
 		hostname[sizeof(hostname) - 1] = '\0';
 		(void)time(&now);
 		lt = localtime(&now);
 		/*
 		 * all this stuff is to blank out a square for the message;
 		 * we wrap message lines at column 79, not 80, because some
 		 * terminals wrap after 79, some do not, and we can't tell.
 		 * Which means that we may leave a non-blank character
 		 * in column 80, but that can't be helped.
 		 */
 		(void)fprintf(fp, "\r%79s\r\n", " ");
 		(void)snprintf(lbuf, sizeof lbuf,
 		    "Broadcast Message from %s@%s", whom, hostname);
 		(void)fprintf(fp, "%-79.79s\007\007\r\n", lbuf);
 		tty = ttyname(STDERR_FILENO);
 		if (tty == NULL)
 			tty = "??";
 		(void)snprintf(lbuf, sizeof lbuf,
 		    "        (%s) at %d:%02d %s...", tty,
 		    lt->tm_hour, lt->tm_min, lt->tm_zone);
 		(void)fprintf(fp, "%-79.79s\r\n", lbuf);
 	(void)fprintf(fp, "%79s\r\n", " ");
 	if (fname && !(freopen(fname, "r", stdin)))
-		err(1, "can't read %s", fname);
+		err(EXIT_FAILURE, "can't read %s", fname);
 	while (fgets(lbuf, sizeof(lbuf), stdin))
 		for (cnt = 0, p = lbuf; (ch = *p) != '\0'; ++p, ++cnt) {
 			if (cnt == 79 || ch == '\n') {
 				for (; cnt < 79; ++cnt)
 					putc(' ', fp);
 				putc('\r', fp);
 				putc('\n', fp);
 				cnt = -1;
+			}
 			if (ch != '\n')
 				putc(ch, fp);
+		}
 	(void)fprintf(fp, "%79s\r\n", " ");
 	rewind(fp);
-	if (fstat(fd, &sbuf))
+	if (fstat(fd, &sbuf) == -1)
-		err(1, "can't stat temporary file");
+		err(EXIT_FAILURE, "can't stat temporary file");
 	if ((uint64_t)sbuf.st_size > SIZE_T_MAX)
-		errx(1, "file too big");
+		errx(EXIT_FAILURE, "file too big");
-	mbufsize = sbuf.st_size;
+	mbufsize = (size_t)sbuf.st_size;
 	if (!(mbuf = malloc(mbufsize)))
-		err(1, "malloc");
+		err(EXIT_FAILURE, "malloc");
 	if (fread(mbuf, 1, mbufsize, fp) != mbufsize)
-		err(1, "can't read temporary file");
+		err(EXIT_FAILURE, "can't read temporary file");
 	(void)fclose(fp);
 	iov->iov_base = mbuf;
 	iov->iov_len = mbufsize;
+}
 static void
 usage(void)
+{
-	(void)fprintf(stderr, "usage: %s [-g group] [file]\n", getprogname());
+	(void)fprintf(stderr, "Usage: %s [-g group] [file]\n", getprogname());
-	exit(1);
+	exit(EXIT_FAILURE);
+}

 @@ -1,17 +1,18 @@
-#	$NetBSD: Makefile,v 1.10 2007/05/28 12:06:32 tls Exp $
+#	$NetBSD: Makefile,v 1.11 2015/11/21 14:59:51 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 .include <bsd.own.mk>
 WARNS=6
 USE_FORT?= yes	# setuid
 PROG=	wall
 SRCS=	wall.c utmpentry.c term_chk.c
 BINGRP=	tty
 BINMODE=2555
 DPADD+=${LIBUTIL}
 LDADD+=-lutil
 .PATH.c: ${NETBSDSRCDIR}/usr.bin/who ${NETBSDSRCDIR}/usr.bin/write
 CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
 CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/write