From c9aa5000d70b9d2bae7903074c8f10b75815e01d Mon Sep 17 00:00:00 2001 From: David Shaw Date: Sat, 14 Feb 2004 05:03:45 +0000 Subject: * keyserver.c (argsep): Move to misc.c. * main.h, misc.c (parse_options), export.c (parse_export_options), import.c (parse_import_options), g10.c (main): Use it here to allow for options with optional arguments. Change all callers. --- g10/g10.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'g10/g10.c') diff --git a/g10/g10.c b/g10/g10.c index 0749ff6dc..916934c4f 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -2096,17 +2096,17 @@ main( int argc, char **argv ) { struct parse_options lopts[]= { - {"show-photos",LIST_SHOW_PHOTOS}, - {"show-policy-urls",LIST_SHOW_POLICY_URLS}, - {"show-notations",LIST_SHOW_NOTATIONS}, - {"show-keyserver-urls",LIST_SHOW_KEYSERVER_URLS}, - {"show-validity",LIST_SHOW_VALIDITY}, - {"show-long-keyids",LIST_SHOW_LONG_KEYIDS}, - {"show-unusable-uids",LIST_SHOW_UNUSABLE_UIDS}, - {"show-unusable-subkeys",LIST_SHOW_UNUSABLE_SUBKEYS}, - {"show-keyring",LIST_SHOW_KEYRING}, - {"show-sig-expire",LIST_SHOW_SIG_EXPIRE}, - {NULL,0} + {"show-photos",LIST_SHOW_PHOTOS,NULL}, + {"show-policy-urls",LIST_SHOW_POLICY_URLS,NULL}, + {"show-notations",LIST_SHOW_NOTATIONS,NULL}, + {"show-keyserver-urls",LIST_SHOW_KEYSERVER_URLS,NULL}, + {"show-validity",LIST_SHOW_VALIDITY,NULL}, + {"show-long-keyids",LIST_SHOW_LONG_KEYIDS,NULL}, + {"show-unusable-uids",LIST_SHOW_UNUSABLE_UIDS,NULL}, + {"show-unusable-subkeys",LIST_SHOW_UNUSABLE_SUBKEYS,NULL}, + {"show-keyring",LIST_SHOW_KEYRING,NULL}, + {"show-sig-expire",LIST_SHOW_SIG_EXPIRE,NULL}, + {NULL,0,NULL} }; if(!parse_options(pargs.r.ret_str,&opt.list_options,lopts,1)) @@ -2123,14 +2123,14 @@ main( int argc, char **argv ) { struct parse_options vopts[]= { - {"show-photos",VERIFY_SHOW_PHOTOS}, - {"show-policy-urls",VERIFY_SHOW_POLICY_URLS}, - {"show-notations",VERIFY_SHOW_NOTATIONS}, - {"show-keyserver-urls",VERIFY_SHOW_KEYSERVER_URLS}, - {"show-validity",VERIFY_SHOW_VALIDITY}, - {"show-long-keyids",VERIFY_SHOW_LONG_KEYIDS}, - {"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS}, - {NULL,0} + {"show-photos",VERIFY_SHOW_PHOTOS,NULL}, + {"show-policy-urls",VERIFY_SHOW_POLICY_URLS,NULL}, + {"show-notations",VERIFY_SHOW_NOTATIONS,NULL}, + {"show-keyserver-urls",VERIFY_SHOW_KEYSERVER_URLS,NULL}, + {"show-validity",VERIFY_SHOW_VALIDITY,NULL}, + {"show-long-keyids",VERIFY_SHOW_LONG_KEYIDS,NULL}, + {"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS,NULL}, + {NULL,0,NULL} }; if(!parse_options(pargs.r.ret_str,&opt.verify_options,vopts,1)) -- cgit v1.2.3