From c897d730b57bc403000586298d6d367bee6bf5bf Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 29 Jun 1997 18:28:18 +0000 Subject: [PATCH] - Cleanup warnings - Move ttymsg to libutil.h --- usr.bin/wall/Makefile | 6 +- usr.bin/wall/ttymsg.c | 169 ------------------------------------------ usr.bin/wall/wall.c | 16 ++-- 3 files changed, 13 insertions(+), 178 deletions(-) delete mode 100644 usr.bin/wall/ttymsg.c diff --git a/usr.bin/wall/Makefile b/usr.bin/wall/Makefile index 34d9c20634bf..93a486613a7a 100644 --- a/usr.bin/wall/Makefile +++ b/usr.bin/wall/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.3 1994/11/17 07:17:53 jtc Exp $ +# $NetBSD: Makefile,v 1.4 1997/06/29 18:28:18 christos Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes PROG= wall -SRCS= ttymsg.c wall.c BINGRP= tty BINMODE=2555 +DPADD+=${LIBUTIL} +LDADD+=-lutil .include diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c deleted file mode 100644 index 4ffe06f01ea9..000000000000 --- a/usr.bin/wall/ttymsg.c +++ /dev/null @@ -1,169 +0,0 @@ -/* $NetBSD: ttymsg.c,v 1.4 1997/02/11 08:42:03 mrg Exp $ */ - -/* - * Copyright (c) 1989, 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)ttymsg.c 8.2 (Berkeley) 11/16/93"; -#endif -static char rcsid[] = "$NetBSD: ttymsg.c,v 1.4 1997/02/11 08:42:03 mrg Exp $"; -#endif /* not lint */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Display the contents of a uio structure on a terminal. Used by wall(1), - * syslogd(8), and talkd(8). Forks and finishes in child if write would block, - * waiting up to tmout seconds. Returns pointer to error string on unexpected - * error; string is not newline-terminated. Various "normal" errors are - * ignored (exclusive-use, lack of permission, etc.). - */ -char * -ttymsg(iov, iovcnt, line, tmout) - struct iovec *iov; - int iovcnt; - char *line; - int tmout; -{ - static char device[MAXNAMLEN] = _PATH_DEV; - static char errbuf[1024]; - register int cnt, fd, left, wret; - struct iovec localiov[6]; - int forked = 0; - - if (iovcnt > sizeof(localiov) / sizeof(localiov[0])) - return ("too many iov's (change code in wall/ttymsg.c)"); - - (void)strncpy(device + sizeof(_PATH_DEV) - 1, line, - sizeof(device) - sizeof(_PATH_DEV)); - if (strchr(device + sizeof(_PATH_DEV) - 1, '/')) { - /* A slash is an attempt to break security... */ - (void) snprintf(errbuf, sizeof(errbuf), "'/' in \"%s\"", - device); - return (errbuf); - } - - /* - * open will fail on slip lines or exclusive-use lines - * if not running as root; not an error. - */ - if ((fd = open(device, O_WRONLY|O_NONBLOCK, 0)) < 0) { - if (errno == EBUSY || errno == EACCES) - return (NULL); - (void) snprintf(errbuf, sizeof(errbuf), - "%s: %s", device, strerror(errno)); - return (errbuf); - } - - for (cnt = left = 0; cnt < iovcnt; ++cnt) - left += iov[cnt].iov_len; - - for (;;) { - wret = writev(fd, iov, iovcnt); - if (wret >= left) - break; - if (wret >= 0) { - left -= wret; - if (iov != localiov) { - bcopy(iov, localiov, - iovcnt * sizeof(struct iovec)); - iov = localiov; - } - for (cnt = 0; wret >= iov->iov_len; ++cnt) { - wret -= iov->iov_len; - ++iov; - --iovcnt; - } - if (wret) { - iov->iov_base += wret; - iov->iov_len -= wret; - } - continue; - } - if (errno == EWOULDBLOCK) { - int cpid, off = 0; - - if (forked) { - (void) close(fd); - _exit(1); - } - cpid = fork(); - if (cpid < 0) { - (void) snprintf(errbuf, sizeof(errbuf), - "fork: %s", strerror(errno)); - (void) close(fd); - return (errbuf); - } - if (cpid) { /* parent */ - (void) close(fd); - return (NULL); - } - forked++; - /* wait at most tmout seconds */ - (void) signal(SIGALRM, SIG_DFL); - (void) signal(SIGTERM, SIG_DFL); /* XXX */ - (void) sigsetmask(0); - (void) alarm((u_int)tmout); - (void) fcntl(fd, O_NONBLOCK, &off); - continue; - } - /* - * We get ENODEV on a slip line if we're running as root, - * and EIO if the line just went away. - */ - if (errno == ENODEV || errno == EIO) - break; - (void) close(fd); - if (forked) - _exit(1); - (void) snprintf(errbuf, sizeof(errbuf), - "%s: %s", device, strerror(errno)); - return (errbuf); - } - - (void) close(fd); - if (forked) - _exit(0); - return (NULL); -} diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c index ee9e640583b0..7c986f760218 100644 --- a/usr.bin/wall/wall.c +++ b/usr.bin/wall/wall.c @@ -1,4 +1,4 @@ -/* $NetBSD: wall.c,v 1.7 1997/02/11 08:42:04 mrg Exp $ */ +/* $NetBSD: wall.c,v 1.8 1997/06/29 18:28:20 christos Exp $ */ /* * Copyright (c) 1988, 1990, 1993 @@ -33,17 +33,17 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1988, 1990, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; +__COPYRIGHT("@(#) Copyright (c) 1988, 1990, 1993\n\ + The Regents of the University of California. All rights reserved.\n"); #endif /* not lint */ #ifndef lint #if 0 static char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93"; #endif -static char rcsid[] = "$NetBSD: wall.c,v 1.7 1997/02/11 08:42:04 mrg Exp $"; +__RCSID("$NetBSD: wall.c,v 1.8 1997/06/29 18:28:20 christos Exp $"); #endif /* not lint */ /* @@ -63,8 +63,10 @@ static char rcsid[] = "$NetBSD: wall.c,v 1.7 1997/02/11 08:42:04 mrg Exp $"; #include #include #include +#include void makemsg __P((char *)); +int main __P((int, char *[])); #define IGNOREUSER "sleeper" @@ -83,7 +85,7 @@ main(argc, argv) struct iovec iov; struct utmp utmp; FILE *fp; - char *p, *ttymsg(); + char *p; struct passwd *pep = getpwnam("nobody"); char line[sizeof(utmp.ut_line) + 1]; @@ -134,7 +136,7 @@ makemsg(fname) struct tm *lt; struct passwd *pw; struct stat sbuf; - time_t now, time(); + time_t now; FILE *fp; int fd; char *p, *whom, hostname[MAXHOSTNAMELEN], lbuf[100], tmpname[15];