2008-01-10 Marcus Brinkmann <marcus@g10code.de>

* engine-gpgconf.c (gpgconf_config_load_cb2): Handle the flag
	NO_ARG_DESC.
This commit is contained in:
Marcus Brinkmann 2008-01-10 02:31:15 +00:00
parent 62a1429a5c
commit e65bb3ef3c
2 changed files with 18 additions and 7 deletions

View File

@ -1,3 +1,8 @@
2008-01-10 Marcus Brinkmann <marcus@g10code.de>
* engine-gpgconf.c (gpgconf_config_load_cb2): Handle the flag
NO_ARG_DESC.
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.

View File

@ -1,9 +1,6 @@
// Check protocol.
// IMPLEMENT NO_ARG_DESC!!!!
/* engine-gpgconf.c - gpg-conf engine.
Copyright (C) 2000 Werner Koch (dd9jn)
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007 g10 Code GmbH
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008 g10 Code GmbH
This file is part of GPGME.
@ -457,9 +454,18 @@ gpgconf_config_load_cb2 (void *hook, char *line)
return gpg_error_from_syserror ();
}
err = gpgconf_parse_option (opt, &opt->no_arg_value, field[8]);
if (err)
return err;
if (opt->flags & GPGME_CONF_NO_ARG_DESC)
{
opt->no_arg_description = strdup (field[8]);
if (!opt->no_arg_description)
return gpg_error_from_syserror ();
}
else
{
err = gpgconf_parse_option (opt, &opt->no_arg_value, field[8]);
if (err)
return err;
}
err = gpgconf_parse_option (opt, &opt->value, field[9]);
if (err)