Ticket #314: dasd.diff

src/emx/src/lib/sys/b_fsFileStat.c

@@ -53 +53 @@
     char szNativePath[PATH_MAX];
     int rc = __libc_back_fsResolve(pszPath, BACKFS_FLAGS_RESOLVE_FULL | BACKFS_FLAGS_RESOLVE_DIR_MAYBE, szNativePath, NULL);
     if (!rc)
+    {
+        /*
+         * Check if DASD mode is requested.
+         */
+        if (pszPath[1] == ':' && pszPath[2] == '\0')
+            szNativePath[2] = '\0';
+
         rc = __libc_back_fsNativeFileStat(szNativePath, pStat);
+    }
 
     if (!rc)
         LIBCLOG_RETURN_INT(rc);

src/emx/src/lib/sys/b_fsFileStatFH.c

@@ -86 +86 @@
         pStat->st_nlink = 1;
         pStat->st_blksize = 4096*12; /* 48KB */
 
-        if ((pFH->fFlags & __LIBC_FH_TYPEMASK) == F_FILE)
+        int   fDasdMode = 0;
+        ULONG fulMode;
+
+        if (!DosQueryFHState(fh, &fulMode))
+            fDasdMode = fulMode & OPEN_FLAGS_DASD;
+
+        if ((pFH->fFlags & __LIBC_FH_TYPEMASK) == F_FILE && !fDasdMode)
         {
             /*
              * Regular OS/2 file.

src/emx/src/lib/sys/b_fsNativeFileStat.c

@@ -116 +116 @@
     }
 
     /*
+     * If a drive in DASD mode, make a fake unix sutff
+     */
+    if (    (pszNativePath[0] >= 'A' && pszNativePath[0] <= 'Z')
+        &&  (pszNativePath[1] == ':' && !pszNativePath[2]))
+    {
+        ULONG      ulDiskNum = pszNativePath[0] - 'A' + 1;
+        FSALLOCATE fsalloc;
+        FSINFO     fsinfo;
+        int        rc;
+
+        rc = DosQueryFSInfo(ulDiskNum, FSIL_ALLOC, &fsalloc, sizeof(fsalloc));
+        if (rc)
+        {
+            rc = -__libc_native2errno(rc);
+            LIBCLOG_ERROR_RETURN_INT(rc);
+        }
+
+        /* fake unix stuff */
+        /** @todo this doesn't entirely match the open and file handle stat code.
+         * Fortunately, the user will not see that unless won't have the filename... */
+        pStat->st_dev = __libc_back_fsPathCalcInodeAndDev(pszNativePath, &pStat->st_ino);
+        pStat->st_attr = FILE_NORMAL;
+        pStat->st_mode = S_IFREG | S_IRWXO | S_IRWXG | S_IRWXU;
+        pStat->st_uid = 0;
+        pStat->st_gid = 0;
+        pStat->st_rdev = 0; /* b_ioFileOpen depends on this being 0 for devices! */
+        pStat->st_nlink = 1;
+        pStat->st_size = (off_t)fsalloc.cUnit * fsalloc.cSectorUnit * fsalloc.cbSector;
+        pStat->st_blocks = pStat->st_size / S_BLKSIZE;
+        pStat->st_blksize = 4096 * 12; /* 48kb */
+        pStat->st_atime = 0;
+        pStat->st_mtime = 0;
+        pStat->st_ctime = 0;
+        pStat->st_birthtime = 0;
+        LIBCLOG_RETURN_INT(0);
+    }
+
+    /*
      * Get path info.
      */
     FS_SAVE_LOAD();

src/emx/src/lib/sys/b_ioFileOpen.c

@@ -153 +153 @@
     if (rc)
         LIBCLOG_ERROR_RETURN_INT(rc);
 
+    /*
+     * Check if DASD mode is requsted.
+     */
+    if (pszFile[1] == ':' && !pszFile[2])
+    {
+        szNativePath[2] = '\0';
+        flOpenMode |= OPEN_FLAGS_DASD;
+    }
+
     dev_t   Dev = 0;
     ino_t   Inode = 0;
     PEAOP2 pEaOp2 = NULL;