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

[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 7a8fc46..2c22279 100644 (file)
--- a/usr.sbin/sendmail/praliases/praliases.c
+++ b/usr.sbin/sendmail/praliases/praliases.c
@@ -1,12 +1,7 @@
 /*
  * Copyright (c) 1983 Eric P. Allman
 /*
  * Copyright (c) 1983 Eric P. Allman

-<<<<<<< 1.2
- * 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.
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.

->>>>>>> /tmp/T4010782

  *
  * 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


@@ -38,78 +33,39 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-<<<<<<< 1.2
-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";
 static char copyright[] =
 "@(#) Copyright (c) 1988, 1993\n\
        The Regents of the University of California.  All rights reserved.\n";

->>>>>>> /tmp/T4010782

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

-<<<<<<< 1.2
-static char sccsid[] = "@(#)praliases.c        5.5 (Berkeley) 6/1/90";
-=======
-static char sccsid[] = "@(#)praliases.c        8.1 (Berkeley) 6/7/93";
->>>>>>> /tmp/T4010782
+static char sccsid[] = "@(#)praliases.c        8.3 (Berkeley) 3/6/94";

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

-<<<<<<< 1.2
-=======

 #include <ndbm.h>
 #include <ndbm.h>

->>>>>>> /tmp/T4010782

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

-<<<<<<< 1.2
-=======

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

->>>>>>> /tmp/T4010782

 
 

-<<<<<<< 1.2
-typedef struct {
-       char *dptr;
-       int dsize;
-} datum;
-
-
-=======

 int
 int

->>>>>>> /tmp/T4010782

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

-<<<<<<< 1.2
-=======

        int argc;
        int argc;

->>>>>>> /tmp/T4010782

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

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

        DBM *dbp;
        datum content, key;
        char *filename;
        DBM *dbp;
        datum content, key;
        char *filename;

->>>>>>> /tmp/T4010782

        int ch;
        int ch;

-<<<<<<< 1.2
-=======

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

->>>>>>> /tmp/T4010782

 
 

-<<<<<<< 1.2
-=======

        filename = "/etc/aliases";
        filename = "/etc/aliases";

->>>>>>> /tmp/T4010782

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


@@ -117,39 +73,28 @@ main(argc, argv)
                        break;
                case '?':
                default:
                        break;
                case '?':
                default:

-<<<<<<< 1.2
-                       fputs("usage: praliases [-f file]\n", stderr);
-=======

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

->>>>>>> /tmp/T4010782

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

-<<<<<<< 1.2
-       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))
 #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);
+                               printf("%.*s:%.*s\n",
+                                       newdbkey.size, newdbkey.data,
+                                       newdbcontent.size, newdbcontent.data);

                }
                else for (; *argv; ++argv) {
                        newdbkey.data = *argv;
                        newdbkey.size = strlen(*argv) + 1;
                }
                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);
+                       if (!db->get(db, &newdbkey, &newdbcontent, 0))
+                               printf("%s:%.*s\n", newdbkey.data,
+                                       newdbcontent.size, newdbcontent.data);

                        else
                                printf("%s: No such key\n",
                                        newdbkey.data);
                        else
                                printf("%s: No such key\n",
                                        newdbkey.data);


@@ -163,10 +108,12 @@ main(argc, argv)
                        exit(EX_OSFILE);
                }
                if (!argc)
                        exit(EX_OSFILE);
                }
                if (!argc)

-                       for (key = dbm_nextkey(dbp);
+                       for (key = dbm_firstkey(dbp);

                            key.dptr != NULL; key = dbm_nextkey(dbp)) {
                                content = dbm_fetch(dbp, key);
                            key.dptr != NULL; key = dbm_nextkey(dbp)) {
                                content = dbm_fetch(dbp, key);

-                               (void)printf("%s:%s\n", key.dptr, content.dptr);
+                               (void)printf("%.*s:%.*s\n",
+                                       key.dsize, key.dptr,
+                                       content.dsize, content.dptr);

                        }
                else for (; *argv; ++argv) {
                        key.dptr = *argv;
                        }
                else for (; *argv; ++argv) {
                        key.dptr = *argv;


@@ -175,25 +122,11 @@ main(argc, argv)
                        if (!content.dptr)
                                (void)printf("%s: No such key\n", key.dptr);
                        else
                        if (!content.dptr)
                                (void)printf("%s: No such key\n", key.dptr);
                        else

-                               (void)printf("%s:%s\n", key.dptr, content.dptr);
->>>>>>> /tmp/T4010782
+                               (void)printf("%s:%.*s\n", key.dptr,
+                                       content.dsize, content.dptr);

                }
                }

-<<<<<<< 1.2
-       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
 #ifdef NEWDB

->>>>>>> /tmp/T4010782

        }
        }

-<<<<<<< 1.2
-=======

 #endif
 #endif

->>>>>>> /tmp/T4010782

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