util: refactor error reporting

1 files changed, 21 insertions, 21 deletions

diff --git a/src/libnpass/libnpass.c b/src/libnpass/libnpass.c
index 14f4737..9158c62 100644
--- a/src/libnpass/libnpass.c
+++ b/src/libnpass/libnpass.c
@@ -55,29 +55,29 @@ int pass_init(const char *fpr)
 
 	r = set_pass_dir();
 	if (r)
-		err_die(1, "PASSWORD_STORE_DIR not set");
+		err_ret(1, "PASSWORD_STORE_DIR not set");
 
 	r = gpg_key_validate(fpr);
 	if (r)
-		err_die(1, "key not usable, try gpg --full-generate-key");
+		err_ret(1, "key not usable, try gpg --full-generate-key");
 
 
 	r = r_mkdir(pass_dir, S_IRWXU);
 	if (r)
-		err_die(1, "%s %s", pass_dir, strerror(errno));
+		err_ret(1, "%s %s", pass_dir, strerror(errno));
 
 	r = snprintf(gpg_id_path, sizeof(gpg_id_path), "%s/%s", pass_dir, ".gpg-id");
 	if (r > (int) sizeof(gpg_id_path))
-		err_die(1, "path exceeded PATH_MAX");
+		err_ret(1, "path exceeded PATH_MAX");
 
 	gpg_id = fopen(gpg_id_path, "w");
 	if (!gpg_id)
-		err_die(1, "%s %s", gpg_id_path, strerror(errno));
+		err_ret(1, "%s %s", gpg_id_path, strerror(errno));
 
 	r = fwrite(fpr, strlen(fpr), 1,gpg_id);
 	fclose(gpg_id);
 	if (!r)
-		err_die(1, "write failed");
+		err_ret(1, "write failed");
 
 	return 0;
 }
@@ -89,11 +89,11 @@ int pass_cat(FILE *out, const char *path)
 
 	r = set_pass_dir();
 	if (r)
-		err_die(1, "PASSWORD_STORE_DIR not set");
+		err_ret(1, "PASSWORD_STORE_DIR not set");
 
 	r = snprintf(pass_path, sizeof(pass_path), "%s/%s.gpg", pass_dir, path);
 	if (r >= (int) sizeof(pass_path))
-		err_die(1, "path exceeded PATH_MAX");
+		err_ret(1, "path exceeded PATH_MAX");
 
 	r = gpg_decrypt(out, pass_path);
 	return r;
@@ -132,44 +132,44 @@ int pass_add(const char *path, const char *pass, size_t n)
 
 	r = set_pass_dir();
 	if (r)
-		err_die(1, "PASSWORD_STORE_DIR not set");
+		err_ret(1, "PASSWORD_STORE_DIR not set");
 
 	r = snprintf(gpg_id_path, sizeof(gpg_id_path), "%s/%s", pass_dir, ".gpg-id");
 	if (r > (int) sizeof(gpg_id_path))
-		err_die(1, "path exceeded PATH_MAX");
+		err_ret(1, "path exceeded PATH_MAX");
 
 	gpg_id = fopen(gpg_id_path, "r");
 	if (!gpg_id)
-		err_die(1, "%s %s", gpg_id_path, strerror(errno));
+		err_ret(1, "%s %s", gpg_id_path, strerror(errno));
 
 	rc = fgets(fpr, sizeof(fpr), gpg_id);
 	if (!rc)
-		err_die(1, "failed to read %s", gpg_id_path);
+		err_ret(1, "failed to read %s", gpg_id_path);
 	fclose(gpg_id);
 	util_strtrim(fpr);
 
 	r = gpg_key_validate(fpr);
 	if (r)
-		err_die(1, "invalid key , try gpg --list-keys");
+		err_ret(1, "invalid key , try gpg --list-keys");
 
 	// TODO: guard against .*\.gpg\.gpg[/$]
 	r = snprintf(pass_path, sizeof(pass_path), "%s/%s.gpg", pass_dir, path);
 	if (r > (int) sizeof(pass_path))
-		err_die(1, "path exceeded PATH_MAX");
+		err_ret(1, "path exceeded PATH_MAX");
 
 	rc = strdup(pass_path);
 	if (!rc)
-		err_die(1, "%s", strerror(errno));
+		err_ret(1, "%s", strerror(errno));
 	(void) r_mkdir(dirname(rc), S_IRWXU);
 	free(rc);
 
 	r = access(pass_path, F_OK);
 	if (!(errno & ENOENT))
-		err_die(1, "an entry already exists for %s", path);
+		err_ret(1, "an entry already exists for %s", path);
 
 	out_stream = fopen(pass_path, "w");
 	if (!out_stream)
-		err_die(1, "%s", strerror(errno));
+		err_ret(1, "%s", strerror(errno));
 
 	r = gpg_encrypt(out_stream, fpr, pass, n);
 
@@ -185,20 +185,20 @@ int pass_rm(const char *path)
 
 	r = set_pass_dir();
 	if (r)
-		err_die(1, "PASSWORD_STORE_DIR not set");
+		err_ret(1, "PASSWORD_STORE_DIR not set");
 
 	r = snprintf(gpg_path, sizeof(gpg_path), "%s.gpg", path);
 	if (r > (int) sizeof(gpg_path))
-		err_die(1, "path exceeded PATH_MAX");
+		err_ret(1, "path exceeded PATH_MAX");
 
 	r = snprintf(abs_path, sizeof(gpg_path), "%s/%s", pass_dir, gpg_path);
 	if (r > (int) sizeof(abs_path))
-		err_die(1, "path exceeded PATH_MAX");
+		err_ret(1, "path exceeded PATH_MAX");
 
 	// TODO: guard against .*\.gpg\.gpg[/$]
 	r = unlink(abs_path);
 	if (r)
-		err_die(1, "%s %s", abs_path, strerror(errno));
+		err_ret(1, "%s %s", abs_path, strerror(errno));
 
 	return r_rmdir(pass_dir, dirname(gpg_path));
 }