diff options
| author | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2005-02-14 02:39:14 +0000 |
|---|---|---|
| committer | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2005-02-14 02:39:14 +0000 |
| commit | 684b2a5fa3f04afe0789a1f9155cac8e62a9385b (patch) | |
| tree | e109b48bd3a58abfa6dedd2be0e7f509d15c5b1d /contrib/sendmail/makemap/makemap.c | |
| parent | 6af83ee0d2941d18880b6aaa2b4facd1d30c6106 (diff) | |
| download | src-684b2a5fa3f04afe0789a1f9155cac8e62a9385b.tar.gz src-684b2a5fa3f04afe0789a1f9155cac8e62a9385b.zip | |
Resolve conflicts from sendmail 8.13.3 import
MFC after: 4 days
Notes
Notes:
svn path=/head/; revision=141862
Diffstat (limited to 'contrib/sendmail/makemap/makemap.c')
| -rw-r--r-- | contrib/sendmail/makemap/makemap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c index bf3d282380d8..344d5b97207c 100644 --- a/contrib/sendmail/makemap/makemap.c +++ b/contrib/sendmail/makemap/makemap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2002, 2004 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1992 Eric P. Allman. All rights reserved. * Copyright (c) 1992, 1993 @@ -14,13 +14,13 @@ #include <sm/gen.h> SM_IDSTR(copyright, -"@(#) Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.\n\ +"@(#) Copyright (c) 1998-2002, 2004 Sendmail, Inc. and its suppliers.\n\ All rights reserved.\n\ Copyright (c) 1992 Eric P. Allman. All rights reserved.\n\ Copyright (c) 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.176 2002/06/27 23:41:04 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.177 2004/08/03 23:57:24 ca Exp $") #include <sys/types.h> @@ -52,6 +52,8 @@ BITMAP256 DontBlameSendmail; #define BUFSIZE 1024 #define ISSEP(c) (sep == '\0' ? isascii(c) && isspace(c) : (c) == sep) +static void usage __P((char *)); + static void usage(progname) char *progname; |