Changeset 2280 in kBuild for trunk

Timestamp:

Feb 24, 2009 4:07:53 AM (16 years ago)

Author:

bird

Message:

kash/show.c: move the trace file out of the way.

File:

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

trunk/src/kash/show.c

@@ -401 +401 @@
         int flags;
 #endif
+        int fd;
 
         if (debug(psh) != 1) {
@@ -430 +431 @@
                 }
         } else {
-                if ((tracefile = fopen(s, "a")) == NULL) {
+                fd = shfile_open(&psh->fdtab, 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) {
                         fprintf(stderr, "Can't open %s\n", s);
                         debug(psh) = 0;
@@ -436 +453 @@
                 }
         }
-#if defined(O_APPEND) && !defined(_MSC_VER)
-        if ((flags = shfile_fcntl(&psh->fdtab, fileno(tracefile), F_GETFL, 0)) >= 0)
-                shfile_fcntl(&psh->fdtab, fileno(tracefile), F_SETFL, flags | O_APPEND);
-#endif
         setvbuf(tracefile, (char *)NULL, _IOLBF, 0); //setlinebuf(tracefile);
         fputs("\nTracing started.\n", tracefile);