Merge remote-tracking branch 'mvo/feature/build-dep-dsc2' into debian/experimental

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

diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 7ae93c9b0c11b3779802d0e66efbbf03ae448348..39ebb3bb4433699f8e7ec6c6f25e4f004c0c7986 100644 (file)
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -11,18 +11,15 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/dirstream.h"
-#endif
+#include<config.h>
 
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/error.h>
 
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+#include <sys/time.h>
 #include <errno.h>
-#include <utime.h>
 #include <unistd.h>
 #include <apti18n.h>
                                                                        /*}}}*/
@@ -47,11 +44,15 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
         
         // fchmod deals with umask and fchown sets the ownership
         if (fchmod(iFd,Itm.Mode) != 0)
-           return _error->Errno("fchmod",_("Failed to write file %s"),
-                                Itm.Name);
+        {
+           close(iFd);
+           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 to write file %s"),
-                                Itm.Name);
+        {
+           close(iFd);
+           return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name);
+        }
         Fd = iFd;
         return true;
       }
@@ -61,6 +62,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;
    }
@@ -75,25 +92,24 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd)
 {
    if (Fd < 0)
       return true;
-   
-   if (close(Fd) != 0)
-      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 :> */
-   struct utimbuf Time;
-   Time.actime = Itm.MTime;
-   Time.modtime = Itm.MTime;
-   if (utime(Itm.Name,&Time) != 0)
-      _error->Errno("utime",_("Failed to close file %s"),Itm.Name);
-   
-   return true;   
+   struct timeval times[2];
+   times[0].tv_sec = times[1].tv_sec = Itm.MTime;
+   times[0].tv_usec = times[1].tv_usec = 0;
+   if (utimes(Itm.Name, times) != 0)
+      _error->Errno("utimes", "Failed to set modification time for %s",Itm.Name);
+
+   if (close(Fd) != 0)
+      return _error->Errno("close",_("Failed to close file %s"),Itm.Name);
+   return true;
 }
                                                                        /*}}}*/
 // DirStream::Fail - Failed processing a file                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool pkgDirStream::Fail(Item &Itm,int Fd)
+bool pkgDirStream::Fail(Item &/*Itm*/, int Fd)
 {
    if (Fd < 0)
       return true;