summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:56:54 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:56:54 +0000
commit4decd43cbd7fc6c9f3719d6bfc8ac040bd4d5371 (patch)
treeb7dc620e3580ae3a8e5cbbad501a767afdb59e25
parentf08fcf34cacb98d46cd8ee85398994db26a80a56 (diff)
fixed typo in fileutl.cc (damn you, studly caps...)
Author: tausq Date: 2001-03-03 22:45:59 GMT fixed typo in fileutl.cc (damn you, studly caps...) make apt-extracttemplates use FileFd
-rw-r--r--apt-pkg/contrib/fileutl.cc6
-rw-r--r--cmdline/apt-extracttemplates.cc15
2 files changed, 12 insertions, 9 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index fd9b93036..db878064d 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: fileutl.cc,v 1.36 2001/03/03 22:36:20 tausq Exp $
+// $Id: fileutl.cc,v 1.37 2001/03/03 22:45:59 tausq Exp $
/* ######################################################################
File Utilities
@@ -405,8 +405,8 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms)
break;
case WriteTemp:
- unlink(Filename.c_str());
- iFd = open(FileName.c_str(),O_RDWR | O_CREATE | O_EXCL,Perms);
+ unlink(FileName.c_str());
+ iFd = open(FileName.c_str(),O_RDWR | O_CREAT | O_EXCL,Perms);
break;
}
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 0f7242e98..3fd572e4f 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.4 2001/02/27 04:26:03 jgg Exp $
+// $Id: apt-extracttemplates.cc,v 1.5 2001/03/03 22:45:59 tausq Exp $
/* ######################################################################
APT Extract Templates - Program to extract debconf config and template
@@ -27,6 +27,7 @@
#include <apt-pkg/deblistparser.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
#include <stdio.h>
#include <string.h>
@@ -39,7 +40,7 @@
#include "apt-extracttemplates.h"
/*}}}*/
-#define TMPDIR "/var/lib/debconf/"
+#define TMPDIR "/tmp"
pkgCache *DebFile::Cache = 0;
@@ -246,16 +247,18 @@ string WriteFile(const char *prefix, const char *data)
char fn[512];
static int i;
snprintf(fn, sizeof(fn), "%s%s.%u%d", _config->Find("APT::ExtractTemplates::TempDir", TMPDIR).c_str(), prefix, getpid(), i++);
+ FileFd f;
+ if (data == NULL)
+ data = "";
- ofstream ofs(fn);
- if (!ofs)
+ if (!f.Open(fn, FileFd::WriteTemp, 0600))
{
_error->Errno("ofstream::ofstream",_("Unable to write to %s"),fn);
return string();
}
- ofs << (data ? data : "");
- ofs.close();
+ f.Write(data, strlen(data));
+ f.Close();
return fn;
}
/*}}}*/