diff options
| -rw-r--r-- | sm/ChangeLog | 8 | ||||
| -rw-r--r-- | sm/gpgsm.c | 16 | ||||
| -rw-r--r-- | sm/import.c | 2 | ||||
| -rw-r--r-- | sm/server.c | 23 |
4 files changed, 31 insertions, 18 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index 423c223a7..34a73a298 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,11 @@ +2002-07-03 Werner Koch <wk@gnupg.org> + + * server.c (gpgsm_status2): Insert a blank between all optional + arguments when using assuan. + * server.c (cmd_recipient): No more need for extra blank in constants. + * import.c (print_imported_status): Ditto. + * gpgsm.c (main): Ditto. + 2002-07-02 Werner Koch <wk@gnupg.org> * verify.c (gpgsm_verify): Extend the STATUS_BADSIG line with diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 1bfc1bfbf..f2287ef20 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1068,14 +1068,14 @@ main ( int argc, char **argv) sl->d, gnupg_strerror (rc)); gpgsm_status2 (&ctrl, STATUS_INV_RECP, rc == -1? "1": - rc == GNUPG_Ambiguous_Name? "2 ": - rc == GNUPG_Wrong_Key_Usage? "3 ": - rc == GNUPG_Certificate_Revoked? "4 ": - rc == GNUPG_Certificate_Expired? "5 ": - rc == GNUPG_No_CRL_Known? "6 ": - rc == GNUPG_CRL_Too_Old? "8 ": - rc == GNUPG_No_Policy_Match? "8 ": - "0 ", + rc == GNUPG_Ambiguous_Name? "2": + rc == GNUPG_Wrong_Key_Usage? "3": + rc == GNUPG_Certificate_Revoked? "4": + rc == GNUPG_Certificate_Expired? "5": + rc == GNUPG_No_CRL_Known? "6": + rc == GNUPG_CRL_Too_Old? "7": + rc == GNUPG_No_Policy_Match? "8": + "0", sl->d, NULL); } } diff --git a/sm/import.c b/sm/import.c index 2b7fbfecf..b0e312740 100644 --- a/sm/import.c +++ b/sm/import.c @@ -41,7 +41,7 @@ print_imported_status (CTRL ctrl, KsbaCert cert) char *fpr; fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1); - gpgsm_status2 (ctrl, STATUS_IMPORTED, fpr, " [X.509]", NULL); + gpgsm_status2 (ctrl, STATUS_IMPORTED, fpr, "[X.509]", NULL); xfree (fpr); } diff --git a/sm/server.c b/sm/server.c index 4a8a8c40a..5f490b5a9 100644 --- a/sm/server.c +++ b/sm/server.c @@ -243,14 +243,14 @@ cmd_recipient (ASSUAN_CONTEXT ctx, char *line) if (rc) gpgsm_status2 (ctrl, STATUS_INV_RECP, rc == -1? "1": - rc == GNUPG_Ambiguous_Name? "2 ": - rc == GNUPG_Wrong_Key_Usage? "3 ": - rc == GNUPG_Certificate_Revoked? "4 ": - rc == GNUPG_Certificate_Expired? "5 ": - rc == GNUPG_No_CRL_Known? "6 ": - rc == GNUPG_CRL_Too_Old? "8 ": - rc == GNUPG_No_Policy_Match? "8 ": - "0 ", + rc == GNUPG_Ambiguous_Name? "2": + rc == GNUPG_Wrong_Key_Usage? "3": + rc == GNUPG_Certificate_Revoked? "4": + rc == GNUPG_Certificate_Expired? "5": + rc == GNUPG_No_CRL_Known? "6": + rc == GNUPG_CRL_Too_Old? "7": + rc == GNUPG_No_Policy_Match? "8": + "0", line, NULL); return map_to_assuan_status (rc); @@ -873,7 +873,12 @@ gpgsm_status2 (CTRL ctrl, int no, ...) n = 0; while ( (text = va_arg (arg_ptr, const char *)) ) { - for ( ; *text && n < DIM (buf)-1; n++) + if (n) + { + *p++ = ' '; + n++; + } + for ( ; *text && n < DIM (buf)-2; n++) *p++ = *text++; } *p = 0; |