summaryrefslogtreecommitdiff
path: root/src/engine-gpgconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine-gpgconf.c')
-rw-r--r--src/engine-gpgconf.c112
1 files changed, 58 insertions, 54 deletions
diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
index 6807dce..fec0fc3 100644
--- a/src/engine-gpgconf.c
+++ b/src/engine-gpgconf.c
@@ -1,19 +1,19 @@
/* engine-gpgconf.c - gpg-conf engine.
Copyright (C) 2000 Werner Koch (dd9jn)
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008 g10 Code GmbH
-
+
This file is part of GPGME.
GPGME is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of
the License, or (at your option) any later version.
-
+
GPGME is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
@@ -96,7 +96,7 @@ gpgconf_new (void **engine, const char *file_name, const char *home_dir)
gpgconf = calloc (1, sizeof *gpgconf);
if (!gpgconf)
- return gpg_error_from_errno (errno);
+ return gpg_error_from_syserror ();
gpgconf->file_name = strdup (file_name ? file_name
: _gpgme_get_gpgconf_path ());
@@ -147,7 +147,7 @@ release_opt (gpgme_conf_opt_t opt)
release_arg (opt->default_value, opt->alt_type);
if (opt->default_description)
free (opt->default_description);
-
+
release_arg (opt->no_arg_value, opt->alt_type);
release_arg (opt->value, opt->alt_type);
release_arg (opt->new_value, opt->alt_type);
@@ -218,7 +218,7 @@ gpgconf_read (void *engine, char *arg1, char *arg2,
/* _gpgme_engine_new guarantees that this is not NULL. */
argv[0] = gpgconf->file_name;
-
+
if (_gpgme_io_pipe (rp, 1) < 0)
return gpg_error_from_syserror ();
@@ -234,7 +234,7 @@ gpgconf_read (void *engine, char *arg1, char *arg2,
do
{
- nread = _gpgme_io_read (rp[0],
+ nread = _gpgme_io_read (rp[0],
linebuf + linelen, LINELENGTH - linelen - 1);
if (nread > 0)
{
@@ -268,7 +268,7 @@ gpgconf_read (void *engine, char *arg1, char *arg2,
}
}
while (nread > 0 && linelen < LINELENGTH - 1);
-
+
if (!err && nread < 0)
err = gpg_error_from_syserror ();
if (!err && nread > 0)
@@ -300,7 +300,7 @@ gpgconf_config_load_cb (void *hook, char *line)
/* We require at least the first 3 fields. */
if (fields < 2)
- return gpg_error (GPG_ERR_INV_ENGINE);
+ return trace_gpg_error (GPG_ERR_INV_ENGINE);
/* Find the pointer to the new component in the list. */
while (comp && comp->next)
@@ -369,15 +369,15 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
case GPGME_CONF_UINT32:
arg->value.uint32 = strtoul (line, NULL, 0);
break;
-
+
case GPGME_CONF_INT32:
arg->value.uint32 = strtol (line, NULL, 0);
break;
-
+
case GPGME_CONF_STRING:
/* The complex types below are only here to silent the
compiler warning. */
- case GPGME_CONF_FILENAME:
+ case GPGME_CONF_FILENAME:
case GPGME_CONF_LDAP_SERVER:
case GPGME_CONF_KEY_FPR:
case GPGME_CONF_PUB_KEY:
@@ -385,7 +385,7 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
case GPGME_CONF_ALIAS_LIST:
/* Skip quote character. */
line++;
-
+
err = _gpgme_decode_percent_string (line, &arg->value.string,
0, 0);
if (err)
@@ -426,7 +426,7 @@ gpgconf_config_load_cb2 (void *hook, char *line)
/* We require at least the first 10 fields. */
if (fields < 10)
- return gpg_error (GPG_ERR_INV_ENGINE);
+ return trace_gpg_error (GPG_ERR_INV_ENGINE);
opt = calloc (1, sizeof (*opt));
if (!opt)
@@ -557,11 +557,11 @@ _gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p,
case GPGME_CONF_UINT32:
arg->value.uint32 = *((unsigned int *) value);
break;
-
+
case GPGME_CONF_INT32:
arg->value.int32 = *((int *) value);
break;
-
+
case GPGME_CONF_STRING:
case GPGME_CONF_FILENAME:
case GPGME_CONF_LDAP_SERVER:
@@ -576,7 +576,7 @@ _gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p,
return gpg_error_from_syserror ();
}
break;
-
+
default:
free (arg);
return gpg_error (GPG_ERR_INV_VALUE);
@@ -600,7 +600,7 @@ _gpgme_conf_arg_release (gpgme_conf_arg_t arg, gpgme_conf_type_t type)
case GPGME_CONF_STRING:
default:
break;
-
+
case GPGME_CONF_FILENAME:
case GPGME_CONF_LDAP_SERVER:
case GPGME_CONF_KEY_FPR:
@@ -737,53 +737,54 @@ arg_to_data (gpgme_data_t conf, gpgme_conf_opt_t option, gpgme_conf_arg_t arg)
buf[sizeof (buf) - 1] = '\0';
amt = gpgme_data_write (conf, buf, strlen (buf));
break;
-
+
case GPGME_CONF_INT32:
snprintf (buf, sizeof (buf), "%i", arg->value.uint32);
buf[sizeof (buf) - 1] = '\0';
amt = gpgme_data_write (conf, buf, strlen (buf));
break;
-
-
+
+
case GPGME_CONF_STRING:
/* The complex types below are only here to silent the
compiler warning. */
- case GPGME_CONF_FILENAME:
+ case GPGME_CONF_FILENAME:
case GPGME_CONF_LDAP_SERVER:
case GPGME_CONF_KEY_FPR:
case GPGME_CONF_PUB_KEY:
case GPGME_CONF_SEC_KEY:
case GPGME_CONF_ALIAS_LIST:
- /* One quote character, and three times to allow
- for percent escaping. */
- {
- char *ptr = arg->value.string;
- amt = gpgme_data_write (conf, "\"", 1);
- if (amt < 0)
- break;
-
- while (!err && *ptr)
- {
- switch (*ptr)
- {
- case '%':
- amt = gpgme_data_write (conf, "%25", 3);
- break;
-
- case ':':
- amt = gpgme_data_write (conf, "%3a", 3);
- break;
-
- case ',':
- amt = gpgme_data_write (conf, "%2c", 3);
- break;
-
- default:
- amt = gpgme_data_write (conf, ptr, 1);
- }
- ptr++;
- }
- }
+ if (arg->value.string)
+ {
+ /* One quote character, and three times to allow for
+ percent escaping. */
+ char *ptr = arg->value.string;
+ amt = gpgme_data_write (conf, "\"", 1);
+ if (amt < 0)
+ break;
+
+ while (!err && *ptr)
+ {
+ switch (*ptr)
+ {
+ case '%':
+ amt = gpgme_data_write (conf, "%25", 3);
+ break;
+
+ case ':':
+ amt = gpgme_data_write (conf, "%3a", 3);
+ break;
+
+ case ',':
+ amt = gpgme_data_write (conf, "%2c", 3);
+ break;
+
+ default:
+ amt = gpgme_data_write (conf, ptr, 1);
+ }
+ ptr++;
+ }
+ }
break;
}
@@ -798,7 +799,7 @@ arg_to_data (gpgme_data_t conf, gpgme_conf_opt_t option, gpgme_conf_arg_t arg)
if (amt < 0)
return gpg_error_from_syserror ();
-
+
return 0;
}
@@ -924,5 +925,8 @@ struct engine_ops _gpgme_engine_ops_gpgconf =
gpgconf_conf_save,
gpgconf_set_io_cbs,
NULL, /* io_event */
- NULL /* cancel */
+ NULL, /* cancel */
+ NULL, /* cancel_op */
+ NULL, /* passwd */
+ NULL /* set_pinentry_mode */
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 06:51:45 +0000