Deleted Added
full compact
conf.c (98125) conf.c (98844)
1/*
2 * Copyright (c) 1998-2002 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-2002 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: conf.c,v 8.969 2002/05/24 23:48:55 gshapiro Exp $")
16SM_RCSID("@(#)$Id: conf.c,v 8.972 2002/06/18 16:11:44 ca Exp $")
17
17
18/* $FreeBSD: head/contrib/sendmail/src/conf.c 98125 2002-06-11 21:16:51Z gshapiro $ */
18/* $FreeBSD: head/contrib/sendmail/src/conf.c 98844 2002-06-26 02:50:37Z gshapiro $ */
19
20#include <sendmail/pathnames.h>
21
22# include <sys/ioctl.h>
23# include <sys/param.h>
24
25#include <limits.h>
26#if NETINET || NETINET6

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

2335** It looks like the Compaq Tru64 5.1A now aligns argv and envp to
2336** 64 bit alignment, so unless each piece of argv and envp is a multiple
2337** of 8 bytes (including terminating NULL), initsetproctitle() won't use
2338** any of the space beyond argv[0]. Be sure to set SPT_ALIGN_SIZE if
2339** you use this FFR.
2340*/
2341
2342# ifdef SPT_ALIGN_SIZE
19
20#include <sendmail/pathnames.h>
21
22# include <sys/ioctl.h>
23# include <sys/param.h>
24
25#include <limits.h>
26#if NETINET || NETINET6

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

2335** It looks like the Compaq Tru64 5.1A now aligns argv and envp to
2336** 64 bit alignment, so unless each piece of argv and envp is a multiple
2337** of 8 bytes (including terminating NULL), initsetproctitle() won't use
2338** any of the space beyond argv[0]. Be sure to set SPT_ALIGN_SIZE if
2339** you use this FFR.
2340*/
2341
2342# ifdef SPT_ALIGN_SIZE
2343# define SPT_ALIGN(x, align) ((((x) + SPT_ALIGN_SIZE) >> (align)) << (align))
2343# define SPT_ALIGN(x, align) (((((x) + SPT_ALIGN_SIZE) >> (align)) << (align)) - 1)
2344# else /* SPT_ALIGN_SIZE */
2345# define SPT_ALIGN(x, align) (x)
2346# endif /* SPT_ALIGN_SIZE */
2347#else /* _FFR_SPT_ALIGN */
2348# define SPT_ALIGN(x, align) (x)
2349#endif /* _FFR_SPT_ALIGN */
2350
2351/*

--- 3681 unchanged lines hidden ---
2344# else /* SPT_ALIGN_SIZE */
2345# define SPT_ALIGN(x, align) (x)
2346# endif /* SPT_ALIGN_SIZE */
2347#else /* _FFR_SPT_ALIGN */
2348# define SPT_ALIGN(x, align) (x)
2349#endif /* _FFR_SPT_ALIGN */
2350
2351/*

--- 3681 unchanged lines hidden ---