X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.c;h=c9f3085a4d1586ac799061f69fdf5cc0b68f484c;hb=refs%2Fheads%2F1.1;hp=5f40b8afac98ee4d891ed7b4f1961293f4eb8400;hpb=3d787920d51a35e74e442c7265be3b13b69ad8e4;p=tinc

diff --git a/src/utils.c b/src/utils.c
index 5f40b8af..3a3030d1 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -18,8 +18,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <assert.h>
-
 #include "logger.h"
 #include "system.h"
 #include "utils.h"
@@ -81,64 +79,13 @@ size_t bin2hex(const void *vsrc, char *dst, size_t length) {
 	return length * 2;
 }
 
-char *absolute_path(const char *path) {
-#ifdef HAVE_WINDOWS
-	// Works for nonexistent paths
-	return _fullpath(NULL, path, 0);
-#else
-
-	if(!path || !*path) {
-		return NULL;
-	}
-
-	// If an absolute path was passed, return its copy
-	if(*path == '/') {
-		return xstrdup(path);
-	}
-
-	// Try using realpath. If it fails for any reason
-	// other than that the file was not found, bail out.
-	char *abs = realpath(path, NULL);
-
-	if(abs || errno != ENOENT) {
-		return abs;
-	}
-
-	// Since the file does not exist, we're forced to use a fallback.
-	// Get current working directory and concatenate it with the argument.
-	char cwd[PATH_MAX];
-
-	if(!getcwd(cwd, sizeof(cwd))) {
-		return NULL;
-	}
-
-	// Remove trailing slash if present since we'll be adding our own
-	size_t cwdlen = strlen(cwd);
-
-	if(cwdlen && cwd[cwdlen - 1] == '/') {
-		cwd[cwdlen - 1] = '\0';
-	}
-
-	// We don't do any normalization because it's complicated, and the payoff is small.
-	// If user passed something like '.././../foo' — that's their choice; fopen works either way.
-	xasprintf(&abs, "%s/%s", cwd, path);
-
-	if(strlen(abs) >= PATH_MAX) {
-		free(abs);
-		abs = NULL;
-	}
-
-	return abs;
-#endif
-}
-
 size_t b64decode_tinc(const char *src, void *dst, size_t length) {
 	size_t i;
 	uint32_t triplet = 0;
 	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) {
@@ -347,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));
 }
-