* keyedit.c (print_and_check_one_sig): Use list-option show-long-keyid in
authorDavid Shaw <dshaw@jabberwocky.com>
Sat, 30 Aug 2003 00:40:56 +0000 (00:40 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Sat, 30 Aug 2003 00:40:56 +0000 (00:40 +0000)
--edit-key "check" function.

g10/ChangeLog
g10/keyedit.c

index 329283a..06221be 100644 (file)
@@ -1,3 +1,8 @@
+2003-08-29  David Shaw  <dshaw@jabberwocky.com>
+
+       * keyedit.c (print_and_check_one_sig): Use list-option
+       show-long-keyid in --edit-key "check" function.
+
 2003-08-28  David Shaw  <dshaw@jabberwocky.com>
 
        * passphrase.c (agent_send_all_options): Make use of $GPG_TTY.
index 7b696c5..bd6b5fc 100644 (file)
@@ -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 ",
                   is_rev? "rev":"sig",sigrc,
                   (sig->sig_class-0x10>0 &&
                    sig->sig_class-0x10<4)?'0'+sig->sig_class-0x10:' ',
@@ -143,8 +143,12 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
                   sig->flags.notation?'N':' ',
                    sig->flags.expired?'X':' ',
                   (sig->trust_depth>9)?'T':
-                  (sig->trust_depth>0)?'0'+sig->trust_depth:' ',
-                  (ulong)sig->keyid[1], datestr_from_sig(sig));
+                  (sig->trust_depth>0)?'0'+sig->trust_depth:' ');
+       if(opt.list_options&LIST_SHOW_LONG_KEYID)
+         tty_printf("%08lX%08lX",(ulong)sig->keyid[0],(ulong)sig->keyid[1]);
+       else
+         tty_printf("%08lX",(ulong)sig->keyid[1]);
+       tty_printf(" %s", datestr_from_sig(sig));
        if(opt.list_options&LIST_SHOW_SIG_EXPIRE)
          tty_printf(" %s",expirestr_from_sig(sig));
        tty_printf("  ");