diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/status.c | 1 | ||||
| -rw-r--r-- | g10/status.h | 1 | ||||
| -rw-r--r-- | g10/verify.c | 20 |
4 files changed, 21 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 089ab1d59..7d3ccbc75 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,10 @@ -Wed Sep 22 10:14:17 CEST 1999 Werner Koch <[email protected]> +Thu Sep 23 09:52:58 CEST 1999 Werner Koch <[email protected]> + + * verify.c (print_file_status): New. + (verify_one_file): Moved status print to th new fnc. Add error status. + * status.c, status.h (STATUS_FILE_ERROR): New +Wed Sep 22 10:14:17 CEST 1999 Werner Koch <[email protected]> * openfile.c (make_outfile_name): Use case-insenstive compare for DOS systems. Add ".pgp" to the list of know extensions. diff --git a/g10/status.c b/g10/status.c index c8d750944..fb9931d21 100644 --- a/g10/status.c +++ b/g10/status.c @@ -119,6 +119,7 @@ write_status_text ( int no, const char *text) case STATUS_IMPORT_RES : s = "IMPORT_RES\n"; break; case STATUS_FILE_START : s = "FILE_START\n"; break; case STATUS_FILE_DONE : s = "FILE_DONE\n"; break; + case STATUS_FILE_ERROR : s = "FILE_ERROR\n"; break; default: s = "?\n"; break; } diff --git a/g10/status.h b/g10/status.h index 2365dbdf5..612cfdbcb 100644 --- a/g10/status.h +++ b/g10/status.h @@ -67,6 +67,7 @@ #define STATUS_IMPORT_RES 37 #define STATUS_FILE_START 38 #define STATUS_FILE_DONE 39 +#define STATUS_FILE_ERROR 40 /*-- status.c --*/ diff --git a/g10/verify.c b/g10/verify.c index 37a0caeb6..680fed0ff 100644 --- a/g10/verify.c +++ b/g10/verify.c @@ -84,6 +84,17 @@ verify_signatures( int nfiles, char **files ) return rc; } + +static void +print_file_status( int status, const char *name, int what ) +{ + char *p = m_alloc(strlen(name)+10); + sprintf(p, "%d %s", what, name ); + write_status_text( status, p ); + m_free(p); +} + + static int verify_one_file( const char *name ) { @@ -91,15 +102,10 @@ verify_one_file( const char *name ) armor_filter_context_t afx; int rc; - - { - char *p = m_alloc(strlen(name)+10); - sprintf(p, "1 %s", name ); - write_status_text( STATUS_FILE_START, p ); - m_free(p); - } + print_file_status( STATUS_FILE_START, name, 1 ); fp = iobuf_open(name); if( !fp ) { + print_file_status( STATUS_FILE_ERROR, name, 1 ); log_error(_("can't open `%s'\n"), print_fname_stdin(name)); return G10ERR_OPEN_FILE; } |