Changeset 2323

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

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• include/InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• include/InnoTekLIBC/sharedpm.h (modified) (8 diffs, 1 prop)
• include/fts.h (modified) (4 diffs, 1 prop)
• include/unistd.h (modified) (1 diff, 1 prop)
• src/lib/bsd/gen/fts.c (modified) (19 diffs, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/misc/fchdir.c (added)
• src/lib/sys/__spawnve.c (modified) (6 diffs, 1 prop)
• src/lib/sys/b_dir.c (modified) (9 diffs, 1 prop)
• src/lib/sys/b_dir.h (modified) (2 diffs, 1 prop)
• src/lib/sys/b_fsDirCurrentSet.c (modified) (4 diffs, 1 prop)
• src/lib/sys/b_fsDirCurrentSetFH.c (added)
• src/lib/sys/filehandles.c (modified) (14 diffs, 1 prop)
• src/lib/sys/syscalls.h (modified) (1 diff, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -2 +2 @@
 
 TODO: open replace on RAMFS fails with error 32!
+
+2005-09-25: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - libc:
+        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!
 
 2005-08-28: knut st. osmundsen <bird-gccos2-spam@anduin.net>

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. */

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

@@ -40 +40 @@
 #endif
 #ifndef __EMX__
-# define HAVE_FCHDIR
 # define IS_SLASH(ch)   ( (ch) == '/' )
 #else
@@ -225 +224 @@
          * descriptor we run anyway, just more slowly.
          */
-#ifdef HAVE_FCHDIR
         if (!ISSET(FTS_NOCHDIR) && (sp->fts_rfd = _open(".", O_RDONLY, 0)) < 0)
-#else
-        if (!ISSET(FTS_NOCHDIR) && (sp->fts_rdir = getcwd(NULL, 0)) != NULL)
-#endif
-            SET(FTS_NOCHDIR);
+                SET(FTS_NOCHDIR);
 
         return (sp);
@@ -319 +314 @@
         /* Return to original directory, save errno if necessary. */
         if (!ISSET(FTS_NOCHDIR)) {
-#ifdef HAVE_FCHDIR
                 saved_errno = fchdir(sp->fts_rfd) ? errno : 0;
                 (void)_close(sp->fts_rfd);
-#else
-                saved_errno = chdir(sp->fts_rdir) ? errno : 0;
-                free(sp->fts_rdir); sp->fts_rdir = NULL;
-#endif
 
                 /* Set errno and return. */
@@ -340 +330 @@
         return (0);
 }
-
 
 /*
@@ -386 +375 @@
                 p->fts_info = fts_stat(sp, p, 1);
                 if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-#ifdef HAVE_FCHDIR
                         if ((p->fts_symfd = _open(".", O_RDONLY, 0)) < 0) {
                                 p->fts_errno = errno;
@@ -392 +380 @@
                         } else
                                 p->fts_flags |= FTS_SYMFOLLOW;
-#endif
                 }
                 return (p);
@@ -402 +389 @@
                 if (instr == FTS_SKIP ||
                     (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
-#ifdef HAVE_FCHDIR
                         if (p->fts_flags & FTS_SYMFOLLOW)
                                 (void)_close(p->fts_symfd);
-#endif
                         if (sp->fts_child) {
                                 fts_lfree(sp->fts_child);
@@ -462 +447 @@
                  */
                 if (p->fts_level == FTS_ROOTLEVEL) {
-#ifdef HAVE_FCHDIR
                         if (FCHDIR(sp, sp->fts_rfd)) {
-#else
-                        if (FCHDIR(sp, sp->fts_rdir)) {
-#endif
                                 SET(FTS_STOP);
                                 return (NULL);
@@ -484 +465 @@
                         p->fts_info = fts_stat(sp, p, 1);
                         if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-#ifdef HAVE_FCHDIR
                                 if ((p->fts_symfd =
                                     _open(".", O_RDONLY, 0)) < 0) {
@@ -491 +471 @@
                                 } else
                                         p->fts_flags |= FTS_SYMFOLLOW;
-#endif
                         }
                         p->fts_instr = FTS_NOINSTR;
@@ -525 +504 @@
          */
         if (p->fts_level == FTS_ROOTLEVEL) {
-#ifdef HAVE_FCHDIR
                 if (FCHDIR(sp, sp->fts_rfd)) {
-#else
-                if (FCHDIR(sp, sp->fts_rdir)) {
-#endif
                         SET(FTS_STOP);
                         return (NULL);
                 }
-#ifdef HAVE_FCHDIR
         } else if (p->fts_flags & FTS_SYMFOLLOW) {
                 if (FCHDIR(sp, p->fts_symfd)) {
@@ -543 +517 @@
                 }
                 (void)_close(p->fts_symfd);
-#else
-        (void)saved_errno;
-#endif
         } else if (!(p->fts_flags & FTS_DONTCHDIR) &&
             fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
@@ -583 +554 @@
 {
         FTSENT *p;
-#ifdef HAVE_FCHDIR
         int fd;
-#else
-        char *pszRoot;
-        int rc;
-#endif
+
         if (instr != 0 && instr != FTS_NAMEONLY) {
                 errno = EINVAL;
@@ -640 +607 @@
                 return (sp->fts_child = fts_build(sp, instr));
 
-#ifdef HAVE_FCHDIR
         if ((fd = _open(".", O_RDONLY, 0)) < 0)
-#else
-        if ((pszRoot = getcwd(NULL, 0)) == NULL)
-#endif
                 return (NULL);
         sp->fts_child = fts_build(sp, instr);
-#ifdef HAVE_FCHDIR
         if (fchdir(fd))
                 return (NULL);
         (void)_close(fd);
-#else
-        rc = chdir(pszRoot);
-        free(pszRoot);
-        if (rc)
-            return NULL;
-#endif
         return (sp->fts_child);
 }
@@ -725 +681 @@
          * If being called from fts_read, set the fts_info field.
          */
-#ifdef FTS_WHITEOUT
+#if defined(FTS_WHITEOUT) && !defined(__EMX__)
         if (ISSET(FTS_WHITEOUT))
                 oflag = DTF_NODUP | DTF_REWIND;
@@ -784 +740 @@
         cderrno = 0;
         if (nlinks || type == BREAD) {
-#ifdef HAVE_FCHDIR
                 if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
-#else
-                if (fts_safe_changedir(sp, cur, dirfd(dirp), cur->fts_accpath)) {
-#endif
                         if (nlinks && type == BREAD)
                                 cur->fts_errno = errno;
@@ -953 +905 @@
         if (descend && (type == BCHILD || !nitems) &&
             (cur->fts_level == FTS_ROOTLEVEL ?
-#ifdef HAVE_FCHDIR
             FCHDIR(sp, sp->fts_rfd) :
-#else
-            FCHDIR(sp, sp->fts_rdir) :
-#endif
             fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
                 cur->fts_info = FTS_ERR;
@@ -1259 +1207 @@
         if (ISSET(FTS_NOCHDIR))
                 return (0);
-#ifdef HAVE_FCHDIR
         if (fd < 0 && (newfd = _open(path, O_RDONLY, 0)) < 0)
                 return (-1);
         if (_fstat(newfd, &sb)) {
-#else
-        (void)newfd;
-        if (_stat(path, &sb)) {
-#endif
                 ret = -1;
                 goto bail;
@@ -1275 +1218 @@
                 goto bail;
         }
-#ifdef HAVE_FCHDIR
         ret = fchdir(newfd);
-#else
-        ret = chdir(path);
-#endif
 bail:
-#ifdef HAVE_FCHDIR
         oerrno = errno;
         if (fd < 0)
                 (void)_close(newfd);
         errno = oerrno;
-#else
-        (void)oerrno;
-#endif
         return (ret);
 }

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

@@ -1948 +1948 @@
     "__hstrdup" @1946
     "___libc_Back_dirOpenNative" @1947
+    "___libc_Back_fsDirCurrentSetFH" @1948
+    "__std_fchdir" @1949

trunk/src/emx/src/lib/sys/__spawnve.c

@@ -42 +42 @@
     LIBCLOG_ENTER("\n");
     __LIBC_PSPMINHERIT      pRet = NULL;
+    size_t                  cbStrings = 0;
+    char                   *pszStrings = NULL;
 
     /*
@@ -48 +50 @@
     size_t                  cbFH;
     __LIBC_PSPMINHFHBHDR    pFH;
-    pFH = __libc_fhInheritPack(&cbFH);
+    pFH = __libc_fhInheritPack(&cbFH, &pszStrings, &cbStrings);
     if (pFH)
     {
@@ -68 +70 @@
                  * Allocate shared memory.
                  */
-                size_t  cb = sizeof(__LIBC_SPMINHERIT) + ((cbFH + 3) & ~3) + ((cbFS + 3) & ~3) + ((cbSig + 3) & ~3);
+                #define ALIGNIT(cb) (((cb) + 3) & ~3)
+                size_t  cb = sizeof(__LIBC_SPMINHERIT) + ALIGNIT(cbFH) + ALIGNIT(cbFS) + ALIGNIT(cbSig) + ALIGNIT(cbStrings);
                 pRet = __libc_spmAlloc(cb);
                 if (pRet)
                 {
+                    pRet->cb = sizeof(*pRet);
+                    char *p = (char *)(pRet + 1);
+
                     /* fh */
-                    pRet->cb = sizeof(*pRet);
-                    pRet->pFHBundles = (__LIBC_PSPMINHFHBHDR)(pRet + 1);
+                    pRet->pFHBundles = (__LIBC_PSPMINHFHBHDR)p;
+                    p += ALIGNIT(cbFH);
                     memcpy(pRet->pFHBundles, pFH, cbFH);
                     free(pFH);
@@ -81 +87 @@
                     if (pFS)
                     {
-                        pRet->pFS = (__LIBC_PSPMINHFS)((char *)pRet->pFHBundles + ((cbFH + 3) & ~3));
+                        pRet->pFS = (__LIBC_PSPMINHFS)p;
+                        p += ALIGNIT(cbFS);
                         memcpy(pRet->pFS, pFS, cbFS);
                         free(pFS);
@@ -91 +98 @@
                     if (pSig)
                     {
-                        pRet->pSig = (__LIBC_PSPMINHSIG)((char *)pRet->pFHBundles + ((cbFH + 3) & ~3) + ((cbFS + 3) & ~3));
+                        pRet->pSig = (__LIBC_PSPMINHSIG)p;
+                        p += ALIGNIT(cbSig);
                         memcpy(pRet->pSig, pSig, cbSig);
                         free(pSig);
                     }
+                    else
+                        pRet->pSig = NULL;
+
+                    /* strings */
+                    if (pszStrings)
+                    {
+                        pRet->pszStrings = p;
+                        /*p += ALIGNIT(cbStrings);*/
+                        memcpy(pRet->pszStrings, pszStrings, cbStrings);
+                        free(pszStrings);
+                    }
+                    else
+                        pRet->pszStrings = NULL;
 
                     /* done! */
@@ -108 +129 @@
         free(pFH);
     }
+    free(pszStrings);
 
     LIBCLOG_RETURN_P(pRet);

trunk/src/emx/src/lib/sys/b_dir.c

@@ -39 +39 @@
 #include <limits.h>
 #include <sys/fcntl.h>
+#include <sys/dirent.h>
 #include <emx/umalloc.h>
 #include <emx/io.h>
@@ -54 +55 @@
 static int dirFileControl(__LIBC_PFH pFH, int fh, int iRequest, int iArg, int *prc);
 static int dirIOControl(__LIBC_PFH pFH, int fh, int iIOControl, int iArg, int *prc);
+static int dirSeek(__LIBC_PFH pFH, int fh, off_t off, int iMethod, off_t *poffNew);
 static int dirSelect(int cFHs, struct fd_set *pRead, struct fd_set *pWrite, struct fd_set *pExcept, struct timeval *tv, int *prc);
 static int dirForkChild(__LIBC_PFH pFH, int fh, __LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation);
+static int dirOpen(const char *pszNativePath, unsigned fLibc, int *pfh, __LIBC_PFHDIR *ppFHDir);
 
 
@@ -73 +76 @@
     dirFileControl,
     dirIOControl,
+    //dirSeek,
     dirSelect,
     NULL,
@@ -200 +204 @@
     LIBCLOG_ENTER("pFH=%p fh=%d iIOControl=%d iArg=%d prc=%p\n", (void *)pFH, fh, iIOControl, iArg, (void *)prc);
     LIBCLOG_ERROR_RETURN_INT(-EOPNOTSUPP);
+}
+
+
+/** Seek to a new position in the 'file'.
+ *
+ * @returns 0 on success.
+ * @returns OS/2 error code or negated errno on failure.
+ * @param   pFH         Pointer to the handle structure to operate on.
+ * @param   fh          It's associated filehandle.
+ * @param   off         The offset to seek. The meaning depends on SEEK_.
+ * @param   iMethod     The seek method, any of the SEEK_* macros.
+ * @param   poffNew     Where to store the new file offset.
+ */
+static int dirSeek(__LIBC_PFH pFH, int fh, off_t off, int iMethod, off_t *poffNew)
+{
+    /** @todo Implement reading and seeking. */
+    return -1;
 }
 
@@ -238 +259 @@
 static int dirForkChild(__LIBC_PFH pFH, int fh, __LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation)
 {
-    /** @todo reopen the handle, same as for duplicate! */
+    switch (enmOperation)
+    {
+        case __LIBC_FORK_OP_FORK_CHILD:
+        {
+            __LIBC_PFHDIR pFHDir = (__LIBC_PFHDIR)pFH;
+
+            /* make pattern */
+            char szNativePath[PATH_MAX + 5];
+            size_t cch = strlen(pFH->pszNativePath);
+            memcpy(szNativePath, pFH->pszNativePath, cch);
+            szNativePath[cch] = '/';
+            szNativePath[cch + 1] = '*';
+            szNativePath[cch + 2] = '\0';
+
+            pFHDir->hDir   = HDIR_CREATE;
+            pFHDir->cFiles = pFHDir->cbBuf / 40;
+#if OFF_MAX > LONG_MAX
+            if (pFHDir->fType == FIL_QUERYEASIZEL)  /* the L version is buggy!! Make sure there is enough space. */
+                pFHDir->cFiles = pFHDir->cbBuf / sizeof(FILEFINDBUF4L);
+#endif
+            pFHDir->uCur.pv = pFHDir->uBuf.pv;
+            bzero(pFHDir->uBuf.pv, pFHDir->cbBuf);
+
+            int rc = DosFindFirst((PCSZ)szNativePath,
+                                  &pFHDir->hDir,
+                                  FILE_NORMAL | FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM | FILE_DIRECTORY | FILE_ARCHIVED,
+                                  pFHDir->uBuf.pv,
+                                  pFHDir->cbBuf,
+                                  &pFHDir->cFiles,
+                                  pFHDir->fType);
+            if (rc)
+            {
+                pFHDir->hDir = HDIR_CREATE;
+                return rc;
+            }
+            if (pFHDir->uCurEntry)
+            {
+                unsigned uCurEntry = pFHDir->uCurEntry;
+                pFHDir->uCurEntry = 0;
+                dirSeek(&pFHDir->Core, fh, uCurEntry * sizeof(struct dirent), SEEK_SET, NULL);
+            }
+            break;
+        }
+
+        default:
+            break;
+    }
     return 0;
 }
@@ -248 +315 @@
 
 /**
- * Opens a directory specified by a path already made native.
- *
- * @returns File handle (>=0) on success.
- * @returns negative error code (errno.h) on failure.
+ * Opens a directory.
+ * Internal worker used by the other open/inherit calls.
+ *
+ * @returns 0 on success.
+ * @returns Negated errno on failure.
  * @param   pszNativePath       Pointer to the native path. The buffer must be on stack
  *                              and must have space for 4 extra bytes!
- * @param   fInUnixTree         Set if the native path is in the unix tree.
- * @param   fLibc               The LIBC open() flags.
- * @param   pStat               Pointer to the stat structure for the directory.
- */
-int __libc_Back_dirOpenNative(char *pszNativePath, unsigned fInUnixTree, unsigned fLibc, struct stat *pStat)
-{
-    LIBCLOG_ENTER("pszNativePath=%p:{%s} fInUnixTree=%d fLibc=%#x pStat=%p\n", (void *)pszNativePath, pszNativePath, fInUnixTree, fLibc, (void *)pStat);
-
-    /*
-     * Validate input.
-     */
-    if (!S_ISDIR(pStat->st_mode))
-        LIBCLOG_ERROR_RETURN_INT(-ENOTDIR);
-    if ((fLibc & O_ACCMODE) != O_RDONLY)
-        LIBCLOG_ERROR_RETURN_INT(-EISDIR);
-    if ((fLibc & (O_EXCL | O_CREAT)) == (O_EXCL | O_CREAT))
-        LIBCLOG_ERROR_RETURN_INT(-EEXIST);
-    if (fLibc & (O_TRUNC | O_APPEND))
-        LIBCLOG_ERROR_RETURN_INT(-EPERM);
-    if (fLibc & (O_TRUNC | O_APPEND | O_SIZE))
-        LIBCLOG_ERROR_RETURN_INT(-EINVAL);
-
-    /*
-     * Directory handles are binary, period.
-     */
-    fLibc &= ~O_TEXT;
-    fLibc |= O_BINARY;
+ * @param   pfh                 On input the requested filehandle. -1 means any.
+ *                              On output (success only) the allocated file handle.
+ * @param   ppFHDir             Where to store the handle structure pointer on success.
+ */
+static int dirOpen(const char *pszNativePath, unsigned fLibc, int *pfh, __LIBC_PFHDIR *ppFHDir)
+{
+    LIBC_ASSERT((fLibc & (O_BINARY | __LIBC_FH_TYPEMASK)) == (O_BINARY | F_DIR));
 
     /*
@@ -327 +375 @@
             if (!rc)
             {
-                int fh;
                 __LIBC_PFH pFH;
-                rc = __libc_FHAllocate(-1, fLibc, sizeof(__LIBC_FHDIR), &gDirOps, &pFH, &fh);
+                rc = __libc_FHAllocate(*pfh, fLibc, sizeof(__LIBC_FHDIR), &gDirOps, &pFH, pfh);
                 if (!rc)
                 {
-                    pFH->Dev            = __libc_back_fsPathCalcInodeAndDev(pszNativePath, &pFH->Inode);
                     pFH->pFsInfo        = __libc_back_fsInfoObjByDev(pFH->Dev);
                     pFH->pszNativePath  = Tmp.Core.pszNativePath;
@@ -343 +389 @@
                     pFHDir->cFiles      = Tmp.cFiles;
                     pFHDir->cbBuf       = Tmp.cbBuf;
-
+                    pFHDir->uCurEntry   = 0;
+
+                    *ppFHDir = pFHDir;
                     FS_RESTORE();
-                    LIBCLOG_MSG("pFHDir=%p:{.hDir=%#lx, .fType=%d, .cFiles=%ld, .cbBuf=%#x} fh=%d\n",
-                                (void *)pFHDir, pFHDir->hDir, pFHDir->fType, pFHDir->cFiles, pFHDir->cbBuf, fh);
-                    LIBCLOG_RETURN_INT(fh);
+                    return 0;
                 }
 
@@ -361 +407 @@
     if (rc > 0)
         rc = -__libc_native2errno(rc);
+    return rc;
+}
+
+
+/**
+ * Re-opens a directory we inherited from our parent process.
+ *
+ * @returns 0 on success.
+ * @returns Negated error code (errno.h) on failure.
+ * @param   fh                  The file handle this directory shall have.
+ * @param   pszNativePath       Pointer to the native path.
+ * @param   fInUnixTree         Flag indicating whether the open() call was referencing a path in the unix tree or not.
+ * @param   fFlags              Filehandle flags.
+ * @param   Inode               The inode number of the directory.
+ * @param   Dev                 The device number of the device with the directory.
+ * @param   uCurEntry           The current position.
+ */
+int __libc_back_dirInherit(int fh, const char *pszNativePath, unsigned fInUnixTree, unsigned fFlags, ino_t Inode, dev_t Dev, unsigned uCurEntry)
+{
+    LIBCLOG_ENTER("fh=%d pszNativePath=%p:{%s} fInUnixTree=%d fFlags=%#x Inode=%#llx Dev=%#x uCurEntry=%d\n",
+                  fh, (void *)pszNativePath, pszNativePath, fInUnixTree, fFlags, (unsigned long long)Inode, Dev, uCurEntry);
+
+    /*
+     * Open the directory.
+     */
+    __LIBC_PFHDIR pFHDir;
+    char szNativePath[PATH_MAX + 5];
+    strcpy(szNativePath, pszNativePath);
+    int rc = dirOpen(szNativePath, fFlags, &fh, &pFHDir);
+    if (!rc)
+    {
+        pFHDir->Core.Inode = Inode;
+        pFHDir->Core.Dev   = Dev;
+
+        /*
+         * Seek to the current positions.
+         */
+        if (uCurEntry)
+            dirSeek(&pFHDir->Core, fh, uCurEntry * sizeof(struct dirent), SEEK_SET, NULL);
+
+        LIBCLOG_MSG("pFHDir=%p:{.hDir=%#lx, .fType=%d, .cFiles=%ld, .cbBuf=%#x, .uCurEntry=%d} fh=%d\n",
+                    (void *)pFHDir, pFHDir->hDir, pFHDir->fType, pFHDir->cFiles, pFHDir->cbBuf, pFHDir->uCurEntry, fh);
+        LIBCLOG_RETURN_INT(0);
+    }
     LIBCLOG_ERROR_RETURN_INT(rc);
-}
-
+
+}
+
+
+/**
+ * Opens a directory specified by a path already made native.
+ *
+ * @returns File handle (>=0) on success.
+ * @returns negative error code (errno.h) on failure.
+ * @param   pszNativePath       Pointer to the native path. The buffer must be on stack
+ *                              and must have space for 4 extra bytes!
+ * @param   fInUnixTree         Set if the native path is in the unix tree.
+ * @param   fLibc               The LIBC open() flags.
+ * @param   pStat               Pointer to the stat structure for the directory.
+ */
+int __libc_Back_dirOpenNative(char *pszNativePath, unsigned fInUnixTree, unsigned fLibc, struct stat *pStat)
+{
+    LIBCLOG_ENTER("pszNativePath=%p:{%s} fInUnixTree=%d fLibc=%#x pStat=%p\n", (void *)pszNativePath, pszNativePath, fInUnixTree, fLibc, (void *)pStat);
+
+    /*
+     * Validate input.
+     */
+    if (!S_ISDIR(pStat->st_mode))
+        LIBCLOG_ERROR_RETURN_INT(-ENOTDIR);
+    if ((fLibc & O_ACCMODE) != O_RDONLY)
+        LIBCLOG_ERROR_RETURN_INT(-EISDIR);
+    if ((fLibc & (O_EXCL | O_CREAT)) == (O_EXCL | O_CREAT))
+        LIBCLOG_ERROR_RETURN_INT(-EEXIST);
+    if (fLibc & (O_TRUNC | O_APPEND))
+        LIBCLOG_ERROR_RETURN_INT(-EPERM);
+    if (fLibc & (O_TRUNC | O_APPEND | O_SIZE))
+        LIBCLOG_ERROR_RETURN_INT(-EINVAL);
+
+    /*
+     * Directory handles are binary, period.
+     */
+    fLibc &= ~(O_TEXT | __LIBC_FH_TYPEMASK | __LIBC_FH_FDFLAGS_MASK);
+    fLibc |= O_BINARY | F_DIR;
+
+    /*
+     * Open the directory.
+     */
+    int fh = -1;
+    __LIBC_PFHDIR pFHDir;
+    int rc = dirOpen(pszNativePath, fLibc, &fh, &pFHDir);
+    if (!rc)
+    {
+        pFHDir->Core.Inode = pStat->st_ino;
+        pFHDir->Core.Dev   = pStat->st_dev;
+
+        LIBCLOG_MSG("pFHDir=%p:{.hDir=%#lx, .fType=%d, .cFiles=%ld, .cbBuf=%#x} fh=%d\n",
+                    (void *)pFHDir, pFHDir->hDir, pFHDir->fType, pFHDir->cFiles, pFHDir->cbBuf, fh);
+        LIBCLOG_RETURN_INT(fh);
+    }
+    LIBCLOG_ERROR_RETURN_INT(rc);
+}
+

trunk/src/emx/src/lib/sys/b_dir.h

@@ -65 +65 @@
     /** The size of the find buffer. */
     unsigned        cbBuf;
+    /** Current entry number (total, for seeking). */
+    unsigned        uCurEntry;
 } __LIBC_FHDIR;
 /** Pointer to the a directory handle. */
@@ -71 +73 @@
 
 int __libc_Back_dirOpenNative(char *pszNativePath, unsigned fInUnixTree, unsigned fLibc, struct stat *pStat);
+int __libc_back_dirInherit(int fh, const char *pszNativePath, unsigned fInUnixTree, unsigned fFlags,
+                           ino_t Inode, dev_t Dev, unsigned uCurEntry);
 
 

trunk/src/emx/src/lib/sys/b_fsDirCurrentSet.c

@@ -49 +49 @@
 {
     LIBCLOG_ENTER("pszPath=%p:{%s} fDrive=%d\n", (void *)pszPath, pszPath, fDrive);
-    FS_VAR();
 
     /*
@@ -73 +72 @@
          * when in the unix compartement or when fDrive is set.
          */
-        FS_SAVE_LOAD();
+        FS_VAR_SAVE_LOAD();
         int rc = DosSetCurrentDir((PCSZ)&szNativePath[0]);
-        FS_RESTORE();
         if (!rc)
         {
@@ -84 +82 @@
                     ULONG ulDrive = szNativePath[0] - (szNativePath[0] >= 'A' && szNativePath[0] <= 'Z' ? 'A' - 1 : 'a' -1);
                     rc = DosSetDefaultDisk(ulDrive);
-                    LIBC_ASSERTM(!rc, "DosSetDefaultDisk(%ld) -> %d. unix drive is %c\n", ulDrive, rc, szNativePath[0]);
+                    LIBC_ASSERTM(!rc, "DosSetDefaultDisk(%ld) -> %d. drive is %c\n", ulDrive, rc, szNativePath[0]);
                     rc = 0;             /* ignore this kind of errors. */
                     __libc_gfInUnixTree = fInUnixTree;
@@ -92 +90 @@
         else
             rc = -__libc_native2errno(rc);
+        FS_RESTORE();
     }
 

trunk/src/emx/src/lib/sys/filehandles.c

@@ -53 +53 @@
 #include "syscalls.h"
 #include "b_fs.h"
-
+#include "b_dir.h"
+
+#include <InnoTekLIBC/backend.h>
 #define __LIBC_LOG_GROUP    __LIBC_LOG_GRP_INITTERM
 #include <InnoTekLIBC/logstrict.h>
@@ -170 +172 @@
             __LIBC_PSPMINHFHBHDR    pHdr;
             __LIBC_PSPMINHFHBSTD    pStds;
-            __LIBC_PSPMINHFHBSTDOLD pStdsOld;
+            __LIBC_PSPMINHFHBDIR    pDirs;
             __LIBC_PSPMINHFHBSOCK   pSockets;
             uintptr_t               u;
@@ -189 +191 @@
                         if (fhAllocate(iFH, u.pStds->aHandles[i].fFlags, sizeof(__LIBC_FH), NULL, &pFH, NULL, 0))
                         {
-                            LIBC_ASSERTM_FAILED("Failed to allocated inherited file handle! iFH=%d\n", iFH);
+                            __libc_Back_panic(0, NULL, "Failed to allocated inherited file handle! iFH=%d\n", iFH);
                             __libc_spmInheritRelease();
                             return -1;
@@ -196 +198 @@
                         pFH->Dev = u.pStds->aHandles[i].Dev;
                         pFH->pFsInfo = __libc_back_fsInfoObjByDev(pFH->Dev);
-                        pFH->pszNativePath = NULL;
+                        pFH->pszNativePath = u.pStds->aHandles[i].offNativePath
+                            ? _hstrdup(pInherit->pszStrings + u.pStds->aHandles[i].offNativePath) : NULL;
                     }
                     u.pv = &u.pStds->aHandles[c];
                     break;
 
-                case __LIBC_SPM_INH_FHB_TYPE_STANDARD_OLD:
+                case __LIBC_SPM_INH_FHB_TYPE_DIRECTORY:
                     for (i = 0; i < c; i++)
                     {
-                        if (fhAllocate(iFH, u.pStdsOld->afFlags[i], sizeof(__LIBC_FH), NULL, NULL, NULL, 0))
+                        const char *pszPath = u.pDirs->aHandles[i].offNativePath ? pInherit->pszStrings + u.pDirs->aHandles[i].offNativePath : NULL;
+                        int rc = __libc_back_dirInherit(iFH, pszPath, u.pDirs->aHandles[i].fInUnixTree,
+                                                        u.pDirs->aHandles[i].fFlags, u.pDirs->aHandles[i].Inode,
+                                                        u.pDirs->aHandles[i].Dev, u.pDirs->aHandles[i].uCurEntry);
+                        if (rc)
                         {
-                            LIBC_ASSERTM_FAILED("Failed to allocated inherited file handle! iFH=%d\n", iFH);
+                            __libc_Back_panic(0, NULL, "Failed to allocated inherited directory handle! rc=%d iFH=%d path=%s\n", rc, iFH, pszPath);
                             __libc_spmInheritRelease();
                             return -1;
                         }
                     }
-                    u.pv = &u.pStdsOld->afFlags[c];
+                    u.pv = &u.pDirs->aHandles[c];
                     break;
 
@@ -220 +227 @@
                         if (rc)
                         {
-                            LIBC_ASSERTM_FAILED("Failed to allocated inherited socket (4.4) handle! rc=%d iFH=%d iSocket=%d\n",
-                                                rc, iFH, u.pSockets->aHandles[i].usSocket);
+                            __libc_Back_panic(0, NULL, "Failed to allocated inherited socket (4.4) handle! rc=%d iFH=%d iSocket=%d\n",
+                                              rc, iFH, u.pSockets->aHandles[i].usSocket);
                             __libc_spmInheritRelease();
                             return -1;
@@ -235 +242 @@
                         if (rc)
                         {
-                            LIBC_ASSERTM_FAILED("Failed to allocated inherited socket (4.3) handle! rc=%d iFH=%d iSocket=%d\n",
-                                                rc, iFH, u.pSockets->aHandles[i].usSocket);
+                            __libc_Back_panic(0, NULL, "Failed to allocated inherited socket (4.3) handle! rc=%d iFH=%d iSocket=%d\n",
+                                              rc, iFH, u.pSockets->aHandles[i].usSocket);
                             __libc_spmInheritRelease();
                             return -1;
@@ -295 +302 @@
 
 /**
+ * Adds a string to the string table.
+ */
+static inline unsigned fhAddString(const char *pszString, char **ppszStrings, size_t *pcbAlloc, size_t *pcb)
+{
+    if (!pszString)
+        return 0;
+
+    size_t      cb  = strlen(pszString) + 1;
+    unsigned    off = *pcb;
+
+    /* need more space? */
+    if (cb + off > *pcbAlloc)
+    {
+        size_t cbAlloc = (cb + off + !off + 0xfff) & ~0xfff;
+        void *pv = _hrealloc(*ppszStrings, cbAlloc);
+        if (!pv)
+            return 0;
+        *ppszStrings = (char *)pv;
+        *pcbAlloc = cbAlloc;
+        if (!off)
+        {
+            *pcb = off = 1;
+            **ppszStrings = '\0';
+        }
+    }
+
+    /* copy */
+    memcpy(*ppszStrings + off, pszString, cb);
+    *pcb += cb;
+    return off;
+}
+
+
+/**
  * Pack down file handles for exec.
  *
@@ -303 +344 @@
  * @param   pcb     Where to store the size of the returned data.
  */
-__LIBC_PSPMINHFHBHDR    __libc_fhInheritPack(size_t *pcb)
+__LIBC_PSPMINHFHBHDR    __libc_fhInheritPack(size_t *pcb, char **ppszStrings, size_t *pcbStrings)
 {
     LIBCLOG_ENTER("pcb=%p\n", (void *)pcb);
-    size_t                  cb = 0x1000;
+    size_t                  cbStringAlloc = *pcbStrings;
+    size_t                  cb = 0x2000;
     unsigned                iFH;
     unsigned                cFHs;
@@ -314 +356 @@
     {
         __LIBC_PSPMINHFHBHDR    pHdr;
+        __LIBC_PSPMINHFHBDIR    pDirs;
         __LIBC_PSPMINHFHBSTD    pStds;
         __LIBC_PSPMINHFHBSOCK   pSockets;
@@ -321 +364 @@
 
     /*
-     * Allocate buffer.
-     */
+     * Allocate buffers.
+     */
+    LIBC_ASSERT(cb > sizeof(u.pDirs->aHandles[0]) * 256 + sizeof(*u.pDirs));
     pRet = _hmalloc(cb);
     if (!pRet)
@@ -361 +405 @@
          */
         /* Ensure space for max sized bundle and termination record. */
-        if ( ((uintptr_t)&u.pSockets->aHandles[256] + sizeof(__LIBC_SPMINHFHBHDR) - (uintptr_t)pRet) > cb)
-        {
-            void *pv = realloc(pRet, cb + 0x1000);
+        if ( ((uintptr_t)&u.pDirs->aHandles[256] + sizeof(__LIBC_SPMINHFHBHDR) - (uintptr_t)pRet) > cb )
+        {
+            void *pv = realloc(pRet, cb + 0x2000);
             if (!pv)
             {
@@ -372 +416 @@
             u.u += (uintptr_t)pv - (uintptr_t)pv;
             pRet = pv;
-            cb += 0x1000;
+            cb += 0x2000;
         }
         /* init the bundle. */
@@ -388 +432 @@
                     u.pStds->aHandles[i].Inode  = gpapFHs[iFH]->Inode;
                     u.pStds->aHandles[i].Dev    = gpapFHs[iFH]->Dev;
+                    u.pStds->aHandles[i].offNativePath = fhAddString(gpapFHs[iFH]->pszNativePath, ppszStrings, &cbStringAlloc, pcbStrings);
                     /* next */
                     i++; iFH++;
@@ -400 +445 @@
                 u.pStds->Hdr.cHandles = i;
                 u.pv = &u.pStds->aHandles[i];
+                break;
+            }
+
+            case enmFH_Directory:
+            {
+                u.pDirs->Hdr.uchType = __LIBC_SPM_INH_FHB_TYPE_DIRECTORY;
+                u.pDirs->Hdr.StartFH = iFH;
+                /* walk file handles. */
+                for (i = 0; ; )
+                {
+                    u.pDirs->aHandles[i].fFlags        = gpapFHs[iFH]->fFlags;
+                    u.pDirs->aHandles[i].Inode         = gpapFHs[iFH]->Inode;
+                    u.pDirs->aHandles[i].Dev           = gpapFHs[iFH]->Dev;
+                    LIBC_ASSERT(gpapFHs[iFH]->pszNativePath && *gpapFHs[iFH]->pszNativePath);
+                    u.pDirs->aHandles[i].offNativePath = fhAddString(gpapFHs[iFH]->pszNativePath, ppszStrings, &cbStringAlloc, pcbStrings);
+                    if (!u.pDirs->aHandles[i].offNativePath)
+                    {
+                        _fmutex_release(&gmtx);
+                        free(pRet);
+                        LIBCLOG_ERROR_RETURN_P(NULL);
+                    }
+                    u.pDirs->aHandles[i].fInUnixTree   = !!((__LIBC_PFHDIR)gpapFHs[iFH])->fInUnixTree;
+                    u.pDirs->aHandles[i].uCurEntry     = ((__LIBC_PFHDIR)gpapFHs[iFH])->uCurEntry;
+                    /* next */
+                    i++; iFH++;
+                    if (    i >= 255
+                        ||  iFH >= cFHs
+                        ||  !gpapFHs[iFH]
+                        ||  !gpapFHs[iFH]->pOps
+                        ||  (gpapFHs[iFH]->pOps->enmType != enmType)
+                        ||  (gpapFHs[iFH]->fFlags & ((FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT) | O_NOINHERIT)) )
+                        break;
+                }
+                /* commit the bundle. */
+                u.pStds->Hdr.cHandles = i;
+                u.pv = &u.pDirs->aHandles[i];
                 break;
             }

trunk/src/emx/src/lib/sys/syscalls.h

@@ -126 +126 @@
 /** @defgroup grp_sys_inherit   Inherit Function
  * @{ */
-__LIBC_PSPMINHFHBHDR    __libc_fhInheritPack(size_t *pcb);
+__LIBC_PSPMINHFHBHDR    __libc_fhInheritPack(size_t *pcb, char **ppszStrings, size_t *pcbStrings);
 void                    __libc_fhInheritDone(void);
 /** @} */