lint, prettyness police

SCCS-vsn: usr.sbin/pwd_mkdb/pwd_mkdb.c 8.2

diff --git a/usr/src/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr/src/usr.sbin/pwd_mkdb/pwd_mkdb.c
index c131c51..82fa718 100644 (file)
--- a/usr/src/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr/src/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -12,13 +12,14 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)pwd_mkdb.c 8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)pwd_mkdb.c 8.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 
 #include <db.h>
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 
 #include <db.h>

+#include <err.h>

 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>


@@ -29,6 +30,8 @@ static char sccsid[] = "@(#)pwd_mkdb.c        8.1 (Berkeley) %G%";
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

+#include "pw_scan.h"
+

 #define        INSECURE        1
 #define        SECURE          2
 #define        PERM_INSECURE   (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
 #define        INSECURE        1
 #define        SECURE          2
 #define        PERM_INSECURE   (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)


@@ -43,8 +46,6 @@ HASHINFO openinfo = {
        0               /* lorder */
 };
 
        0               /* lorder */
 };
 

-char *progname = "pwd_mkdb";
-

 static enum state { FILE_INSECURE, FILE_SECURE, FILE_ORIG } clean;
 static struct passwd pwd;                      /* password structure */
 static char *pname;                            /* password file name */
 static enum state { FILE_INSECURE, FILE_SECURE, FILE_ORIG } clean;
 static struct passwd pwd;                      /* password structure */
 static char *pname;                            /* password file name */


@@ -60,14 +61,12 @@ main(argc, argv)
        int argc;
        char *argv[];
 {
        int argc;
        char *argv[];
 {

-       extern int optind;
-       register int len, makeold;
-       register char *p, *t;

        DB *dp, *edp;
        DBT data, key;
        FILE *fp, *oldfp;
        sigset_t set;
        DB *dp, *edp;
        DBT data, key;
        FILE *fp, *oldfp;
        sigset_t set;

-       int ch, cnt, tfd;
+       int ch, cnt, len, makeold, tfd;
+       char *p, *t;

        char buf[MAX(MAXPATHLEN, LINE_MAX * 2)], tbuf[1024];
 
        makeold = 0;
        char buf[MAX(MAXPATHLEN, LINE_MAX * 2)], tbuf[1024];
 
        makeold = 0;


@@ -283,7 +282,7 @@ scan(fp, pw)
        char *p;
 
        if (!fgets(line, sizeof(line), fp))
        char *p;
 
        if (!fgets(line, sizeof(line), fp))

-               return(0);
+               return (0);

        ++lcnt;
        /*
         * ``... if I swallow anything evil, put your fingers down my
        ++lcnt;
        /*
         * ``... if I swallow anything evil, put your fingers down my


@@ -291,27 +290,28 @@ scan(fp, pw)
         *      -- The Who
         */
        if (!(p = strchr(line, '\n'))) {
         *      -- The Who
         */
        if (!(p = strchr(line, '\n'))) {

-               (void)fprintf(stderr, "pwd_mkdb: line too long\n");
+               warnx("line too long");

                goto fmt;
 
        }
        *p = '\0';
        if (!pw_scan(line, pw)) {
                goto fmt;
 
        }
        *p = '\0';
        if (!pw_scan(line, pw)) {

-               (void)fprintf(stderr, "pwd_mkdb: at line #%d.\n", lcnt);
-fmt:           errno = EFTYPE;
+               warnx("at line #%d", lcnt);
+fmt:           errno = EFTYPE; /* XXX */

                error(pname);
        }
                error(pname);
        }

+
+       return (1);

 }
 
 void
 mv(from, to)
        char *from, *to;
 {
 }
 
 void
 mv(from, to)
        char *from, *to;
 {

-       int sverrno;

        char buf[MAXPATHLEN];
 
        if (rename(from, to)) {
        char buf[MAXPATHLEN];
 
        if (rename(from, to)) {

-               sverrno = errno;
+               int sverrno = errno;

                (void)snprintf(buf, sizeof(buf), "%s to %s", from, to);
                errno = sverrno;
                error(buf);
                (void)snprintf(buf, sizeof(buf), "%s to %s", from, to);
                errno = sverrno;
                error(buf);


@@ -322,7 +322,8 @@ void
 error(name)
        char *name;
 {
 error(name)
        char *name;
 {

-       (void)fprintf(stderr, "pwd_mkdb: %s: %s\n", name, strerror(errno));
+
+       warn(name);

        cleanup();
        exit(1);
 }
        cleanup();
        exit(1);
 }


@@ -350,6 +351,7 @@ cleanup()
 void
 usage()
 {
 void
 usage()
 {

+

        (void)fprintf(stderr, "usage: pwd_mkdb [-p] file\n");
        exit(1);
 }
        (void)fprintf(stderr, "usage: pwd_mkdb [-p] file\n");
        exit(1);
 }