diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-04 11:15:28 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-04 11:15:28 +0100 |
| commit | c93d14fc05b50a8ee8bb7804579c2912f34c676b (patch) | |
| tree | 1f45c51bd8d3ab33de2610f1663b3ec8e5f49c02 /apt-pkg/contrib/gpgv.cc | |
| parent | e2fa0aa64d2249129543f82a213043d96469be1c (diff) | |
| parent | 23bd09778261c945b460b46d855b1a6ef998cfd8 (diff) | |
Merge branch 'debian/sid' into feature/source-deb822
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()); } /*}}}*/ |