StringUtil: rename ffStrCopy and correctly reflect its usage

CarterLi · CarterLi · commit 7c8250c68c04 · 2024-11-11T18:02:23.000+08:00
diff --git a/src/detection/cpucache/cpucache_apple.c b/src/detection/cpucache/cpucache_apple.c
@@ -20,35 +20,35 @@ const char* ffDetectCPUCache(FFCPUCacheResult* result)
     {
         *pNum = (char) ('0' + i);
 
-        ffStrCopyN(pSubkey, "physicalcpu", lenLeft);
+        ffStrCopy(pSubkey, "physicalcpu", lenLeft);
         uint32_t ncpu = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
         if (ncpu <= 0) continue;
 
-        ffStrCopyN(pSubkey, "l1icachesize", lenLeft);
+        ffStrCopy(pSubkey, "l1icachesize", lenLeft);
         uint32_t size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
         if (size)
             ffCPUCacheAddItem(result, 1, size, lineSize, FF_CPU_CACHE_TYPE_INSTRUCTION)->num = ncpu;
 
-        ffStrCopyN(pSubkey, "l1dcachesize", lenLeft);
+        ffStrCopy(pSubkey, "l1dcachesize", lenLeft);
         size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
         if (size)
             ffCPUCacheAddItem(result, 1, size, lineSize, FF_CPU_CACHE_TYPE_DATA)->num = ncpu;
 
-        ffStrCopyN(pSubkey, "l2cachesize", lenLeft);
+        ffStrCopy(pSubkey, "l2cachesize", lenLeft);
         size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
         if (size)
         {
-            ffStrCopyN(pSubkey, "cpusperl2", lenLeft);
+            ffStrCopy(pSubkey, "cpusperl2", lenLeft);
             uint32_t cpuSper = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
             if (cpuSper)
                 ffCPUCacheAddItem(result, 2, size, lineSize, FF_CPU_CACHE_TYPE_UNIFIED)->num = ncpu / cpuSper;
         }
 
-        ffStrCopyN(pSubkey, "l3cachesize", lenLeft);
+        ffStrCopy(pSubkey, "l3cachesize", lenLeft);
         size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
         if (size)
         {
-            ffStrCopyN(pSubkey, "cpusperl3", lenLeft);
+            ffStrCopy(pSubkey, "cpusperl3", lenLeft);
             uint32_t cpuSper = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
             if (cpuSper)
                 ffCPUCacheAddItem(result, 3, size, lineSize, FF_CPU_CACHE_TYPE_UNIFIED)->num = ncpu / cpuSper;
diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c
@@ -460,7 +460,7 @@ static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf
             {
                 if (ffStrStartsWith(entry->d_name, "card"))
                 {
-                    ffStrCopyN(drmKeyBuffer, entry->d_name, ARRAY_SIZE(drmKeyBuffer));
+                    ffStrCopy(drmKeyBuffer, entry->d_name, ARRAY_SIZE(drmKeyBuffer));
                     drmKey = drmKeyBuffer;
                     break;
                 }
diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c
@@ -231,7 +231,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
             FF_LIST_FOR_EACH(FFLocalIpResult, iface, *results)
             {
                 struct ifreq ifr;
-                ffStrCopyN(ifr.ifr_name, iface->name.chars, IFNAMSIZ);
+                ffStrCopy(ifr.ifr_name, iface->name.chars, IFNAMSIZ);
 
                 if (options->showType & FF_LOCALIP_TYPE_MTU_BIT)
                 {
@@ -248,7 +248,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
                         iface->speed = (edata.speed_hi << 16) | edata.speed; // ethtool_cmd_speed is not available on Android
                     #elif __FreeBSD__ || __APPLE__ || __OpenBSD__ || __NetBSD__
                     struct ifmediareq ifmr = {};
-                    ffStrCopyN(ifmr.ifm_name, iface->name.chars, IFNAMSIZ);
+                    ffStrCopy(ifmr.ifm_name, iface->name.chars, IFNAMSIZ);
                     if (ioctl(sockfd, SIOCGIFMEDIA, &ifmr) == 0 && (IFM_TYPE(ifmr.ifm_active) & IFM_ETHER))
                     {
                         switch (IFM_SUBTYPE(ifmr.ifm_active))
diff --git a/src/detection/packages/packages_windows.c b/src/detection/packages/packages_windows.c
@@ -58,8 +58,8 @@ static void detectChoco(FF_MAYBE_UNUSED FFPackagesResult* result)
         return;
 
     char chocoPath[MAX_PATH + 3];
-    char* pend = ffStrCopyN(chocoPath, chocoInstall, ARRAY_SIZE(chocoPath));
-    ffStrCopyN(pend, "/lib/*", ARRAY_SIZE(chocoPath) - (size_t) (pend - chocoPath));
+    char* pend = ffStrCopy(chocoPath, chocoInstall, ARRAY_SIZE(chocoPath));
+    ffStrCopy(pend, "/lib/*", ARRAY_SIZE(chocoPath) - (size_t) (pend - chocoPath));
     result->choco = getNumElements(chocoPath, FILE_ATTRIBUTE_DIRECTORY, "choco");
 }
 
@@ -71,8 +71,8 @@ static void detectPacman(FFPackagesResult* result)
 
     // MSYS2
     char pacmanPath[MAX_PATH + 3];
-    char* pend = ffStrCopyN(pacmanPath, msystemPrefix, ARRAY_SIZE(pacmanPath));
-    ffStrCopyN(pend, "/../var/lib/pacman/local/*", ARRAY_SIZE(pacmanPath) - (size_t) (pend - pacmanPath));
+    char* pend = ffStrCopy(pacmanPath, msystemPrefix, ARRAY_SIZE(pacmanPath));
+    ffStrCopy(pend, "/../var/lib/pacman/local/*", ARRAY_SIZE(pacmanPath) - (size_t) (pend - pacmanPath));
     result->pacman = getNumElements(pacmanPath, FILE_ATTRIBUTE_DIRECTORY, NULL);
 }
 
diff --git a/src/detection/terminalfont/terminalfont_windows.c b/src/detection/terminalfont/terminalfont_windows.c
@@ -98,12 +98,12 @@ static void detectFromWindowsTerminal(const FFstrbuf* terminalExe, FFTerminalFon
     if(terminalExe && terminalExe->length > 0 && !ffStrbufEqualS(terminalExe, "Windows Terminal"))
     {
         char jsonPath[MAX_PATH + 1];
-        char* pathEnd = ffStrCopyN(jsonPath, terminalExe->chars, ffStrbufLastIndexC(terminalExe, '\\') + 1);
-        ffStrCopyN(pathEnd, ".portable", ARRAY_SIZE(jsonPath) - (size_t) (pathEnd - jsonPath) - 1);
+        char* pathEnd = ffStrCopy(jsonPath, terminalExe->chars, ffStrbufLastIndexC(terminalExe, '\\') + 1);
+        ffStrCopy(pathEnd, ".portable", ARRAY_SIZE(jsonPath) - (size_t) (pathEnd - jsonPath) - 1);
 
         if(ffPathExists(jsonPath, FF_PATHTYPE_ANY))
         {
-            ffStrCopyN(pathEnd, "settings\\settings.json", ARRAY_SIZE(jsonPath) - (size_t) (pathEnd - jsonPath) - 1);
+            ffStrCopy(pathEnd, "settings\\settings.json", ARRAY_SIZE(jsonPath) - (size_t) (pathEnd - jsonPath) - 1);
             if(!ffAppendFileBuffer(jsonPath, &json))
                 error = "Error reading Windows Terminal portable settings JSON file";
         }
diff --git a/src/detection/wifi/wifi_linux.c b/src/detection/wifi/wifi_linux.c
@@ -190,7 +190,7 @@ static const char* detectWifiWithIoctls(FFWifiResult* item)
         return "socket() failed";
 
     struct iwreq iwr;
-    ffStrCopyN(iwr.ifr_name, item->inf.description.chars, IFNAMSIZ);
+    ffStrCopy(iwr.ifr_name, item->inf.description.chars, IFNAMSIZ);
     ffStrbufEnsureFree(&item->conn.ssid, IW_ESSID_MAX_SIZE);
     iwr.u.essid.pointer = (caddr_t) item->conn.ssid.chars;
     iwr.u.essid.length = IW_ESSID_MAX_SIZE + 1;
diff --git a/src/util/stringUtils.h b/src/util/stringUtils.h
@@ -80,12 +80,12 @@ static inline bool ffCharIsDigit(char c)
     return '0' <= c && c <= '9';
 }
 
-static inline char* ffStrCopyN(char* __restrict__ dst, const char* __restrict__ src, size_t nDst)
+// Copies at most (dstBufSiz - 1) bytes from src to dst; dst is always null-terminated
+static inline char* ffStrCopy(char* __restrict__ dst, const char* __restrict__ src, size_t dstBufSiz)
 {
-    assert(dst != NULL);
     if (__builtin_expect(dst == NULL, false)) return dst;
 
-    size_t len = strnlen(src, nDst - 1);
+    size_t len = strnlen(src, dstBufSiz - 1);
     memcpy(dst, src, len);
     dst[len] = '\0';
     return dst + len;

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf`
`460`	`460`	`{`
`461`	`461`	`if (ffStrStartsWith(entry->d_name, "card"))`
`462`	`462`	`{`
`463`		`- ffStrCopyN(drmKeyBuffer, entry->d_name, ARRAY_SIZE(drmKeyBuffer));`
	`463`	`+ ffStrCopy(drmKeyBuffer, entry->d_name, ARRAY_SIZE(drmKeyBuffer));`
`464`	`464`	`drmKey = drmKeyBuffer;`
`465`	`465`	`break;`
`466`	`466`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)`
`231`	`231`	`FF_LIST_FOR_EACH(FFLocalIpResult, iface, *results)`
`232`	`232`	`{`
`233`	`233`	`struct ifreq ifr;`
`234`		`- ffStrCopyN(ifr.ifr_name, iface->name.chars, IFNAMSIZ);`
	`234`	`+ ffStrCopy(ifr.ifr_name, iface->name.chars, IFNAMSIZ);`
`235`	`235`
`236`	`236`	`if (options->showType & FF_LOCALIP_TYPE_MTU_BIT)`
`237`	`237`	`{`
`@@ -248,7 +248,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)`
`248`	`248`	`iface->speed = (edata.speed_hi << 16) \| edata.speed; // ethtool_cmd_speed is not available on Android`
`249`	`249`	`#elif __FreeBSD__ \|\| __APPLE__ \|\| __OpenBSD__ \|\| __NetBSD__`
`250`	`250`	`struct ifmediareq ifmr = {};`
`251`		`- ffStrCopyN(ifmr.ifm_name, iface->name.chars, IFNAMSIZ);`
	`251`	`+ ffStrCopy(ifmr.ifm_name, iface->name.chars, IFNAMSIZ);`
`252`	`252`	`if (ioctl(sockfd, SIOCGIFMEDIA, &ifmr) == 0 && (IFM_TYPE(ifmr.ifm_active) & IFM_ETHER))`
`253`	`253`	`{`
`254`	`254`	`switch (IFM_SUBTYPE(ifmr.ifm_active))`
Original file line number	Diff line number	Diff line change
`@@ -98,12 +98,12 @@ static void detectFromWindowsTerminal(const FFstrbuf* terminalExe, FFTerminalFon`
`98`	`98`	`if(terminalExe && terminalExe->length > 0 && !ffStrbufEqualS(terminalExe, "Windows Terminal"))`
`99`	`99`	`{`
`100`	`100`	`char jsonPath[MAX_PATH + 1];`
`101`		`- char* pathEnd = ffStrCopyN(jsonPath, terminalExe->chars, ffStrbufLastIndexC(terminalExe, '\\') + 1);`
`102`		`- ffStrCopyN(pathEnd, ".portable", ARRAY_SIZE(jsonPath) - (size_t) (pathEnd - jsonPath) - 1);`
	`101`	`+ char* pathEnd = ffStrCopy(jsonPath, terminalExe->chars, ffStrbufLastIndexC(terminalExe, '\\') + 1);`
	`102`	`+ ffStrCopy(pathEnd, ".portable", ARRAY_SIZE(jsonPath) - (size_t) (pathEnd - jsonPath) - 1);`
`103`	`103`
`104`	`104`	`if(ffPathExists(jsonPath, FF_PATHTYPE_ANY))`
`105`	`105`	`{`
`106`		`- ffStrCopyN(pathEnd, "settings\\settings.json", ARRAY_SIZE(jsonPath) - (size_t) (pathEnd - jsonPath) - 1);`
	`106`	`+ ffStrCopy(pathEnd, "settings\\settings.json", ARRAY_SIZE(jsonPath) - (size_t) (pathEnd - jsonPath) - 1);`
`107`	`107`	`if(!ffAppendFileBuffer(jsonPath, &json))`
`108`	`108`	`error = "Error reading Windows Terminal portable settings JSON file";`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,12 +80,12 @@ static inline bool ffCharIsDigit(char c)`
`80`	`80`	`return '0' <= c && c <= '9';`
`81`	`81`	`}`
`82`	`82`
`83`		`-static inline char* ffStrCopyN(char* __restrict__ dst, const char* __restrict__ src, size_t nDst)`
	`83`	`+// Copies at most (dstBufSiz - 1) bytes from src to dst; dst is always null-terminated`
	`84`	`+static inline char* ffStrCopy(char* __restrict__ dst, const char* __restrict__ src, size_t dstBufSiz)`
`84`	`85`	`{`
`85`		`- assert(dst != NULL);`
`86`	`86`	`if (__builtin_expect(dst == NULL, false)) return dst;`
`87`	`87`
`88`		`- size_t len = strnlen(src, nDst - 1);`
	`88`	`+ size_t len = strnlen(src, dstBufSiz - 1);`
`89`	`89`	`memcpy(dst, src, len);`
`90`	`90`	`dst[len] = '\0';`
`91`	`91`	`return dst + len;`