Changeset 3268 for trunk

Timestamp:

May 1, 2007, 5:52:14 PM (18 years ago)

Author:

bird

Message:

Don't use the P_tmpdir #define and use the OS/2 TMP and TEMP variables as well to find a usable tmp location. Temporary files are always binary.

File:

• trunk/essentials/app-shells/bash/lib/sh/tmpfile.c (modified) (3 diffs)

trunk/essentials/app-shells/bash/lib/sh/tmpfile.c

@@ -62 +62 @@
 
 #ifdef P_tmpdir
+# ifdef __OS2__ /* P_tmpdir is bogus ("."). */
+  sys_tmpdir = "/@unixroot/var/tmp";
+# else
   sys_tmpdir = P_tmpdir;
-  if (file_iswdir (sys_tmpdir))
-    return sys_tmpdir;
-#endif
-
+# endif 
+  if (file_iswdir (sys_tmpdir))
+    return sys_tmpdir;
+#endif
+
+# ifdef __OS2__
+  sys_tmpdir = "/@unixroot/tmp";
+# else
   sys_tmpdir = "/tmp";
-  if (file_iswdir (sys_tmpdir))
-    return sys_tmpdir;
-
+# endif 
+  if (file_iswdir (sys_tmpdir))
+    return sys_tmpdir;
+
+#ifdef __OS2__
+  sys_tmpdir = "/@unixroot/var/tmp";
+#else
   sys_tmpdir = "/var/tmp";
-  if (file_iswdir (sys_tmpdir))
-    return sys_tmpdir;
-
+#endif 
+  if (file_iswdir (sys_tmpdir))
+    return sys_tmpdir;
+
+#ifdef __OS2__
+  sys_tmpdir = "/@unixroot/usr/tmp";
+#else
   sys_tmpdir = "/usr/tmp";
-  if (file_iswdir (sys_tmpdir))
-    return sys_tmpdir;
+#endif
+  if (file_iswdir (sys_tmpdir))
+    return sys_tmpdir;
+
+#ifdef __OS2__
+  sys_tmpdir = get_string_value ("TMP");
+  if (file_iswdir (sys_tmpdir))
+    return sys_tmpdir;
+
+  sys_tmpdir = get_string_value ("TEMP");
+  if (file_iswdir (sys_tmpdir))
+    return sys_tmpdir;
+#endif
 
   sys_tmpdir = DEFAULT_TMPDIR;
@@ -185 +211 @@
       if (tmpnamelen > 0 && tmpnamelen < 32)
         filename[tdlen + 1 + tmpnamelen] = '\0';
+# ifdef __OS2__
+      fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY) | O_BINARY, 0600);
+# else
       fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY), 0600);
+# endif 
     }
   while (fd < 0 && errno == EEXIST);
@@ -210 +240 @@
   if (fd < 0)
     return ((FILE *)NULL);
+#ifdef __OS2__
+  fp = fdopen (fd, (flags & MT_READWRITE) ? "w+b" : "wb");
+#else
   fp = fdopen (fd, (flags & MT_READWRITE) ? "w+" : "w");
+#endif
   if (fp == 0)
     close (fd);