correct some style/performance/warnings from cppcheck

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

diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index bb0bf96c18a480bdaa32727b73637224a85f2b92..b62bdcae12457e0440ea3910093449218da5a7cc 100644 (file)
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -20,7 +20,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>

-#include <utime.h>

 #include <unistd.h>
 #include <apti18n.h>
                                                                        /*}}}*/
 #include <unistd.h>
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -46,15 +45,13 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
         // fchmod deals with umask and fchown sets the ownership
         if (fchmod(iFd,Itm.Mode) != 0)
         {
         // fchmod deals with umask and fchown sets the ownership
         if (fchmod(iFd,Itm.Mode) != 0)
         {

-           _error->Errno("fchmod",_("Failed to write file %s"), Itm.Name);

            close(iFd);
            close(iFd);

-           return false;
+           return _error->Errno("fchmod",_("Failed to write file %s"), Itm.Name);

         }
         if (fchown(iFd,Itm.UID,Itm.GID) != 0 && errno != EPERM)
         {
         }
         if (fchown(iFd,Itm.UID,Itm.GID) != 0 && errno != EPERM)
         {

-           return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name);

            close(iFd);
            close(iFd);

-           return false;
+           return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name);

         }
         Fd = iFd;
         return true;
         }
         Fd = iFd;
         return true;


@@ -95,19 +92,18 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd)
 {
    if (Fd < 0)
       return true;
 {
    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 :> */
 
    /* 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 timespec times[2];
+   times[0].tv_sec = times[1].tv_sec = Itm.MTime;
+   times[0].tv_nsec = times[1].tv_nsec = 0;
+   if (futimens(Fd, times) != 0)
+      _error->Errno("futimens", "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                          /*{{{*/
 }
                                                                        /*}}}*/
 // DirStream::Fail - Failed processing a file                          /*{{{*/