security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

gpg: Add new function write_status_printf.

Browse Source 
* g10/cpr.c (write_status_printf): New.
--

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-09-01 16:33:21 +02:00
parent 37e3c89725
commit 6bdadae005
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
g10/cpr.c
View File

@ -183,6 +183,33 @@ write_status_text (int no, const char *text)
write_status_strings (no, text, NULL); write_status_strings (no, text, NULL);
} }
/* Write a status line with code NO followed by the outout of the
* printf style FORMAT. The caller needs to make sure that LFs and
* CRs are not printed. */
void
write_status_printf (int no, const char *format, ...)
{
va_list arg_ptr;
if (!statusfp || !status_currently_allowed (no) )
return; /* Not enabled or allowed. */
es_fputs ("[GNUPG:] ", statusfp);
es_fputs (get_status_string (no), statusfp);
if (format)
{
es_putc ( ' ', statusfp);
va_start (arg_ptr, format);
es_vfprintf (statusfp, format, arg_ptr);
va_end (arg_ptr);
}
es_putc ('\n', statusfp);
if (es_fflush (statusfp) && opt.exit_on_status_write_error)
g10_exit (0);
}
/* Write an ERROR status line using a full gpg-error error value. */ /* Write an ERROR status line using a full gpg-error error value. */
void void
write_status_error (const char *where, gpg_error_t err) write_status_error (const char *where, gpg_error_t err)

2
g10/main.h
View File

@ -191,6 +191,8 @@ void write_status_error (const char *where, gpg_error_t err);
void write_status_errcode (const char *where, int errcode); void write_status_errcode (const char *where, int errcode);
void write_status_failure (const char *where, gpg_error_t err); void write_status_failure (const char *where, gpg_error_t err);
void write_status_text ( int no, const char *text ); void write_status_text ( int no, const char *text );
void write_status_printf (int no, const char *format,
...) GPGRT_ATTR_PRINTF(2,3);
void write_status_strings (int no, const char *text, void write_status_strings (int no, const char *text,
...) GPGRT_ATTR_SENTINEL(0); ...) GPGRT_ATTR_SENTINEL(0);
void write_status_buffer ( int no, void write_status_buffer ( int no,