libnpass: refactor set_pass_dir to pass_store_path_set

3 files changed, 54 insertions, 59 deletions

diff --git a/include/libnpass/libnpass.h b/include/libnpass/libnpass.h
index 310d634..1a0f31a 100644
--- a/include/libnpass/libnpass.h
+++ b/include/libnpass/libnpass.h
@@ -22,6 +22,7 @@ struct store {
 };
 
 int pass_readstore_all(const char *path, struct store **stor);
+int pass_store_path_set(char **store);
 int pass_store_type(const char *spath);
 int pass_store_cmp(const void *vp1, const void *vp2);
 
diff --git a/src/libnpass/libnpass.c b/src/libnpass/libnpass.c
index edeb4af..63bf96f 100644
--- a/src/libnpass/libnpass.c
+++ b/src/libnpass/libnpass.c
@@ -18,7 +18,7 @@
 #define DEF_STOR_SIZE 64
 #define FPR_MAX	      NAME_MAX
 
-static char pass_dir[PATH_MAX] = {0};
+static char store_path[PATH_MAX] = {0};
 static const char *pass_gen_set[] = {
 	"0123456789",
 
@@ -35,17 +35,21 @@ static const char *pass_gen_set[] = {
 static int openstore(const char *spath, DIR **dirp);
 static int readstore(DIR *dirp, struct store *s);
 static int is_storeobj(struct dirent *dir);
-static int set_pass_dir(void);
 
-static int set_pass_dir(void)
+int pass_store_path_set(char **store)
 {
 	struct stat statbuf;
 	const char *env;
-	int r;
+	int ret;
+
+	if (store != NULL)
+		*store = store_path;
+	if (*store_path)
+		return 0;
 
 	env = getenv("PASSWORD_STORE_DIR");
 	if (env) {
-		strncpy(pass_dir, env, sizeof(pass_dir) - 1);
+		strncpy(store_path, env, sizeof(store_path) - 1);
 		return 0;
 	}
 
@@ -54,30 +58,30 @@ static int set_pass_dir(void)
 	 */
 	env = getenv("HOME");
 	if (env) {
-		r = snprintf(pass_dir, sizeof(pass_dir), "%s/%s", env,
-			     ".password-store");
-		if (r < 0 || (size_t)r > sizeof(pass_dir))
+		ret = snprintf(store_path, sizeof(store_path), "%s/%s", env,
+			       ".password-store");
+		if (ret < 0 || (size_t)ret > sizeof(store_path))
 			return_err(-ENAMETOOLONG, "Path exceeded PATH_MAX");
 
-		r = stat(pass_dir, &statbuf);
-		if (!r)
+		ret = stat(store_path, &statbuf);
+		if (!ret)
 			return 0;
 	}
 
 	env = getenv("XDG_DATA_HOME");
 	if (env) {
-		r = snprintf(pass_dir, sizeof(pass_dir), "%s/%s", env,
-			     DEF_PASS_DIR);
-		if (r < 0 || (size_t)r > sizeof(pass_dir))
+		ret = snprintf(store_path, sizeof(store_path), "%s/%s", env,
+			       DEF_PASS_DIR);
+		if (ret < 0 || (size_t)ret > sizeof(store_path))
 			return_err(-ENAMETOOLONG, "Path exceeded PATH_MAX");
 		return 0;
 	}
 
 	env = getenv("HOME");
 	if (env) {
-		r = snprintf(pass_dir, sizeof(pass_dir), "%s/%s/%s", env,
-			     ".local/share", DEF_PASS_DIR);
-		if (r < 0 || (size_t)r > sizeof(pass_dir))
+		ret = snprintf(store_path, sizeof(store_path), "%s/%s/%s", env,
+			       ".local/share", DEF_PASS_DIR);
+		if (ret < 0 || (size_t)ret > sizeof(store_path))
 			return_err(-ENAMETOOLONG, "Path exceeded PATH_MAX");
 		return 0;
 	}
@@ -127,11 +131,7 @@ int pass_store_type(const char *spath)
 	struct stat sbuf;
 	int r;
 
-	r = set_pass_dir();
-	if (r < 0)
-		return_err(-EINVAL, "PASSWORD_STORE_DIR must be set");
-
-	r = snprintf(abs_path, sizeof(abs_path), "%s/%s", pass_dir,
+	r = snprintf(abs_path, sizeof(abs_path), "%s/%s", store_path,
 		     (spath) ? spath : "");
 	if (r < 0 || (size_t)r >= sizeof(abs_path))
 		return_err(-ENAMETOOLONG, "Path exceeded PATH_MAX");
@@ -139,7 +139,8 @@ int pass_store_type(const char *spath)
 	if (!r && (sbuf.st_mode & S_IFMT) == S_IFDIR)
 		return PASS_STORE_DIR;
 
-	r = snprintf(abs_path, sizeof(abs_path), "%s/%s.gpg", pass_dir, spath);
+	r = snprintf(abs_path, sizeof(abs_path), "%s/%s.gpg", store_path,
+		     spath);
 	if (r < 0 || (size_t)r >= sizeof(abs_path))
 		return_err(-ENAMETOOLONG, "Path exceeded PATH_MAX");
 	r = stat(abs_path, &sbuf);
@@ -164,14 +165,14 @@ static int openstore(const char *spath, DIR **dirp)
 		return (ret < 0) ? ret : -EINVAL;
 
 	if (spath) {
-		ret = snprintf(abs_path, sizeof(abs_path), "%s/%s", pass_dir,
+		ret = snprintf(abs_path, sizeof(abs_path), "%s/%s", store_path,
 			       spath);
 		if (ret < 0 || (size_t)ret >= sizeof(abs_path))
 			return_err(-ENAMETOOLONG, "Path exceeded PATH_MAX");
 
 		path = abs_path;
 	} else {
-		path = pass_dir;
+		path = store_path;
 	}
 
 	*dirp = opendir(path);
@@ -260,19 +261,15 @@ int pass_init(const char *fpr)
 	FILE *gpg_id;
 	int r, fpr_len;
 
-	r = set_pass_dir();
-	if (r < 0)
-		return_err(r, "PASSWORD_STORE_DIR must be set");
-
 	r = gpg_key_validate(fpr);
 	if (r < 0)
 		return_err(r, "Try `gpg --full-generate-key`");
 
-	r = r_mkdir(pass_dir, S_IRWXU);
+	r = r_mkdir(store_path, S_IRWXU);
 	if (r < 0)
-		return_err(r, "%s: %s", strerror(errno), pass_dir);
+		return_err(r, "%s: %s", strerror(errno), store_path);
 
-	r = snprintf(gpg_id_path, sizeof(gpg_id_path), "%s/%s", pass_dir,
+	r = snprintf(gpg_id_path, sizeof(gpg_id_path), "%s/%s", store_path,
 		     ".gpg-id");
 	if (r < 0 || (size_t)r >= sizeof(gpg_id_path))
 		return_err(-ENAMETOOLONG, "Path exceeded PATH_MAX");
@@ -301,7 +298,7 @@ int pass_cat(FILE *out, const char *path)
 	if (ret != PASS_STORE_ENC)
 		return_err(-EINVAL, "Not a password: %s", path);
 
-	ret = snprintf(pass_path, sizeof(pass_path), "%s/%s.gpg", pass_dir,
+	ret = snprintf(pass_path, sizeof(pass_path), "%s/%s.gpg", store_path,
 		       path);
 	if (ret < 0 || (size_t)ret >= sizeof(pass_path))
 		return_err(-ENAMETOOLONG, "Path exceeded PATH_MAX");
@@ -374,11 +371,7 @@ int pass_add(const char *path, const char *pass, size_t n)
 	char *p;
 	int ret;
 
-	ret = set_pass_dir();
-	if (ret < 0)
-		return_err(ret, "PASSWORD_STORE_DIR must be set");
-
-	ret = snprintf(gpg_id_path, sizeof(gpg_id_path), "%s/%s", pass_dir,
+	ret = snprintf(gpg_id_path, sizeof(gpg_id_path), "%s/%s", store_path,
 		       ".gpg-id");
 	if (ret < 0 || (size_t)ret >= sizeof(gpg_id_path))
 		return_err(-EINVAL, "Path exceeded PATH_MAX");
@@ -398,7 +391,7 @@ int pass_add(const char *path, const char *pass, size_t n)
 		return_err(ret, "Invalid key: Try `gpg --list-keys`");
 
 	/* TODO: guard against .*\.gpg\.gpg[/$] */
-	ret = snprintf(pass_path, sizeof(pass_path), "%s/%s.gpg", pass_dir,
+	ret = snprintf(pass_path, sizeof(pass_path), "%s/%s.gpg", store_path,
 		       path);
 	if (ret < 0 || (size_t)ret >= sizeof(pass_path))
 		return_err(-errno, "Path exceeded PATH_MAX");
@@ -427,15 +420,12 @@ int pass_rm(const char *path)
 	char gpg_path[PATH_MAX], abs_path[PATH_MAX];
 	int ret = 0;
 
-	ret = set_pass_dir();
-	if (ret < 0)
-		return_err(ret, "PASSWORD_STORE_DIR must be set");
-
 	ret = snprintf(gpg_path, sizeof(gpg_path), "%s.gpg", path);
 	if (ret < 0 || (size_t)ret >= sizeof(gpg_path))
 		return_err(-EINVAL, "Path exceeded PATH_MAX");
 
-	ret = snprintf(abs_path, sizeof(gpg_path), "%s/%s", pass_dir, gpg_path);
+	ret = snprintf(abs_path, sizeof(gpg_path), "%s/%s", store_path,
+		       gpg_path);
 	if (ret < 0 || (size_t)ret >= sizeof(abs_path))
 		return_err(-EINVAL, "Path exceeded PATH_MAX");
 
@@ -444,5 +434,5 @@ int pass_rm(const char *path)
 	if (ret < 0)
 		return_err(-errno, "%s: %s", strerror(errno), abs_path);
 
-	return r_rmdir_empty(pass_dir, dirname(gpg_path));
+	return r_rmdir_empty(store_path, dirname(gpg_path));
 }
diff --git a/src/npass/npass.c b/src/npass/npass.c
index 54b0f06..053f120 100644
--- a/src/npass/npass.c
+++ b/src/npass/npass.c
@@ -221,56 +221,60 @@ out_free_pass:
 
 int main(int argc, char *argv[])
 {
-	int r = 0;
-	pass_store_t store_type;
+	int ret;
+
+	ret = pass_store_path_set(NULL);
+	if (ret < 0)
+		return EXIT_FAILURE;
 
-	++argv;
+	argv++;
 	if (!--argc) {
-		r = ls(NULL, 0);
+		ret = ls(NULL, 0);
 	} else if (!strcmp("help", *argv)) {
 		if (argc != 1)
 			return_invalid_usage(EXIT_FAILURE);
 
+		ret = 0;
 		print_usage();
 	} else if (!strcmp("init", *argv)) {
 		if (argc != 2)
 			return_invalid_usage(EXIT_FAILURE);
 
-		r = pass_init(argv[1]);
+		ret = pass_init(argv[1]);
 	} else if (!strcmp("ls", *argv)) {
 		if (argc > 2)
 			return_invalid_usage(EXIT_FAILURE);
 
-		r = ls(argv[1], 0);
+		ret = ls(argv[1], 0);
 	} else if (!strcmp("cat", *argv)) {
 		if (argc != 2)
 			return_invalid_usage(EXIT_FAILURE);
 
-		r = cat(argv[1]);
+		ret = cat(argv[1]);
 	} else if (!strcmp("add", *argv)) {
 		if (argc != 2)
 			return_invalid_usage(EXIT_FAILURE);
 
-		r = add(argv[1]);
+		ret = add(argv[1]);
 	} else if (!strcmp("rm", *argv)) {
 		if (argc != 2)
 			return_invalid_usage(EXIT_FAILURE);
 
-		r = pass_rm(argv[1]);
+		ret = pass_rm(argv[1]);
 	} else if (!strcmp("gen", *argv)) {
 		if (argc < 2)
 			return_invalid_usage(EXIT_FAILURE);
 
-		r = gen(argc, argv);
+		ret = gen(argc, argv);
 	} else if (argc == 1) {
-		store_type = pass_store_type(*argv);
+		ret = pass_store_type(*argv);
 
-		switch (store_type) {
+		switch (ret) {
 		case PASS_STORE_DIR:
-			r = ls(*argv, 0);
+			ret = ls(*argv, 0);
 			break;
 		case PASS_STORE_ENC:
-			r = cat(*argv);
+			ret = cat(*argv);
 			break;
 		default:
 			return 1;
@@ -280,5 +284,5 @@ int main(int argc, char *argv[])
 		return_invalid_usage(EXIT_FAILURE);
 	}
 
-	return (r < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
+	return (ret < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
 }