Use err(3), cosmetic in usage(), remove `cmdname'.

4 files changed, 58 insertions, 68 deletions

diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 7445fd7..f8dd6b3 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -30,16 +30,21 @@
 #ident	"@(#)rpc_cout.c	1.14	93/07/05 SMI" 
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #endif
+static const char rcsid[] =
+	"$Id$";
+#endif
 
 /*
  * rpc_cout.c, XDR routine outputter for the RPC protocol compiler
  * Copyright (C) 1987, Sun Microsystems, Inc.
  */
+#include <err.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
@@ -453,8 +458,7 @@ int flag;
 							  strlen(sizestr)
 							  +strlen(ptemp)+1);
 					if (sizestr == NULL){
-						f_print(stderr,
-							"Fatal error : no memory\n");
+						warnx("fatal error: no memory");
 						crash();
 					};
 					sizestr = strcat(sizestr, ptemp);
@@ -744,10 +748,7 @@ char *str;
 
 	ptr =  (char *)malloc(strlen(str)+1);
 	if (ptr == (char *) NULL)
-	{
-		f_print(stderr, "malloc failed\n");
-		exit(1);
-	};
+		errx(1, "malloc failed");
 
 	hptr = ptr;
 	while (*str != '\0')
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 59431c3..10539db 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -31,18 +31,23 @@
 #ident	"@(#)rpc_main.c	1.21	94/04/25 SMI"
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
 #endif
+static const char rcsid[] =
+	"$Id$";
+#endif
 
 /*
  * rpc_main.c, Top level of the RPC protocol compiler.
  * Copyright (C) 1987, Sun Microsystems, Inc.
  */
 
+#include <err.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <ctype.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/file.h>
@@ -87,9 +92,6 @@ static void s_output __P(( int, char **, char *, char *, int, char *, int, int )
 
 static int cppDefined = 0;	/* explicit path for C preprocessor */
 
-
-static char *cmdname;
-
 static char *svcclosetime = "120";
 static char *CPP = SVR4_CPP;
 static char CPPFLAGS[] = "-C";
@@ -291,14 +293,12 @@ open_output(infile, outfile)
 	}
 
 	if (infile != NULL && streq(outfile, infile)) {
-	f_print(stderr, "%s: %s already exists.  No output generated.\n",
-		cmdname, infile);
+		warnx("%s already exists. No output generated", infile);
 		crash();
 	}
 	fout = fopen(outfile, "w");
 	if (fout == NULL) {
-		f_print(stderr, "%s: unable to open ", cmdname);
-		perror(outfile);
+		warn("unable to open %s", outfile);
 		crash();
 	}
 	record_open(outfile);
@@ -331,14 +331,12 @@ static void find_cpp()
 
 	if (stat(CPP, &buf) < 0)  { /* SVR4 or explicit cpp does not exist */
 		if (cppDefined) {
-			fprintf(stderr,
-				"cannot find C preprocessor: %s \n", CPP);
+			warnx("cannot find C preprocessor: %s", CPP);
 			crash();
 		} else {	/* try the other one */
 			CPP = SUNOS_CPP;
 			if (stat(CPP, &buf) < 0) { /* can't find any cpp */
-				fprintf(stderr,
-		"cannot find any C preprocessor (cpp)\n");
+				warnx("cannot find any C preprocessor (cpp)");
 				crash();
 			}
 		}
@@ -370,17 +368,16 @@ open_input(infile, define)
 		(void) dup2(pd[1], 1);
 		(void) close(pd[0]);
 		execv(arglist[0], arglist);
-		perror("execv");
+		warn("execv");
 		exit(1);
 	case -1:
-		perror("fork");
+		warn("fork");
 		exit(1);
 	}
 	(void) close(pd[1]);
 	fin = fdopen(pd[0], "r");
 	if (fin == NULL) {
-		f_print(stderr, "%s: ", cmdname);
-		perror(infilename);
+		warn("%s", infilename);
 		crash();
 	}
 }
@@ -418,7 +415,7 @@ char* list_to_check[];
 			return (1);
 		}
 	}
-	f_print(stderr, "illegal nettype :\'%s\'\n", name);
+	warnx("illegal nettype :\'%s\'", name);
 	return (0);
 }
 
@@ -1029,7 +1026,7 @@ addarg(cp)
 	char *cp;
 {
 	if (argcount >= ARGLISTLEN) {
-		f_print(stderr, "rpcgen: too many defines\n");
+		warnx("too many defines");
 		crash();
 		/*NOTREACHED*/
 	}
@@ -1043,7 +1040,7 @@ putarg(where, cp)
 	int where;
 {
 	if (where >= ARGLISTLEN) {
-		f_print(stderr, "rpcgen: arglist coding error\n");
+		warnx("arglist coding error");
 		crash();
 		/*NOTREACHED*/
 	}
@@ -1067,16 +1064,14 @@ char *outfile;
 	if (infile)		/* infile ! = NULL */
 		if (stat(infile, &buf) < 0)
 		{
-			perror(infile);
+			warn("%s", infile);
 			crash();
 		};
 	if (outfile) {
 		if (stat(outfile, &buf) < 0)
 			return;	/* file does not exist */
 		else {
-			f_print(stderr,
-	"file '%s' already exists and may be overwritten\n",
-				outfile);
+			warnx("file '%s' already exists and may be overwritten", outfile);
 			crash();
 		}
 	}
@@ -1097,7 +1092,6 @@ parseargs(argc, argv, cmd)
 	char flag[(1 << 8 * sizeof (char))];
 	int nflags;
 
-	cmdname = argv[0];
 	cmd->infile = cmd->outfile = NULL;
 	if (argc < 2) {
 		return (0);
@@ -1118,9 +1112,7 @@ parseargs(argc, argv, cmd)
 	for (i = 1; i < argc; i++) {
 		if (argv[i][0] != '-') {
 			if (cmd->infile) {
-				f_print(stderr,
-	"Cannot specify more than one input file.\n");
-
+				warnx("cannot specify more than one input file");
 				return (0);
 			}
 			cmd->infile = argv[i];
@@ -1272,7 +1264,7 @@ parseargs(argc, argv, cmd)
 		/* pmflag or inetdflag is always TRUE */
 		if ((inetdflag && cmd->nflag)) {
 			/* netid not allowed with inetdflag */
-	f_print(stderr, "Cannot use netid flag with inetd flag.\n");
+			warnx("cannot use netid flag with inetd flag");
 			return (0);
 		}
 	} else {		/* 4.1 mode */
@@ -1281,13 +1273,13 @@ parseargs(argc, argv, cmd)
 		inetdflag = 1;	/* inetdflag is TRUE by default */
 #endif
 		if (cmd->nflag) { /* netid needs TIRPC */
-	f_print(stderr, "Cannot use netid flag without TIRPC.\n");
+			warnx("cannot use netid flag without TIRPC");
 			return (0);
 		}
 	}
 
 	if (newstyle && (tblflag || cmd->tflag)) {
-		f_print(stderr, "Cannot use table flags with newstyle.\n");
+		warnx("cannot use table flags with newstyle");
 		return (0);
 	}
 
@@ -1302,12 +1294,10 @@ parseargs(argc, argv, cmd)
 		}
 	} else if (cmd->infile == NULL &&
 	    (cmd->Ssflag || cmd->Scflag || cmd->makefileflag)) {
-		f_print(stderr,
-		  "\"infile\" is required for template generation flags.\n");
+		warnx("\"infile\" is required for template generation flags");
 		return (0);
 	} if (nflags > 1) {
-		f_print(stderr,
-			"Cannot have more than one file generation flag.\n");
+		warnx("cannot have more than one file generation flag");
 		return (0);
 	}
 	return (1);
@@ -1316,17 +1306,14 @@ parseargs(argc, argv, cmd)
 static void
 usage()
 {
-	f_print(stderr, "usage:  %s infile\n", cmdname);
-	f_print(stderr,
-		"\t%s [-abCLNTM] [-Dname[=value]] [-i size]\
-[-I [-K seconds]] [-Y path] infile\n",
-		cmdname);
-	f_print(stderr,
-		"\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm]\
-[-o outfile] [infile]\n",
-		cmdname);
-	f_print(stderr, "\t%s [-s nettype]* [-o outfile] [infile]\n", cmdname);
-	f_print(stderr, "\t%s [-n netid]* [-o outfile] [infile]\n", cmdname);
+	f_print(stderr, "%s\n%s\n%s\n%s\n%s\n", 
+		"usage: rpcgen infile",
+		"       rpcgen [-abCLNTM] [-Dname[=value]] [-i size]\
+[-I [-K seconds]] [-Y path] infile",
+		"       rpcgen [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm]\
+[-o outfile] [infile]",
+		"       rpcgen [-s nettype]* [-o outfile] [infile]",
+		"       rpcgen [-n netid]* [-o outfile] [infile]");
 	options_usage();
 	exit(1);
 }
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index f8b56798..00b5561 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -30,13 +30,18 @@
 #ident	"@(#)rpc_tblout.c	1.11	93/07/05 SMI" 
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #endif
+static const char rcsid[] =
+	"$Id$";
+#endif
 
 /*
  * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler
  * Copyright (C) 1989, Sun Microsystems, Inc.
  */
+#include <err.h>
 #include <stdio.h>
 #include <string.h>
 #include "rpc_parse.h"
@@ -107,9 +112,7 @@ write_table(def)
 				f_print(fout,
 			"\n/*\n * WARNING: table out of order\n */\n");
 				if (warning == 0) {
-					f_print(stderr,
-				    "WARNING %s table is out of order\n",
-					    progvers);
+					warnx("WARNING %s table is out of order", progvers);
 					warning = 1;
 					nonfatalerrors = 1;
 				}
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 1ade911..175cf29 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -30,16 +30,21 @@
 #ident	"@(#)rpc_util.c	1.14	93/07/05 SMI"
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
+static const char rcsid[] =
+	"$Id$";
+#endif
 
 /*
  * rpc_util.c, Utility routines for the RPC protocol compiler
  * Copyright (C) 1989, Sun Microsystems, Inc.
  */
+#include <err.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <unistd.h>
 #include "rpc_scan.h"
 #include "rpc_parse.h"
@@ -275,8 +280,7 @@ error(msg)
 	char *msg;
 {
 	printwhere();
-	f_print(stderr, "%s, line %d: ", infilename, linenum);
-	f_print(stderr, "%s\n", msg);
+	warnx("%s, line %d: %s", infilename, linenum, msg);
 	crash();
 }
 
@@ -302,7 +306,7 @@ record_open(file)
 	if (nfiles < NFILES) {
 		outfiles[nfiles++] = file;
 	} else {
-		f_print(stderr, "too many files!\n");
+		warnx("too many files");
 		crash();
 	}
 }
@@ -459,10 +463,8 @@ make_argname(pname, vname)
 	char *name;
 
 	name = malloc(strlen(pname) + strlen(vname) + strlen(ARGEXT) + 3);
-	if (!name) {
-		fprintf(stderr, "failed in malloc");
-		exit(1);
-	}
+	if (!name)
+		errx(1, "failed in malloc");
 	sprintf(name, "%s_%s_%s", locase(pname), vname, ARGEXT);
 	return (name);
 }
@@ -477,11 +479,8 @@ char *type;
 {
 	bas_type *ptr;
 
-	if ((ptr = (bas_type *) malloc(sizeof (bas_type))) ==
-	    (bas_type *)NULL) {
-		fprintf(stderr, "failed in malloc");
-		exit(1);
-	}
+	if ((ptr = (bas_type *) malloc(sizeof (bas_type))) == (bas_type *)NULL)
+		errx(1, "failed in malloc");
 
 	ptr->name = type;
 	ptr->length = len;