Changeset 2140 in kBuild for trunk

Timestamp:

Dec 25, 2008 7:10:32 PM (16 years ago)

Author:

bird

Message:

ash: Changed opentrace so that the trace file get's a high file descriptor.

File:

• trunk/src/ash/show.c (modified) (3 diffs)

trunk/src/ash/show.c

@@ -47 +47 @@
 #include <stdarg.h>
 #include <stdlib.h>
+#include <sys/fcntl.h>
+#include <unistd.h>
 
 #include "shell.h"
@@ -385 +387 @@
         int flags;
 #endif
+#if 1
+        int fd;
+#endif
 
         if (debug != 1) {
@@ -413 +418 @@
                         return;
                 }
+                trace("opentrace: fno=%d - freopen\n", fileno(tracefile));
         } else {
+#if 0
                 if ((tracefile = fopen(s, "a")) == NULL) {
+#else
+                fd = open(s, O_APPEND | O_RDWR | O_CREAT, 0600);
+                if (fd != -1) {
+                        int fd2 = fcntl(fd, F_DUPFD, 199);
+                        if (fd2 == -1)
+                                fd2 = fcntl(fd, F_DUPFD, 99);
+                        if (fd2 == -1)
+                                fd2 = fcntl(fd, F_DUPFD, 49);
+                        if (fd2 == -1)
+                                fd2 = fcntl(fd, F_DUPFD, 18);
+                        if (fd2 == -1)
+                                fd2 = fcntl(fd, F_DUPFD, 10);
+                        if (fd2 != -1) {
+                                close(fd);
+                                fd = fd2;
+                        }
+                }
+                if (fd == -1 || (tracefile = fdopen(fd, "a")) == NULL) {
+#endif
                         fprintf(stderr, "Can't open %s\n", s);
                         debug = 0;
                         return;
                 }
+                trace("opentrace: fno=%d\n", fileno(tracefile));
         }
 #ifdef O_APPEND