Deleted Added
sdiff udiff text old ( 141858 ) new ( 147078 )
full compact
collect.c (141858) collect.c (147078)
1/*
2 * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
3 * All rights reserved.
4 * Copyright (c) 1983, 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 */
13
14#include <sendmail.h>
15
1/*
2 * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
3 * All rights reserved.
4 * Copyright (c) 1983, 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 */
13
14#include <sendmail.h>
15
16SM_RCSID("@(#)$Id: collect.c,v 8.260 2004/11/30 23:29:15 ca Exp $")
16SM_RCSID("@(#)$Id: collect.c,v 8.261 2005/02/16 23:38:51 ca Exp $")
17
18static void collecttimeout __P((int));
19static void eatfrom __P((char *volatile, ENVELOPE *));
20static void collect_doheader __P((ENVELOPE *));
21static SM_FILE_T *collect_dfopen __P((ENVELOPE *));
22static SM_FILE_T *collect_eoh __P((ENVELOPE *, int, int));
23
24/*

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

723 /* NOTREACHED */
724 }
725 else if (SuperSafe == SAFE_NO ||
726 SuperSafe == SAFE_INTERACTIVE ||
727 (SuperSafe == SAFE_REALLY_POSTMILTER && smtpmode))
728 {
729 /* skip next few clauses */
730 /* EMPTY */
17
18static void collecttimeout __P((int));
19static void eatfrom __P((char *volatile, ENVELOPE *));
20static void collect_doheader __P((ENVELOPE *));
21static SM_FILE_T *collect_dfopen __P((ENVELOPE *));
22static SM_FILE_T *collect_eoh __P((ENVELOPE *, int, int));
23
24/*

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

723 /* NOTREACHED */
724 }
725 else if (SuperSafe == SAFE_NO ||
726 SuperSafe == SAFE_INTERACTIVE ||
727 (SuperSafe == SAFE_REALLY_POSTMILTER && smtpmode))
728 {
729 /* skip next few clauses */
730 /* EMPTY */
731 /* Note: updfs() is not called in this case! */
731 }
732 else if (sm_io_setinfo(df, SM_BF_COMMIT, NULL) < 0 && errno != EINVAL)
733 {
734 int save_errno = errno;
735
736 if (save_errno == EEXIST)
737 {
738 char *dfile;

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

776 /* NOTREACHED */
777 }
778 else
779 {
780 /* everything is happily flushed to disk */
781 df = NULL;
782
783 /* remove from available space in filesystem */
732 }
733 else if (sm_io_setinfo(df, SM_BF_COMMIT, NULL) < 0 && errno != EINVAL)
734 {
735 int save_errno = errno;
736
737 if (save_errno == EEXIST)
738 {
739 char *dfile;

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

777 /* NOTREACHED */
778 }
779 else
780 {
781 /* everything is happily flushed to disk */
782 df = NULL;
783
784 /* remove from available space in filesystem */
784 updfs(e, false, true);
785 updfs(e, 0, 1, "collect");
785 }
786
787 /* An EOF when running SMTP is an error */
788 if (inputerr && (OpMode == MD_SMTP || OpMode == MD_DAEMON))
789 {
790 char *host;
791 char *problem;
792 ADDRESS *q;

--- 329 unchanged lines hidden --- 		786 }
787
788 /* An EOF when running SMTP is an error */
789 if (inputerr && (OpMode == MD_SMTP || OpMode == MD_DAEMON))
790 {
791 char *host;
792 char *problem;
793 ADDRESS *q;

--- 329 unchanged lines hidden ---