isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge compat.h and missing.h into missing.h

Browse Source
This commit is contained in:
Todd C. Miller
2010-08-16 14:05:44 -04:00
parent 6ce5c4cd97
commit f454727bb8
52 changed files with 392 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST
View File

@@ -84,7 +84,6 @@ doc/visudo.man.in
doc/visudo.pod
include/Makefile.in
include/alloc.h
include/compat.h
include/error.h
include/fileops.h
include/lbuf.h

16
common/Makefile.in
View File

@@ -59,15 +59,15 @@ libcommon.la: $(LTOBJS)
$(LIBTOOL) --mode=link $(CC) -o $@ $(LTOBJS) -no-install
# Dependencies
aix.lo: $(srcdir)/aix.c $(incdir)/compat.h $(incdir)/alloc.h $(incdir)/error.h $(top_builddir)/config.h
alloc.lo: $(srcdir)/alloc.c $(incdir)/compat.h $(incdir)/alloc.h $(incdir)/error.h $(top_builddir)/config.h
atobool.lo: $(srcdir)/atobool.c $(incdir)/compat.h $(incdir)/missing.h $(top_builddir)/config.h
aix.lo: $(srcdir)/aix.c $(incdir)/missing.h $(incdir)/alloc.h $(incdir)/error.h $(top_builddir)/config.h
alloc.lo: $(srcdir)/alloc.c $(incdir)/missing.h $(incdir)/alloc.h $(incdir)/error.h $(top_builddir)/config.h
atobool.lo: $(srcdir)/atobool.c $(incdir)/missing.h $(incdir)/missing.h $(top_builddir)/config.h
fileops.lo: $(srcdir)/fileops.c $(incdir)/fileops.h $(top_builddir)/config.h
fmt_string.lo: $(srcdir)/fmt_string.c $(incdir)/compat.h $(top_builddir)/config.h
lbuf.lo: $(srcdir)/lbuf.c $(incdir)/compat.h $(incdir)/alloc.h $(incdir)/error.h $(incdir)/missing.h $(incdir)/lbuf.h $(top_builddir)/config.h
list.lo: $(srcdir)/list.c $(incdir)/compat.h $(incdir)/list.h $(incdir)/error.h $(top_builddir)/config.h
term.lo: $(srcdir)/term.c $(incdir)/compat.h $(top_builddir)/config.h
zero_bytes.lo: $(srcdir)/zero_bytes.c $(incdir)/compat.h $(top_builddir)/config.h
fmt_string.lo: $(srcdir)/fmt_string.c $(incdir)/missing.h $(top_builddir)/config.h
lbuf.lo: $(srcdir)/lbuf.c $(incdir)/missing.h $(incdir)/alloc.h $(incdir)/error.h $(incdir)/missing.h $(incdir)/lbuf.h $(top_builddir)/config.h
list.lo: $(srcdir)/list.c $(incdir)/missing.h $(incdir)/list.h $(incdir)/error.h $(top_builddir)/config.h
term.lo: $(srcdir)/term.c $(incdir)/missing.h $(top_builddir)/config.h
zero_bytes.lo: $(srcdir)/zero_bytes.c $(incdir)/missing.h $(top_builddir)/config.h
install:

2
common/aix.c
View File

@@ -31,7 +31,7 @@
#include <usersec.h>
#include <uinfo.h>
#include "compat.h"
#include "missing.h"
#include "alloc.h"
#include "error.h"

1
common/alloc.c
View File

@@ -45,7 +45,6 @@
# include <inttypes.h>
#endif
#include <compat.h>
#include <missing.h>
#include <alloc.h>
#include <error.h>

1
common/atobool.c
View File

@@ -38,7 +38,6 @@
# include <strings.h>
#endif /* HAVE_STRINGS_H */
#include <compat.h>
#include <missing.h>
int

1
common/fileops.c
View File

@@ -47,7 +47,6 @@
# include <emul/timespec.h>
#endif
#include <compat.h>
#include <missing.h>
#include <fileops.h>

2
common/fmt_string.c
View File

@@ -38,7 +38,7 @@
# include <strings.h>
#endif /* HAVE_STRINGS_H */
#include <compat.h>
#include <missing.h>
/*
* Allocate storage for a name=value string and return it.

3
common/lbuf.c
View File

@@ -42,10 +42,9 @@
#include <ctype.h>
#include <termios.h>
#include <compat.h>
#include <missing.h>
#include <alloc.h>
#include <error.h>
#include <missing.h>
#include <lbuf.h>
void

2
common/list.c
View File

@@ -29,7 +29,7 @@
# endif
#endif /* STDC_HEADERS */
#include <compat.h>
#include <missing.h>
#include <list.h>
#ifdef DEBUG
# include <error.h>

2
common/term.c
View File

@@ -38,7 +38,7 @@
#endif /* HAVE_STRINGS_H */
#include <termios.h>
#include <compat.h>
#include <missing.h>
#ifndef TCSASOFT
# define TCSASOFT 0

2
common/zero_bytes.c
View File

@@ -18,7 +18,7 @@
#include <sys/types.h>
#include <config.h>
#include <compat.h>
#include <missing.h>
/*
* Like bzero(3) but with a volatile pointer. The hope is that

39
compat/Makefile.in
View File

@@ -66,33 +66,32 @@ libreplace.la: $(LTLIBOBJS)
siglist.c: mksiglist
./mksiglist > $@
mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/compat.h $(top_builddir)/config.h
mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/missing.h $(top_builddir)/config.h
$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@
@DEV@$(srcdir)/mksiglist.h: $(srcdir)/siglist.in
@DEV@ awk 'BEGIN {print "/* public domain */\n"} /^ [A-Z]/ {printf("#ifdef SIG%s\n if (my_sys_siglist[SIG%s] == NULL)\n\tmy_sys_siglist[SIG%s] = \"%s\";\n#endif\n", $$1, $$1, $$1, substr($$0, 13))}' < $(srcdir)/siglist.in > $@
siglist.lo: siglist.c $(incdir)/compat.h $(top_builddir)/config.h
siglist.lo: siglist.c $(incdir)/missing.h $(top_builddir)/config.h
# Dependencies
closefrom.lo: $(compat)/closefrom.c $(incdir)/compat.h $(top_builddir)/config.h
fnmatch.lo: $(compat)/fnmatch.c $(compat)/fnmatch.h $(compat)/charclass.h $(incdir)/compat.h $(top_builddir)/config.h
getcwd.lo: $(compat)/getcwd.c $(incdir)/compat.h $(top_builddir)/config.h
getline.lo: $(compat)/getline.c $(incdir)/compat.h $(top_builddir)/config.h
getprogname.lo: $(compat)/getprogname.c $(incdir)/compat.h $(top_builddir)/config.h
glob.lo: $(compat)/glob.c $(compat)/glob.h $(compat)/charclass.h $(incdir)/compat.h $(top_builddir)/config.h
isblank.lo: $(compat)/isblank.c $(incdir)/compat.h $(top_builddir)/config.h
memrchr.lo: $(compat)/memrchr.c $(incdir)/compat.h $(top_builddir)/config.h
mkstemps.lo: $(compat)/mkstemps.c $(incdir)/compat.h $(top_builddir)/config.h
nanosleep.lo: $(compat)/nanosleep.c $(incdir)/compat.h $(top_builddir)/config.h
sigaction.lo: $(compat)/sigaction.c $(incdir)/compat.h $(incdir)/compat.h
snprintf.lo: $(compat)/snprintf.c $(incdir)/compat.h $(top_builddir)/config.h
strcasecmp.lo: $(compat)/strcasecmp.c $(incdir)/compat.h $(top_builddir)/config.h
strerror.lo: $(compat)/strerror.c $(incdir)/compat.h $(top_builddir)/config.h
strlcat.lo: $(compat)/strlcat.c $(incdir)/compat.h $(top_builddir)/config.h
strlcpy.lo: $(compat)/strlcpy.c $(incdir)/compat.h $(top_builddir)/config.h
strsignal.lo: $(compat)/strsignal.c $(incdir)/compat.h $(top_builddir)/config.h
utimes.lo: $(compat)/utimes.c $(incdir)/compat.h $(compat)/utime.h $(top_builddir)/config.h
closefrom.lo: $(compat)/closefrom.c $(incdir)/missing.h $(top_builddir)/config.h
fnmatch.lo: $(compat)/fnmatch.c $(compat)/fnmatch.h $(compat)/charclass.h $(incdir)/missing.h $(top_builddir)/config.h
getcwd.lo: $(compat)/getcwd.c $(incdir)/missing.h $(top_builddir)/config.h
getline.lo: $(compat)/getline.c $(incdir)/missing.h $(top_builddir)/config.h
getprogname.lo: $(compat)/getprogname.c $(incdir)/missing.h $(top_builddir)/config.h
glob.lo: $(compat)/glob.c $(compat)/glob.h $(compat)/charclass.h $(incdir)/missing.h $(top_builddir)/config.h
isblank.lo: $(compat)/isblank.c $(incdir)/missing.h $(top_builddir)/config.h
memrchr.lo: $(compat)/memrchr.c $(incdir)/missing.h $(top_builddir)/config.h
mkstemps.lo: $(compat)/mkstemps.c $(incdir)/missing.h $(top_builddir)/config.h
nanosleep.lo: $(compat)/nanosleep.c $(incdir)/missing.h $(top_builddir)/config.h
snprintf.lo: $(compat)/snprintf.c $(incdir)/missing.h $(top_builddir)/config.h
strcasecmp.lo: $(compat)/strcasecmp.c $(incdir)/missing.h $(top_builddir)/config.h
strerror.lo: $(compat)/strerror.c $(incdir)/missing.h $(top_builddir)/config.h
strlcat.lo: $(compat)/strlcat.c $(incdir)/missing.h $(top_builddir)/config.h
strlcpy.lo: $(compat)/strlcpy.c $(incdir)/missing.h $(top_builddir)/config.h
strsignal.lo: $(compat)/strsignal.c $(incdir)/missing.h $(top_builddir)/config.h
utimes.lo: $(compat)/utimes.c $(incdir)/missing.h $(compat)/utime.h $(top_builddir)/config.h
install:

2
compat/closefrom.c
View File

@@ -47,7 +47,7 @@
# endif
#endif
#include <compat.h>
#include <missing.h>
#ifndef HAVE_FCNTL_CLOSEM
# ifndef HAVE_DIRFD

2
compat/fnmatch.c
View File

@@ -47,7 +47,7 @@
# include <strings.h>
#endif /* HAVE_STRINGS_H */
#include <compat.h>
#include <missing.h>
#include "fnmatch.h"
#include "charclass.h"

2
compat/getcwd.c
View File

@@ -71,7 +71,7 @@
# endif
#endif
#include <compat.h>
#include <missing.h>
#define ISDOT(dp) \
(dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \

2
compat/getgrouplist.c
View File

@@ -34,7 +34,7 @@
#endif /* HAVE_STRINGS_H */
#include <grp.h>
#include <compat.h>
#include <missing.h>
/*
* BSD-compatible getgrouplist(3) using getgrent(3)

2
compat/getline.c
View File

@@ -35,7 +35,7 @@
#endif /* HAVE_STRINGS_H */
#include <limits.h>
#include <compat.h>
#include <missing.h>
#ifndef LINE_MAX
# define LINE_MAX 2048

2
compat/getprogname.c
View File

@@ -18,7 +18,7 @@
#include <string.h>
#include <config.h>
#include <compat.h>
#include <missing.h>
static const char *progname = "sudo";

2
compat/glob.c
View File

@@ -95,7 +95,7 @@
#include <limits.h>
#include <pwd.h>
#include <compat.h>
#include <missing.h>
#include "glob.h"
#include "charclass.h"

2
compat/isblank.c
View File

@@ -15,7 +15,7 @@
*/
#include <config.h>
#include <compat.h>
#include <missing.h>
#undef isblank
int

2
compat/memrchr.c
View File

@@ -16,7 +16,7 @@
#include <sys/types.h>
#include <config.h>
#include <compat.h>
#include <missing.h>
/*
* Reverse memchr()

4
compat/mksiglist.c
View File

@@ -28,7 +28,7 @@
#endif /* STDC_HEADERS */
#include <signal.h>
#include <compat.h>
#include <missing.h>
int
main(int argc, char *argv[])
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
printf("#include <config.h>\n");
printf("#include <signal.h>\n");
printf("#include <compat.h>\n\n");
printf("#include <missing.h>\n\n");
printf("const char *const my_sys_siglist[NSIG] = {\n");
for (i = 0; i < NSIG; i++) {
if (my_sys_siglist[i] != NULL) {

2
compat/mkstemps.c
View File

@@ -36,7 +36,7 @@
# include <time.h>
#endif
#include <compat.h>
#include <missing.h>
static unsigned int get_random(void);
static void seed_random(void);

2
compat/nanosleep.c
View File

@@ -29,7 +29,7 @@
#endif
#include <errno.h>
#include <compat.h>
#include <missing.h>
int
nanosleep(const struct timespec *ts, struct timespec *rts)

2
compat/setenv.c
View File

@@ -38,7 +38,7 @@
#endif /* HAVE_MALLOC_H && !STDC_HEADERS */
#include <errno.h>
#include <compat.h>
#include <missing.h>
int
setenv(const char *var, const char *val, int overwrite)

2
compat/snprintf.c
View File

@@ -71,7 +71,7 @@
#include <limits.h>
#include <stdarg.h>
#include <compat.h>
#include <missing.h>
static int xxxprintf(char **, size_t, int, const char *, va_list);

3
compat/strlcat.c
View File

@@ -21,8 +21,7 @@
#include <string.h>
#include <config.h>
#include <compat.h>
#include <missing.h>
/*
* Appends src to string dst of size siz (unlike strncat, siz is the

2
compat/strlcpy.c
View File

@@ -20,7 +20,7 @@
#include <sys/types.h>
#include <config.h>
#include <compat.h>
#include <missing.h>
/*
* Copy src to string dst of size siz. At most siz-1 characters

2
compat/strsignal.c
View File

@@ -18,7 +18,7 @@
#include <signal.h>
#include <config.h>
#include <compat.h>
#include <missing.h>
#if defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST == 1
# define my_sys_siglist sys_siglist

2
compat/unsetenv.c
View File

@@ -35,7 +35,7 @@
#endif /* HAVE_STRINGS_H */
#include <errno.h>
#include <compat.h>
#include <missing.h>
extern char **environ; /* global environment */

2
compat/utimes.c
View File

@@ -30,7 +30,7 @@
# include "utime.h"
#endif
#include <compat.h>
#include <missing.h>
#ifndef HAVE_UTIMES
/*

70
include/compat.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 1998-2005, 2008, 2010
* Copyright (c) 1996, 1998-2005, 2008, 2009-2010
* Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
@@ -19,11 +19,11 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
#ifndef _SUDO_COMPAT_H
#define _SUDO_COMPAT_H
#ifndef _SUDO_MISSING_H
#define _SUDO_MISSING_H
/*
* Macros that may be missing on some Operating Systems
* Macros and functions that may be missing on some operating systems.
*/
/* Define away __attribute__ for non-gcc or old gcc */
@@ -261,4 +261,64 @@ void setprogname(const char *);
# endif
#endif /* HAVE_SETEUID */
#endif /* _SUDO_COMPAT_H */
#include <stdio.h>
#include <stdarg.h>
/* Functions "missing" from libc. */
struct timeval;
struct timespec;
#ifndef HAVE_CLOSEFROM
void closefrom(int);
#endif
#ifndef HAVE_GETCWD
char *getcwd(char *, size_t size);
#endif
#ifndef HAVE_GETLINE
ssize_t getline(char **, size_t *, FILE *);
#endif
#ifndef HAVE_UTIMES
int utimes(const char *, const struct timeval *);
#endif
#ifdef HAVE_FUTIME
int futimes(int, const struct timeval *);
#endif
#ifndef HAVE_SNPRINTF
int snprintf(char *, size_t, const char *, ...) __printflike(3, 4);
#endif
#ifndef HAVE_VSNPRINTF
int vsnprintf(char *, size_t, const char *, va_list) __printflike(3, 0);
#endif
#ifndef HAVE_ASPRINTF
int asprintf(char **, const char *, ...) __printflike(2, 3);
#endif
#ifndef HAVE_VASPRINTF
int vasprintf(char **, const char *, va_list) __printflike(2, 0);
#endif
#ifndef HAVE_STRLCAT
size_t strlcat(char *, const char *, size_t);
#endif
#ifndef HAVE_STRLCPY
size_t strlcpy(char *, const char *, size_t);
#endif
#ifndef HAVE_MEMRCHR
void *memrchr(const void *, int, size_t);
#endif
#ifndef HAVE_MKSTEMPS
int mkstemps(char *, int);
#endif
#ifndef HAVE_NANOSLEEP
int nanosleep(const struct timespec *, struct timespec *);
#endif
#ifndef HAVE_SETENV
int setenv(const char *, const char *, int);
#endif
#ifndef HAVE_UNSETENV
int unsetenv(const char *);
#endif
#ifndef HAVE_STRSIGNAL
char *strsignal(int);
#endif
#endif /* _SUDO_MISSING_H */

247
include/missing.h
View File

@@ -1,5 +1,6 @@
/*
* Copyright (c) 2009-2010 Todd C. Miller <Todd.Miller@courtesan.com>
* Copyright (c) 1996, 1998-2005, 2008, 2009-2010
* Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -12,11 +13,255 @@
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Sponsored in part by the Defense Advanced Research Projects
* Agency (DARPA) and Air Force Research Laboratory, Air Force
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
#ifndef _SUDO_MISSING_H
#define _SUDO_MISSING_H
/*
* Macros and functions that may be missing on some operating systems.
*/
/* Define away __attribute__ for non-gcc or old gcc */
#if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC__ == 2 && __GNUC_MINOR__ < 5
# define __attribute__(x)
#endif
/* For silencing gcc warnings about rcsids */
#ifndef __unused
# if defined(__GNUC__) && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 7)
# define __unused __attribute__((__unused__))
# else
# define __unused
# endif
#endif
/* For catching format string mismatches */
#ifndef __printflike
# if defined(__GNUC__) && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7)
# define __printflike(f, v) __attribute__((__format__ (__printf__, f, v)))
# else
# define __printflike(f, v)
# endif
#endif
/*
* Some systems lack full limit definitions.
*/
#ifndef OPEN_MAX
# define OPEN_MAX 256
#endif
#ifndef INT_MAX
# define INT_MAX 0x7fffffff
#endif
#ifndef PATH_MAX
# ifdef MAXPATHLEN
# define PATH_MAX MAXPATHLEN
# else
# ifdef _POSIX_PATH_MAX
# define PATH_MAX _POSIX_PATH_MAX
# else
# define PATH_MAX 1024
# endif
# endif
#endif
#ifndef MAXHOSTNAMELEN
# define MAXHOSTNAMELEN 64
#endif
/*
* Posix versions for those without...
*/
#ifndef _S_IFMT
# define _S_IFMT S_IFMT
#endif /* _S_IFMT */
#ifndef _S_IFREG
# define _S_IFREG S_IFREG
#endif /* _S_IFREG */
#ifndef _S_IFDIR
# define _S_IFDIR S_IFDIR
#endif /* _S_IFDIR */
#ifndef _S_IFLNK
# define _S_IFLNK S_IFLNK
#endif /* _S_IFLNK */
#ifndef S_ISREG
# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
#endif /* S_ISREG */
#ifndef S_ISDIR
# define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
#endif /* S_ISDIR */
/*
* Some OS's may not have this.
*/
#ifndef S_IRWXU
# define S_IRWXU 0000700 /* rwx for owner */
#endif /* S_IRWXU */
/*
* These should be defined in <unistd.h> but not everyone has them.
*/
#ifndef STDIN_FILENO
# define STDIN_FILENO 0
#endif
#ifndef STDOUT_FILENO
# define STDOUT_FILENO 1
#endif
#ifndef STDERR_FILENO
# define STDERR_FILENO 2
#endif
/*
* BSD defines these in <sys/param.h> but others may not.
*/
#ifndef MIN
# define MIN(a,b) (((a)<(b))?(a):(b))
#endif
#ifndef MAX
# define MAX(a,b) (((a)>(b))?(a):(b))
#endif
/*
* Simple isblank() macro and function for systems without it.
*/
#ifndef HAVE_ISBLANK
int isblank(int);
# define isblank(_x) ((_x) == ' ' || (_x) == '\t')
#endif
/*
* NCR's SVr4 has _innetgr(3) instead of innetgr(3) for some reason.
*/
#ifdef HAVE__INNETGR
# define innetgr(n, h, u, d) (_innetgr(n, h, u, d))
# define HAVE_INNETGR 1
#endif /* HAVE__INNETGR */
/*
* On POSIX systems, O_NOCTTY is the default so some OS's may lack this define.
*/
#ifndef O_NOCTTY
# define O_NOCTTY 0
#endif /* O_NOCTTY */
/*
* Add IRIX-like sigaction_t for those without it.
* SA_RESTART is not required by POSIX; SunOS has SA_INTERRUPT instead.
*/
#ifndef HAVE_SIGACTION_T
typedef struct sigaction sigaction_t;
#endif
#ifndef SA_INTERRUPT
# define SA_INTERRUPT 0
#endif
#ifndef SA_RESTART
# define SA_RESTART 0
#endif
/*
* If dirfd() does not exists, hopefully dd_fd does.
*/
#if !defined(HAVE_DIRFD) && defined(HAVE_DD_FD)
# define dirfd(_d) ((_d)->dd_fd)
# define HAVE_DIRFD
#endif
/*
* Define futimes() in terms of futimesat() if needed.
*/
#if !defined(HAVE_FUTIMES) && defined(HAVE_FUTIMESAT)
# define futimes(_f, _tv) futimesat(_f, NULL, _tv)
# define HAVE_FUTIMES
#endif
#if !defined(HAVE_KILLPG) && !defined(killpg)
# define killpg(s) kill(-(s))
#endif
/*
* If we lack getprogname(), emulate with __progname if possible.
* Otherwise, add a prototype for use with our own getprogname.c.
*/
#ifndef HAVE_GETPROGNAME
# ifdef HAVE___PROGNAME
extern const char *__progname;
# define getprogname() (__progname)
# else
const char *getprogname(void);
void setprogname(const char *);
#endif /* HAVE___PROGNAME */
#endif /* !HAVE_GETPROGNAME */
#ifndef timevalclear
# define timevalclear(tv) ((tv)->tv_sec = (tv)->tv_usec = 0)
#endif
#ifndef timevalisset
# define timevalisset(tv) ((tv)->tv_sec || (tv)->tv_usec)
#endif
#ifndef timevalcmp
# define timevalcmp(tv1, tv2, op) \
(((tv1)->tv_sec == (tv2)->tv_sec) ? \
((tv1)->tv_usec op (tv2)->tv_usec) : \
((tv1)->tv_sec op (tv2)->tv_sec))
#endif
#ifndef timevaladd
# define timevaladd(tv1, tv2) \
do { \
(tv1)->tv_sec += (tv2)->tv_sec; \
(tv1)->tv_usec += (tv2)->tv_usec; \
if ((tv1)->tv_usec >= 1000000) { \
(tv1)->tv_sec++; \
(tv1)->tv_usec -= 1000000; \
} \
} while (0)
#endif
#ifndef timevalsub
# define timevalsub(tv1, tv2) \
do { \
(tv1)->tv_sec -= (tv2)->tv_sec; \
(tv1)->tv_usec -= (tv2)->tv_usec; \
if ((tv1)->tv_usec < 0) { \
(tv1)->tv_sec--; \
(tv1)->tv_usec += 1000000; \
} \
} while (0)
#endif
/* Not all systems define NSIG in signal.h */
#if !defined(NSIG)
# if defined(_NSIG)
# define NSIG _NSIG
# elif defined(__NSIG)
# define NSIG __NSIG
# else
# define NSIG 64
# endif
#endif
#ifndef WCOREDUMP
# define WCOREDUMP(x) ((x) & 0x80)
#endif
#ifndef HAVE_SETEUID
# if defined(HAVE_SETRESUID)
# define seteuid(u) setresuid(-1, (u), -1)
# define setegid(g) setresgid(-1, (g), -1)
# define HAVE_SETEUID 1
# elif defined(HAVE_SETREUID)
# define seteuid(u) setreuid(-1, (u))
# define setegid(g) setregid(-1, (g))
# define HAVE_SETEUID 1
# endif
#endif /* HAVE_SETEUID */
#include <stdio.h>
#include <stdarg.h>
/* Functions "missing" from libc. */

1
plugins/sample/sample_plugin.c
View File

@@ -50,7 +50,6 @@
#include <stdarg.h>
#include <sudo_plugin.h>
#include <compat.h>
#include <missing.h>
#include <pathnames.h>

1
plugins/sample_group/getgrent.c
View File

@@ -45,7 +45,6 @@
#include <pwd.h>
#include <grp.h>
#include <compat.h>
#include <missing.h>
#ifndef LINE_MAX

1
plugins/sample_group/sample_group.c
View File

@@ -49,7 +49,6 @@
#include <pwd.h>
#include <sudo_plugin.h>
#include <compat.h>
#include <missing.h>
/*

18
plugins/sudoers/Makefile.in
View File

@@ -118,10 +118,10 @@ TEST_OBJS = interfaces.o testsudoers.o tsgetgrpw.o error.o group_plugin.o
VERSION = @PACKAGE_VERSION@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
SUDODEP = $(srcdir)/sudoers.h $(incdir)/compat.h \
$(srcdir)/defaults.h $(incdir)/error.h $(incdir)/list.h \
$(srcdir)/logging.h $(incdir)/missing.h $(srcdir)/sudo_nss.h \
$(devdir)/def_data.h $(top_builddir)/pathnames.h $(top_builddir)/config.h
SUDODEP = $(srcdir)/sudoers.h $(srcdir)/defaults.h $(incdir)/error.h \
$(incdir)/list.h $(srcdir)/logging.h $(incdir)/missing.h \
$(srcdir)/sudo_nss.h $(devdir)/def_data.h \
$(top_builddir)/pathnames.h $(top_builddir)/config.h
AUTHDEP = $(SUDODEP) $(authdir)/sudo_auth.h
@@ -211,11 +211,11 @@ redblack.lo: $(srcdir)/redblack.c $(SUDODEP) $(srcdir)/redblack.h
set_perms.lo: $(srcdir)/set_perms.c $(SUDODEP)
sudo_nss.lo: $(srcdir)/sudo_nss.c $(SUDODEP)
sudoers.lo: $(srcdir)/sudoers.c $(SUDODEP) $(srcdir)/interfaces.h
timestr.lo: $(srcdir)/timestr.c $(incdir)/compat.h $(top_builddir)/config.h
timestr.lo: $(srcdir)/timestr.c $(incdir)/missing.h $(top_builddir)/config.h
toke.lo: $(devdir)/toke.c $(SUDODEP) $(srcdir)/parse.h $(incdir)/list.h $(devdir)/gram.h
$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(devdir)/toke.c
tsgetgrpw.lo: $(srcdir)/tsgetgrpw.c $(SUDODEP)
plugin_error.lo: $(srcdir)/plugin_error.c $(incdir)/error.h $(incdir)/compat.h $(top_builddir)/config.h
plugin_error.lo: $(srcdir)/plugin_error.c $(incdir)/error.h $(incdir)/missing.h $(top_builddir)/config.h
# Auth dependencies
sudo_auth.lo: $(authdir)/sudo_auth.c $(AUTHDEP) $(INSDEP)
@@ -235,14 +235,14 @@ securid5.lo: $(authdir)/securid5.c $(AUTHDEP)
sia.lo: $(authdir)/sia.c $(AUTHDEP)
# Command dependencies (sudoreplay, testsudoers, visudo)
error.o: $(top_srcdir)/src/error.c $(incdir)/error.h $(incdir)/compat.h $(top_builddir)/config.h
error.o: $(top_srcdir)/src/error.c $(incdir)/error.h $(incdir)/missing.h $(top_builddir)/config.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(top_srcdir)/src/error.c
find_path.o: find_path.lo
getdate.o: $(devdir)/getdate.c $(incdir)/compat.h $(top_builddir)/config.h
getdate.o: $(devdir)/getdate.c $(incdir)/missing.h $(top_builddir)/config.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(devdir)/getdate.c
goodpath.o: goodpath.lo
interfaces.o: interfaces.lo
sudoreplay.o: $(srcdir)/sudoreplay.c $(incdir)/alloc.h $(incdir)/compat.h $(incdir)/error.h $(incdir)/missing.h $(top_builddir)/config.h
sudoreplay.o: $(srcdir)/sudoreplay.c $(incdir)/alloc.h $(incdir)/missing.h $(incdir)/error.h $(incdir)/missing.h $(top_builddir)/config.h
testsudoers.o: $(srcdir)/testsudoers.c $(SUDODEP) $(srcdir)/parse.h $(incdir)/list.h $(srcdir)/interfaces.h $(devdir)/gram.h
tsgetgrpw.o: $(srcdir)/tsgetgrpw.c $(SUDODEP)
visudo.o: $(srcdir)/visudo.c $(SUDODEP) $(devdir)/gram.h

2
plugins/sudoers/audit.c
View File

@@ -28,7 +28,7 @@
#endif /* STDC_HEADERS */
#include <stdarg.h>
#include <compat.h>
#include <missing.h>
#include "logging.h"
#ifdef HAVE_BSM_AUDIT

1
plugins/sudoers/boottime.c
View File

@@ -47,7 +47,6 @@
# include <sys/sysctl.h>
#endif
#include <compat.h>
#include <missing.h>
/*

2
plugins/sudoers/getdate.c
View File

@@ -50,7 +50,7 @@
#endif
#include <ctype.h>
#include <compat.h>
#include <missing.h>
#define EPOCH 1970

2
plugins/sudoers/getdate.y
View File

@@ -39,7 +39,7 @@
#endif
#include <ctype.h>
#include <compat.h>
#include <missing.h>
#define EPOCH 1970

3
plugins/sudoers/linux_audit.c
View File

@@ -31,10 +31,9 @@
#include <string.h>
#include <libaudit.h>
#include <compat.h>
#include <missing.h>
#include <error.h>
#include <alloc.h>
#include <missing.h>
#include <linux_audit.h>
/*

2
plugins/sudoers/plugin_error.c
View File

@@ -21,7 +21,7 @@
#include <setjmp.h>
#include <config.h>
#include <compat.h>
#include <missing.h>
#include <alloc.h>
#include <error.h>
#include <sudo_plugin.h>

3
plugins/sudoers/sudoers.h
View File

@@ -24,12 +24,11 @@
#include <pathnames.h>
#include <limits.h>
#include <compat.h>
#include <missing.h>
#include <error.h>
#include <alloc.h>
#include <list.h>
#include <fileops.h>
#include <missing.h>
#include "defaults.h"
#include "logging.h"
#include "sudo_nss.h"

3
plugins/sudoers/sudoreplay.c
View File

@@ -85,10 +85,9 @@
#include <pathnames.h>
#include <compat.h>
#include <missing.h>
#include <alloc.h>
#include <error.h>
#include <missing.h>
#ifndef LINE_MAX
# define LINE_MAX 2048

2
plugins/sudoers/timestr.c
View File

@@ -28,7 +28,7 @@
#endif /* STDC_HEADERS */
#include <time.h>
#include <compat.h>
#include <missing.h>
char *get_timestr(time_t, int);

13
src/Makefile.in
View File

@@ -80,9 +80,8 @@ LIBOBJDIR = $(top_builddir)/@ac_config_libobj_dir@/
VERSION = @PACKAGE_VERSION@
SUDODEP = $(srcdir)/sudo.h $(incdir)/sudo_plugin.h $(incdir)/alloc.h \
$(incdir)/compat.h $(incdir)/error.h $(incdir)/list.h \
$(incdir)/missing.h $(top_builddir)/pathnames.h \
$(top_builddir)/config.h
$(incdir)/error.h $(incdir)/list.h $(incdir)/missing.h \
$(top_builddir)/pathnames.h $(top_builddir)/config.h
all: $(PROGS)
@@ -106,19 +105,19 @@ sesh: sesh.o
# Dependencies
# XXX - SUDODEP is overkill for some of these
conversation.o: $(srcdir)/conversation.c $(SUDODEP)
error.o: $(srcdir)/error.c $(incdir)/compat.h $(incdir)/error.h $(top_builddir)/config.h
error.o: $(srcdir)/error.c $(incdir)/missing.h $(incdir)/error.h $(top_builddir)/config.h
exec.o: $(srcdir)/exec.c $(SUDODEP) $(srcdir)/sudo_exec.h
exec_pty.o: $(srcdir)/exec_pty.c $(SUDODEP) $(srcdir)/sudo_exec.h
get_pty.o: $(srcdir)/get_pty.c $(SUDODEP)
load_plugins.o: $(srcdir)/load_plugins.c $(SUDODEP)
parse_args.o: $(srcdir)/parse_args.c sudo_usage.h $(SUDODEP)
selinux.o: $(srcdir)/selinux.c $(SUDODEP)
sesh.o: $(srcdir)/sesh.c $(incdir)/compat.h $(top_builddir)/config.h
sesh.o: $(srcdir)/sesh.c $(incdir)/missing.h $(top_builddir)/config.h
sudo.o: $(srcdir)/sudo.c $(SUDODEP)
sudo_edit.o: $(srcdir)/sudo_edit.c $(SUDODEP)
sudo_noexec.lo: $(srcdir)/sudo_noexec.c $(incdir)/compat.h $(top_builddir)/config.h
sudo_noexec.lo: $(srcdir)/sudo_noexec.c $(incdir)/missing.h $(top_builddir)/config.h
tgetpass.o: $(srcdir)/tgetpass.c $(SUDODEP)
ttysize.o: $(srcdir)/ttysize.c $(incdir)/compat.h $(top_builddir)/config.h
ttysize.o: $(srcdir)/ttysize.c $(incdir)/missing.h $(top_builddir)/config.h
install: install-dirs install-binaries @INSTALL_NOEXEC@

2
src/error.c
View File

@@ -20,7 +20,7 @@
#include <string.h>
#include <config.h>
#include <compat.h>
#include <missing.h>
#include "error.h"
static void _warning(int, const char *, va_list);

2
src/sesh.c
View File

@@ -27,7 +27,7 @@
#include <string.h>
#include <unistd.h>
#include <compat.h>
#include <missing.h>
int
main (int argc, char *argv[])

3
src/sudo.h
View File

@@ -27,12 +27,11 @@
#include <pathnames.h>
#include <limits.h>
#include <compat.h>
#include <missing.h>
#include <alloc.h>
#include <error.h>
#include <fileops.h>
#include <list.h>
#include <missing.h>
#ifdef __TANDEM
# define ROOT_UID 65535

2
src/sudo_noexec.c
View File

@@ -22,7 +22,7 @@
#endif
#include <stdarg.h>
#include <compat.h>
#include <missing.h>
/*
* Dummy versions of the execve() family of syscalls. We don't need

2
src/ttysize.c
View File

@@ -34,7 +34,7 @@
#endif /* HAVE_UNISTD_H */
#include <termios.h>
#include <compat.h>
#include <missing.h>
#if !defined(TIOCGSIZE) && defined(TIOCGWINSZ)
# define TIOCGSIZE TIOCGWINSZ