Changeset 25596 in vbox

Timestamp:

Dec 30, 2009 10:53:20 PM (15 years ago)

Author:

vboxsync

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

56287

Message:

iprt: Added new format extension: %Rbn - prints the base of a path name.

Location:

trunk/src/VBox/Runtime

Files:

• common/string/strformatrt.cpp (modified) (3 diffs)
• testcase/tstRTStrFormat.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/string/strformatrt.cpp

@@ -131 +131 @@
  *      - \%Rfn             - Pretty printing of a function or method. It drops the
  *                            return code and parameter list.
+ *      - \%Rbn             - Prints the base name.  For dropping the path in
+ *                            order to save space when printing a path name.
  *
  * On other platforms, \%Rw? simply prints the argument in a form of 0xXXXXXXXX.
@@ -160 +162 @@
 #include <iprt/time.h>
 #include <iprt/net.h>
+#include <iprt/path.h>
 #include "internal/string.h"
 
@@ -568 +571 @@
 
             /*
+             * Base name printing.
+             */
+            case 'b':
+            {
+                switch (*(*ppszFormat)++)
+                {
+                    case 'n':
+                    {
+                        const char *pszLastSep;
+                        const char *psz = pszLastSep = va_arg(*pArgs, const char *);
+                        if (!VALID_PTR(psz))
+                            return pfnOutput(pvArgOutput, "<null>", sizeof("<null>") - 1);
+
+                        while ((ch = *psz) != '\0')
+                        {
+                            if (RTPATH_IS_SEP(ch))
+                            {
+                                do
+                                    psz++;
+                                while ((ch = *psz) != '\0' && RTPATH_IS_SEP(ch));
+                                if (!ch)
+                                    break;
+                                pszLastSep = psz;
+                            }
+                            psz++;
+                        }
+
+                        return pfnOutput(pvArgOutput, pszLastSep, psz - pszLastSep);
+                    }
+
+                    default:
+                        AssertMsgFailed(("Invalid status code format type '%.10s'!\n", pszFormatOrg));
+                        break;
+                }
+                break;
+            }
+
+
+            /*
              * Pretty function / method name printing.
              */

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

@@ -231 +231 @@
     CHECK42("%RI8", (int8_t)-128, "-128");
 
+    CHECK42("%Rbn", "file.c", "file.c");
+    CHECK42("%Rbn", "foo/file.c", "file.c");
+    CHECK42("%Rbn", "/foo/file.c", "file.c");
+    CHECK42("%Rbn", "/dir/subdir/", "subdir/");
+
+    CHECK42("%Rfn", "function", "function");
+    CHECK42("%Rfn", "void function(void)", "function");
+
     CHECK42("%RTfile", (RTFILE)127, "127");
     CHECK42("%RTfile", (RTFILE)12341234, "12341234");