aboutsummaryrefslogtreecommitdiffstats
path: root/sm
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2007-08-02 18:12:43 +0000
committerWerner Koch <[email protected]>2007-08-02 18:12:43 +0000
commitebd36b634450ce9fdf0104052cca2b035ad3a22d (patch)
tree1708507fee17d3520460bd94636800d4b828c8ed /sm
parentApplied exact length hack. (diff)
downloadgnupg-ebd36b634450ce9fdf0104052cca2b035ad3a22d.tar.gz
gnupg-ebd36b634450ce9fdf0104052cca2b035ad3a22d.zip
Factored common gpgconf constants out
Fixed W32 compare_filenames
Diffstat (limited to 'sm')
-rw-r--r--sm/ChangeLog4
-rw-r--r--sm/gpgsm.c40
2 files changed, 16 insertions, 28 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 7b64d47f7..910056a74 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-02 Werner Koch <[email protected]>
+
+ * gpgsm.c (main): Factored GC_OPT_FLAGS out to gc-opt-flags.h.
+
2007-07-17 Werner Koch <[email protected]>
* gpgsm.c (main): Implement --default-key.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index c00c01c9d..3a1c6d811 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -36,6 +36,7 @@
#include "i18n.h"
#include "keydb.h"
#include "sysutils.h"
+#include "gc-opt-flags.h"
#ifndef O_BINARY
@@ -1292,17 +1293,18 @@ main ( int argc, char **argv)
gpgsm_exit(2);
/* Set the random seed file. */
- if (use_random_seed) {
- char *p = make_filename (opt.homedir, "random_seed", NULL);
- gcry_control (GCRYCTL_SET_RANDOM_SEED_FILE, p);
- xfree(p);
- }
-
-
+ if (use_random_seed)
+ {
+ char *p = make_filename (opt.homedir, "random_seed", NULL);
+ gcry_control (GCRYCTL_SET_RANDOM_SEED_FILE, p);
+ xfree(p);
+ }
+
if (!cmd && opt.fingerprint && !with_fpr)
set_cmd (&cmd, aListKeys);
- if (!nrings && default_keyring) /* Add default keybox. */
+ /* Add default keybox. */
+ if (!nrings && default_keyring)
{
int created;
@@ -1353,7 +1355,7 @@ main ( int argc, char **argv)
}
/* Build the recipient list. We first add the regular ones and then
- the encrypt-to ones because the underlying function will silenty
+ the encrypt-to ones because the underlying function will silently
ignore duplicates and we can't allow to keep a duplicate which is
flagged as encrypt-to as the actually encrypt function would then
complain about no (regular) recipients. */
@@ -1369,7 +1371,7 @@ main ( int argc, char **argv)
}
if (log_get_errorcount(0))
- gpgsm_exit(1); /* must stop for invalid recipients */
+ gpgsm_exit(1); /* Must stop for invalid recipients. */
fname = argc? *argv : NULL;
@@ -1377,24 +1379,6 @@ main ( int argc, char **argv)
{
case aGPGConfList:
{ /* List options and default values in the GPG Conf format. */
-
- /* The following list is taken from gnupg/tools/gpgconf-comp.c. */
- /* Option flags. YOU MUST NOT CHANGE THE NUMBERS OF THE EXISTING
- FLAGS, AS THEY ARE PART OF THE EXTERNAL INTERFACE. */
-#define GC_OPT_FLAG_NONE 0UL
- /* The RUNTIME flag for an option indicates that the option can be
- changed at runtime. */
-#define GC_OPT_FLAG_RUNTIME (1UL << 3)
- /* The DEFAULT flag for an option indicates that the option has a
- default value. */
-#define GC_OPT_FLAG_DEFAULT (1UL << 4)
- /* The DEF_DESC flag for an option indicates that the option has a
- default, which is described by the value of the default field. */
-#define GC_OPT_FLAG_DEF_DESC (1UL << 5)
- /* The NO_ARG_DESC flag for an option indicates that the argument has
- a default, which is described by the value of the ARGDEF field. */
-#define GC_OPT_FLAG_NO_ARG_DESC (1UL << 6)
-
char *config_filename_esc = percent_escape (opt.config_filename, NULL);
printf ("gpgconf-gpgsm.conf:%lu:\"%s\n",