harec

commit f6d5897c521287dede383aeb724efb72068c2e8b
parent c28716b1013bd745fb156681d0618c859e6fe7e5
Author: Drew DeVault <sir@cmpwn.com>
Date:   Fri, 12 Mar 2021 10:23:29 -0500

mod: use POSIX-compatible version reference

Diffstat:
M
src/mod.c
 | 
26
++++++++++++++++++++++----

1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/mod.c b/src/mod.c
@@ -14,19 +14,37 @@
 #include "type_store.h"
 #include "util.h"
 
+static char *
+ident_to_env(const struct identifier *ident)
+{
+	if (ident->ns) {
+		char *ns = ident_to_env(ident->ns);
+		if (!ns) {
+			return NULL;
+		}
+		int n = snprintf(NULL, 0, "%s_%s", ns, ident->name);
+		char *str = xcalloc(1, n + 1);
+		snprintf(str, n + 1, "%s_%s", ns, ident->name);
+		free(ns);
+		return str;
+	}
+	return strdup(ident->name);
+}
+
+
 static const char *
 open_typedefs(struct identifier *ident)
 {
-	char *sym = ident_to_sym(ident);
+	char *env = ident_to_env(ident);
 	char versenv[PATH_MAX+1];
-	snprintf(versenv, sizeof(versenv), "HARE.%s.VERSION", sym);
+	snprintf(versenv, sizeof(versenv), "HARE_VERSION_%s", env);
 
 	char *version = getenv(versenv);
 	if (!version) {
-		version = sym;
+		version = env;
 	} else {
 		version = strdup(version);
-		free(sym);
+		free(env);
 	}
 
 	const struct pathspec paths[] = {