diff options
| author | Werner Koch <[email protected]> | 2023-05-24 10:09:47 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-05-24 10:12:34 +0000 |
| commit | faf0a97b2e0b62fe23acdc8473033398ba2ce1bc (patch) | |
| tree | e71af94c9d766daf2d0da38ec87a4fe0539acf2e | |
| parent | gpg: Report BEGIN_* status before examining the input. (diff) | |
| download | gnupg-faf0a97b2e0b62fe23acdc8473033398ba2ce1bc.tar.gz gnupg-faf0a97b2e0b62fe23acdc8473033398ba2ce1bc.zip | |
gpg: Improve error code for file already exists.
* g10/plaintext.c (get_output_file): Fix error code.
| -rw-r--r-- | g10/plaintext.c | 3 | ||||
| -rw-r--r-- | sm/server.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/g10/plaintext.c b/g10/plaintext.c index 5c21dd7f6..e12c2bf79 100644 --- a/g10/plaintext.c +++ b/g10/plaintext.c @@ -137,8 +137,7 @@ get_output_file (const byte *embedded_name, int embedded_namelen, if (!tmp || !*tmp) { xfree (tmp); - /* FIXME: Below used to be GPG_ERR_CREATE_FILE */ - err = gpg_error (GPG_ERR_GENERAL); + err = gpg_error (GPG_ERR_EEXIST); goto leave; } xfree (fname); diff --git a/sm/server.c b/sm/server.c index e44856ab9..3ec1c0c4b 100644 --- a/sm/server.c +++ b/sm/server.c @@ -1530,7 +1530,7 @@ gpgsm_status_with_err_code (ctrl_t ctrl, int no, const char *text, { char buf[30]; - sprintf (buf, "%u", (unsigned int)ec); + snprintf (buf, sizeof buf, "%u", (unsigned int)ec); if (text) return gpgsm_status2 (ctrl, no, text, buf, NULL); else |