aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyedit.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2004-01-24 00:47:45 +0000
committerDavid Shaw <[email protected]>2004-01-24 00:47:45 +0000
commit385a19bd7bab47da5b703fafa3ff177fbed631a4 (patch)
tree2b92d533161f9fc253261d920ddeaffffd15570b /g10/keyedit.c
parent* g10.c (list_config): New function to dump config options to stdout. (diff)
downloadgnupg-385a19bd7bab47da5b703fafa3ff177fbed631a4.tar.gz
gnupg-385a19bd7bab47da5b703fafa3ff177fbed631a4.zip
* mainproc.c (list_node): Show sigs with --verbose.
* options.h, g10.c (set_screen_dimensions): New function to look at COLUMNS and LINES. * keyserver.c (parse_keyrec, keyserver_search_prompt), keyedit.c (print_and_check_one_sig): Use new screen dimension variables.
Diffstat (limited to 'g10/keyedit.c')
-rw-r--r--g10/keyedit.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 50383b9e3..21607737b 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -71,7 +71,6 @@ static int enable_disable_key( KBNODE keyblock, int disable );
static void menu_showphoto( KBNODE keyblock );
static int update_trust=0;
-static int columns=80;
#define CONTROL_D ('D' - 'A' + 1)
@@ -165,7 +164,7 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
else {
size_t n;
char *p = get_user_id( sig->keyid, &n );
- tty_print_utf8_string2( p, n, columns-37 );
+ tty_print_utf8_string2( p, n, opt.screen_columns-37 );
m_free(p);
}
tty_printf("\n");
@@ -1189,15 +1188,6 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
goto leave;
}
-#ifndef _WIN32
- if(getenv("COLUMNS"))
- {
- columns=atoi(getenv("COLUMNS"));
- if(columns<80 || columns>255)
- columns=80;
- }
-#endif
-
if( sign_mode ) {
commands = NULL;
append_to_strlist( &commands, sign_mode == 1? "sign":