optimized

Signed-off-by: leleliu008 <leleliu008@gmail.com>

Author: leleliu008

src/home.c

@@ -1,5 +1,7 @@
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
+
 #include <unistd.h>
 #include <sys/stat.h>
 
@@ -14,71 +16,89 @@ int uppm_home_dir(char buf[], size_t bufSize, size_t * outSize) {
         return UPPM_ERROR_ARG_IS_INVALID;
     }
 
-    const char * const uppmHomeDir = getenv("UPPM_HOME");
+    const char * const uppmHomeDIR = getenv("UPPM_HOME");
 
-    if (uppmHomeDir == NULL) {
-        const char * const userHomeDir = getenv("HOME");
+    if (uppmHomeDIR == NULL) {
+        const char * const userHomeDIR = getenv("HOME");
 
-        if (userHomeDir == NULL) {
+        if (userHomeDIR == NULL) {
             return UPPM_ERROR_ENV_HOME_NOT_SET;
         }
 
-        size_t userHomeDirLength = strlen(userHomeDir);
-
-        if (userHomeDirLength == 0U) {
+        if (userHomeDIR[0] == '\0') {
             return UPPM_ERROR_ENV_HOME_NOT_SET;
         }
 
-        size_t   uppmHomeDirLength = userHomeDirLength + + 7U;
-        char     uppmHomeDir[uppmHomeDirLength];
-        snprintf(uppmHomeDir, uppmHomeDirLength, "%s/.uppm", userHomeDir);
+        size_t defaultUppmHomeDIRCapacity = strlen(userHomeDIR) + 7U;
+        char   defaultUppmHomeDIR[defaultUppmHomeDIRCapacity];
+
+        int ret = snprintf(defaultUppmHomeDIR, defaultUppmHomeDIRCapacity, "%s/.uppm", userHomeDIR);
+
+        if (ret < 0) {
+            perror(NULL);
+            return UPPM_ERROR;
+        }
+
+        size_t defaultUppmHomeDIRLength = ret;
 
         struct stat st;
 
-        if (stat(uppmHomeDir, &st) == 0) {
+        if (stat(defaultUppmHomeDIR, &st) == 0) {
             if (!S_ISDIR(st.st_mode)) {
-                fprintf(stderr, "'%s\n' was expected to be a directory, but it was not.\n", uppmHomeDir);
+                fprintf(stderr, "%s was expected to be a directory, but it was not.\n", defaultUppmHomeDIR);
                 return UPPM_ERROR;
             }
         } else {
-            if (mkdir(uppmHomeDir, S_IRWXU) != 0) {
-                perror(uppmHomeDir);
-                return UPPM_ERROR;
+            if (mkdir(defaultUppmHomeDIR, S_IRWXU) != 0) {
+                if (errno != EEXIST) {
+                    perror(defaultUppmHomeDIR);
+                    return UPPM_ERROR;
+                }
             }
         }
 
-        size_t n = (bufSize > uppmHomeDirLength) ? uppmHomeDirLength : bufSize;
+        size_t m = bufSize - 1U;
+
+        size_t n = (m > defaultUppmHomeDIRLength) ? defaultUppmHomeDIRLength : m;
+
+        strncpy(buf, defaultUppmHomeDIR, n);
 
-        strncpy(buf, uppmHomeDir, n);
+        buf[n] = '\0';
 
         if (outSize != NULL) {
             (*outSize) = n;
         }
     } else {
-        if (uppmHomeDir[0] == '\0') {
+        if (uppmHomeDIR[0] == '\0') {
             fprintf(stderr, "'UPPM_HOME' environment variable's value was expected to be a non-empty string, but it was not.\n");
             return UPPM_ERROR;
         }
 
         struct stat st;
 
-        if (stat(uppmHomeDir, &st) == 0) {
+        if (stat(uppmHomeDIR, &st) == 0) {
             if (!S_ISDIR(st.st_mode)) {
-                fprintf(stderr, "'%s\n' was expected to be a directory, but it was not.\n", uppmHomeDir);
+                fprintf(stderr, "%s was expected to be a directory, but it was not.\n", uppmHomeDIR);
                 return UPPM_ERROR;
             }
         } else {
-            if (mkdir(uppmHomeDir, S_IRWXU) != 0) {
-                perror(uppmHomeDir);
-                return UPPM_ERROR;
+            if (mkdir(uppmHomeDIR, S_IRWXU) != 0) {
+                if (errno != EEXIST) {
+                    perror(uppmHomeDIR);
+                    return UPPM_ERROR;
+                }
             }
         }
 
-        size_t uppmHomeDirLength = strlen(uppmHomeDir);
+        size_t uppmHomeDIRLength = strlen(uppmHomeDIR);
+
+        size_t m = bufSize - 1U;
+
+        size_t n = (m > uppmHomeDIRLength) ? uppmHomeDIRLength : m;
 
-        size_t n = (bufSize > uppmHomeDirLength) ? uppmHomeDirLength : bufSize;
+        strncpy(buf, uppmHomeDIR, n);
 
-        strncpy(buf, uppmHomeDir, n);
+        buf[n] = '\0';
 
         if (outSize != NULL) {
             (*outSize) = n;

src/upgrade-self.c

@@ -61,10 +61,54 @@ static int uppm_upgrade_tar_filename(char buf[], const size_t bufSize, const cha
 #elif defined (__DragonFly__)
     ret = snprintf(buf, bufSize, "uppm-%s-%s-%s-%s.tar.xz", latestVersion, osType, osVers, osArch);
 #elif defined (__FreeBSD__)
+    double v = atof(osVers * 10);
+
+    if (v < 130) {
+        osVers[0] = '1';
+        osVers[1] = '3';
+        osVers[2] = '.';
+        osVers[3] = '0';
+        osVers[4] = '\0';
+    } else if (v > 132) {
+        osVers[0] = '1';
+        osVers[1] = '3';
+        osVers[2] = '.';
+        osVers[3] = '2';
+        osVers[4] = '\0';
+    }
+
     ret = snprintf(buf, bufSize, "uppm-%s-%s-%s-%s.tar.xz", latestVersion, osType, osVers, osArch);
 #elif defined (__OpenBSD__)
+    double v = atof(osVers * 10);
+
+    if (v < 73) {
+        osVers[0] = '7';
+        osVers[1] = '.';
+        osVers[2] = '3';
+        osVers[3] = '\0';
+    } else if (v > 74) {
+        osVers[0] = '7';
+        osVers[1] = '.';
+        osVers[2] = '4';
+        osVers[3] = '\0';
+    }
+
     ret = snprintf(buf, bufSize, "uppm-%s-%s-%s-%s.tar.xz", latestVersion, osType, osVers, osArch);
 #elif defined (__NetBSD__)
+    double v = atof(osVers * 10);
+
+    if (v < 92) {
+        osVers[0] = '9';
+        osVers[1] = '.';
+        osVers[2] = '2';
+        osVers[3] = '\0';
+    } else if (v > 93) {
+        osVers[0] = '9';
+        osVers[1] = '.';
+        osVers[2] = '3';
+        osVers[3] = '\0';
+    }
+
     ret = snprintf(buf, bufSize, "uppm-%s-%s-%s-%s.tar.xz", latestVersion, osType, osVers, osArch);
 #else
     ret = snprintf(buf, bufSize, "uppm-%s-%s-%s.tar.xz", latestVersion, osType, osArch);