diff options
| author | sinanmohd <sinan@sinanmohd.com> | 2024-04-15 18:10:57 +0530 |
|---|---|---|
| committer | sinanmohd <sinan@sinanmohd.com> | 2024-04-15 18:32:55 +0530 |
| commit | 689c7e2204e3e924cf24ddfb9c399215b786ec1b (patch) | |
| tree | c7e87e82a76f1b30f6e7c5c140d172526849f1fd /src/libnpass/libnpass.c | |
| parent | 39a4d38bb7da97189a301b8a26cb83a469d87d3d (diff) | |
libnpass/gpg: refactor
https://www.kernel.org/doc/html/v4.10/process/coding-style.html
- Centralized exiting of functions (goto cleanup)
- Function return values and names
(-Exxx = failure, 0 = success) for imperative commands
(0 = failure, non-zero = success) for predicates
- avoid macros that affect control flow
Diffstat (limited to 'src/libnpass/libnpass.c')
| -rw-r--r-- | src/libnpass/libnpass.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libnpass/libnpass.c b/src/libnpass/libnpass.c index 6618385..6c66a79 100644 --- a/src/libnpass/libnpass.c +++ b/src/libnpass/libnpass.c @@ -265,7 +265,7 @@ int pass_init(const char *fpr) err_ret(1, "PASSWORD_STORE_DIR not set"); r = gpg_key_validate(fpr); - if (r) + if (r < 0) err_ret(1, "key not usable, try gpg --full-generate-key"); r = r_mkdir(pass_dir, S_IRWXU); @@ -308,7 +308,7 @@ int pass_cat(FILE *out, const char *path) err_ret(1, "failed to build path"); r = gpg_decrypt(out, pass_path); - return r; + return (r < 0) ? 1 : r; } ssize_t pass_getpass(char **lineptr, size_t *n, FILE *stream) @@ -386,7 +386,7 @@ int pass_add(const char *path, const char *pass, size_t n) util_strtrim(fpr); r = gpg_key_validate(fpr); - if (r) + if (r < 0) err_ret(1, "invalid key , try gpg --list-keys"); /* TODO: guard against .*\.gpg\.gpg[/$] */ @@ -411,7 +411,7 @@ int pass_add(const char *path, const char *pass, size_t n) r = gpg_encrypt(out_stream, fpr, pass, n); fclose(out_stream); - return r; + return (r < 0) ? 1 : r; } int pass_rm(const char *path) |