Changeset 2933 in vbox

Timestamp:

May 30, 2007 2:56:43 PM (18 years ago)

Author:

vboxsync

Message:

Make '.' mean hidden when converting from unix to dos file mode.

Location:

trunk/src/VBox/Runtime

Files:

• fs.cpp (modified) (6 diffs)
• include/internal/fs.h (modified) (2 diffs)
• r3/posix/fileio-posix.cpp (modified) (1 diff)
• r3/posix/path-posix.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/fs.cpp

@@ -33 +33 @@
 #include <iprt/time.h>
 #include <iprt/string.h>
+#include <iprt/path.h>
 #include <iprt/ctype.h>
 #include "internal/fs.h"
@@ -90 +91 @@
  * @param   fMode       The mode mask containing dos-style attibutes only.
  */
-RTFMODE rtFsModeFromUnix(RTFMODE fMode)
+RTFMODE rtFsModeFromUnix(RTFMODE fMode, const char *pszName, unsigned cbName)
 {
     fMode &= RTFS_UNIX_MASK;
@@ -100 +101 @@
     if (!(fMode & RTFS_DOS_MASK))
         fMode |= RTFS_DOS_NT_NORMAL;
+    if (!(fMode & RTFS_DOS_HIDDEN) && pszName)
+    {
+        pszName = RTPathFilename(pszName);
+        if (pszName && *pszName == '.')
+            fMode |= RTFS_DOS_HIDDEN;
+    }
     return fMode;
 }
@@ -117 +124 @@
         rtFsModeFromDos(fMode, pszName, cbName);
     else if (!(fMode & RTFS_DOS_MASK))
-        rtFsModeFromUnix(fMode);
+        rtFsModeFromUnix(fMode, pszName, cbName);
     else if (!(fMode & RTFS_TYPE_MASK))
         fMode |= fMode & RTFS_DOS_DIRECTORY ? RTFS_TYPE_DIRECTORY : RTFS_TYPE_FILE;
@@ -169 +176 @@
  * @param   pStat           The stat structure to use.
  */
-void rtFsConvertStatToObjInfo(PRTFSOBJINFO pObjInfo, const struct stat *pStat)
+void rtFsConvertStatToObjInfo(PRTFSOBJINFO pObjInfo, const struct stat *pStat, const char *pszName, unsigned cbName)
 {
     pObjInfo->cbObject    = pStat->st_size;
@@ -246 +253 @@
     Assert(RTFS_TYPE_MASK == S_IFMT);
 
-    pObjInfo->Attr.fMode  = rtFsModeFromUnix(fMode);
+    pObjInfo->Attr.fMode  = rtFsModeFromUnix(fMode, pszName, cbName);
 
     /* additional unix attribs */

trunk/src/VBox/Runtime/include/internal/fs.h

@@ -31 +31 @@
 
 RTFMODE rtFsModeFromDos(RTFMODE fMode, const char *pszName, unsigned cbName);
-RTFMODE rtFsModeFromUnix(RTFMODE fMode);
+RTFMODE rtFsModeFromUnix(RTFMODE fMode, const char *pszName, unsigned cbName);
 RTFMODE rtFsModeNormalize(RTFMODE fMode, const char *pszName, unsigned cbName);
 bool    rtFsModeIsValid(RTFMODE fMode);
@@ -38 +38 @@
 size_t  rtPathVolumeSpecLen(const char *pszPath);
 #ifndef __WIN__
-void    rtFsConvertStatToObjInfo(PRTFSOBJINFO pObjInfo, const struct stat *pStat);
+void    rtFsConvertStatToObjInfo(PRTFSOBJINFO pObjInfo, const struct stat *pStat, const char *pszName, unsigned cbName);
 #endif
 

trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp

@@ -425 +425 @@
      * Setup the returned data.
      */
-    rtFsConvertStatToObjInfo(pObjInfo, &Stat);
+    rtFsConvertStatToObjInfo(pObjInfo, &Stat, NULL, 0);
 
     /*

trunk/src/VBox/Runtime/r3/posix/path-posix.cpp

@@ -337 +337 @@
 # else
         int cchLink = readlink("/proc/curproc/file", &g_szrtProgramPath[0], sizeof(g_szrtProgramPath) - 1);
-# endif         
+# endif
         if (cchLink < 0 || cchLink == sizeof(g_szrtProgramPath) - 1)
         {
@@ -465 +465 @@
         if (!stat(pszNativePath, &Stat))
         {
-            rtFsConvertStatToObjInfo(pObjInfo, &Stat);
+            rtFsConvertStatToObjInfo(pObjInfo, &Stat, pszPath, 0);
             switch (enmAdditionalAttribs)
             {