update changelog

[debian/sudo] / sudo_noexec.c

diff --git a/sudo_noexec.c b/sudo_noexec.c
index f06f03f53a3fb0b55357178d72e5efb0f1304dc4..eff07b9ee68aedf2a094cc89d3d08bacbebf659f 100644 (file)
--- a/sudo_noexec.c
+++ b/sudo_noexec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2004-2005 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
@@ -14,13 +14,19 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <errno.h>
+#ifndef HAVE_TIMESPEC
+# include <time.h>
+#endif
+#ifdef __STDC__
+# include <stdarg.h>
+#else
+# include <varargs.h>
+#endif
 
-#ifndef lint
-static const char rcsid[] = "$Sudo: sudo_noexec.c,v 1.5 2004/02/13 21:36:43 millert Exp $";
-#endif /* lint */
+#include <compat.h>
 
 /*
  * Dummy versions of the execve() family of syscalls.  We don't need
@@ -34,24 +40,72 @@ static const char rcsid[] = "$Sudo: sudo_noexec.c,v 1.5 2004/02/13 21:36:43 mill
 extern int errno;
 #endif
 
-#define DUMMY(fn, args, atypes)        \
-int                            \
-fn args                                \
-    atypes                     \
-{                              \
-    errno = EACCES;            \
-    return(-1);                        \
+#define DUMMY_BODY                             \
+{                                              \
+    errno = EACCES;                            \
+    return(-1);                                        \
 }
 
-DUMMY(execve, (path, argv, envp),
-      const char *path; char *const argv[]; char *const envp[];)
-DUMMY(_execve, (path, argv, envp),
-      const char *path; char *const argv[]; char *const envp[];)
-DUMMY(execv, (path, argv, envp),
-      const char *path; char *const argv[];)
-DUMMY(_execv, (path, argv, envp),
-      const char *path; char *const argv[];)
-DUMMY(fexecve, (fd, argv, envp),
-      int fd; char *const argv[]; char *const envp[];)
-DUMMY(_fexecve, (fd, argv, envp),
-      int fd; char *const argv[]; char *const envp[];)
+#ifdef __STDC__
+
+#define DUMMY2(fn, t1, t2)                     \
+int                                            \
+fn(t1 a1, t2 a2)                               \
+DUMMY_BODY
+
+#define DUMMY3(fn, t1, t2, t3)                 \
+int                                            \
+fn(t1 a1, t2 a2, t3 a3)                                \
+DUMMY_BODY
+
+#define DUMMY_VA(fn, t1, t2)                   \
+int                                            \
+fn(t1 a1, t2 a2, ...)                          \
+DUMMY_BODY
+
+#else /* !__STDC__ */
+
+#define DUMMY2(fn, t1, t2)                     \
+int                                            \
+fn(a1, a2)                                     \
+t1 a1; t2 a2;                                  \
+DUMMY_BODY
+
+#define DUMMY3(fn, t1, t2, t3)                 \
+int                                            \
+fn(a1, a2, a3)                                 \
+t1 a1; t2 a2; t3 a3;                           \
+DUMMY_BODY
+
+#define DUMMY_VA(fn, t1, t2)                   \
+int                                            \
+fn(a1, a2, va_alist)                           \
+t1 a1; t2 a2; va_dcl                           \
+DUMMY_BODY
+
+#endif /* !__STDC__ */
+
+DUMMY_VA(execl, const char *, const char *)
+DUMMY_VA(_execl, const char *, const char *)
+DUMMY_VA(__execl, const char *, const char *)
+DUMMY_VA(execle, const char *, const char *)
+DUMMY_VA(_execle, const char *, const char *)
+DUMMY_VA(__execle, const char *, const char *)
+DUMMY_VA(execlp, const char *, const char *)
+DUMMY_VA(_execlp, const char *, const char *)
+DUMMY_VA(__execlp, const char *, const char *)
+DUMMY2(execv, const char *, char * const *)
+DUMMY2(_execv, const char *, char * const *)
+DUMMY2(__execv, const char *, char * const *)
+DUMMY2(execvp, const char *, char * const *)
+DUMMY2(_execvp, const char *, char * const *)
+DUMMY2(__execvp, const char *, char * const *)
+DUMMY3(execvP, const char *, const char *, char * const *)
+DUMMY3(_execvP, const char *, const char *, char * const *)
+DUMMY3(__execvP, const char *, const char *, char * const *)
+DUMMY3(execve, const char *, char * const *, char * const *)
+DUMMY3(_execve, const char *, char * const *, char * const *)
+DUMMY3(__execve, const char *, char * const *, char * const *)
+DUMMY3(fexecve, int , char * const *, char * const *)
+DUMMY3(_fexecve, int , char * const *, char * const *)
+DUMMY3(__fexecve, int , char * const *, char * const *)