Deleted Added
full compact
mci.c (102533) mci.c (110563)
1/*
2 * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
3 * All rights reserved.
4 * Copyright (c) 1995-1997 Eric P. Allman. All rights reserved.
5 * Copyright (c) 1988, 1993
6 * The Regents of the University of California. All rights reserved.
7 *
8 * By using this file, you agree to the terms and conditions set
9 * forth in the LICENSE file which can be found at the top level of
10 * the sendmail distribution.
11 *
1/*
2 * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
3 * All rights reserved.
4 * Copyright (c) 1995-1997 Eric P. Allman. All rights reserved.
5 * Copyright (c) 1988, 1993
6 * The Regents of the University of California. All rights reserved.
7 *
8 * By using this file, you agree to the terms and conditions set
9 * forth in the LICENSE file which can be found at the top level of
10 * the sendmail distribution.
11 *
12 * $FreeBSD: head/contrib/sendmail/src/mci.c 102533 2002-08-28 18:12:33Z gshapiro $
12 * $FreeBSD: head/contrib/sendmail/src/mci.c 110563 2003-02-08 20:35:51Z gshapiro $
13 *
14 */
15
16#include <sendmail.h>
17
13 *
14 */
15
16#include <sendmail.h>
17
18SM_RCSID("@(#)$Id: mci.c,v 8.205 2002/05/24 18:53:48 gshapiro Exp $")
18SM_RCSID("@(#)$Id: mci.c,v 8.205.2.2 2002/11/26 19:15:19 gshapiro Exp $")
19
20#if NETINET || NETINET6
21# include <arpa/inet.h>
22#endif /* NETINET || NETINET6 */
23
24#include <dirent.h>
25
26static int mci_generate_persistent_path __P((const char *, char *,

--- 1214 unchanged lines hidden (view full) ---

1241 "", LOCK_SH|LOCK_NB);
1242 (void) sm_io_close(fp, SM_TIME_DEFAULT);
1243 FileName = NULL;
1244
1245 (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, "%c%-39s %12s ",
1246 locked ? '*' : ' ', hostname,
1247 pintvl(curtime() - mcib.mci_lastuse, true));
1248 if (mcib.mci_rstatus != NULL)
19
20#if NETINET || NETINET6
21# include <arpa/inet.h>
22#endif /* NETINET || NETINET6 */
23
24#include <dirent.h>
25
26static int mci_generate_persistent_path __P((const char *, char *,

--- 1214 unchanged lines hidden (view full) ---

1241 "", LOCK_SH|LOCK_NB);
1242 (void) sm_io_close(fp, SM_TIME_DEFAULT);
1243 FileName = NULL;
1244
1245 (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, "%c%-39s %12s ",
1246 locked ? '*' : ' ', hostname,
1247 pintvl(curtime() - mcib.mci_lastuse, true));
1248 if (mcib.mci_rstatus != NULL)
1249 {
1249 (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, "%.*s\n", width,
1250 mcib.mci_rstatus);
1250 (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, "%.*s\n", width,
1251 mcib.mci_rstatus);
1252 }
1251 else if (mcib.mci_exitstat == EX_TEMPFAIL && mcib.mci_errno != 0)
1252 (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
1253 "Deferred: %.*s\n", width - 10,
1254 sm_errstring(mcib.mci_errno));
1255 else if (mcib.mci_exitstat != 0)
1256 {
1257 char *exmsg = sm_sysexmsg(mcib.mci_exitstat);
1258

--- 231 unchanged lines hidden ---
1253 else if (mcib.mci_exitstat == EX_TEMPFAIL && mcib.mci_errno != 0)
1254 (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
1255 "Deferred: %.*s\n", width - 10,
1256 sm_errstring(mcib.mci_errno));
1257 else if (mcib.mci_exitstat != 0)
1258 {
1259 char *exmsg = sm_sysexmsg(mcib.mci_exitstat);
1260

--- 231 unchanged lines hidden ---