diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-06 07:51:45 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-06 07:51:45 +0100 |
| commit | 1b4560fec66a6e7b2dff9aaa19095fb8423f69a0 (patch) | |
| tree | 7fb2b63e31f356ef87af4699ba87b4f1443f508c /apt-pkg/contrib/gpgv.cc | |
| parent | 81d183681aea972fddd453d62109f8ccda3f447a (diff) | |
| parent | 74d4bb26e09146b9d5f01889a676dc58ff5d63cd (diff) | |
Merge branch 'debian/sid' into feature/apt-manpage
Diffstat (limited to 'apt-pkg/contrib/gpgv.cc')
| -rw-r--r-- | apt-pkg/contrib/gpgv.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index f47e7ea48..f57a72d86 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -10,6 +10,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <sys/wait.h> +#include <unistd.h> #include<apt-pkg/configuration.h> #include<apt-pkg/error.h> @@ -21,16 +22,9 @@ /*}}}*/ static char * GenerateTemporaryFileTemplate(const char *basename) /*{{{*/ { - const char *tmpdir = getenv("TMPDIR"); -#ifdef P_tmpdir - if (!tmpdir) - tmpdir = P_tmpdir; -#endif - if (!tmpdir) - tmpdir = "/tmp"; - std::string out; - strprintf(out, "%s/%s.XXXXXX", tmpdir, basename); + std::string tmpdir = GetTempDir(); + strprintf(out, "%s/%s.XXXXXX", tmpdir.c_str(), basename); return strdup(out.c_str()); } /*}}}*/ |