Changeset 2323 for trunk/src/emx/include

Timestamp:

Sep 25, 2005, 1:01:36 PM (20 years ago)

Author:

bird

Message:

o Implemented fchdir().
o Implemented inheritance of open directory handles. Unfortunately,

I ran out of size bits for the bundle type, so the SPM bit is no
longer compatible with earlier versions. The consequences
of this are related to inheritance and signaling - so recompile!

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• InnoTekLIBC/sharedpm.h (modified) (8 diffs, 1 prop)
• fts.h (modified) (4 diffs, 1 prop)
• unistd.h (modified) (1 diff, 1 prop)

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

@@ -235 +235 @@
  */
 int __libc_Back_fsDirCurrentSet(const char *pszPath, int fDrive);
+
+/**
+ * Changes the current directory of the process.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   fh          The handle of an open directory.
+ * @param   fDrive      Force a change of the current drive too.
+ */
+int __libc_Back_fsDirCurrentSetFH(int fh, int fDrive);
 
 /**

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

@@ -37 +37 @@
 
 /** The name of the shared semaphore protecting the memory. */
-#define SPM_MUTEX_NAME          "\\SEM32\\INNOTEKLIBC-V1.1"
+#define SPM_MUTEX_NAME          "\\SEM32\\INNOTEKLIBC-V1.3"
 
 /** The name of the shared memory. */
-#define SPM_MEMORY_NAME         "\\SHAREMEM\\INNOTEKLIBC-V1.1"
+#define SPM_MEMORY_NAME         "\\SHAREMEM\\INNOTEKLIBC-V1.3"
 
 /** The timeout for accessing the shared mem semaphore. */
@@ -60 +60 @@
  * The SPM version.
  */
-#define SPM_VERSION             0x00010002
+#define SPM_VERSION             0x00010003
 
 
@@ -163 +163 @@
 #define __LIBC_SPM_INH_FHB_TYPE_END         (0)
 /** Standard bundle. */
-#define __LIBC_SPM_INH_FHB_TYPE_STANDARD    (0x10 | (sizeof(unsigned) + sizeof(ino_t) + sizeof(dev_t)))
-/** The old standard bundle. */
-#define __LIBC_SPM_INH_FHB_TYPE_STANDARD_OLD (0x10 | sizeof(unsigned))
+#define __LIBC_SPM_INH_FHB_TYPE_STANDARD    (0xe0 | (sizeof(unsigned) + sizeof(ino_t) + sizeof(dev_t) + sizeof(unsigned)))
+/** Directory bundle. */
+#define __LIBC_SPM_INH_FHB_TYPE_DIRECTORY   (0xc0 | (sizeof(unsigned) + sizeof(ino_t) + sizeof(dev_t) + sizeof(unsigned) + sizeof(unsigned)))
 /** Socket bundle, using the BSD 4.4 backend. */
-#define __LIBC_SPM_INH_FHB_TYPE_SOCKET_44   (0x20 | (sizeof(unsigned) + sizeof(unsigned short)))
+#define __LIBC_SPM_INH_FHB_TYPE_SOCKET_44   (0xa0 | (sizeof(unsigned) + sizeof(unsigned short)))
 /** Socket bundle, using the BSD 4.3 backend. */
-#define __LIBC_SPM_INH_FHB_TYPE_SOCKET_43   (0x30 | (sizeof(unsigned) + sizeof(unsigned short)))
+#define __LIBC_SPM_INH_FHB_TYPE_SOCKET_43   (0x80 | (sizeof(unsigned) + sizeof(unsigned short)))
+/*#define __LIBC_SPM_INH_FHB_TYPE_            (0x60 | (sizeof(unsigned) + ))*/
+/*#define __LIBC_SPM_INH_FHB_TYPE_            (0x40 | (sizeof(unsigned) + ))*/
+/*#define __LIBC_SPM_INH_FHB_TYPE_            (0x20 | (sizeof(unsigned) + ))*/
+/*#define __LIBC_SPM_INH_FHB_TYPE_            (0x00 | (sizeof(unsigned) + ))*/
 /** Get the per file handle size from the bundle type. */
-#define __LIBC_SPM_INH_FHB_SIZE(type)   ((type) & 0x0f)
+#define __LIBC_SPM_INH_FHB_SIZE(type)   ((type) & 0x1f)
 /** @} */
 
@@ -182 +186 @@
     /** Bundle type. */
     unsigned char   uchType;
-    /** Cound of handles in this bundle. */
+    /** Count of handles in this bundle. */
     unsigned char   cHandles;
     /** Start handle number. */
@@ -204 +208 @@
     struct
     {
-        /** The flags */
+        /** The flags. */
         unsigned            fFlags;
         /** The inode number. */
@@ -210 +214 @@
         /** The device number. */
         dev_t               Dev;
+        /** String table offset of the native path. */
+        unsigned            offNativePath : 24;
+        unsigned            u8Reserved : 8;
     } aHandles[1];
 } __LIBC_SPMINHFHBSTD;
@@ -217 +224 @@
 
 /**
- * SPM standard filehandle inherit bundle
- * This is used for OS/2 filehandles which only needs flags
- * transfered.
+ * SPM directory filehandle inherit bundle.
  */
 #pragma pack(1)
-typedef struct __libc_SPMInhFHOld
+typedef struct __libc_SPMInhFHDir
 {
     /** The common bundle header. */
     __LIBC_SPMINHFHBHDR Hdr;
     /** Array of flags of Hdr.cHandles entries. */
-    unsigned            afFlags[1];
-} __LIBC_SPMINHFHBSTDOLD;
+    struct
+    {
+        /** The flags. */
+        unsigned            fFlags;
+        /** The inode number. */
+        ino_t               Inode;
+        /** The device number. */
+        dev_t               Dev;
+        /** String table offset of the native path. */
+        unsigned            offNativePath : 24;
+        /** Set if this path is in the unix tree. */
+        unsigned            fInUnixTree : 1;
+        unsigned            u7Reserved : 7;
+        /** The current position. */
+        unsigned            uCurEntry;
+    } aHandles[1];
+} __LIBC_SPMINHFHBDIR;
 #pragma pack()
-/** Pointer to SPM standard filehandle inherit bundle. */
-typedef __LIBC_SPMINHFHBSTDOLD *__LIBC_PSPMINHFHBSTDOLD;
+/** Pointer to SPM directory filehandle inherit bundle. */
+typedef __LIBC_SPMINHFHBDIR *__LIBC_PSPMINHFHBDIR;
 
 /**
@@ -303 +323 @@
     /** Pointer to the signal part. If NULL default values are assumed. */
     __LIBC_PSPMINHSIG       pSig;
-
+    /** Pointer to strings (filenames++).
+     * All the strings are NULL terminated and referenced by offset. */
+    char                   *pszStrings;
 } __LIBC_SPMINHERIT;
 /** Pointer to inherit data. */

trunk/src/emx/include/fts.h

@@ -49 +49 @@
         dev_t fts_dev;                  /* starting device # */
         char *fts_path;                 /* path for this descent */
-#ifdef __EMX__
-        char *fts_rdir;                 /* path of root */
-#else
         int fts_rfd;                    /* fd for root */
-#endif
         int fts_pathlen;                /* sizeof(path) */
         int fts_nitems;                 /* elements in the sort array */
@@ -66 +62 @@
 #define FTS_SEEDOT      0x020           /* return dot and dot-dot */
 #define FTS_XDEV        0x040           /* don't cross devices */
-#ifndef __EMX__
 #define FTS_WHITEOUT    0x080           /* return whiteout information */
-#endif
 #define FTS_OPTIONMASK  0x0ff           /* valid user option mask */
 
@@ -86 +80 @@
         char *fts_path;                 /* root path */
         int fts_errno;                  /* errno for this node */
-#ifndef __EMX__
         int fts_symfd;                  /* fd for symlink */
-#endif
         u_short fts_pathlen;            /* strlen(fts_path) */
         u_short fts_namelen;            /* strlen(fts_name) */
@@ -113 +105 @@
 #define FTS_SL          12              /* symbolic link */
 #define FTS_SLNONE      13              /* symbolic link without target */
-#ifndef __EMX__
 #define FTS_W           14              /* whiteout object */
-#endif
         u_short fts_info;               /* user flags for FTSENT structure */
 
 #define FTS_DONTCHDIR    0x01           /* don't chdir .. to the parent */
 #define FTS_SYMFOLLOW    0x02           /* followed a symlink to get here */
-#ifndef __EMX__
 #define FTS_ISW          0x04           /* this is a whiteout object */
-#endif
         u_short fts_flags;              /* private flags for FTSENT structure */
 

trunk/src/emx/include/unistd.h

@@ -441 +441 @@
 /** @todo char  *ctermid(char *); */            /* XXX ??? */
 void     encrypt(char *, int);                  /* bird: SuS say it returns void, and so does our implementation */
-/** @todo int    fchdir(int); */
+int      fchdir(int);
 /* tcpip: long   gethostid(void); */
 pid_t    getpgid(pid_t _pid);       /* bird: SuS say pid_r return. */