Changeset 34214 in vbox for trunk/src/VBox/Runtime/common/path/RTPathAppendEx.cpp

Timestamp:

Nov 19, 2010 5:18:15 PM (15 years ago)

Author:

vboxsync

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

67956

Message:

IPRT: Added RTPathJoinEx and RTPathAppendEx.

File:

• trunk/src/VBox/Runtime/common/path/RTPathAppendEx.cpp (copied) (copied from trunk/src/VBox/Runtime/common/path/RTPathAppend.cpp ) (7 diffs)

trunk/src/VBox/Runtime/common/path/RTPathAppendEx.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTPathAppend
+ * IPRT - RTPathAppendEx
  */
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -105 +105 @@
 
 
-RTDECL(int) RTPathAppend(char *pszPath, size_t cbPathDst, const char *pszAppend)
+RTDECL(int) RTPathAppendEx(char *pszPath, size_t cbPathDst, const char *pszAppend, size_t cchAppendMax)
 {
     char *pszPathEnd = RTStrEnd(pszPath, cbPathDst);
@@ -115 +115 @@
     if (!pszAppend)
         return VINF_SUCCESS;
-    size_t cchAppend = strlen(pszAppend);
+    size_t cchAppend = RTStrNLen(pszAppend, cchAppendMax);
     if (!cchAppend)
         return VINF_SUCCESS;
@@ -122 +122 @@
         if (cchAppend >= cbPathDst)
             return VERR_BUFFER_OVERFLOW;
-        memcpy(pszPath, pszAppend, cchAppend + 1);
+        memcpy(pszPath, pszAppend, cchAppend);
+        pszPath[cchAppend] = '\0';
         return VINF_SUCCESS;
     }
@@ -153 +154 @@
         {
             /* One slash is sufficient at this point. */
-            while (RTPATH_IS_SLASH(pszAppend[1]))
+            while (cchAppend > 1 && RTPATH_IS_SLASH(pszAppend[1]))
                 pszAppend++, cchAppend--;
 
@@ -163 +164 @@
     {
         /* No slashes needed in the appended bit. */
-        while (RTPATH_IS_SLASH(*pszAppend))
+        while (cchAppend && RTPATH_IS_SLASH(*pszAppend))
             pszAppend++, cchAppend--;
 
@@ -180 +181 @@
      * What remains now is the just the copying.
      */
-    memcpy(pszPathEnd, pszAppend, cchAppend + 1);
+    memcpy(pszPathEnd, pszAppend, cchAppend);
+    pszPathEnd[cchAppend] = '\0';
     return VINF_SUCCESS;
 }