optimized

Signed-off-by: leleliu008 <[email protected]>
leleliu008 · Sep 10, 2023 · 54bbc12 · 54bbc12
1 parent a13a61e
commit 54bbc12
Show file tree

Hide file tree

Showing 15 changed files with 182 additions and 168 deletions.
diff --git a/src/cleanup.c b/src/cleanup.c
@@ -6,8 +6,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "core/rm-r.h"
-
 #include "uppm.h"
 
 static int uppm_cleanup_downloads(bool verbose) {

diff --git a/src/core/rm-r.c b/src/core/rm-r.c
diff --git a/src/core/rm-r.h b/src/core/rm-r.h
diff --git a/src/depends.c b/src/depends.c
@@ -10,7 +10,6 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 
-#include "core/rm-r.h"
 #include "core/http.h"
 #include "core/url.h"
 
@@ -356,9 +355,10 @@ static int uppm_depends2(const char * packageName, UPPMDependsOutputType outputT
 
     if (stat(sessionDIR, &st) == 0) {
         if (S_ISDIR(st.st_mode)) {
-            if (rm_r(sessionDIR, false) != 0) {
-                perror(sessionDIR);
-                return UPPM_ERROR;
+            ret = uppm_rm_r(sessionDIR, false);
+
+            if (ret != UPPM_OK) {
+                return ret;
             }
         } else {
             fprintf(stderr, "%s was expected to be a directory, but it was not.\n", sessionDIR);

diff --git a/src/formula-repo-add.c b/src/formula-repo-add.c
@@ -8,7 +8,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "core/rm-r.h"
 #include "core/log.h"
 
 #include "uppm.h"
@@ -97,9 +96,10 @@ int uppm_formula_repo_add(const char * formulaRepoName, const char * formulaRepo
 
     if (stat(sessionDIR, &st) == 0) {
         if (S_ISDIR(st.st_mode)) {
-            if (rm_r(sessionDIR, false) != 0) {
-                perror(sessionDIR);
-                return UPPM_ERROR;
+            ret = uppm_rm_r(sessionDIR, false);
+
+            if (ret != UPPM_OK) {
+                return ret;
             }
         } else {
             fprintf(stderr, "%s was expected to be a directory, but it was not.\n", sessionDIR);

diff --git a/src/formula-repo-create.c b/src/formula-repo-create.c
@@ -3,12 +3,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <unistd.h>
+
 #include <fcntl.h>
+#include <unistd.h>
 #include <sys/stat.h>
+
 #include <git2.h>
 
-#include "core/rm-r.h"
 #include "core/log.h"
 
 #include "uppm.h"
@@ -92,9 +93,10 @@ int uppm_formula_repo_create(const char * formulaRepoName, const char * formulaR
 
     if (stat(sessionDIR, &st) == 0) {
         if (S_ISDIR(st.st_mode)) {
-            if (rm_r(sessionDIR, false) != 0) {
-                perror(sessionDIR);
-                return UPPM_ERROR;
+            ret = uppm_rm_r(sessionDIR, false);
+
+            if (ret != UPPM_OK) {
+                return ret;
             }
         } else {
             fprintf(stderr, "%s was expected to be a directory, but it was not.\n", sessionDIR);

diff --git a/src/formula-repo-remove.c b/src/formula-repo-remove.c
@@ -1,9 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
 
-#include "core/rm-r.h"
+#include <sys/stat.h>
 
 #include "uppm.h"
 
@@ -48,12 +47,7 @@ int uppm_formula_repo_remove(const char * formulaRepoName) {
     snprintf(formulaRepoConfigFilePath, formulaRepoConfigFilePathLength, "%s/.uppm-formula-repo.yml", formulaRepoPath);
 
     if (stat(formulaRepoConfigFilePath, &st) == 0 && S_ISREG(st.st_mode)) {
-        if (rm_r(formulaRepoPath, false) == 0) {
-            return UPPM_OK;
-        } else {
-            perror(formulaRepoPath);
-            return UPPM_ERROR;
-        }
+        return uppm_rm_r(formulaRepoPath, false);
     } else {
         fprintf(stderr, "formula repo is broken: %s\n", formulaRepoName);
         return UPPM_ERROR;

diff --git a/src/generate-url-transform-sample.c b/src/generate-url-transform-sample.c
@@ -6,7 +6,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "core/rm-r.h"
 #include "core/log.h"
 
 #include "uppm.h"
@@ -51,9 +50,10 @@ int uppm_generate_url_transform_sample() {
 
     if (stat(sessionDIR, &st) == 0) {
         if (S_ISDIR(st.st_mode)) {
-            if (rm_r(sessionDIR, false) != 0) {
-                perror(sessionDIR);
-                return UPPM_ERROR;
+            ret = uppm_rm_r(sessionDIR, false);
+
+            if (ret != UPPM_OK) {
+                return ret;
             }
         } else {
             fprintf(stderr, "%s was expected to be a directory, but it was not.\n", sessionDIR);
@@ -143,10 +143,5 @@ int uppm_generate_url_transform_sample() {
 
     fprintf(stderr, "%sYou can rename url-transform.sample to url-transform then edit it to meet your needs.\n\nTo apply this, you should run 'export UPPM_URL_TRANSFORM=%s' in your terminal.\n%s", COLOR_GREEN, outFilePath, COLOR_OFF);
 
-    if (rm_r(sessionDIR, false) != 0) {
-        perror(sessionDIR);
-        return UPPM_ERROR;
-    }
-
-    return UPPM_OK;
+    return uppm_rm_r(sessionDIR, false);
 }
diff --git a/src/install.c b/src/install.c
@@ -14,7 +14,6 @@
 
 #include "core/sysinfo.h"
 #include "core/self.h"
-#include "core/rm-r.h"
 #include "core/tar.h"
 
 #include "sha256sum.h"
@@ -244,9 +243,11 @@ int uppm_install(const char * packageName, bool verbose, bool force) {
 
     if (lstat(packageInstalledRealDIR, &st) == 0) {
         if (S_ISDIR(st.st_mode)) {
-            if (rm_r(packageInstalledRealDIR, verbose) != 0) {
+            ret = uppm_rm_r(packageInstalledRealDIR, verbose);
+
+            if (ret != UPPM_OK) {
                 uppm_formula_free(formula);
-                return UPPM_ERROR;
+                return ret;
             }
         } else {
             if (unlink(packageInstalledRealDIR) != 0) {
@@ -520,9 +521,10 @@ int uppm_install(const char * packageName, bool verbose, bool force) {
             if (errno == EEXIST) {
                 if (lstat(packageName, &st) == 0) {
                     if (S_ISDIR(st.st_mode)) {
-                        if (rm_r  (packageName, verbose) != 0) {
-                            perror(packageName);
-                            return UPPM_ERROR;
+                        ret = uppm_rm_r(packageName, verbose);
+
+                        if (ret != UPPM_OK) {
+                            return ret;
                         }
                     } else {
                         if (unlink(packageName) != 0) {

diff --git a/src/integrate.c b/src/integrate.c
@@ -5,8 +5,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "core/rm-r.h"
-
 #include "uppm.h"
 
 int uppm_integrate_zsh_completion(const char * outputDIR, bool verbose) {
@@ -49,9 +47,10 @@ int uppm_integrate_zsh_completion(const char * outputDIR, bool verbose) {
 
     if (stat(sessionDIR, &st) == 0) {
         if (S_ISDIR(st.st_mode)) {
-            if (rm_r(sessionDIR, false) != 0) {
-                perror(sessionDIR);
-                return UPPM_ERROR;
+            ret = uppm_rm_r(sessionDIR, false);
+
+            if (ret != UPPM_OK) {
+                return ret;
             }
         } else {
             fprintf(stderr, "%s was expected to be a directory, but it was not.\n", sessionDIR);