replace path building with TDNFAllocateStringPrintf() with TDNFJoin()

vmware · Nov 29, 2021 · 8e586f5 · 8e586f5
1 parent 0810428
commit 8e586f5
Show file tree

Hide file tree

Showing 11 changed files with 164 additions and 162 deletions.
diff --git a/client/api.c b/client/api.c
@@ -301,11 +301,11 @@ TDNFCheckLocalPackages(
         {
             continue;
         }
-        dwError = TDNFAllocateStringPrintf(
+        dwError = TDNFJoinPath(
                       &pszRPMPath,
-                      "%s/%s",
                       pszLocalPath,
-                      pEnt->d_name);
+                      pEnt->d_name,
+                      NULL);
         BAIL_ON_TDNF_ERROR(dwError);
 
         dwPkgAdded = repo_add_rpm(
@@ -660,9 +660,10 @@ TDNFOpenHandle(
     {
         int nIsDir = 0;
 
-        dwError = TDNFAllocateStringPrintf(&pszCacheDir, "%s/%s",
-                                           pTdnf->pArgs->pszInstallRoot,
-                                           pTdnf->pConf->pszCacheDir);
+        dwError = TDNFJoinPath(&pszCacheDir,
+                               pTdnf->pArgs->pszInstallRoot,
+                               pTdnf->pConf->pszCacheDir,
+                               NULL);
         BAIL_ON_TDNF_ERROR(dwError);
 
         TDNF_SAFE_FREE_MEMORY(pTdnf->pConf->pszCacheDir);
@@ -671,9 +672,10 @@ TDNFOpenHandle(
 
         if (!nHasOptReposdir)
         {
-            dwError = TDNFAllocateStringPrintf(&pszRepoDir, "%s/%s",
-                                               pTdnf->pArgs->pszInstallRoot,
-                                               pTdnf->pConf->pszRepoDir);
+            dwError = TDNFJoinPath(&pszRepoDir,
+                                   pTdnf->pArgs->pszInstallRoot,
+                                   pTdnf->pConf->pszRepoDir,
+                                   NULL);
             BAIL_ON_TDNF_ERROR(dwError);
 
             dwError = TDNFIsDir(pszRepoDir, &nIsDir);
@@ -1171,9 +1173,10 @@ TDNFRepoSync(
         {
             if (!pReposyncArgs->nNoRepoPath)
             {
-                dwError = TDNFAllocateStringPrintf(&pszDir, "%s/%s",
-                            strcmp(pszRootPath, "/") ? pszRootPath : "",
-                            pPkgInfo->pszRepoName);
+                dwError = TDNFJoinPath(&pszDir,
+                                       strcmp(pszRootPath, "/") ? pszRootPath : "",
+                                       pPkgInfo->pszRepoName,
+                                       NULL);
                 BAIL_ON_TDNF_ERROR(dwError);
             }
             else
@@ -1257,9 +1260,10 @@ TDNFRepoSync(
             }
 
             /* no need to check nNoRepoPath since we wouldn't get here */
-            dwError = TDNFAllocateStringPrintf(&pszRepoDir, "%s/%s",
-                        strcmp(pszRootPath, "/") ? pszRootPath : "",
-                        pRepo->pszId);
+            dwError = TDNFJoinPath(&pszRepoDir,
+                                   strcmp(pszRootPath, "/") ? pszRootPath : "",
+                                   pRepo->pszId,
+                                   NULL);
             BAIL_ON_TDNF_ERROR(dwError);
 
             ret = nftw(pszRepoDir, _rm_rpms, 10, FTW_DEPTH|FTW_PHYS);
@@ -1291,9 +1295,10 @@ TDNFRepoSync(
                 const char *pszBasePath = pReposyncArgs->pszMetaDataPath ?
                                 pReposyncArgs->pszMetaDataPath : pszRootPath;
 
-                dwError = TDNFAllocateStringPrintf(&pszRepoDir, "%s/%s",
-                            strcmp(pszBasePath, "/") ? pszBasePath : "",
-                            pRepo->pszId);
+                dwError = TDNFJoinPath(&pszRepoDir,
+                                       strcmp(pszBasePath, "/") ? pszBasePath : "",
+                                       pRepo->pszId,
+                                       NULL);
                 BAIL_ON_TDNF_ERROR(dwError);
             }
             else

diff --git a/client/config.c b/client/config.c
@@ -149,7 +149,7 @@ TDNFReadConfig(
     dwError = TDNFAllocateString(pszConfFile, &pszConfFileCopy);
     BAIL_ON_TDNF_ERROR(dwError);
 
-    dwError = TDNFAllocateStringPrintf(&pszMinVersionsDir, "%s/minversions.d", dirname(pszConfFileCopy));
+    dwError = TDNFJoinPath(&pszMinVersionsDir, dirname(pszConfFileCopy), "minversions.d", NULL);
     BAIL_ON_TDNF_ERROR(dwError);
 
     dwError = TDNFReadMinVersionsFiles(pszMinVersionsDir, &pConf->ppszMinVersions);
@@ -519,7 +519,8 @@ TDNFReadMinVersionsFiles(
         {
             continue;
         }
-        dwError = TDNFAllocateStringPrintf(&pszFile, "%s/%s", pszDir, pEnt->d_name);
+        dwError = TDNFAllocateStringPrintf(&pszFile, pszDir, pEnt->d_name);
+        dwError = TDNFJoinPath(&pszFile, pszDir, pEnt->d_name, NULL);
         BAIL_ON_TDNF_ERROR(dwError);
 
         dwError = TDNFReadFileToStringArray(pszFile, &pppszArrayList[i]);

diff --git a/client/gpgcheck.c b/client/gpgcheck.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 VMware, Inc. All Rights Reserved.
+ * Copyright (C) 2015-2021 VMware, Inc. All Rights Reserved.
  *
  * Licensed under the GNU Lesser General Public License v2.1 (the "License");
  * you may not use this file except in compliance with the License. The terms
@@ -580,22 +580,23 @@ TDNFFetchRemoteGPGKey(
     }
     BAIL_ON_TDNF_ERROR(dwError);
 
-    dwError = TDNFAllocateStringPrintf(
+    dwError = TDNFJoinPath(
                   &pszTopKeyCacheDir,
-                  "%s/%s/keys",
                   pTdnf->pConf->pszCacheDir,
-                  pszRepoName);
+                  pszRepoName,
+                  "keys",
+                  NULL);
     BAIL_ON_TDNF_ERROR(dwError);
 
     dwError = TDNFNormalizePath(pszTopKeyCacheDir,
                                 &pszRealTopKeyCacheDir);
     BAIL_ON_TDNF_ERROR(dwError);
 
-    dwError = TDNFAllocateStringPrintf(
+    dwError = TDNFJoinPath(
                   &pszFilePath,
-                  "%s/%s",
                   pszRealTopKeyCacheDir,
-                  pszKeyLocation);
+                  pszKeyLocation,
+                  NULL);
     BAIL_ON_TDNF_ERROR(dwError);
 
     dwError = TDNFNormalizePath(

diff --git a/client/init.c b/client/init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 VMware, Inc. All Rights Reserved.
+ * Copyright (C) 2015-2021 VMware, Inc. All Rights Reserved.
  *
  * Licensed under the GNU Lesser General Public License v2.1 (the "License");
  * you may not use this file except in compliance with the License. The terms
@@ -75,9 +75,10 @@ TDNFCloneCmdArgs(
         int nExists = 0;
 
         /* prepend installroot to tdnf.conf location */
-        dwError = TDNFAllocateStringPrintf(&pszConfFileInstallRoot, "%s/%s",
-                                           pCmdArgsIn->pszInstallRoot,
-                                           TDNF_CONF_FILE);
+        dwError = TDNFJoinPath(&pszConfFileInstallRoot,
+                               pCmdArgsIn->pszInstallRoot,
+                               TDNF_CONF_FILE,
+                               NULL);
         BAIL_ON_TDNF_ERROR(dwError);
 
         dwError = TDNFIsFileOrSymlink(pszConfFileInstallRoot, &nExists);
@@ -290,11 +291,11 @@ TDNFRefreshSack(
         //Check if expired since last sync per metadata_expire
         if(pRepo->lMetadataExpire >= 0)
         {
-            dwError = TDNFAllocateStringPrintf(
+            dwError = TDNFJoinPath(
                           &pszRepoCacheDir,
-                          "%s/%s",
                           pTdnf->pConf->pszCacheDir,
-                          pRepo->pszId);
+                          pRepo->pszId,
+                          NULL);
             BAIL_ON_TDNF_ERROR(dwError);
 
             dwError = TDNFShouldSyncMetadata(

diff --git a/client/plugins.c b/client/plugins.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 VMware, Inc. All Rights Reserved.
+ * Copyright (C) 2020-2021 VMware, Inc. All Rights Reserved.
  *
  * Licensed under the GNU Lesser General Public License v2.1 (the "License");
  * you may not use this file except in compliance with the License. The terms
@@ -314,11 +314,11 @@ _TDNFLoadPluginConfigs(
             continue;
         }
 
-        dwError = TDNFAllocateStringPrintf(
+        dwError = TDNFJoinPath(
                       &pszPluginConfig,
-                      "%s/%s",
                       pConf->pszConfPath,
-                      pEnt->d_name);
+                      pEnt->d_name,
+                      NULL);
         BAIL_ON_TDNF_ERROR(dwError);
 
         dwError = _TDNFLoadPluginConfig(pszPluginConfig, &pPlugin);

diff --git a/client/remoterepo.c b/client/remoterepo.c
@@ -890,10 +890,7 @@ TDNFCreatePackageUrl(
     BAIL_ON_TDNF_ERROR(dwError);
 
     if (pszBaseUrl) {
-        dwError = TDNFAllocateStringPrintf(&pszPackageUrl,
-                                           "%s/%s",
-                                           pszBaseUrl,
-                                           pszPackageLocation);
+        dwError = TDNFJoinPath(&pszPackageUrl, pszBaseUrl, pszPackageLocation, NULL);
         BAIL_ON_TDNF_ERROR(dwError);
     }
     else
@@ -944,10 +941,10 @@ TDNFDownloadPackage(
                                  &pszCopyOfPackageLocation);
     BAIL_ON_TDNF_ERROR(dwError);
 
-    dwError = TDNFAllocateStringPrintf(&pszPackageFile,
-                                       "%s/%s",
-                                       pszRpmCacheDir,
-                                       basename(pszCopyOfPackageLocation));
+    dwError = TDNFJoinPath(&pszPackageFile,
+                           pszRpmCacheDir,
+                           basename(pszCopyOfPackageLocation),
+                           NULL);
     BAIL_ON_TDNF_ERROR(dwError);
 
     /* don't download if file is already there. Older versions may have left
@@ -1002,12 +999,11 @@ TDNFDownloadPackageToCache(
         BAIL_ON_TDNF_ERROR(dwError);
     }
 
-    dwError = TDNFAllocateStringPrintf(
-                  &pszRpmCacheDir,
-                  "%s/%s/%s",
-                  pTdnf->pConf->pszCacheDir,
-                  pszRepoName,
-                  "rpms");
+    dwError = TDNFJoinPath(&pszRpmCacheDir,
+                           pTdnf->pConf->pszCacheDir,
+                           pszRepoName,
+                           "rpms",
+                           NULL);
     BAIL_ON_TDNF_ERROR(dwError);
 
     dwError = TDNFNormalizePath(pszRpmCacheDir,
@@ -1033,7 +1029,7 @@ TDNFDownloadPackageToCache(
  * TDNFDownloadPackageToTree()
  *
  * Download a package while preserving the directory path. For example,
- * if pszPackageLocation is "RPMS/x86_64/foo-1.2-3.rpm, the destination will
+ * if pszPackageLocation is "RPMS/x86_64/foo-1.2-3.rpm", the destination will
  * be downloaded under the destination directory in RPMS/x86_64/foo-1.2-3.rpm
  * (so 'RPMS/x86_64/' will be preserved).
 */
@@ -1073,11 +1069,7 @@ TDNFDownloadPackageToTree(
     }
     BAIL_ON_TDNF_ERROR(dwError);
 
-    dwError = TDNFAllocateStringPrintf(
-                  &pszFilePath,
-                  "%s/%s",
-                  pszNormalRpmCacheDir,
-                  pszRemotePath);
+    dwError = TDNFJoinPath(&pszFilePath, pszNormalRpmCacheDir, pszRemotePath, NULL);
     BAIL_ON_TDNF_ERROR(dwError);
 
     dwError = TDNFNormalizePath(
@@ -1144,7 +1136,7 @@ TDNFDownloadPackageToTree(
  * TDNFDownloadPackageToDirectory()
  *
  * Download a package withou preserving the directory path. For example,
- * if pszPackageLocation is "RPMS/x86_64/foo-1.2-3.rpm, the destination will
+ * if pszPackageLocation is "RPMS/x86_64/foo-1.2-3.rpm", the destination will
  * be downloaded under the destination directory (pszDirectory) as foo-1.2-3.rpm
  * (so RPMS/x86_64/ will be stripped).
 */
@@ -1184,11 +1176,7 @@ TDNFDownloadPackageToDirectory(
 
     pszFileName = basename(pszRemotePath);
 
-    dwError = TDNFAllocateStringPrintf(
-                  &pszFilePath,
-                  "%s/%s",
-                  pszDirectory,
-                  pszFileName);
+    TDNFJoinPath(&pszFilePath, pszDirectory, pszFileName, NULL);
     BAIL_ON_TDNF_ERROR(dwError);
 
     dwError = TDNFDownloadPackage(pTdnf, pszPackageLocation, pszPkgName,