diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:55:27 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:55:27 +0000 |
| commit | 101030ab14d60497fcba5b1c2866d52fc5ac4780 (patch) | |
| tree | ac6ecefeeeef51c4e7fa80577c6af064060174c3 /apt-pkg | |
| parent | abb9b874c5d1573a42c8c5519a38ac0575ef77ba (diff) | |
More Solaris fixes
Author: jgg
Date: 1999-12-10 06:30:42 GMT
More Solaris fixes
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/cdromutl.cc | 8 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index f6e4bc216..f703621c8 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cdromutl.cc,v 1.9 1999/08/30 07:48:04 jgg Exp $ +// $Id: cdromutl.cc,v 1.10 1999/12/10 06:30:42 jgg Exp $ /* ###################################################################### CDROM Utilities - Some functions to manipulate CDROM mounts. @@ -21,7 +21,7 @@ #include <sys/wait.h> #include <sys/errno.h> -#include <sys/vfs.h> +#include <sys/statvfs.h> #include <dirent.h> #include <fcntl.h> #include <sys/stat.h> @@ -183,8 +183,8 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version) // Some stats from the fsys if (_config->FindB("Debug::identcdrom",false) == false) { - struct statfs Buf; - if (statfs(CD.c_str(),&Buf) != 0) + struct statvfs Buf; + if (statvfs(CD.c_str(),&Buf) != 0) return _error->Errno("statfs","Failed to stat the cdrom"); // We use a kilobyte block size to advoid overflow diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 874a9ba97..685bd4228 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: dpkgpm.cc,v 1.14 1999/09/10 02:40:31 jgg Exp $ +// $Id: dpkgpm.cc,v 1.15 1999/12/10 06:30:42 jgg Exp $ /* ###################################################################### DPKG Package Manager - Provide an interface to dpkg @@ -356,7 +356,7 @@ bool pkgDPkgPM::Go() /* No Job Control Stop Env is a magic dpkg var that prevents it from using sigstop */ - setenv("DPKG_NO_TSTP","yes",1); + putenv("DPKG_NO_TSTP=yes"); execvp(Args[0],(char **)Args); cerr << "Could not exec dpkg!" << endl; _exit(100); |