Changeset 18671 for trunk/base

Timestamp:

Jul 22, 2006, 3:08:58 AM (18 years ago)

Author:

pguyot (Paul Guyot)

Message:

More debug code.
Removed the execve workaround now that I figured out the problem was pclose closing fd 3 even if popen didn't open fd 3 (I can only reproduce this with darwintrace.dylib inserted).
Fix a C standard violation (only happening with show process compilation option set, which we don't use in DP).

File:

• trunk/base/src/darwintracelib1.0/darwintrace.c (modified) (6 diffs)

trunk/base/src/darwintracelib1.0/darwintrace.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
- * $Id: darwintrace.c,v 1.11 2006/07/20 13:35:24 pguyot Exp $
+ * $Id: darwintrace.c,v 1.12 2006/07/22 03:08:58 pguyot Exp $
  *
  * @APPLE_BSD_LICENSE_HEADER_START@
@@ -130 +130 @@
 #if DARWINTRACE_SHOW_PROCESS
         if (__darwintrace_pid == -1) {
+                char** progname = _NSGetProgname();
                 __darwintrace_pid = getpid();
-                char** progname = _NSGetProgname();
                 if (progname && *progname) {
                         strcpy(__darwintrace_progname, *progname);
@@ -190 +190 @@
                 procname ? procname : __darwintrace_progname, __darwintrace_pid,
 #endif
-                op, path );
+                op, somepath );
 
         write(__darwintrace_fd, logbuffer, size);
@@ -267 +267 @@
                                 __darwintrace_setup();
                                 if (__darwintrace_fd >= 0) {
+                                    dprintf("darwintrace: original open path is %s\n", path);
                                         log_op("open", NULL, path, result);
                                 }
@@ -273 +274 @@
                                 __darwintrace_setup();
                                 if (__darwintrace_fd >= 0) {
+                                    dprintf("darwintrace: original create path is %s\n", path);
                                         log_op("create", NULL, path, result);
                                 }
@@ -376 +378 @@
         }
         
-        saved_fd = __darwintrace_fd;
-        __darwintrace_fd = -2;
-#if DARWINTRACE_SHOW_PROCESS
-        saved_pid = __darwintrace_pid;
-        __darwintrace_pid = -1;
-#endif
-        
         result = execve(path, argv, envp);
-        /* execve failed and the file wasn't closed. keep the reference */
-        __darwintrace_fd = saved_fd;
-#if DARWINTRACE_SHOW_PROCESS
-        __darwintrace_pid = saved_pid;
-#endif
-
         return result;
 #undef close