BSD 4_4_Lite1 release

[unix-history] / usr / src / usr.sbin / sendmail / makemap / makemap.c

diff --git a/usr/src/usr.sbin/sendmail/makemap/makemap.c b/usr/src/usr.sbin/sendmail/makemap/makemap.c
index efb43a3..f2d4aea 100644 (file)
--- a/usr/src/usr.sbin/sendmail/makemap/makemap.c
+++ b/usr/src/usr.sbin/sendmail/makemap/makemap.c
@@ -3,11 +3,37 @@
  * Copyright (c) 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
  * Copyright (c) 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)makemap.c  8.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)makemap.c  8.6 (Berkeley) 11/22/93";

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -55,7 +81,7 @@ main(argc, argv)
        bool notrunc = FALSE;
        bool allowreplace = FALSE;
        bool verbose = FALSE;
        bool notrunc = FALSE;
        bool allowreplace = FALSE;
        bool verbose = FALSE;

-       bool foldcase = FALSE;
+       bool foldcase = TRUE;

        int exitstat;
        int opt;
        char *typename;
        int exitstat;
        int opt;
        char *typename;


@@ -92,7 +118,7 @@ main(argc, argv)
                        break;
 
                  case 'f':
                        break;
 
                  case 'f':

-                       foldcase = TRUE;
+                       foldcase = FALSE;

                        break;
 
                  case 'o':
                        break;
 
                  case 'o':


@@ -236,8 +262,15 @@ main(argc, argv)
                */
 
                p = strchr(ibuf, '\n');
                */
 
                p = strchr(ibuf, '\n');

-               if (*p != '\0')
+               if (p != NULL)

                        *p = '\0';
                        *p = '\0';

+               else if (!feof(stdin))
+               {
+                       fprintf(stderr, "%s: %s: line %d: line too long (%d bytes max)\n",
+                               progname, mapname, lineno, sizeof ibuf);
+                       continue;
+               }
+                       

                if (ibuf[0] == '\0' || ibuf[0] == '#')
                        continue;
                if (isspace(ibuf[0]))
                if (ibuf[0] == '\0' || ibuf[0] == '#')
                        continue;
                if (isspace(ibuf[0]))