Changeset 1718 for zzufTweet

Timestamp:

Jan 25, 2007, 11:34:28 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Carry DEBUG_FILENO in the ZZUF_DEBUG environment variable.

Location:

zzuf/trunk/src

Files:

• debug.c (modified) (10 diffs)
• lib-fd.c (modified) (1 diff)
• libzzuf.c (modified) (2 diffs)
• libzzuf.h (modified) (2 diffs)
• zzuf.c (modified) (2 diffs)

zzuf/trunk/src/debug.c

@@ -35 +35 @@
 #include "libzzuf.h"
 
-extern int _zz_hasdebug;
+extern int _zz_debugfd;
 
 #define WRITE_INT(fd, i, base) \
@@ -58 +58 @@
 #endif
     va_list args;
-    int saved_errno, fd = DEBUG_FILENO;
+    int saved_errno;
 
-    if(!_zz_hasdebug)
+    if(_zz_debugfd < 0)
         return;
 
@@ -66 +66 @@
     va_start(args, format);
 #ifdef SAFE_FUNCTION
-    write(fd, "** zzuf debug ** ", 17);
+    write(_zz_debugfd, "** zzuf debug ** ", 17);
     for(f = format; *f; f++)
     {
         if(*f != '%')
         {
-            write(fd, f, 1);
+            write(_zz_debugfd, f, 1);
             continue;
         }
@@ -83 +83 @@
             char i = (char)(unsigned char)va_arg(args, int);
             if(i >= 0x20 && i < 0x7f)
-                write(fd, &i, 1);
+                write(_zz_debugfd, &i, 1);
             else if(i == '\n')
-                write(fd, "\\n", 2);
+                write(_zz_debugfd, "\\n", 2);
             else if(i == '\t')
-                write(fd, "\\t", 2);
+                write(_zz_debugfd, "\\t", 2);
             else if(i == '\r')
-                write(fd, "\\r", 2);
+                write(_zz_debugfd, "\\r", 2);
             else
             {
-                write(fd, "\\x", 2);
-                write(fd, hex2char + ((i & 0xf0) >> 4), 1);
-                write(fd, hex2char + (i & 0x0f), 1);
+                write(_zz_debugfd, "\\x", 2);
+                write(_zz_debugfd, hex2char + ((i & 0xf0) >> 4), 1);
+                write(_zz_debugfd, hex2char + (i & 0x0f), 1);
             }
         }
@@ -100 +100 @@
         {
             int i = va_arg(args, int);
-            WRITE_INT(fd, i, 10);
+            WRITE_INT(_zz_debugfd, i, 10);
         }
         else if(*f == 'x')
         {
             int i = va_arg(args, int);
-            WRITE_INT(fd, i, 16);
+            WRITE_INT(_zz_debugfd, i, 16);
         }
         else if(f[0] == 'l' && f[1] == 'i')
         {
             long int i = va_arg(args, long int);
-            WRITE_INT(fd, i, 10);
+            WRITE_INT(_zz_debugfd, i, 10);
             f++;
         }
@@ -116 +116 @@
         {
             long long int i = va_arg(args, long long int);
-            WRITE_INT(fd, i, 10);
+            WRITE_INT(_zz_debugfd, i, 10);
             f += 2;
         }
@@ -123 +123 @@
             uintptr_t i = va_arg(args, uintptr_t);
             if(!i)
-                write(fd, "NULL", 5);
+                write(_zz_debugfd, "NULL", 5);
             else
             {
-                write(fd, "0x", 2);
-                WRITE_INT(fd, i, 16);
+                write(_zz_debugfd, "0x", 2);
+                WRITE_INT(_zz_debugfd, i, 16);
             }
         }
@@ -134 +134 @@
             char *s = va_arg(args, char *);
             if(!s)
-                write(fd, "(nil)", 5);
+                write(_zz_debugfd, "(nil)", 5);
             else
             {
@@ -140 +140 @@
                 while(s[l])
                     l++;
-                write(fd, s, l);
+                write(_zz_debugfd, s, l);
             }
         }
@@ -146 +146 @@
         {
             int i = va_arg(args, int);
-            write(fd, hex2char + ((i & 0xf0) >> 4), 1);
-            write(fd, hex2char + (i & 0x0f), 1);
+            write(_zz_debugfd, hex2char + ((i & 0xf0) >> 4), 1);
+            write(_zz_debugfd, hex2char + (i & 0x0f), 1);
             f += 2;
         }
         else
         {
-            write(fd, f - 1, 2);
+            write(_zz_debugfd, f - 1, 2);
         }
     }
-    write(fd, "\n", 1);
+    write(_zz_debugfd, "\n", 1);
 #else
     fprintf(stderr, "** zzuf debug ** ");

zzuf/trunk/src/lib-fd.c

@@ -451 +451 @@
 
     /* Hey, it’s our debug channel! Silently pretend we closed it. */
-    if(fd == DEBUG_FILENO)
+    if(fd == _zz_debugfd)
         return 0;
 

zzuf/trunk/src/libzzuf.c

@@ -52 +52 @@
 /* Global variables */
 int   _zz_ready    = 0;
-int   _zz_hasdebug = 0;
+int   _zz_debugfd  = -1;
 int   _zz_signal   = 0;
 int   _zz_memory   = 0;
@@ -66 +66 @@
 
     tmp = getenv("ZZUF_DEBUG");
-    if(tmp && *tmp == '1')
-        _zz_hasdebug = 1;
+    if(tmp)
+        _zz_debugfd = atoi(tmp);
 
     tmp = getenv("ZZUF_SEED");

zzuf/trunk/src/libzzuf.h

@@ -16 +16 @@
  *  libzzuf.h: preloaded wrapper library
  */
-
-/* We use file descriptor 17 as the debug channel */
-#define DEBUG_FILENO 17
 
 /* We arbitrarily split files into 1024-byte chunks. Each chunk has an
@@ -48 +45 @@
 extern int _zz_ready;
 extern int _zz_disabled;
-extern int _zz_hasdebug;
+extern int _zz_debugfd;
 extern int _zz_signal;
 extern int _zz_memory;

zzuf/trunk/src/zzuf.c

@@ -65 +65 @@
 #   define SIGKILL 9
 #endif
+
+/* We use file descriptor 17 as the debug channel */
+#define DEBUG_FILENO 17
+#define DEBUG_FILENO_STR "17"
 
 static void loop_stdin(struct opts *);
@@ -200 +204 @@
             break;
         case 'd': /* --debug */
-            setenv("ZZUF_DEBUG", "1", 1);
+            setenv("ZZUF_DEBUG", DEBUG_FILENO_STR, 1);
             break;
         case 'D': /* --delay */