diff options
| author | David Shaw <[email protected]> | 2003-08-03 02:37:48 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-08-03 02:37:48 +0000 |
| commit | 752e3459ab6cfd3b1e03902a321bbc748e9d7ca5 (patch) | |
| tree | d2a4f8251015de5e475499f98e03a0e54c435bcd | |
| parent | minor changes to make make distcheck happy (diff) | |
| download | gnupg-752e3459ab6cfd3b1e03902a321bbc748e9d7ca5.tar.gz gnupg-752e3459ab6cfd3b1e03902a321bbc748e9d7ca5.zip | |
* options.h, g10.c (main), keylist.c (list_keyblock_print), keyedit.c
(print_and_check_one_sig): New "show-sig-expire" list-option to show
signature expiration dates (if any).
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/g10.c | 1 | ||||
| -rw-r--r-- | g10/keyedit.c | 5 | ||||
| -rw-r--r-- | g10/keylist.c | 5 | ||||
| -rw-r--r-- | g10/options.h | 1 |
5 files changed, 16 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index fd35c3a29..642494413 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2003-08-02 David Shaw <[email protected]> + + * options.h, g10.c (main), keylist.c (list_keyblock_print), + keyedit.c (print_and_check_one_sig): New "show-sig-expire" + list-option to show signature expiration dates (if any). + 2003-07-24 David Shaw <[email protected]> * options.h, g10.c (main, add_keyserver_url): Add @@ -1764,6 +1764,7 @@ main( int argc, char **argv ) {"show-keyring",LIST_SHOW_KEYRING}, {"show-validity",LIST_SHOW_VALIDITY}, {"show-long-keyid",LIST_SHOW_LONG_KEYID}, + {"show-sig-expire",LIST_SHOW_SIG_EXPIRE}, {NULL,0} }; diff --git a/g10/keyedit.c b/g10/keyedit.c index 68f71d6f8..42ece5496 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -133,7 +133,7 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node, break; } if( sigrc != '?' || print_without_key ) { - tty_printf("%s%c%c %c%c%c%c%c%c %08lX %s ", + tty_printf("%s%c%c %c%c%c%c%c%c %08lX %s", is_rev? "rev":"sig",sigrc, (sig->sig_class-0x10>0 && sig->sig_class-0x10<4)?'0'+sig->sig_class-0x10:' ', @@ -145,6 +145,9 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node, (sig->trust_depth>9)?'T': (sig->trust_depth>0)?'0'+sig->trust_depth:' ', (ulong)sig->keyid[1], datestr_from_sig(sig)); + if(opt.list_options&LIST_SHOW_SIG_EXPIRE) + tty_printf(" %s",expirestr_from_sig(sig)); + tty_printf(" "); if( sigrc == '%' ) tty_printf("[%s] ", g10_errstr(rc) ); else if( sigrc == '?' ) diff --git a/g10/keylist.c b/g10/keylist.c index 12cf4e573..e01d8d993 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -823,7 +823,10 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque ) printf("%08lX%08lX",(ulong)sig->keyid[0],(ulong)sig->keyid[1]); else printf("%08lX",(ulong)sig->keyid[1]); - printf(" %s ", datestr_from_sig(sig)); + printf(" %s", datestr_from_sig(sig)); + if(opt.list_options&LIST_SHOW_SIG_EXPIRE) + printf(" %s", expirestr_from_sig(sig)); + printf(" "); if( sigrc == '%' ) printf("[%s] ", g10_errstr(rc) ); else if( sigrc == '?' ) diff --git a/g10/options.h b/g10/options.h index d9ea86571..e24337117 100644 --- a/g10/options.h +++ b/g10/options.h @@ -234,6 +234,7 @@ struct { #define LIST_SHOW_KEYRING 8 #define LIST_SHOW_VALIDITY 16 #define LIST_SHOW_LONG_KEYID 32 +#define LIST_SHOW_SIG_EXPIRE 64 #define VERIFY_SHOW_PHOTOS 1 #define VERIFY_SHOW_POLICY 2 |