diff options
| -rw-r--r-- | usr.bin/calendar/io.c | 7 | ||||
| -rw-r--r-- | usr.bin/cut/cut.c | 12 | ||||
| -rw-r--r-- | usr.bin/passwd/yp_passwd.c | 9 | ||||
| -rw-r--r-- | usr.bin/rs/rs.c | 6 |
4 files changed, 19 insertions, 15 deletions
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c index 2974d688e2e..3169ab3cf2b 100644 --- a/usr.bin/calendar/io.c +++ b/usr.bin/calendar/io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.1 1996/12/05 06:04:40 millert Exp $ */ +/* $OpenBSD: io.c,v 1.2 1997/09/12 04:12:48 millert Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -43,7 +43,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94"; #else -static char rcsid[] = "$OpenBSD: io.c,v 1.1 1996/12/05 06:04:40 millert Exp $"; +static char rcsid[] = "$OpenBSD: io.c,v 1.2 1997/09/12 04:12:48 millert Exp $"; #endif #endif /* not lint */ @@ -253,7 +253,8 @@ opencal() chdir(getenv("HOME")); if (!(chdir(calendarHome) == 0 && freopen(calendarFile, "r", stdin))) - errx(1, "no calendar file: ``%s'' or ``~/%s/%s\n", calendarFile, calendarHome, calendarFile); + errx(1, "no calendar file: ``%s'' or ``~/%s/%s", + calendarFile, calendarHome, calendarFile); } } if (pipe(pdes) < 0) diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c index 86592253161..f3c1916e622 100644 --- a/usr.bin/cut/cut.c +++ b/usr.bin/cut/cut.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cut.c,v 1.3 1997/01/15 23:42:24 millert Exp $ */ +/* $OpenBSD: cut.c,v 1.4 1997/09/12 04:12:51 millert Exp $ */ /* $NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: cut.c,v 1.3 1997/01/15 23:42:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: cut.c,v 1.4 1997/09/12 04:12:51 millert Exp $"; #endif /* not lint */ #include <ctype.h> @@ -174,11 +174,11 @@ get_list(list) } } if (*p) - errx(1, "[-cf] list: illegal list value\n"); + errx(1, "[-cf] list: illegal list value"); if (!stop || !start) - errx(1, "[-cf] list: values may not include zero\n"); + errx(1, "[-cf] list: values may not include zero"); if (stop > _POSIX2_LINE_MAX) - errx(1, "[-cf] list: %d too large (max %d)\n", + errx(1, "[-cf] list: %d too large (max %d)", stop, _POSIX2_LINE_MAX); if (maxval < stop) maxval = stop; @@ -237,7 +237,7 @@ f_cut(fp, fname) output = 0; for (isdelim = 0, p = lbuf;; ++p) { if (!(ch = *p)) - errx(1, "%s: line too long.\n", fname); + errx(1, "%s: line too long.", fname); /* this should work if newline is delimiter */ if (ch == sep) isdelim = 1; diff --git a/usr.bin/passwd/yp_passwd.c b/usr.bin/passwd/yp_passwd.c index 7d56018d9bf..657ed6bdc65 100644 --- a/usr.bin/passwd/yp_passwd.c +++ b/usr.bin/passwd/yp_passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yp_passwd.c,v 1.8 1997/03/27 00:30:55 weingart Exp $ */ +/* $OpenBSD: yp_passwd.c,v 1.9 1997/09/12 04:12:53 millert Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -34,7 +34,7 @@ */ #ifndef lint /*static char sccsid[] = "from: @(#)yp_passwd.c 1.0 2/2/93";*/ -static char rcsid[] = "$OpenBSD: yp_passwd.c,v 1.8 1997/03/27 00:30:55 weingart Exp $"; +static char rcsid[] = "$OpenBSD: yp_passwd.c,v 1.9 1997/09/12 04:12:53 millert Exp $"; #endif /* not lint */ #ifdef YP @@ -104,7 +104,8 @@ yp_passwd(username) * the daemon. */ if ((r = yp_master(domain, "passwd.byname", &master)) != 0) { - warnx("can't find the master YP server. Reason: %s\n", yperr_string(r)); + warnx("can't find the master YP server. Reason: %s", + yperr_string(r)); exit(1); } @@ -150,7 +151,7 @@ yp_passwd(username) client = clnt_create(master, YPPASSWDPROG, YPPASSWDVERS, "udp"); if (client==NULL) { - warnx("cannot contact yppasswdd on %s: Reason: %s\n", + warnx("cannot contact yppasswdd on %s: Reason: %s", master, yperr_string(YPERR_YPBIND)); free(yppasswd.newpw.pw_passwd); return(YPERR_YPBIND); diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c index c0f760e51e9..04f5f7f1b2e 100644 --- a/usr.bin/rs/rs.c +++ b/usr.bin/rs/rs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rs.c,v 1.3 1996/06/26 05:38:47 deraadt Exp $ */ +/* $OpenBSD: rs.c,v 1.4 1997/09/12 04:12:54 millert Exp $ */ /*- * Copyright (c) 1993 @@ -50,6 +50,7 @@ static char sccsid[] = "@(#)rs.c 8.1 (Berkeley) 6/6/93"; */ #include <ctype.h> +#include <err.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -266,7 +267,8 @@ prepfile() else if (orows == 0 && ocols == 0) { /* decide rows and cols */ ocols = owidth / colw; if (ocols == 0) { - warnx("Display width %d is less than column width %d\n", owidth, colw); + warnx("Display width %d is less than column width %d", + owidth, colw); ocols = 1; } if (ocols > nelem) |