Changeset 2316 for trunk/src/emx/include

Timestamp:

Aug 29, 2005, 5:35:39 AM (20 years ago)

Author:

bird

Message:

o Reworked the open backend, adding directory support. Some O_*

flags was changed in the process, breaking the old ABI.
This is not fully tested.

o Added more BSD fields to struct stat, breaking the old ABI.

The mtime field and ctime fields will now keep the same values
and the creation time is to be found in birthtime. This means that
ctime will be updated in a few places where it doesn't on unix - but
this is probably better than previously where it wasn't ever updated
when it should.

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• emx/io.h (modified) (1 diff, 1 prop)
• sys/fcntl.h (modified) (3 diffs, 1 prop)
• sys/stat.h (modified) (6 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -398 +398 @@
 
 /**
- * Opens a file.
+ * Opens or creates a file.
  *
  * @returns Filehandle to the opened file on success.
  * @returns Negative error code (errno.h) on failure.
  * @param   pszFile     Path to the file.
- * @param   fFlags      Open flags.
+ * @param   fLibc       The LIBC open flags (O_*).
+ * @param   fShare      The share flags (SH_*).
  * @param   cbInitial   Initial filesize.
  * @param   Mode        The specified permission mask.
- * @param   fLibc       LIBC filehandle flags.
  * @param   ppFH        Where to store the LIBC filehandle structure which was created
  *                      for the opened file.
  */
-int __libc_Back_ioFileOpen(const char *pszFile, int fFlags, off_t cbInitial, mode_t Mode, unsigned fLibc, PLIBCFH *ppFH);
+int __libc_Back_ioFileOpen(const char *pszFile, unsigned fLibc, int fShare, off_t cbInitial, mode_t Mode, PLIBCFH *ppFH);
 
 /**

trunk/src/emx/include/emx/io.h

@@ -36 +36 @@
 /*      O_NONBLOCK  0x00000004 */
 /*      O_APPEND    0x00000008 */
-/* emx  O_TEXT      0x00000010 */
-/* emx  O_SIZE      0x00000020 */
-/*      free        0x00000040 */
+/*      reserved    0x00000010 O_SHLOCK */
+/*      reserved    0x00000020 O_EXLOCK */
+/*      reserved    0x00000040 O_ASYNC  */
 /*      O_(F)SYNC   0x00000080 */
-/*      O_SYNC      0x00000080 */
-/* emx  O_BINARY    0x00000100 */
+/*      O_NOFOLLOW  0x00000100 */
 /*      O_CREAT     0x00000200 */
 /*      O_TRUNC     0x00000400 */
 /*      O_EXCL      0x00000800 */
 /* emx  O_NOINHERIT 0x00001000 */
-/*      free        0x00002000 */
-/*      free        0x00004000 */
+/*      free?       0x00002000 */
+/*      free?       0x00004000 */
 /*      O_NOCTTY    0x00008000 */
+/*      O_DIRECT    0x00010000 */
+/* emx  O_BINARY    0x00020000 */
+/* emx  O_TEXT      0x00040000 */
+/* emx  O_SIZE      0x00080000 */
 #define F_EOF       0x00100000
 #define F_TERMIO    0x00200000

trunk/src/emx/include/sys/fcntl.h

@@ -126 +126 @@
 /* bird: EMX used 0x2000 for O_SYNC. */
 #define O_SYNC          0x0080          /* POSIX synonym for O_FSYNC */
-#if 0  /* bird: not implemented - start */
 #if __BSD_VISIBLE
 #define O_NOFOLLOW      0x0100          /* don't follow symlinks */
 #endif
-#endif /* bird: not implemented - end */
 #define O_CREAT         0x0200          /* create if nonexistent */
 #define O_TRUNC         0x0400          /* truncate to zero length */
@@ -145 +143 @@
 #define O_NOCTTY        0x8000          /* don't assign controlling terminal */
 
-#if 0  /* bird: not implemented - start */
 #if __BSD_VISIBLE
 /* Attempt to bypass buffer cache */
 #define O_DIRECT        0x00010000
 #endif
-#endif /* bird: not implemented - end */
 
 /*
@@ -279 +275 @@
 #if !defined (O_TEXT)
 /* Open flags.
-   As stated in the FreeBSD part, there is supposidly a limited number of bits
-   available. We'll try keep it suitable for 16bit just in case (don't care to
-   check what we use right now) because that'll enable us to share a 32-bit flag
-   variable per handle to both status (O_*) flags and descriptor (FD_*) flags.
-
-   When we've disabled a few BSD flags and leave out KERNEL stuff the following
-   bits are available:
-        0x0010, 0x0020, 0x0040, 0x0100, 0x1000, 0x4000*, 0x2000
-*/
-#define O_TEXT          0x0010
-#define O_BINARY        0x0100
-#define O_SIZE          0x0020          /* EMX used 0x8000 for O_SIZE. */
+ *      There is some limits to the available bits, generally FreeBSD limits
+ *      it's range to the first 16-bits. See emx\io.h for the complete
+ *      assignments.
+ */
+#define O_BINARY    0x00020000
+#define O_TEXT      0x00040000
+#define O_SIZE      0x00080000
 #if !defined (_POSIX_SOURCE) || defined(__USE_EMX)
-#define O_NOINHERIT     0x1000          /* EMX used 0x1000 for O_NOINHERIT. */
+#define O_NOINHERIT 0x00001000
 #endif
 #endif

trunk/src/emx/include/sys/stat.h

@@ -137 +137 @@
 struct stat {
         __dev_t   st_dev;               /* inode's device */
+#if 1 /* bird: emx: */
+        __uint32_t st_attr;             /* emx: OS/2 & DOS attributes */
+#endif
         ino_t     st_ino;               /* inode's number */
         mode_t    st_mode;              /* inode protection mode */
@@ -143 +146 @@
         gid_t     st_gid;               /* group ID of the file's group */
         __dev_t   st_rdev;              /* device type */
-#if 1 /* bird: emx */
-        time_t    st_atime;
-        time_t    st_mtime;
-        time_t    st_ctime;
-#else /* bird: emx */
+#if 1 /* bird: emx - better alignment of 64-bit types */
+        __int32_t st_lspare;
+#endif /* bird */
 #if __BSD_VISIBLE
         struct  timespec st_atimespec;  /* time of last access */
@@ -160 +161 @@
         long      st_ctimensec;         /* nsec of last file status change */
 #endif
-#endif /* bird: emx */
         off_t     st_size;              /* file size, in bytes */
         __int64_t st_blocks;            /* blocks allocated for file */
         __uint32_t st_blksize;          /* optimal blocksize for I/O */
-#if 1 /* bird: emx: */
-        long      st_attr;              /* emx: OS/2 & DOS attributes */
-#else /* bird: emx */
-
         fflags_t  st_flags;             /* user defined flags for file */
         __uint32_t st_gen;              /* file generation number */
+#if 0 /* bird: !emx - it's higher up for packing reasons */
         __int32_t st_lspare;
+#endif /* bird */
 #if __BSD_VISIBLE
         struct timespec st_birthtimespec; /* time of file creation */
@@ -189 +187 @@
         unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
 #endif
-#endif /* bird: emx - end */
 };
 
@@ -220 +217 @@
 #endif /* bird: emx */
 
-#if 0  /* bird: emx */
 #if __BSD_VISIBLE
 #define st_atime st_atimespec.tv_sec
@@ -227 +223 @@
 #define st_birthtime st_birthtimespec.tv_sec
 #endif
-#endif /* bird: emx */
 
 #define S_ISUID 0004000                 /* set user id on execution */