move TDNFIsDir() to common/

vmware · Nov 15, 2022 · 2df446c · 2df446c
1 parent ced5f99
commit 2df446c
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 42 deletions.
diff --git a/client/prototypes.h b/client/prototypes.h
@@ -1056,12 +1056,6 @@ TDNFGetFileSize(
     int *pnSize
     );
 
-uint32_t
-TDNFIsDir(
-    const char* pszPath,
-    int* pnPathIsDir
-    );
-
 int
 TDNFIsGlob(
     const char* pszString

diff --git a/client/utils.c b/client/utils.c
@@ -330,42 +330,6 @@ TDNFGetFileSize(
     goto cleanup;
 }
 
-uint32_t
-TDNFIsDir(
-    const char* pszPath,
-    int* pnPathIsDir
-    )
-{
-    uint32_t dwError = 0;
-    int nPathIsDir = 0;
-    struct stat stStat = {0};
-
-    if(!pnPathIsDir || IsNullOrEmptyString(pszPath))
-    {
-        dwError = ERROR_TDNF_INVALID_PARAMETER;
-        BAIL_ON_TDNF_ERROR(dwError);
-    }
-
-    if(stat(pszPath, &stStat))
-    {
-        dwError = errno;
-        BAIL_ON_TDNF_SYSTEM_ERROR(dwError);
-    }
-
-    nPathIsDir = S_ISDIR(stStat.st_mode);
-
-    *pnPathIsDir = nPathIsDir;
-cleanup:
-    return dwError;
-
-error:
-    if(pnPathIsDir)
-    {
-        *pnPathIsDir = 0;
-    }
-    goto cleanup;
-}
-
 /* update time if file exists, create if not */
 uint32_t
 TDNFTouchFile(

diff --git a/common/prototypes.h b/common/prototypes.h
@@ -273,6 +273,12 @@ TDNFReadFileToStringArray(
     char ***pppszArray
     );
 
+uint32_t
+TDNFIsDir(
+    const char* pszPath,
+    int* pnPathIsDir
+    );
+
 //setopt.c
 uint32_t
 AddSetOpt(

diff --git a/common/utils.c b/common/utils.c
@@ -869,3 +869,38 @@ TDNFReadFileToStringArray(
     goto cleanup;
 }
 
+uint32_t
+TDNFIsDir(
+    const char* pszPath,
+    int* pnPathIsDir
+    )
+{
+    uint32_t dwError = 0;
+    int nPathIsDir = 0;
+    struct stat stStat = {0};
+
+    if(!pnPathIsDir || IsNullOrEmptyString(pszPath))
+    {
+        dwError = ERROR_TDNF_INVALID_PARAMETER;
+        BAIL_ON_TDNF_ERROR(dwError);
+    }
+
+    if(stat(pszPath, &stStat))
+    {
+        dwError = errno;
+        BAIL_ON_TDNF_SYSTEM_ERROR(dwError);
+    }
+
+    nPathIsDir = S_ISDIR(stStat.st_mode);
+
+    *pnPathIsDir = nPathIsDir;
+cleanup:
+    return dwError;
+
+error:
+    if(pnPathIsDir)
+    {
+        *pnPathIsDir = 0;
+    }
+    goto cleanup;
+}