X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/a0732d0baf2d71a9360a2206b94236a0e3496097..c307a4f0aa29c9c52a0e028524d21b448a53d09b:/apt-inst/dirstream.cc

diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 7ae93c9b0..65d1aa188 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -11,9 +11,7 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/dirstream.h"
-#endif
+#include<config.h>
 
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/error.h>
@@ -47,11 +45,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 +63,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;
    }