From f1cb96b2ca44e4aa70b57abc58ffc615af6b0583 Mon Sep 17 00:00:00 2001 From: glass Date: Mon, 31 Jan 1994 02:38:08 +0000 Subject: upgrade to version 8.6.5 --- usr.sbin/sendmail/makemap/makemap.8 | 2 +- usr.sbin/sendmail/makemap/makemap.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'usr.sbin/sendmail/makemap') diff --git a/usr.sbin/sendmail/makemap/makemap.8 b/usr.sbin/sendmail/makemap/makemap.8 index 2fd678e7ee0..2ee45c2dd86 100644 --- a/usr.sbin/sendmail/makemap/makemap.8 +++ b/usr.sbin/sendmail/makemap/makemap.8 @@ -101,7 +101,7 @@ This must match the \-N flag in the sendmail.cf .It Fl f Normally all upper case letters in the key are folded to lower case. -This flag disables that behavior. +This flag disables that behaviour. This is intended to mesh with the \-f flag in the \fBK\fP diff --git a/usr.sbin/sendmail/makemap/makemap.c b/usr.sbin/sendmail/makemap/makemap.c index 2f008fbbda1..f2d4aea9ca9 100644 --- a/usr.sbin/sendmail/makemap/makemap.c +++ b/usr.sbin/sendmail/makemap/makemap.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)makemap.c 8.5 (Berkeley) 9/22/93"; +static char sccsid[] = "@(#)makemap.c 8.6 (Berkeley) 11/22/93"; #endif /* not lint */ #include @@ -262,8 +262,15 @@ main(argc, argv) */ p = strchr(ibuf, '\n'); - if (*p != '\0') + if (p != NULL) *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])) -- cgit