Add missing const and document where it can't be used.

[coloredstderr/coloredstderr.git] / src / coloredstderr.c

diff --git a/src/coloredstderr.c b/src/coloredstderr.c
index b7e71e17871d6f7c7411c4c922d48cfcb2530680..3fe2053ce251bb33fc06dd9b59397212466a75c6 100644 (file)
--- a/src/coloredstderr.c
+++ b/src/coloredstderr.c
@@ -25,6 +25,12 @@
 /* Must be loaded before the following headers. */
 #include "ldpreload.h"
 
+/* Disable assert()s if not compiled with --enable-debug. */
+#ifndef DEBUG
+# define NDEBUG
+#endif
+
+#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
@@ -78,6 +84,8 @@ static int force_write_to_non_tty;
  * additional call. */
 static int isatty_noinline(int fd) noinline;
 static int isatty_noinline(int fd) {
+    assert(fd >= 0);
+
     int saved_errno = errno;
     int result = isatty(fd);
     errno = saved_errno;
@@ -91,6 +99,8 @@ static void dup_fd(int oldfd, int newfd) {
     debug("%3d -> %3d\t\t\t[%d]\n", oldfd, newfd, getpid());
 #endif
 
+    assert(oldfd >= 0 && newfd >= 0);
+
     if (unlikely(!initialized)) {
         init_from_environment();
     }
@@ -113,6 +123,8 @@ static void close_fd(int fd) {
     debug("%3d ->   .\t\t\t[%d]\n", fd, getpid());
 #endif
 
+    assert(fd >= 0);
+
     if (unlikely(!initialized)) {
         init_from_environment();
     }
@@ -495,14 +507,14 @@ int execve(char const *filename, char * const argv[], char * const env[]) {
     /* Count arguments. */ \
     size_t count = 1; /* arg */ \
     va_start(ap, arg); \
-    while (va_arg(ap, char const *)) { \
+    while (va_arg(ap, char *)) { \
         count++; \
     } \
     va_end(ap); \
     \
     /* Copy varargs. */ \
     char *args[count + 1 /* terminating NULL */]; \
-    args[0] = (char *)arg; \
+    args[0] = (char *)arg; /* there's no other way around the cast */ \
     \
     size_t i = 1; \
     va_start(ap, arg); \
@@ -519,23 +531,24 @@ int execve(char const *filename, char * const argv[], char * const env[]) {
 int execl(char const *path, char const *arg, ...) {
     EXECL_COPY_VARARGS(args);
 
-    update_environment();
+    /* execv() updates the environment. */
     return execv(path, args);
 }
-
 int execlp(char const *file, char const *arg, ...) {
     EXECL_COPY_VARARGS(args);
 
-    update_environment();
+    /* execvp() updates the environment. */
     return execvp(file, args);
 }
-
 int execle(char const *path, char const *arg, ... /*, char * const envp[] */) {
+    char * const *envp;
+
     EXECL_COPY_VARARGS_START(args);
     /* Get envp[] located after arguments. */
-    char * const *envp = va_arg(ap, char * const *);
+    envp = va_arg(ap, char * const *);
     EXECL_COPY_VARARGS_END(args);
 
+    /* execve() updates the environment. */
     return execve(path, args, envp);
 }
 
@@ -561,6 +574,7 @@ int execvpe(char const *file, char * const argv[], char * const envp[]) {
     /* Fake the environment so we can reuse execvp(). */
     environ = (char **)envp;
 
+    /* execvp() updates the environment. */
     return execvp(file, argv);
 }
 #endif