From: Todd C. Miller Date: Sat, 5 Feb 2011 20:04:02 +0000 (-0500) Subject: Make local includes consistent; use double quotes for local includes X-Git-Tag: SUDO_1_7_5~27 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e75e4204c9feeb9615f3f10ab6be2e6c07451ac3;p=sudo Make local includes consistent; use double quotes for local includes --HG-- branch : 1.7 --- diff --git a/error.c b/error.c index 2bf864ba9..e5cb95971 100644 --- a/error.c +++ b/error.c @@ -23,7 +23,7 @@ #include #include -#include +#include "missing.h" #include "error.h" static void _warning __P((int, const char *, va_list)); diff --git a/fileops.c b/fileops.c index 3a509396f..ae9a7df13 100644 --- a/fileops.c +++ b/fileops.c @@ -44,7 +44,7 @@ # include #endif #ifndef HAVE_TIMESPEC -# include +# include "emul/timespec.h" #endif #include "sudo.h" diff --git a/fnmatch.c b/fnmatch.c index a580cf667..723e53d7d 100644 --- a/fnmatch.c +++ b/fnmatch.c @@ -49,7 +49,7 @@ # include #endif /* HAVE_STRINGS_H */ -#include +#include "missing.h" #include "emul/fnmatch.h" #include "emul/charclass.h" diff --git a/getcwd.c b/getcwd.c index b2917c16f..1260ad46f 100644 --- a/getcwd.c +++ b/getcwd.c @@ -71,7 +71,7 @@ # endif #endif -#include +#include "missing.h" #define ISDOT(dp) \ (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \ diff --git a/getprogname.c b/getprogname.c index d923d9f75..0790222d7 100644 --- a/getprogname.c +++ b/getprogname.c @@ -25,7 +25,7 @@ #include #include -#include +#include "missing.h" const char * getprogname() diff --git a/gettime.c b/gettime.c index c605da3af..6cb15d784 100644 --- a/gettime.c +++ b/gettime.c @@ -24,7 +24,7 @@ # include #endif -#include +#include "missing.h" /* * Get the current time via gettimeofday() for systems with diff --git a/glob.c b/glob.c index dba446465..66dcadcb7 100644 --- a/glob.c +++ b/glob.c @@ -95,7 +95,7 @@ #include #include -#include +#include "missing.h" #include "emul/glob.h" #include "emul/charclass.h" diff --git a/isblank.c b/isblank.c index a12547c73..a7f01e2a6 100644 --- a/isblank.c +++ b/isblank.c @@ -15,8 +15,10 @@ */ #include + #include -#include + +#include "missing.h" #undef isblank int diff --git a/memrchr.c b/memrchr.c index 0271333e3..425fcb47d 100644 --- a/memrchr.c +++ b/memrchr.c @@ -18,7 +18,7 @@ #include -#include +#include "missing.h" /* * Reverse memchr() diff --git a/mksiglist.c b/mksiglist.c index 5e5d32745..055dd1c2f 100644 --- a/mksiglist.c +++ b/mksiglist.c @@ -30,7 +30,7 @@ #endif /* STDC_HEADERS */ #include -#include +#include "missing.h" int main(argc, argv) @@ -44,7 +44,7 @@ main(argc, argv) printf("#include \n"); printf("#include \n"); - printf("#include \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) { diff --git a/mkstemps.c b/mkstemps.c index d72de98a9..b3b688d7b 100644 --- a/mkstemps.c +++ b/mkstemps.c @@ -15,7 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "config.h" +#include #include #include diff --git a/nanosleep.c b/nanosleep.c index 921b34d19..1849eb2cd 100644 --- a/nanosleep.c +++ b/nanosleep.c @@ -25,7 +25,7 @@ # include #endif #ifndef HAVE_TIMESPEC -# include +# include "emul/timespec.h" #endif #include diff --git a/setsid.c b/setsid.c index 80c620c9c..79271c865 100644 --- a/setsid.c +++ b/setsid.c @@ -26,7 +26,7 @@ #endif /* HAVE_UNISTD_H */ #include -#include +#include "missing.h" pid_t setsid() diff --git a/sigaction.c b/sigaction.c index 8a09ca655..9285ddac6 100644 --- a/sigaction.c +++ b/sigaction.c @@ -21,10 +21,11 @@ #include #include + #include #include -#include +#include "missing.h" int sigaction(signo, sa, osa) diff --git a/snprintf.c b/snprintf.c index a1a3322fc..0fc62dcb6 100644 --- a/snprintf.c +++ b/snprintf.c @@ -76,7 +76,7 @@ # include #endif -#include +#include "missing.h" static int xxxprintf __P((char **, size_t, int, const char *, va_list)); diff --git a/strcasecmp.c b/strcasecmp.c index 2df6d60b4..9ab451c1d 100644 --- a/strcasecmp.c +++ b/strcasecmp.c @@ -18,7 +18,7 @@ #include -#include +#include "missing.h" /* * Case insensitive string compare routines, same semantics as str[n]cmp() diff --git a/strerror.c b/strerror.c index 7d5a8b71d..88b888bc4 100644 --- a/strerror.c +++ b/strerror.c @@ -25,7 +25,7 @@ #include #include -#include +#include "missing.h" /* * Map errno -> error string. diff --git a/strlcat.c b/strlcat.c index b987f1b71..77f6c8663 100644 --- a/strlcat.c +++ b/strlcat.c @@ -21,7 +21,7 @@ #include #include -#include +#include "missing.h" /* * Appends src to string dst of size siz (unlike strncat, siz is the diff --git a/strlcpy.c b/strlcpy.c index 3ccc2a467..df2e67741 100644 --- a/strlcpy.c +++ b/strlcpy.c @@ -20,7 +20,7 @@ #include -#include +#include "missing.h" /* * Copy src to string dst of size siz. At most siz-1 characters diff --git a/strsignal.c b/strsignal.c index 35f216639..a5514290d 100644 --- a/strsignal.c +++ b/strsignal.c @@ -21,7 +21,7 @@ #include #include -#include +#include "missing.h" #if defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST == 1 # define my_sys_siglist sys_siglist diff --git a/sudo_noexec.c b/sudo_noexec.c index 647e65382..ba180b5d0 100644 --- a/sudo_noexec.c +++ b/sudo_noexec.c @@ -28,7 +28,7 @@ # include #endif -#include +#include "missing.h" /* * Dummy versions of the execve() family of syscalls. We don't need diff --git a/sudoreplay.c b/sudoreplay.c index 8a627b560..968df800e 100644 --- a/sudoreplay.c +++ b/sudoreplay.c @@ -50,7 +50,7 @@ # include #endif #ifndef HAVE_TIMESPEC -# include +# include "emul/timespec.h" #endif #include #include diff --git a/utimes.c b/utimes.c index a39a1befd..5ff4379c0 100644 --- a/utimes.c +++ b/utimes.c @@ -26,10 +26,10 @@ #ifdef HAVE_UTIME_H # include #else -# include +# include "emul/utime.h" #endif -#include +#include "missing.h" #ifndef HAVE_UTIMES /* diff --git a/vasgroups.c b/vasgroups.c index 867967bf8..0ba33e1b5 100644 --- a/vasgroups.c +++ b/vasgroups.c @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include #include #include diff --git a/zero_bytes.c b/zero_bytes.c index b2de8756c..bce089584 100644 --- a/zero_bytes.c +++ b/zero_bytes.c @@ -18,7 +18,7 @@ #include -#include +#include "missing.h" /* * Like bzero(3) but with a volatile pointer. The hope is that