diff options
| author | Werner Koch <[email protected]> | 2007-08-24 09:34:39 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-08-24 09:34:39 +0000 |
| commit | 503f91e0aea99fe09064e29ec9df1ded1a3bd3c3 (patch) | |
| tree | e3dd4b252d6d05a5aa15aea799ab9447ea74ccbd /kbx | |
| parent | Add new features to kbxutil. (diff) | |
| download | gnupg-503f91e0aea99fe09064e29ec9df1ded1a3bd3c3.tar.gz gnupg-503f91e0aea99fe09064e29ec9df1ded1a3bd3c3.zip | |
tryu harder to ignore duplicate specified keyrings and -boxes.
Documentation updates.
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/ChangeLog | 4 | ||||
| -rw-r--r-- | kbx/keybox-init.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/kbx/ChangeLog b/kbx/ChangeLog index edcf917fd..f7c79ee1a 100644 --- a/kbx/ChangeLog +++ b/kbx/ChangeLog @@ -1,3 +1,7 @@ +2007-08-24 Werner Koch <[email protected]> + + * keybox-init.c (keybox_register_file): Use same_file_p. + 2007-08-23 Werner Koch <[email protected]> * kbxutil.c: New commands --find-dups and --cut. New options diff --git a/kbx/keybox-init.c b/kbx/keybox-init.c index ea95c5f67..fcf3c7cee 100644 --- a/kbx/keybox-init.c +++ b/kbx/keybox-init.c @@ -24,10 +24,9 @@ #include <unistd.h> #include <assert.h> +#include "../jnlib/mischelp.h" #include "keybox-defs.h" -#define compare_filenames strcmp - static KB_NAME kb_names; @@ -42,8 +41,8 @@ keybox_register_file (const char *fname, int secret) for (kr=kb_names; kr; kr = kr->next) { - if ( !compare_filenames (kr->fname, fname) ) - return NULL; /* already registered */ + if (same_file_p (kr->fname, fname) ) + return NULL; /* Already registered. */ } kr = xtrymalloc (sizeof *kr + strlen (fname)); |