Changeset 64623 in vbox for trunk/src/VBox/Runtime/testcase/tstDir.cpp

Timestamp:

Nov 9, 2016 6:30:42 PM (9 years ago)

Author:

vboxsync

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

111842

Message:

direnum-r3-nt.cpp: Fill in inode info when we can.

File:

• trunk/src/VBox/Runtime/testcase/tstDir.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/testcase/tstDir.cpp

@@ -41 +41 @@
      */
     bool fLong      = false;
+    bool fTimes     = false;
+    bool fInode     = false;
     bool fShortName = false;
     bool fFiltered  = false;
@@ -55 +57 @@
                         fLong = true;
                         break;
+                    case 'i':
+                        fLong = fInode = true;
+                        break;
+                    case 't':
+                        fLong = fTimes = true;
+                        break;
                     case 's':
-                        fShortName = true;
+                        fLong = fShortName = true;
                         break;
                     case 'f':
@@ -168 +176 @@
                                      fMode & RTFS_DOS_NT_NOT_CONTENT_INDEXED ? 'I' : '-',
                                      fMode & RTFS_DOS_NT_ENCRYPTED      ? 'E' : '-');
-                            RTPrintf(" %d %4d %4d %10lld %10lld %#llx %#llx %#llx %#llx",
+                            RTPrintf(" %d %4d %4d %10lld %10lld",
                                      DirEntry.Info.Attr.u.Unix.cHardlinks,
                                      DirEntry.Info.Attr.u.Unix.uid,
                                      DirEntry.Info.Attr.u.Unix.gid,
                                      DirEntry.Info.cbObject,
-                                     DirEntry.Info.cbAllocated,
-                                     DirEntry.Info.BirthTime,
-                                     DirEntry.Info.ChangeTime,
-                                     DirEntry.Info.ModificationTime,
-                                     DirEntry.Info.AccessTime);
+                                     DirEntry.Info.cbAllocated);
+                            if (fTimes)
+                                RTPrintf(" %#llx %#llx %#llx %#llx",
+                                         DirEntry.Info.BirthTime,
+                                         DirEntry.Info.ChangeTime,
+                                         DirEntry.Info.ModificationTime,
+                                         DirEntry.Info.AccessTime);
+
+                            if (fInode)
+                                RTPrintf(" %#x:%#018llx",
+                                         DirEntry.Info.Attr.u.Unix.INodeIdDevice, DirEntry.Info.Attr.u.Unix.INodeId);
                             if (fShortName)
                                 RTPrintf(" %2d %-12ls ", DirEntry.cwcShortName, DirEntry.wszShortName);