Adding upstream version 6.0.4-dfsg.upstream/6.0.4-dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 60 insertions, 0 deletions

diff --git a/src/VBox/Runtime/common/string/RTStrCatEx.cpp b/src/VBox/Runtime/common/string/RTStrCatEx.cpp
new file mode 100644
index 00000000..9ff828dd
--- /dev/null
+++ b/src/VBox/Runtime/common/string/RTStrCatEx.cpp
@@ -0,0 +1,60 @@
+/* $Id: RTStrCatEx.cpp $ */
+/** @file
+ * IPRT - RTStrCatEx
+ */
+
+/*
+ * Copyright (C) 2010-2019 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
+ */
+
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
+#include <iprt/string.h>
+#include "internal/iprt.h"
+
+#include <iprt/errcore.h>
+
+
+RTDECL(int) RTStrCatEx(char *pszDst, size_t cbDst, const char *pszSrc, size_t cchMaxSrc)
+{
+    char *pszDst2 = RTStrEnd(pszDst, cbDst);
+    AssertReturn(pszDst2, VERR_INVALID_PARAMETER);
+    cbDst -= pszDst2 - pszDst;
+
+    const char *pszSrcEol = RTStrEnd(pszSrc, cchMaxSrc);
+    size_t      cchSrc    = pszSrcEol ? (size_t)(pszSrcEol - pszSrc) : cchMaxSrc;
+    if (RT_LIKELY(cchSrc < cbDst))
+    {
+        memcpy(pszDst2, pszSrc, cchSrc);
+        pszDst2[cchSrc] = '\0';
+        return VINF_SUCCESS;
+    }
+
+    if (cbDst != 0)
+    {
+        memcpy(pszDst2, pszSrc, cbDst - 1);
+        pszDst2[cbDst - 1] = '\0';
+    }
+    return VERR_BUFFER_OVERFLOW;
+}
+RT_EXPORT_SYMBOL(RTStrCatEx);
+