X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/8f312f45c9602343744a24d2e954504e9bad8de3..18a14a834e4068917d97467a3a52f17ed6055da3:/cmdline/apt-extracttemplates.cc?ds=inline

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 73b3bc51c..de22386b9 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: apt-extracttemplates.cc,v 1.14 2003/01/11 07:18:44 jgg Exp $
+// $Id: apt-extracttemplates.cc,v 1.15 2003/07/26 00:00:11 mdz Exp $
 /* ######################################################################
    
    APT Extract Templates - Program to extract debconf config and template
@@ -99,7 +99,7 @@ bool DebFile::Go()
 	
 	if (File.Seek(Member->Start) == false)
 		return false;
-	ExtractTar Tar(File, Member->Size);
+	ExtractTar Tar(File, Member->Size,"gzip");
 	return Tar.Go(*this);
 }
 									/*}}}*/
@@ -222,8 +222,8 @@ bool DebFile::ParseInfo()
 /* */
 int ShowHelp(void)
 {
-   	ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-	    COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+   	ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+	    COMMON_ARCH,__DATE__,__TIME__);
 
 	if (_config->FindB("version") == true) 
 		return 0;
@@ -238,7 +238,7 @@ int ShowHelp(void)
 	        "  -h   This help text\n"
 		"  -t   Set the temp dir\n"
 		"  -c=? Read this configuration file\n"
-		"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n");
+		"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
 	return 0;
 }
 									/*}}}*/
@@ -249,7 +249,15 @@ string WriteFile(const char *package, const char *prefix, const char *data)
 {
 	char fn[512];
 	static int i;
-	snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d", _config->Find("APT::ExtractTemplates::TempDir", TMPDIR).c_str(), package, prefix, getpid(), i++);
+	const char *tempdir = NULL;
+
+        tempdir = getenv("TMPDIR");
+        if (tempdir == NULL)
+             tempdir = TMPDIR;
+
+	snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d",
+                 _config->Find("APT::ExtractTemplates::TempDir", tempdir).c_str(),
+                 package, prefix, getpid(), i++);
 	FileFd f;
 	if (data == NULL)
 		data = "";