This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

[unix-history] / usr.sbin / sendmail / praliases / praliases.c

diff --git a/usr.sbin/sendmail/praliases/praliases.c b/usr.sbin/sendmail/praliases/praliases.c
index 9217b68..b637cda 100644 (file)
--- a/usr.sbin/sendmail/praliases/praliases.c
+++ b/usr.sbin/sendmail/praliases/praliases.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1983 Eric P. Allman
 /*
  * Copyright (c) 1983 Eric P. Allman

- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -33,32 +33,39 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1988 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1988, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)praliases.c        5.5 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)praliases.c        8.1 (Berkeley) 6/7/93";

 #endif /* not lint */
 
 #endif /* not lint */
 

+#include <ndbm.h>

 #include <sendmail.h>
 #include <sendmail.h>

+#ifdef NEWDB
+#include <db.h>
+#endif

 
 

-typedef struct {
-       char *dptr;
-       int dsize;
-} datum;
-
-
+int

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

+       int argc;

        char **argv;
 {
        extern char *optarg;
        extern int optind;
        char **argv;
 {
        extern char *optarg;
        extern int optind;

-       static char *filename = "/usr/lib/aliases";
-       datum content, key, firstkey(), nextkey(), fetch();
+       DBM *dbp;
+       datum content, key;
+       char *filename;

        int ch;
        int ch;

+#ifdef NEWDB
+       const DB *db;
+       DBT newdbkey, newdbcontent;
+       char buf[MAXNAME];
+#endif

 
 

+       filename = "/etc/aliases";

        while ((ch = getopt(argc, argv, "f:")) != EOF)
                switch((char)ch) {
                case 'f':
        while ((ch = getopt(argc, argv, "f:")) != EOF)
                switch((char)ch) {
                case 'f':


@@ -66,27 +73,56 @@ main(argc, argv)
                        break;
                case '?':
                default:
                        break;
                case '?':
                default:

-                       fputs("usage: praliases [-f file]\n", stderr);
+                       (void)fprintf(stderr, "usage: praliases [-f file]\n");

                        exit(EX_USAGE);
                }
        argc -= optind;
        argv += optind;
 
                        exit(EX_USAGE);
                }
        argc -= optind;
        argv += optind;
 

-       if (dbminit(filename) < 0)
-               exit(EX_OSFILE);
-       if (!argc)
-               for (key = firstkey(); key.dptr; key = nextkey(key)) {
-                       content = fetch(key);
-                       printf("%s:%s\n", key.dptr, content.dptr);
+#ifdef NEWDB
+       (void) strcpy(buf, filename);
+       (void) strcat(buf, ".db");
+       if (db = dbopen(buf, O_RDONLY, 0444 , DB_HASH, NULL)) {
+               if (!argc) {
+                       while(!db->seq(db, &newdbkey, &newdbcontent, R_NEXT))
+                               printf("%s:%s\n", newdbkey.data,
+                                               newdbcontent.data);
+               }
+               else for (; *argv; ++argv) {
+                       newdbkey.data = *argv;
+                       newdbkey.size = strlen(*argv) + 1;
+                       if ( !db->get(db, &newdbkey, &newdbcontent, 0) )
+                               printf("%s:%s\n", newdbkey.data,
+                                       newdbcontent.data);
+                       else
+                               printf("%s: No such key\n",
+                                       newdbkey.data);
+               }
+       }
+       else {
+#endif
+               if ((dbp = dbm_open(filename, O_RDONLY, 0)) == NULL) {
+                       (void)fprintf(stderr,
+                           "praliases: %s: %s\n", filename, strerror(errno));
+                       exit(EX_OSFILE);
+               }
+               if (!argc)
+                       for (key = dbm_nextkey(dbp);
+                           key.dptr != NULL; key = dbm_nextkey(dbp)) {
+                               content = dbm_fetch(dbp, key);
+                               (void)printf("%s:%s\n", key.dptr, content.dptr);
+                       }
+               else for (; *argv; ++argv) {
+                       key.dptr = *argv;
+                       key.dsize = strlen(*argv) + 1;
+                       content = dbm_fetch(dbp, key);
+                       if (!content.dptr)
+                               (void)printf("%s: No such key\n", key.dptr);
+                       else
+                               (void)printf("%s:%s\n", key.dptr, content.dptr);

                }
                }

-       else for (; *argv; ++argv) {
-               key.dptr = *argv;
-               key.dsize = strlen(*argv) + 1;
-               content = fetch(key);
-               if (!content.dptr)
-                       printf("%s: No such key\n", key.dptr);
-               else
-                       printf("%s:%s\n", key.dptr, content.dptr);
+#ifdef NEWDB

        }
        }

+#endif

        exit(EX_OK);
 }
        exit(EX_OK);
 }