Extract filesystem-related functions into fs.c

[tinc] / src / utils.c

diff --git a/src/utils.c b/src/utils.c
index 8b0cd6e..3a3030d 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -85,7 +85,7 @@ size_t b64decode_tinc(const char *src, void *dst, size_t length) {
        unsigned char *udst = (unsigned char *)dst;
 
        for(i = 0; i < length && src[i]; i++) {
-               triplet |= base64_decode[src[i] & 0xff] << (6 * (i & 3));
+               triplet |= (uint32_t)(base64_decode[src[i] & 0xff] << (6 * (i & 3)));
 
                if((i & 3) == 3) {
                        if(triplet & 0xff000000U) {
@@ -119,6 +119,24 @@ size_t b64decode_tinc(const char *src, void *dst, size_t length) {
        }
 }
 
+bool is_decimal(const char *str) {
+       if(!str) {
+               return false;
+       }
+
+       errno = 0;
+       char *badchar = NULL;
+       strtol(str, &badchar, 10);
+       return !errno && badchar != str && !*badchar;
+}
+
+// itoa() conflicts with a similarly named function under MinGW.
+char *int_to_str(int num) {
+       char *str = NULL;
+       xasprintf(&str, "%d", num);
+       return str;
+}
+
 static size_t b64encode_tinc_internal(const void *src, char *dst, size_t length, const char *alphabet) {
        uint32_t triplet;
        const unsigned char *usrc = (unsigned char *)src;
@@ -176,7 +194,7 @@ size_t b64encode_tinc_urlsafe(const void *src, char *dst, size_t length) {
        return b64encode_tinc_internal(src, dst, length, base64_urlsafe);
 }
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 const char *winerror(int err) {
        static char buf[1024], *ptr;
 
@@ -276,29 +294,7 @@ char *replace_name(const char *name) {
        return ret_name;
 }
 
-/* Open a file with the desired permissions, minus the umask.
-   Also, if we want to create an executable file, we call fchmod()
-   to set the executable bits. */
-
-FILE *fopenmask(const char *filename, const char *mode, mode_t perms) {
-       mode_t mask = umask(0);
-       perms &= ~mask;
-       umask(~perms & 0777);
-       FILE *f = fopen(filename, mode);
-
-       if(!f) {
-               fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
-               return NULL;
-       }
-
-#ifdef HAVE_FCHMOD
-
-       if(perms & 0444) {
-               fchmod(fileno(f), perms);
-       }
-
-#endif
-       umask(mask);
-       return f;
+bool string_eq(const char *first, const char *second) {
+       return !first == !second &&
+              !(first && second && strcmp(first, second));
 }
-