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

25
g10/misc.c
View file

@ -672,6 +672,7 @@ parse_options(char *str,unsigned int *options,struct parse_options *opts)
while((tok=strsep(&str," ,")))
{
int i,rev=0;
char *otok=tok;
if(tok[0]=='\0')
continue;
@ -684,8 +685,25 @@ parse_options(char *str,unsigned int *options,struct parse_options *opts)
for(i=0;opts[i].name;i++)
{
if(ascii_strcasecmp(opts[i].name,tok)==0)
size_t toklen=strlen(tok);
if(ascii_strncasecmp(opts[i].name,tok,toklen)==0)
{
/* We have a match, but it might be incomplete */
if(toklen!=strlen(opts[i].name))
{
int j;
for(j=i+1;opts[j].name;j++)
{
if(ascii_strncasecmp(opts[j].name,tok,toklen)==0)
{
log_info(_("ambiguous option `%s'\n"),otok);
return 0;
}
}
}
if(rev)
*options&=~opts[i].bit;
else
@ -695,7 +713,10 @@ parse_options(char *str,unsigned int *options,struct parse_options *opts)
}
if(!opts[i].name)
return 0;
{
log_info(_("unknown option `%s'\n"),otok);
return 0;
}
}
return 1;