diff options
| author | Werner Koch <[email protected]> | 2014-11-11 14:14:31 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-11-11 14:14:31 +0000 |
| commit | b8cdfac353ad96d4ef025c066c16dbde34805661 (patch) | |
| tree | f26e4c6589c0dfc0bb8ff25b645262eb05d24677 /g13 | |
| parent | Remove use of gnulib (part 1) (diff) | |
| download | gnupg-b8cdfac353ad96d4ef025c066c16dbde34805661.tar.gz gnupg-b8cdfac353ad96d4ef025c066c16dbde34805661.zip | |
Remove use of gnulib (part 2)
* configure.ac (strpbrk): Add to AC_CHECK_FUNCS.
(gl_EARLY): Remove.
* common/stringhelp.c (strpbrk) [!HAVE_STRPBRK]: New.
* common/sysutils.c (gnupg_mkdtemp): New. Based on code from
glibc-2.6.
(gnupg_setenv): Rewrite.
(gnupg_unsetenv): Rewrite.
* g10/exec.c: Include sysutils.h and replace mkdtemp by gnupg_mkdtemp.
* g13/be-encfs.c: Ditto.
* g13/mount.c: Ditto.
* tools/symcryptrun.c (confucius_mktmpdir): Ditto.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g13')
| -rw-r--r-- | g13/be-encfs.c | 3 | ||||
| -rw-r--r-- | g13/mount.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/g13/be-encfs.c b/g13/be-encfs.c index 265b4c2bc..f59f4d947 100644 --- a/g13/be-encfs.c +++ b/g13/be-encfs.c @@ -30,6 +30,7 @@ #include "keyblob.h" #include "be-encfs.h" #include "runner.h" +#include "../common/sysutils.h" #include "../common/exechelp.h" @@ -415,7 +416,7 @@ be_encfs_create_container (ctrl_t ctrl, const char *fname, tupledesc_t tuples, err = gpg_error_from_syserror (); goto leave; } - if (!mkdtemp (mountpoint)) + if (!gnupg_mkdtemp (mountpoint)) { err = gpg_error_from_syserror (); log_error (_("can't create directory '%s': %s\n"), diff --git a/g13/mount.c b/g13/mount.c index 512e29d1a..fc640e0ee 100644 --- a/g13/mount.c +++ b/g13/mount.c @@ -33,6 +33,7 @@ #include "keyblob.h" #include "backend.h" #include "utils.h" +#include "../common/sysutils.h" #include "call-gpg.h" #include "mountinfo.h" #include "runner.h" @@ -260,7 +261,7 @@ g13_mount_container (ctrl_t ctrl, const char *filename, const char *mountpoint) mountpoint_buffer = xtrystrdup ("/tmp/g13-XXXXXX"); if (!mountpoint_buffer) return gpg_error_from_syserror (); - if (!mkdtemp (mountpoint_buffer)) + if (!gnupg_mkdtemp (mountpoint_buffer)) { err = gpg_error_from_syserror (); log_error (_("can't create directory '%s': %s\n"), |