fix -f flag to match ORA book

SCCS-vsn: usr.sbin/sendmail/makemap/makemap.c 8.5
SCCS-vsn: usr.sbin/sendmail/makemap/makemap.8 8.2

diff --git a/usr/src/usr.sbin/sendmail/makemap/makemap.8 b/usr/src/usr.sbin/sendmail/makemap/makemap.8
index fe7208c..fe04619 100644 (file)
--- a/usr/src/usr.sbin/sendmail/makemap/makemap.8
+++ b/usr/src/usr.sbin/sendmail/makemap/makemap.8
@@ -3,7 +3,7 @@
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"     @(#)makemap.8  8.1 (Berkeley) %G%
+.\"     @(#)makemap.8  8.2 (Berkeley) %G%

 .\"
 .Dd November 16, 1992
 .Dt MAKEMAP 8
 .\"
 .Dd November 16, 1992
 .Dt MAKEMAP 8


@@ -73,13 +73,14 @@ in the map.
 This must match the \-N flag in the sendmail.cf
 ``K'' line.
 .It Fl f
 This must match the \-N flag in the sendmail.cf
 ``K'' line.
 .It Fl f

-Fold all upper case letters in the key
-to lower case;
-this is intended to mesh with the
+Normally all upper case letters in the key
+are folded to lower case.
+This flag disables that behaviour.
+This is intended to mesh with the

 \-f flag in the
 \fBK\fP
 line in sendmail.cf.
 \-f flag in the
 \fBK\fP
 line in sendmail.cf.

-The value is not case folded.
+The value is never case folded.

 .It Fl o
 Append to an old file.
 This allows you to augment an existing file.
 .It Fl o
 Append to an old file.
 This allows you to augment an existing file.

diff --git a/usr/src/usr.sbin/sendmail/makemap/makemap.c b/usr/src/usr.sbin/sendmail/makemap/makemap.c
index efb43a3..4fbf855 100644 (file)
--- a/usr/src/usr.sbin/sendmail/makemap/makemap.c
+++ b/usr/src/usr.sbin/sendmail/makemap/makemap.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)makemap.c  8.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)makemap.c  8.5 (Berkeley) %G%";

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


@@ -55,7 +55,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 +92,7 @@ main(argc, argv)
                        break;
 
                  case 'f':
                        break;
 
                  case 'f':

-                       foldcase = TRUE;
+                       foldcase = FALSE;

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