Changeset 105898 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 29, 2024 8:46:43 AM (6 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

164618

Message:

VBoxService/toolbox-ls: Also emit output when working on a symlink (instead of only emitting output when following a symlink). Should fix the reading directories testcases using <= 7.0 Guest Additions and guests where /bin/ symlinks to /usr/bin.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp

@@ -997 +997 @@
         {
             if (   RTFS_IS_FILE(objInfo.Attr.fMode)
-                || (   RTFS_IS_SYMLINK(objInfo.Attr.fMode)
-                    && (fFlags & VBOXSERVICETOOLBOXLSFLAG_SYMLINKS)))
-            {
+                || RTFS_IS_SYMLINK(objInfo.Attr.fMode))
                 rc2 = vgsvcToolboxPrintFsInfo(pszPath, strlen(pszPath), fOutputFlags, NULL, &IdCache, &objInfo);
-                if (RT_SUCCESS(rc)) /* Keep initial failing rc. */
-                    rc = rc2;
-            }
             else if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
-            {
                 rc2 = vgsvcToolboxLsHandleDir(pszPath, fFlags, fOutputFlags, &IdCache);
-                if (RT_SUCCESS(rc)) /* Keep initial failing rc. */
-                    rc = rc2;
-            }
+            if (RT_SUCCESS(rc)) /* Keep initial failing rc. */
+                rc = rc2;
         }
         else