Changeset 3063 for branches

Timestamp:

Apr 8, 2007, 10:24:07 PM (18 years ago)

Author:

bird

Message:

Fake something half ok when a device is being stat()'ed. Fixes #149.

Location:

branches/libc-0.6/src/emx/src/lib/sys

Files:

• b_fsNativeFileStat.c (modified) (2 diffs)
• b_ioFileOpen.c (modified) (2 diffs)

branches/libc-0.6/src/emx/src/lib/sys/b_fsNativeFileStat.c

@@ -4 +4 @@
  * LIBC SYS Backend - internal stat.
  *
- * Copyright (c) 2004-2005 knut st. osmundsen <bird@innotek.de>
+ * Copyright (c) 2004-2007 knut st. osmundsen <bird-src-spam@innotek.de>
  *
  *
@@ -85 +85 @@
      * If potential device, then perform real check.
      */
-    /** @todo copy device check from the path resolver. */
+    if (    (pszNativePath[1]== 'd' || pszNativePath[1] == 'D')
+        &&  (pszNativePath[2] == 'e' || pszNativePath[2] == 'E')
+        &&  (pszNativePath[3] == 'v' || pszNativePath[3] == 'V')
+        &&  (pszNativePath[4] == '/' || pszNativePath[4] == '\\')
+        )
+    {
+        ULONG       cb = 64;
+        PFSQBUFFER2 pfsqb = alloca(cb);
+        if (!DosQueryFSAttach((PCSZ)pszNativePath, 0, FSAIL_QUERYNAME, pfsqb, &cb))
+        {
+            /* 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_IFCHR | 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 = 0;
+            pStat->st_blocks = 0;
+            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);
+        }
+    }
 
     /*

branches/libc-0.6/src/emx/src/lib/sys/b_ioFileOpen.c

@@ -4 +4 @@
  * LIBC SYS Backend - open.
  *
- * Copyright (c) 2003-2005 knut st. osmundsen <bird@innotek.de>
+ * Copyright (c) 2003-2007 knut st. osmundsen <bird-src-spam@innotek.de>
  * Copyright (c) 1992-1996 by Eberhard Mattes
  *
@@ -217 +217 @@
                 /*
                  * Character device or Block device:
-                 *                  Translate the major/minor to an OS/2 device name and open that.
+                 *                  Translate the major/minor to an OS/2 device name and open that,
+                 *                  unless it's a native device of course (see b_fsNativeFileStat.c).
                  */
                 case S_IFCHR:
                 case S_IFBLK:
                 {
+                    if (st.st_rdev == 0)
+                        break;
                     /** @todo assign major & minor numbers and do translations. */
                     LIBCLOG_ERROR_RETURN_INT(-ENOTSUP);