aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2006-04-09 03:34:09 +0000
committerDavid Shaw <[email protected]>2006-04-09 03:34:09 +0000
commit51e88a5fdb92797c5109d2948c1f6e1c5230e6ad (patch)
treee7e0c80e14d0a4a4c27fa41fb9bda7946b06e5ab /g10/gpg.c
parentFixed segv (diff)
downloadgnupg-51e88a5fdb92797c5109d2948c1f6e1c5230e6ad.tar.gz
gnupg-51e88a5fdb92797c5109d2948c1f6e1c5230e6ad.zip
* getkey.c (parse_auto_key_locate): Fix dupe-removal code.
* keyedit.c (menu_backsign): Allow backsigning even if the secret subkey doesn't have a binding signature. * armor.c (radix64_read): Don't report EOF when reading only a pad (=) character. The EOF actually starts after the pad. * gpg.c (main): Make --export, --send-keys, --recv-keys, --refresh-keys, and --fetch-keys follow their arguments from left to right. Suggested by Peter Palfrader.
Diffstat (limited to 'g10/gpg.c')
-rw-r--r--g10/gpg.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index 1e86b2d99..e72222204 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3399,12 +3399,17 @@ main (int argc, char **argv )
import_keys( argc? argv:NULL, argc, NULL, opt.import_options );
break;
+ /* TODO: There are a number of command that use this same
+ "make strlist, call function, report error, free strlist"
+ pattern. Join them together here and avoid all that
+ duplicated code. */
+
case aExport:
case aSendKeys:
case aRecvKeys:
sl = NULL;
for( ; argc; argc--, argv++ )
- add_to_strlist2( &sl, *argv, utf8_strings );
+ append_to_strlist2( &sl, *argv, utf8_strings );
if( cmd == aSendKeys )
rc=keyserver_export( sl );
else if( cmd == aRecvKeys )
@@ -3436,7 +3441,7 @@ main (int argc, char **argv )
case aRefreshKeys:
sl = NULL;
for( ; argc; argc--, argv++ )
- add_to_strlist2( &sl, *argv, utf8_strings );
+ append_to_strlist2( &sl, *argv, utf8_strings );
rc=keyserver_refresh(sl);
if(rc)
log_error(_("keyserver refresh failed: %s\n"),g10_errstr(rc));
@@ -3446,7 +3451,7 @@ main (int argc, char **argv )
case aFetchKeys:
sl = NULL;
for( ; argc; argc--, argv++ )
- add_to_strlist2( &sl, *argv, utf8_strings );
+ append_to_strlist2( &sl, *argv, utf8_strings );
rc=keyserver_fetch(sl);
if(rc)
log_error("key fetch failed: %s\n",g10_errstr(rc));