Changeset 2229 for trunk

Timestamp:

Jul 7, 2005, 6:03:55 AM (20 years ago)

Author:

bird

Message:

Renamed the BSD setmode to bsd_setmode and put back the PC setmode.

Location:

trunk/src/emx

Files:

• include/io.h (modified) (1 diff, 1 prop)
• include/unistd.h (modified) (1 diff, 1 prop)
• src/lib/bsd/db/btree/bt_open.c (modified) (1 diff, 1 prop)
• src/lib/bsd/db/hash/hash_page.c (modified) (1 diff, 1 prop)
• src/lib/bsd/gen/setmode.c (modified) (1 diff, 1 prop)
• src/lib/io/_fsetmod.c (modified) (1 diff, 1 prop)
• src/lib/io/_setmode.c (deleted)
• src/lib/io/fdopen.c (modified) (1 diff, 1 prop)
• src/lib/io/pc_setmode.c (added)
• src/lib/io/setmode.c (added)
• src/lib/libc.def (modified) (2 diffs, 1 prop)
• src/lib/libc06b4.def (modified) (1 diff, 1 prop)
• src/lib/libc06b5.def (modified) (1 diff, 1 prop)

trunk/src/emx/include/io.h

@@ -77 +77 @@
 ssize_t read (int, void *, size_t);
 int select (int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *);
-/* int setmode (int, int); - non standard, should not be in this namespace. besides it conflicts with BSD setmode/getmode. */
+int setmode (int, int);
 int sopen (__const__ char *, int, int, ...);
 int stat (__const__ char *, struct stat *);

trunk/src/emx/include/unistd.h

@@ -544 +544 @@
 #endif
 /** @todo int    setlogin(const char *); */
-void    *setmode(const char *);
+void    *bsd_setmode(const char *);
 int      setresgid(gid_t, gid_t, gid_t);
 int      setresuid(uid_t, uid_t, uid_t);

trunk/src/emx/src/lib/bsd/db/btree/bt_open.c

@@ -227 +227 @@
                 if ((t->bt_fd = mkstemp (namestr)) == -1)
                         goto err;
-                _setmode (t->bt_fd, O_BINARY);
+                setmode (t->bt_fd, O_BINARY);
                 if (_abspath (absname, namestr, sizeof (absname)) == 0)
                         t->tempname = strdup (absname);

trunk/src/emx/src/lib/bsd/db/hash/hash_page.c

@@ -883 +883 @@
 #ifdef __EMX__
                 char absname[_MAX_PATH];
-                _setmode (hashp->fp, O_BINARY);
+                setmode (hashp->fp, O_BINARY);
                 if (_abspath (absname, namestr, sizeof (absname)) == 0)
                         hashp->tempname = strdup (absname);

trunk/src/emx/src/lib/bsd/gen/setmode.c

@@ -171 +171 @@
 
 void *
-setmode(const char *p)
+bsd_setmode(const char *p) /* clashes with PC interface. */
 {
         int perm, who;

trunk/src/emx/src/lib/io/_fsetmod.c

@@ -20 +20 @@
       return -1;
     }
-  if (_setmode (stream->_handle, i) == -1)
+  if (setmode (stream->_handle, i) == -1)
     return -1;
   return 0;

trunk/src/emx/src/lib/io/fdopen.c

@@ -92 +92 @@
     }
   if (bt)
-    _setmode (handle, omode);
+    setmode (handle, omode);
   dst->_handle = handle;
   dst->_flags |= _IOOPEN | _IOBUFNONE;

trunk/src/emx/src/lib/libc.def

@@ -918 +918 @@
     "__std_setjmp" @931
     "__std_setlocale" @932
-    "__setmode" @933
+    "__std_setmode" @933
     "__std_setpassent" @934
     "__std_setpgid" @935
@@ -1924 +1924 @@
     "___libc_Back_processGetSid" @1923
     "_optreset" @1924
-    "_setmode" @1925
+    "_bsd_setmode" @1925
     "__std_getpgid" @1926
     "__std_getsid" @1927
     "__std_setlinebuf" @1928
+

trunk/src/emx/src/lib/libc06b4.def

@@ -916 +916 @@
     "__std_setjmp" @931
     "__std_setlocale" @932
-    "__setmode" @933
+    "__std_setmode" @933
     "__std_setpassent" @934
     "__std_setpgid" @935

trunk/src/emx/src/lib/libc06b5.def

@@ -919 +919 @@
     "__std_setjmp" @931
     "__std_setlocale" @932
-    "__setmode" @933
+    "__std_setmode" @933
     "__std_setpassent" @934
     "__std_setpgid" @935