Use err(3). Cosmetics in usage string and man page.

1 files changed, 12 insertions, 27 deletions

diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
index 4541646..863dc4a 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -1,5 +1,6 @@
 #ifndef lint
-static char *rcsid = "$Id: main.c,v 1.9 1997/03/31 05:10:48 imp Exp $";
+static const char rcsid[] =
+	"$Id: main.c,v 1.10 1997/09/18 14:08:40 phk Exp $";
 #endif
 
 /*
@@ -23,9 +24,9 @@ static char *rcsid = "$Id: main.c,v 1.9 1997/03/31 05:10:48 imp Exp $";
  *
  */
 
+#include <err.h>
 #include "lib.h"
 #include "delete.h"
-#include <err.h>
 
 static char Options[] = "hvDdnfp:";
 
@@ -33,12 +34,13 @@ char	*Prefix		= NULL;
 Boolean	NoDeInstall	= FALSE;
 Boolean	CleanDirs	= FALSE;
 
+static void usage __P((void));
+
 int
 main(int argc, char **argv)
 {
     int ch, error;
     char **pkgs, **start;
-    char *prog_name = argv[0];
 
     pkgs = start = argv;
     while ((ch = getopt(argc, argv, Options)) != -1)
@@ -71,7 +73,7 @@ main(int argc, char **argv)
 	case 'h':
 	case '?':
 	default:
-	    usage(prog_name, NULL);
+	    usage();
 	    break;
 	}
 
@@ -85,39 +87,22 @@ main(int argc, char **argv)
 
     /* If no packages, yelp */
     if (pkgs == start)
-	usage(prog_name, "Missing package name(s)");
+	warnx("missing package name(s)"), usage();
     *pkgs = NULL;
     if (!Fake && getuid() != 0)
-	errx(1, "You must be root to delete packages.");
+	errx(1, "you must be root to delete packages");
     if ((error = pkg_perform(start)) != 0) {
 	if (Verbose)
-	    fprintf(stderr, "%d package deletion(s) failed.\n", error);
+	    warnx("%d package deletion(s) failed", error);
 	return error;
     }
     else
 	return 0;
 }
 
-void
-usage(const char *name, const char *fmt, ...)
+static void
+usage()
 {
-    va_list args;
-
-    va_start(args, fmt);
-    if (fmt) {
-	fprintf(stderr, "%s: ", name);
-	vfprintf(stderr, fmt, args);
-	fprintf(stderr, "\n\n");
-    }
-    va_end(args);
-    fprintf(stderr, "Usage: %s [args] pkg [ .. pkg ]\n", name);
-    fprintf(stderr, "Where args are one or more of:\n\n");
-    fprintf(stderr, "-v         verbose\n");
-    fprintf(stderr, "-p arg     override prefix with arg\n");
-    fprintf(stderr, "-d         delete empty directories when deinstalling\n");
-    fprintf(stderr, "-f         force delete even if dependencies exist\n");
-    fprintf(stderr, "           or deinstall/requirement checks fail\n");
-    fprintf(stderr, "-D         don't execute pkg de-install script, if any\n");
-    fprintf(stderr, "-n         don't actually de-install, just show steps\n");
+    fprintf(stderr, "usage: pkg_delete [-vDdnf] [-p prefix] pkg-name ...\n");
     exit(1);
 }