merged from debian-experimental-ma

[apt.git] / apt-inst / dirstream.cc

diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 41dbf44034bb85a24417179f441508b4dc9536fa..586bbf739d71572f667ae73c867c8492416e9741 100644 (file)
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: dirstream.cc,v 1.2 2001/02/20 07:03:16 jgg Exp $
+// $Id: dirstream.cc,v 1.3.2.1 2004/01/16 18:58:50 mdz Exp $
 /* ######################################################################
 
    Directory Stream 
@@ -11,10 +11,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/dirstream.h"
-#endif
-
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/error.h>
 
@@ -24,6 +20,7 @@
 #include <errno.h>
 #include <utime.h>
 #include <unistd.h>
+#include <apti18n.h>
                                                                        /*}}}*/
 
 // DirStream::DoItem - Process an item                                 /*{{{*/
@@ -41,15 +38,15 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
         int iFd = open(Itm.Name,O_NDELAY|O_WRONLY|O_CREAT|O_TRUNC|O_APPEND,
                       Itm.Mode);
         if (iFd < 0)
-           return _error->Errno("open","Failed write file %s",
+           return _error->Errno("open",_("Failed to write file %s"),
                                 Itm.Name);
         
         // fchmod deals with umask and fchown sets the ownership
         if (fchmod(iFd,Itm.Mode) != 0)
-           return _error->Errno("fchmod","Failed write file %s",
+           return _error->Errno("fchmod",_("Failed to write file %s"),
                                 Itm.Name);
         if (fchown(iFd,Itm.UID,Itm.GID) != 0 && errno != EPERM)
-           return _error->Errno("fchown","Failed write file %s",
+           return _error->Errno("fchown",_("Failed to write file %s"),
                                 Itm.Name);
         Fd = iFd;
         return true;
@@ -60,6 +57,22 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
       case Item::CharDevice:
       case Item::BlockDevice:
       case Item::Directory:
+      {
+        struct stat Buf;
+        // check if the dir is already there, if so return true
+        if (stat(Itm.Name,&Buf) == 0)
+        {
+           if(S_ISDIR(Buf.st_mode))
+              return true;
+           // something else is there already, return false
+           return false;
+        }
+        // nothing here, create the dir
+        if(mkdir(Itm.Name,Itm.Mode) < 0)
+           return false;
+        return true;
+        break;
+      }
       case Item::FIFO:
       break;
    }
@@ -76,7 +89,7 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd)
       return true;
    
    if (close(Fd) != 0)
-      return _error->Errno("close","Failed to close file %s",Itm.Name);
+      return _error->Errno("close",_("Failed to close file %s"),Itm.Name);
 
    /* Set the modification times. The only way it can fail is if someone
       has futzed with our file, which is intolerable :> */
@@ -84,7 +97,7 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd)
    Time.actime = Itm.MTime;
    Time.modtime = Itm.MTime;
    if (utime(Itm.Name,&Time) != 0)
-      _error->Errno("utime","Failed to close file %s",Itm.Name);
+      _error->Errno("utime",_("Failed to close file %s"),Itm.Name);
    
    return true;   
 }