Changeset 3687

Timestamp:

Mar 15, 2011, 11:57:10 PM (14 years ago)

Author:

bird

Message:

libc: Reimplemented pathconf and fpathconf. References #44.

Location:

trunk/libc/src

Files:

• kNIX/Makefile.kmk (modified) (2 diffs)
• kNIX/b_fsInfoPathConf.c (added)
• kNIX/b_fsPathConf.c (added)
• kNIX/b_ioPathConf.c (added)
• kNIX/kNIX.h (modified) (1 diff)
• kNIX/os2/fs-os2.c (modified) (7 diffs)
• libc/misc/Makefile.kmk (modified) (1 diff)
• libc/misc/fpathcon.c (deleted)
• libc/misc/fpathconf.c (added)
• libc/misc/pathconf.c (modified) (1 diff)

trunk/libc/src/kNIX/Makefile.kmk

@@ -49 +49 @@
     $(PATH_LIBC_SRC)/kNIX/b_fsFileStat.c \
     $(PATH_LIBC_SRC)/kNIX/b_fsFileStatFH.c \
+    $(PATH_LIBC_SRC)/kNIX/b_fsInfoPathConf.c \
+    $(PATH_LIBC_SRC)/kNIX/b_fsPathConf.c \
     $(PATH_LIBC_SRC)/kNIX/b_fsSymlinkRead.c \
     $(PATH_LIBC_SRC)/kNIX/b_fsSymlinkStat.c \
@@ -60 +62 @@
     $(PATH_LIBC_SRC)/kNIX/b_ioFileSizeSet.c \
     $(PATH_LIBC_SRC)/kNIX/b_ioFHToPath.c \
+    $(PATH_LIBC_SRC)/kNIX/b_ioPathConf.c \
     $(PATH_LIBC_SRC)/kNIX/b_ioRead.c \
     $(PATH_LIBC_SRC)/kNIX/b_ioSeek.c \

trunk/libc/src/kNIX/kNIX.h

@@ -238 +238 @@
 __LIBC_PFSINFO __libc_back_fsInfoObjAddRef(__LIBC_PFSINFO pFsInfo);
 void __libc_back_fsInfoObjRelease(__LIBC_PFSINFO pFsInfo);
+int __libc_back_fsInfoPathConf(__LIBC_PFSINFO pFsInfo, int iName, long *plValue);
 
 uint32_t __libc_back_djb2(const char *psz);

trunk/libc/src/kNIX/os2/fs-os2.c

@@ -281 +281 @@
      * Setup the the executable path rewrite rule.
      */
-    PTIB pTib; 
+    PTIB pTib;
     PPIB pPib;
     DosGetInfoBlocks(&pTib, &pPib);
     APIRET rc = DosQueryModuleName(pPib->pib_hmte, sizeof(__libc_gszExecPath), &__libc_gszExecPath[0]);
-    if (!rc) 
+    if (!rc)
     {
         char *psz = strchr(&__libc_gszExecPath[0], '\0');
-        while (     psz > &__libc_gszExecPath[0] 
+        while (     psz > &__libc_gszExecPath[0]
                &&   *psz != '\\'
                &&   *psz != '/'
@@ -309 +309 @@
     if (DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE, &ulBootDrive, sizeof(ulBootDrive)))
         ulBootDrive = 'C' - 'A' - 1; /* A = 1 */
-    __libc_gszTmpDir[0] = __libc_gszSystemRoot[0] = __libc_gszSystemDrive[0] 
+    __libc_gszTmpDir[0] = __libc_gszSystemRoot[0] = __libc_gszSystemDrive[0]
         = (char)ulBootDrive + 'A' - 1;
 
@@ -463 +463 @@
 {
     static char achBuffer[384]; /* we're protected by the mutex, don't assume too much stack! */
-    ULONG       cb = sizeof(achBuffer);
+    ULONG       cb    = sizeof(achBuffer);
     PFSQBUFFER2 pfsqb = (PFSQBUFFER2)achBuffer;
 
-    /* init the structure */
-    pFsInfo->fZeroNewBytes = 0;
-    pFsInfo->fUnixEAs = 0;
-    pFsInfo->Dev = Dev;
-    pFsInfo->szName[0] = '\0';
-    pFsInfo->szMountpoint[0] = minor(Dev);
-    pFsInfo->szMountpoint[1] = ':';
-    pFsInfo->szMountpoint[2] = '\0';
-    pFsInfo->szMountpoint[3] = '\0';
+    /* init the structure with defaults. */
+    pFsInfo->fZeroNewBytes      = 0;
+    pFsInfo->fUnixEAs           = 0;
+    pFsInfo->fChOwnRestricted   = 1;
+    pFsInfo->fNoNameTrunc       = 1;
+    pFsInfo->cFileSizeBits      = 64;
+    pFsInfo->cchMaxPath         = CCHMAXPATH;
+    pFsInfo->cchMaxName         = CCHMAXPATHCOMP;
+    pFsInfo->cchMaxSymlink      = CCHMAXPATH;
+    pFsInfo->cMaxLinks          = 1;
+    pFsInfo->cchMaxTermCanon    = MAX_CANON;
+    pFsInfo->cchMaxTermInput    = MAX_INPUT;
+    pFsInfo->cbPipeBuf          = _POSIX_PIPE_BUF;
+    pFsInfo->cbBlock            = 512;
+    pFsInfo->cbXferIncr         = 0x1000;
+    pFsInfo->cbXferMax          = 0xf000;
+    pFsInfo->cbXferMin          = 0x1000;
+    pFsInfo->uXferAlign         = 0x1000;
+    pFsInfo->Dev                = Dev;
+    pFsInfo->szName[0]          = '\0';
+    pFsInfo->szMountpoint[0]    = minor(Dev);
+    pFsInfo->szMountpoint[1]    = ':';
+    pFsInfo->szMountpoint[2]    = '\0';
+    pFsInfo->szMountpoint[3]    = '\0';
 
     /* query fs info */
@@ -482 +497 @@
     if (!rc)
         strncat(pFsInfo->szName, (const char *)&pfsqb->szName[pfsqb->cbName + 1], sizeof(pFsInfo->szName) - 1);
-    if (    !strcmp(pFsInfo->szName, "JFS")
-        ||  !strcmp(pFsInfo->szName, "HPFS")
-        ||  !strcmp(pFsInfo->szName, "FAT"))
+    if (!strcmp(pFsInfo->szName, "HPFS"))
     {
         pFsInfo->fZeroNewBytes  = 1;
         pFsInfo->fUnixEAs       = 1;
+        /** @todo detect HPFS386? */
+    }
+    else if (!strcmp(pFsInfo->szName, "JFS"))
+    {
+        pFsInfo->fZeroNewBytes  = 1;
+        pFsInfo->fUnixEAs       = 1;
+    }
+    else if (!strcmp(pFsInfo->szName, "FAT"))
+    {
+        pFsInfo->fZeroNewBytes  = 1;
+        pFsInfo->fUnixEAs       = 1;
+        pFsInfo->cchMaxName     = 8+1+3;
     }
     else if (!strcmp(pFsInfo->szName, "LAN"))
@@ -493 +518 @@
         /* should find a way of getting the remote fs... */
         pFsInfo->fZeroNewBytes  = 1;    /* for performance reasons, assume it zeros. */
-        pFsInfo->fUnixEAs       = 0;
+        pFsInfo->cbXferMin      = 0x200;
+        pFsInfo->cbXferIncr     = 0x200;
     }
     else if (!strcmp(pFsInfo->szName, "RAMFS"))
-    {
         pFsInfo->fZeroNewBytes  = 0;
-        pFsInfo->fUnixEAs       = 1; /* but it doesn't zero */
-    }
     /*else if (!strcmp(pFsInfo->szName, "FAT32"))
-    {
-        pFsInfo->fZeroNewBytes  = 0;
-        pFsInfo->fUnixEAs       = 0;
-    }*/
-    else
-    {
-        pFsInfo->fZeroNewBytes  = 0;
-        pFsInfo->fUnixEAs       = 0;
-    }
+    { } */
 
     LIBCLOG_MSG2("fsInfoObjUpdate: dev:%#x mp:%s fsd:%s fZeroNewBytes=%d fUnixEAs=%d\n",
@@ -699 +714 @@
  *
  * @returns 0 on success.
- * @returns Negative error code (errno.h) on failiure.
+ * @returns Negative error code (errno.h) on failure.
  * @param   pszUserPath     The user path.
  * @parm    fFlags          Flags controlling the operation of the function.
@@ -728 +743 @@
  *
  * @returns 0 on success.
- * @returns Negative error code (errno.h) on failiure.
+ * @returns Negative error code (errno.h) on failure.
  * @param   pszUserPath     The user path.
  * @parm    fFlags          Flags controlling the operation of the function.

trunk/libc/src/libc/misc/Makefile.kmk

@@ -67 +67 @@
     $(PATH_LIBC_SRC)/libc/misc/fnmatch.c \
     $(PATH_LIBC_SRC)/libc/misc/fnslashi.c \
-    $(PATH_LIBC_SRC)/libc/misc/fpathcon.c \
+    $(PATH_LIBC_SRC)/libc/misc/fpathconf.c \
     $(PATH_LIBC_SRC)/libc/misc/fstatfs.c \
     $(PATH_LIBC_SRC)/libc/misc/fullpath.c \

trunk/libc/src/libc/misc/pathconf.c

@@ -1 @@
-/* pathconf.c (emx+gcc) -- Copyright (c) 1994-1995 by Eberhard Mattes */
+/* $Id: $ */
+/** @file
+ *
+ * LIBC - pathconf().
+ *
+ * Copyright (c) 2011 knut st. osmundsen <bird@innotek.de>
+ *
+ *
+ * This file is part of InnoTek LIBC.
+ *
+ * InnoTek LIBC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * InnoTek LIBC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with InnoTek LIBC; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
 
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #include "libc-alias.h"
+#include <errno.h>
 #include <unistd.h>
-#include <limits.h>
-#include <errno.h>
+#include <InnoTekLIBC/backend.h>
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_FS
+#include <InnoTekLIBC/logstrict.h>
 
-/* Return the POSIX.1  minimum values, for now. */
 
-long _STD(pathconf) (const char *path, int name)
+long _STD(pathconf)(const char *pszPath, int iName)
 {
-  switch (name)
-    {
-    case _PC_LINK_MAX:
-      return _POSIX_LINK_MAX;
+    LIBCLOG_ENTER("pszPath=%p:{%s} iName=%d\n", pszPath, pszPath, iName);
+    long lValue;
+    int rc = __libc_Back_fsPathConf(pszPath, iName, &lValue);
+    if (!rc)
+        LIBCLOG_RETURN_LONG(lValue);
+    errno = -rc;
+    LIBCLOG_ERROR_RETURN_LONG(-1L);
+}
 
-    case _PC_MAX_CANON:
-      return _POSIX_MAX_CANON;
-
-    case _PC_MAX_INPUT:
-      return _POSIX_MAX_INPUT;
-
-    case _PC_NAME_MAX:
-      return _POSIX_NAME_MAX;
-
-    case _PC_PATH_MAX:
-      return _POSIX_PATH_MAX;
-
-    case _PC_PIPE_BUF:
-      return _POSIX_PIPE_BUF;
-
-    case _PC_CHOWN_RESTRICTED:
-      return 1;
-
-    case _PC_NO_TRUNC:
-      return 1;                 /* TODO */
-
-    case _PC_VDISABLE:
-      return 0;
-
-    default:
-      errno = EINVAL;
-      return -1;
-    }
-}