Berkeley header; cpp usage fixes for ANSI C; minor cleanups

[unix-history] / usr / src / old / mkpasswd / mkpasswd.c

diff --git a/usr/src/old/mkpasswd/mkpasswd.c b/usr/src/old/mkpasswd/mkpasswd.c
index d0c359b..5cc9e2f 100644 (file)
--- a/usr/src/old/mkpasswd/mkpasswd.c
+++ b/usr/src/old/mkpasswd/mkpasswd.c
@@ -1,28 +1,40 @@
+/*
+ * Copyright (c) 1980, 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1980, 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)mkpasswd.c  4.3 (Berkeley) 84/01/25";
-#endif
+static char sccsid[] = "@(#)mkpasswd.c 5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <sys/file.h>
 #include <stdio.h>
 #include <pwd.h>
 #include <ndbm.h>
 
 
 #include <sys/file.h>
 #include <stdio.h>
 #include <pwd.h>
 #include <ndbm.h>
 

-char   buf[BUFSIZ];
-char   line[BUFSIZ+1];
-char   EMPTY[] = "";
-struct passwd passwd;
-
-struct passwd *fgetpwent();
-

 main(argc, argv)
 main(argc, argv)

+       int argc;

        char *argv[];
 {
        char *argv[];
 {

-       FILE *pwf;

        DBM *dp;
        datum key, content;
        register char *cp, *tp;
        register struct passwd *pwd;
        int verbose = 0, entries = 0, maxlen = 0;
        DBM *dp;
        datum key, content;
        register char *cp, *tp;
        register struct passwd *pwd;
        int verbose = 0, entries = 0, maxlen = 0;

+       char buf[BUFSIZ];

 
        if (argc > 1 && strcmp(argv[1], "-v") == 0) {
                verbose++;
 
        if (argc > 1 && strcmp(argv[1], "-v") == 0) {
                verbose++;


@@ -32,84 +44,57 @@ main(argc, argv)
                fprintf(stderr, "usage: mkpasswd [ -v ] file\n");
                exit(1);
        }
                fprintf(stderr, "usage: mkpasswd [ -v ] file\n");
                exit(1);
        }

-       if ((pwf = fopen(argv[1], "r" )) == NULL) {
+       if (access(argv[1], R_OK) < 0) {

                fprintf(stderr, "mkpasswd: ");
                perror(argv[1]);
                exit(1);
        }
                fprintf(stderr, "mkpasswd: ");
                perror(argv[1]);
                exit(1);
        }

-       umask(0);
-       dp = ndbmopen(argv[1], O_WRONLY|O_CREAT|O_EXCL, 0644);
+       (void)umask(0);
+       dp = dbm_open(argv[1], O_WRONLY|O_CREAT|O_EXCL, 0644);

        if (dp == NULL) {
                fprintf(stderr, "mkpasswd: ");
                perror(argv[1]);
                exit(1);
        }
        if (dp == NULL) {
                fprintf(stderr, "mkpasswd: ");
                perror(argv[1]);
                exit(1);
        }

-       dp->db_maxbno = 0;
-       while (pwd = fgetpwent(pwf)) {
+       setpwfile(argv[1]);
+       while (pwd = getpwent()) {

                cp = buf;
                cp = buf;

-#define        COMPACT(e)      tp = pwd->pw_/**/e; while (*cp++ = *tp++);
-               COMPACT(name);
-               COMPACT(passwd);
-               *(int *)cp = pwd->pw_uid; cp += sizeof (int);
-               *(int *)cp = pwd->pw_gid; cp += sizeof (int);
-               *(int *)cp = pwd->pw_quota; cp += sizeof (int);
-               COMPACT(comment);
-               COMPACT(gecos);
-               COMPACT(dir);
-               COMPACT(shell);
+#define        COMPACT(e)      tp = pwd->e; while (*cp++ = *tp++);
+               COMPACT(pw_name);
+               COMPACT(pw_passwd);
+               bcopy((char *)&pwd->pw_uid, cp, sizeof (int));
+               cp += sizeof (int);
+               bcopy((char *)&pwd->pw_gid, cp, sizeof (int));
+               cp += sizeof (int);
+               bcopy((char *)&pwd->pw_quota, cp, sizeof (int));
+               cp += sizeof (int);
+               COMPACT(pw_comment);
+               COMPACT(pw_gecos);
+               COMPACT(pw_dir);
+               COMPACT(pw_shell);

                content.dptr = buf;
                content.dsize = cp - buf;
                if (verbose)
                        printf("store %s, uid %d\n", pwd->pw_name, pwd->pw_uid);
                key.dptr = pwd->pw_name;
                key.dsize = strlen(pwd->pw_name);
                content.dptr = buf;
                content.dsize = cp - buf;
                if (verbose)
                        printf("store %s, uid %d\n", pwd->pw_name, pwd->pw_uid);
                key.dptr = pwd->pw_name;
                key.dsize = strlen(pwd->pw_name);

-               dbmstore(dp, key, content, DB_INSERT);
+               if (dbm_store(dp, key, content, DBM_INSERT) < 0) {
+                       fprintf(stderr, "mkpasswd: ");
+                       perror("dbm_store failed");
+                       exit(1);
+               }

                key.dptr = (char *)&pwd->pw_uid;
                key.dsize = sizeof (int);
                key.dptr = (char *)&pwd->pw_uid;
                key.dsize = sizeof (int);

-               dbmstore(dp, key, content, DB_INSERT);
+               if (dbm_store(dp, key, content, DBM_INSERT) < 0) {
+                       fprintf(stderr, "mkpasswd: ");
+                       perror("dbm_store failed");
+                       exit(1);
+               }

                entries++;
                if (cp - buf > maxlen)
                        maxlen = cp - buf;
        }
                entries++;
                if (cp - buf > maxlen)
                        maxlen = cp - buf;
        }

+       dbm_close(dp);

        printf("%d password entries, maximum length %d\n", entries, maxlen);
        exit(0);
 }
        printf("%d password entries, maximum length %d\n", entries, maxlen);
        exit(0);
 }

-
-static char *
-pwskip(p)
-register char *p;
-{
-       while( *p && *p != ':' )
-               ++p;
-       if( *p ) *p++ = 0;
-       return(p);
-}
-
-struct passwd *
-fgetpwent(pwf)
-       FILE *pwf;
-{
-       register char *p;
-
-       p = fgets(line, BUFSIZ, pwf);
-       if (p==NULL)
-               return(0);
-       passwd.pw_name = p;
-       p = pwskip(p);
-       passwd.pw_passwd = p;
-       p = pwskip(p);
-       passwd.pw_uid = atoi(p);
-       p = pwskip(p);
-       passwd.pw_gid = atoi(p);
-       passwd.pw_quota = 0;
-       passwd.pw_comment = EMPTY;
-       p = pwskip(p);
-       passwd.pw_gecos = p;
-       p = pwskip(p);
-       passwd.pw_dir = p;
-       p = pwskip(p);
-       passwd.pw_shell = p;
-       while(*p && *p != '\n') p++;
-       *p = '\0';
-       return(&passwd);
-}