summaryrefslogtreecommitdiffstats
path: root/contrib/sendmail/makemap/makemap.c
diff options
context:
space:
mode:
authorgshapiro <gshapiro@FreeBSD.org>2008-08-28 06:08:29 +0000
committergshapiro <gshapiro@FreeBSD.org>2008-08-28 06:08:29 +0000
commitb1e5c9c5e51c0569a82ee5838ed755e3c7bae94f (patch)
tree45eaace561ffa22220b192fa6cc9bd930b44ffb6 /contrib/sendmail/makemap/makemap.c
parentdb890a1eb5b814a0367ca9de9f9a8f211f1231e7 (diff)
downloadFreeBSD-src-b1e5c9c5e51c0569a82ee5838ed755e3c7bae94f.zip
FreeBSD-src-b1e5c9c5e51c0569a82ee5838ed755e3c7bae94f.tar.gz
Merge sendmail 8.14.3 into HEAD.
Note: As the first merge since the conversion to svn, it includes many propset changes to get the proper svn:eol-style and svn:mime-type on the files (as merged from the fixed up vendor/dist area). MFC after: 3 days
Diffstat (limited to 'contrib/sendmail/makemap/makemap.c')
-rw-r--r--contrib/sendmail/makemap/makemap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c
index 7302748..cacec00 100644
--- a/contrib/sendmail/makemap/makemap.c
+++ b/contrib/sendmail/makemap/makemap.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2002, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2002, 2004, 2008 Sendmail, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1992 Eric P. Allman. All rights reserved.
* Copyright (c) 1992, 1993
@@ -20,7 +20,7 @@ SM_IDSTR(copyright,
Copyright (c) 1992, 1993\n\
The Regents of the University of California. All rights reserved.\n")
-SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.178 2007/05/11 18:45:39 ca Exp $")
+SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.179 2008/04/14 02:06:16 ca Exp $")
#include <sys/types.h>
@@ -378,9 +378,10 @@ main(argc, argv)
break;
(void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
- "%.*s\t%.*s\n",
+ "%.*s%c%.*s\n",
(int) db_key.size,
(char *) db_key.data,
+ (sep != '\0') ? sep : '\t',
(int) db_val.size,
(char *)db_val.data);
OpenPOWER on IntegriCloud