Changeset 103024 in vbox

Timestamp:

Jan 24, 2024 1:37:01 PM (13 months ago)

Author:

vboxsync

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

161259

Message:

iprt/string.h,VBoxGuest-linux.c,linux/sharedfolders/vfsmod.c: Replaced the very few RT_STRSCPY uses with RTStrCopy and removed the macro. bugref:10584

Location:

trunk

Files:

• include/iprt/string.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (modified) (3 diffs)
• src/VBox/Additions/linux/sharedfolders/vfsmod.c (modified) (3 diffs)

trunk/include/iprt/string.h

@@ -244 +244 @@
 #else  /* !RT_OS_LINUX && !__KERNEL__ */
 # define RT_BCOPY_UNFORTIFIED(a_pDst, a_pSrc, a_cbToCopy)   memcpy((a_pDst), (a_pSrc), (a_cbToCopy))
-#endif /* !RT_OS_LINUX && !__KERNEL__ */
-
-/** @def RT_STRSCPY
- * Copy string and NULL-terminate output buffer.
- *
- * This macro should mostly be used in Linux kernel code. This is
- * the replacement for deprecated strlcpy. It was deprecated since 4.3.0
- * when strscpy was introduced as an alternative. Finally, strlcpy was
- * completely removed from kernel code in 6.8.0.
- *
- * @param   a_pDst          Pointer to the destination string buffer.
- * @param   a_pSrc          Pointer to the source NULL-terminated string buffer.
- * @param   a_cbDst         Size of destination buffer.
- */
-#if defined(RT_OS_LINUX) && defined(__KERNEL__)
-# if (RTLNX_VER_MIN(4,3,0))
-#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) \
-    { \
-      ssize_t _ret; \
-      _ret = strscpy((a_pDst), (a_pSrc), (a_cbDst)); \
-    }
-# else /* < 4.3.0 */
-#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)   strlcpy((a_pDst), (a_pSrc), (a_cbDst))
-# endif
-#else  /* !RT_OS_LINUX && !__KERNEL__ */
-# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)    strlcpy((a_pDst), (a_pSrc), (a_cbDst))
 #endif /* !RT_OS_LINUX && !__KERNEL__ */
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -1411 +1411 @@
     }
     else if (pParam->name[0] != 'd')
-        RT_STRSCPY(&g_szLogGrp[0], pszValue, sizeof(g_szLogGrp));
-
+        RTStrCopy(&g_szLogGrp[0], sizeof(g_szLogGrp), pszValue);
     return 0;
 }
@@ -1437 +1436 @@
     }
     else if (pParam->name[0] != 'd')
-        RT_STRSCPY(&g_szLogFlags[0], pszValue, sizeof(g_szLogFlags));
+        RTStrCopy(&g_szLogFlags[0], sizeof(g_szLogFlags), pszValue);
     return 0;
 }
@@ -1462 +1461 @@
     }
     else if (pParam->name[0] != 'd')
-        RT_STRSCPY(&g_szLogDst[0], pszValue, sizeof(g_szLogDst));
+        RTStrCopy(&g_szLogDst[0], sizeof(g_szLogDst), pszValue);
     return 0;
 }

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

@@ -1409 +1409 @@
     case Opt_iocharset:
     case Opt_nls:
-        RT_STRSCPY(info->nls_name, param->string, sizeof(info->nls_name));
+        RTStrCopy(info->nls_name, sizeof(info->nls_name), param->string);
         break;
     case Opt_uid:
@@ -1470 +1470 @@
         break;
     case Opt_tag:
-        RT_STRSCPY(info->szTag, param->string, sizeof(info->szTag));
+        RTStrCopy(info->szTag, sizeof(info->szTag), param->string);
         break;
     default:
@@ -1529 +1529 @@
 
     /* fc->source (the shared folder name) is set after vbsf_init_fs_ctx() */
-    RT_STRSCPY(info->name, fc->source, sizeof(info->name));
+    RTStrCopy(info->name, sizeof(info->name), fc->source);
 
 # if RTLNX_VER_MAX(5,3,0)