diff options
| author | Werner Koch <wk@gnupg.org> | 2007-08-02 20:12:43 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2007-08-02 20:12:43 +0200 |
| commit | ebd36b634450ce9fdf0104052cca2b035ad3a22d (patch) | |
| tree | 1708507fee17d3520460bd94636800d4b828c8ed /agent | |
| parent | Applied exact length hack. (diff) | |
| download | gnupg2-ebd36b634450ce9fdf0104052cca2b035ad3a22d.tar.xz gnupg2-ebd36b634450ce9fdf0104052cca2b035ad3a22d.zip | |
Factored common gpgconf constants out
Fixed W32 compare_filenames
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 5 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 19 |
2 files changed, 6 insertions, 18 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index ebac90850..05dd9a830 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,8 @@ +2007-08-02 Werner Koch <wk@g10code.com> + + * gpg-agent.c: Include gc-opt-flags.h and remove their definition + here. + 2007-07-13 Werner Koch <wk@g10code.com> * genkey.c (check_passphrase_constraints): Require a confirmation diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 626581779..cb0a67b73 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -48,6 +48,7 @@ # include "../jnlib/w32-afunix.h" #endif #include "setenv.h" +#include "gc-opt-flags.h" enum cmd_and_opt_values @@ -698,24 +699,6 @@ main (int argc, char **argv ) char *filename_esc; /* 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) - filename = make_filename (opt.homedir, "gpg-agent.conf", NULL ); filename_esc = percent_escape (filename, NULL); |