security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* g10.c (main): Give a deprecated option warning for --show-keyring,

Browse source 
--show-photos, --show-policy-url, --show-notation, and their respective
no- forms.

* options.skel: Remove show-photos and replace with list/verify-options
show-photos.  Remove no-mangle-dos-filenames.

* misc.c (parse_options): Allow for incomplete (but unambiguous) options.
This commit is contained in:
David Shaw 2003-10-10 03:05:05 +00:00
parent f633ef17dc
commit 40db05fb99
4 changed files with 73 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
g10/g10.c
View file

@ -1464,7 +1464,11 @@ main( int argc, char **argv )
sl=append_to_strlist( &nrings, pargs.r.ret_str);
sl->flags=2;
break;
case oShowKeyring: opt.list_options|=LIST_SHOW_KEYRING; break;
case oShowKeyring:
deprecated_warning(configname,configlineno,"--show-keyring",
"--list-options ","show-keyring");
opt.list_options|=LIST_SHOW_KEYRING;
break;
case oDebug: opt.debug |= pargs.r.ret_ulong; break;
case oDebugAll: opt.debug = ~0; break;
case oStatusFD:
@ -1637,10 +1641,18 @@ main( int argc, char **argv )
case oSigPolicyURL: add_policy_url(pargs.r.ret_str,0); break;
case oCertPolicyURL: add_policy_url(pargs.r.ret_str,1); break;
case oShowPolicyURL:
deprecated_warning(configname,configlineno,"--show-policy-url",
"--list-options ","show-policy-url");
deprecated_warning(configname,configlineno,"--show-policy-url",
"--verify-options ","show-policy-url");
opt.list_options|=LIST_SHOW_POLICY;
opt.verify_options|=VERIFY_SHOW_POLICY;
break;
case oNoShowPolicyURL:
deprecated_warning(configname,configlineno,"--no-show-policy-url",
"--list-options ","no-show-policy-url");
deprecated_warning(configname,configlineno,"--no-show-policy-url",
"--verify-options ","no-show-policy-url");
opt.list_options&=~LIST_SHOW_POLICY;
opt.verify_options&=~VERIFY_SHOW_POLICY;
break;
@ -1657,11 +1669,19 @@ main( int argc, char **argv )
break;
case oThrowKeyid: opt.throw_keyid = 1; break;
case oNoThrowKeyid: opt.throw_keyid = 0; break;
case oShowPhotos:
case oShowPhotos:
deprecated_warning(configname,configlineno,"--show-photos",
"--list-options ","show-photos");
deprecated_warning(configname,configlineno,"--show-photos",
"--verify-options ","show-photos");
opt.list_options|=LIST_SHOW_PHOTOS;
opt.verify_options|=VERIFY_SHOW_PHOTOS;
break;
case oNoShowPhotos:
deprecated_warning(configname,configlineno,"--no-show-photos",
"--list-options ","no-show-photos");
deprecated_warning(configname,configlineno,"--no-show-photos",
"--verify-options ","no-show-photos");
opt.list_options&=~LIST_SHOW_PHOTOS;
opt.verify_options&=~VERIFY_SHOW_PHOTOS;
break;
@ -1865,10 +1885,18 @@ main( int argc, char **argv )
case oSigNotation: add_notation_data( pargs.r.ret_str, 0 ); break;
case oCertNotation: add_notation_data( pargs.r.ret_str, 1 ); break;
case oShowNotation:
deprecated_warning(configname,configlineno,"--show-notation",
"--list-options ","show-notation");
deprecated_warning(configname,configlineno,"--show-notation",
"--verify-options ","show-notation");
opt.list_options|=LIST_SHOW_NOTATION;
opt.verify_options|=VERIFY_SHOW_NOTATION;
break;
case oNoShowNotation:
deprecated_warning(configname,configlineno,"--no-show-notation",
"--list-options ","no-show-notation");
deprecated_warning(configname,configlineno,"--no-show-notation",
"--verify-options ","no-show-notation");
opt.list_options&=~LIST_SHOW_NOTATION;
opt.verify_options&=~VERIFY_SHOW_NOTATION;
break;