vbox的更動 34214 路徑 trunk/src/VBox/Runtime/common/path/RTPathJoinEx.cpp

時間撮記:

2010-11-19 下午05:18:15 (14 年 以前)

作者:

vboxsync

訊息:

IPRT: Added RTPathJoinEx and RTPathAppendEx.

檔案:

• trunk/src/VBox/Runtime/common/path/RTPathJoinEx.cpp (複製) (複製 從 trunk/src/VBox/Runtime/common/path/RTPathJoin.cpp ) (3 筆差異)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTPathJoin.
+ * IPRT - RTPathJoinEx.
  */
 
@@ -38 +38 @@
 
 
-RTDECL(int) RTPathJoin(char *pszPathDst, size_t cbPathDst, const char *pszPathSrc,
-                       const char *pszAppend)
+RTDECL(int) RTPathJoinEx(char *pszPathDst, size_t cbPathDst,
+                         const char *pszPathSrc, size_t cchPathSrcMax,
+                         const char *pszAppend, size_t cchAppendMax)
 {
     AssertPtr(pszPathDst);
@@ -48 +49 @@
      * The easy way: Copy the path into the buffer and call RTPathAppend.
      */
-    size_t cchPathSrc = strlen(pszPathSrc);
+    size_t cchPathSrc = RTStrNLen(pszPathSrc, cchPathSrcMax);
     if (cchPathSrc >= cbPathDst)
         return VERR_BUFFER_OVERFLOW;
-    memcpy(pszPathDst, pszPathSrc, cchPathSrc + 1);
+    memcpy(pszPathDst, pszPathSrc, cchPathSrc);
+    pszPathDst[cchPathSrc] = '\0';
 
-    return RTPathAppend(pszPathDst, cbPathDst, pszAppend);
+    return RTPathAppendEx(pszPathDst, cbPathDst, pszAppend, cchAppendMax);
 }