Changeset 70417 in vbox

Timestamp:

Jan 2, 2018 11:14:44 AM (7 years ago)

Author:

vboxsync

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

120022

Message:

IPRT: Renamed RTCmdLs to RTFsCmdLs and moved it into the runtime, leaving a main wrapper behind. Want to use it in VBoxControl for debugging purposes.

Location:

trunk

Files:

• include/iprt/fs.h (modified) (1 diff)
• include/iprt/nt/nt.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/common/fs/RTFsCmdLs.cpp (copied) (copied from trunk/src/VBox/Runtime/tools/RTLs.cpp ) (3 diffs)
• src/VBox/Runtime/tools/RTLs.cpp (added)

trunk/include/iprt/fs.h

@@ -632 +632 @@
 
 
+/**
+ * A /bin/ls clone.
+ *
+ * @returns Program exit code.
+ *
+ * @param   cArgs               The number of arguments.
+ * @param   papszArgs           The argument vector.  (Note that this may be
+ *                              reordered, so the memory must be writable.)
+ */
+RTEXITCODE RTFsCmdLs(unsigned cArgs, char **papszArgs);
+
 #endif /* IN_RING3 */
 

trunk/include/iprt/nt/nt.h

@@ -1559 +1559 @@
 typedef struct _FILE_BOTH_DIR_INFORMATION
 {
-    ULONG           NextEntryOffset;
-    ULONG           FileIndex;
-    LARGE_INTEGER   CreationTime;
-    LARGE_INTEGER   LastAccessTime;
-    LARGE_INTEGER   LastWriteTime;
-    LARGE_INTEGER   ChangeTime;
-    LARGE_INTEGER   EndOfFile;
-    LARGE_INTEGER   AllocationSize;
-    ULONG           FileAttributes;
-    ULONG           FileNameLength;
-    ULONG           EaSize;
-    CCHAR           ShortNameLength;
-    WCHAR           ShortName[12];
-    WCHAR           FileName[1];
+    ULONG           NextEntryOffset;    /**< 0x00: */
+    ULONG           FileIndex;          /**< 0x04: */
+    LARGE_INTEGER   CreationTime;       /**< 0x08: */
+    LARGE_INTEGER   LastAccessTime;     /**< 0x10: */
+    LARGE_INTEGER   LastWriteTime;      /**< 0x18: */
+    LARGE_INTEGER   ChangeTime;         /**< 0x20: */
+    LARGE_INTEGER   EndOfFile;          /**< 0x28: */
+    LARGE_INTEGER   AllocationSize;     /**< 0x30: */
+    ULONG           FileAttributes;     /**< 0x38: */
+    ULONG           FileNameLength;     /**< 0x3c: */
+    ULONG           EaSize;             /**< 0x40: */
+    CCHAR           ShortNameLength;    /**< 0x44: */
+    WCHAR           ShortName[12];      /**< 0x46: */
+    WCHAR           FileName[1];        /**< 0x5e: */
 } FILE_BOTH_DIR_INFORMATION;
 typedef FILE_BOTH_DIR_INFORMATION *PFILE_BOTH_DIR_INFORMATION;

trunk/src/VBox/Runtime/Makefile.kmk

@@ -434 +434 @@
         common/fs/isomakerimport.cpp \
         common/fs/ntfsvfs.cpp \
+        common/fs/RTFsCmdLs.cpp \
         common/ldr/ldr.cpp \
         common/ldr/ldrELF.cpp \

trunk/src/VBox/Runtime/common/fs/RTFsCmdLs.cpp

@@ -1378 +1378 @@
 
 /**
- * A /bin/cat clone.
+ * A /bin/ls clone.
  *
  * @returns Program exit code.
@@ -1386 +1386 @@
  *                              reordered, so the memory must be writable.)
  */
-RTEXITCODE RTCmdLs(unsigned cArgs, char **papszArgs)
+RTEXITCODE RTFsCmdLs(unsigned cArgs, char **papszArgs)
 {
 
@@ -1833 +1833 @@
 }
 
-
-int main(int argc, char **argv)
-{
-    int rc = RTR3InitExe(argc, &argv, 0);
-    if (RT_FAILURE(rc))
-        return RTMsgInitFailure(rc);
-    return RTCmdLs(argc, argv);
-}
-