Deleted Added
full compact
envelope.c (157001) envelope.c (159609)
1/*
2 * Copyright (c) 1998-2003 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-2003 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: envelope.c,v 8.295 2005/06/15 20:32:18 ca Exp $")
16SM_RCSID("@(#)$Id: envelope.c,v 8.296 2006/03/31 18:53:50 ca Exp $")
17
18/*
19** CLRSESSENVELOPE -- clear session oriented data in an envelope
20**
21** Parameters:
22** e -- the envelope to clear.
23**
24** Returns:

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

514 {
515 if (tTd(50, 1))
516 {
517 sm_dprintf("\n===== Dropping queue files for %s... queueit=%d, e_flags=",
518 e->e_id, queueit);
519 printenvflags(e);
520 }
521 if (!panic)
17
18/*
19** CLRSESSENVELOPE -- clear session oriented data in an envelope
20**
21** Parameters:
22** e -- the envelope to clear.
23**
24** Returns:

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

514 {
515 if (tTd(50, 1))
516 {
517 sm_dprintf("\n===== Dropping queue files for %s... queueit=%d, e_flags=",
518 e->e_id, queueit);
519 printenvflags(e);
520 }
521 if (!panic)
522 {
523 if (e->e_dfp != NULL)
524 {
525 (void) sm_io_close(e->e_dfp, SM_TIME_DEFAULT);
526 e->e_dfp = NULL;
527 }
522 (void) xunlink(queuename(e, DATAFL_LETTER));
528 (void) xunlink(queuename(e, DATAFL_LETTER));
529 }
523 if (panic && QueueMode == QM_LOST)
524 {
525 /*
526 ** leave the Qf file behind as
527 ** the delivery attempt failed.
528 */
529
530 /* EMPTY */

--- 742 unchanged lines hidden ---
530 if (panic && QueueMode == QM_LOST)
531 {
532 /*
533 ** leave the Qf file behind as
534 ** the delivery attempt failed.
535 */
536
537 /* EMPTY */

--- 742 unchanged lines hidden ---