Changeset 70319 in vbox

Timestamp:

Dec 22, 2017 1:32:15 PM (7 years ago)

Author:

vboxsync

Message:

RTLdrCheckImport: verbosity

File:

• trunk/src/VBox/Runtime/tools/RTLdrCheckImports.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/tools/RTLdrCheckImports.cpp

@@ -59 +59 @@
     /** The loader architecture. */
     RTLDRARCH   enmLdrArch;
+    /** Verbosity level. */
+    unsigned    cVerbosity;
 } RTCHECKIMPORTSOPTS;
 /** Pointer to the checker options. */
@@ -250 +252 @@
                     {
                         pModule->hLdrMod = hLdrMod;
-                        RTMsgInfo("Import '%s' -> '%s'\n", pModule->szModule, szPath);
+                        if (pOpts->cVerbosity > 0)
+                            RTMsgInfo("Import '%s' -> '%s'\n", pModule->szModule, szPath);
                     }
                     else if (RTErrInfoIsSet(pErrInfo))
@@ -353 +356 @@
                                     }
 
-                                    RTMsgInfo("Import '%s' -> '%s' (%u exports)\n", pModule->szModule, szPath, pModule->cExports);
+                                    if (pOpts->cVerbosity > 0)
+                                        RTMsgInfo("Import '%s' -> '%s' (%u exports)\n",
+                                                  pModule->szModule, szPath, pModule->cExports);
                                 }
                                 else
@@ -392 +397 @@
 static int rtCheckImportsForImage(PCRTCHECKIMPORTSOPTS pOpts, const char *pszImage)
 {
+    if (pOpts->cVerbosity > 0)
+        RTMsgInfo("Checking '%s'...\n", pszImage);
+
     /*
      * Open the image.
@@ -592 +600 @@
     Opts.papszPaths = NULL;
     Opts.enmLdrArch = RTLDRARCH_WHATEVER;
+    Opts.cVerbosity = 1;
 
     static const RTGETOPTDEF s_aOptions[] =
@@ -597 +606 @@
         { "--path", 'p', RTGETOPT_REQ_STRING },
         { "--export", 'e', RTGETOPT_REQ_STRING },
+        { "--quiet", 'q', RTGETOPT_REQ_NOTHING },
+        { "--verbose", 'v', RTGETOPT_REQ_NOTHING },
     };
     RTGETOPTSTATE State;
@@ -626 +637 @@
                 break;
 
+            case 'q':
+                Opts.cVerbosity = 0;
+                break;
+
+            case 'v':
+                Opts.cVerbosity = 0;
+                break;
+
             case VINF_GETOPT_NOT_OPTION:
                 rc = rtCheckImportsForImage(&Opts, ValueUnion.psz);
@@ -633 +652 @@
 
             case 'h':
-                RTPrintf("Usage: RTCheckImports [-p|--path <dir>] [-h|--help] [-V|--version] <image [..]>\n"
+                RTPrintf("Usage: RTCheckImports [-p|--path <dir>] [-v|--verbose] [-q|--quiet] <image [..]>\n"
                          "   or: RTCheckImports -e <image>\n"
+                         "   or: RTCheckImports <-h|--help>\n"
+                         "   or: RTCheckImports <-V|--version>\n"
                          "Checks library imports. VFS chain syntax supported.\n"
                          "\n"
@@ -642 +663 @@
                          "  -e, --export <image>\n"
                          "    Write export list for the file to stdout.  (Redirect to a .export file.)\n"
+                         "  -q, --quiet\n"
+                         "    Quiet execution.\n"
+                         "  -v, --verbose\n"
+                         "    Increases verbosity.\n"
                          ""
                          );