improve umask/fchmod code readability

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index c6072ca15a7859a7d947698984f7c2f25085309b..69a675648f2551a6b129dc201904a2069b666235 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1067,9 +1067,12 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co
    if_FLAGGED_SET(Exclusive, O_EXCL);
    #undef if_FLAGGED_SET
 
-   // there is no getumask() so we read it by setting it and reset
-   mode_t current_umask = umask(0);
-   umask(current_umask);
+   // umask() will always set the umask and return the previous value, so
+   // we first set the umask and then reset it to the old value
+   mode_t CurrentUmask = umask(0);
+   umask(CurrentUmask);
+   // calculate the actual file permissions (just like open/creat)
+   mode_t FilePermissions = (AccessMode & ~CurrentUmask);
 
    if ((Mode & Atomic) == Atomic)
    {
@@ -1084,11 +1087,11 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co
       TemporaryFileName = string(name);
       free(name);
 
-      if(AccessMode != 600 && fchmod(iFd, AccessMode & ~current_umask) == -1)
+      if(FilePermissions != 600 && fchmod(iFd, FilePermissions) == -1)
           return FileFdErrno("fchmod", "Could not change permissions for temporary file %s", TemporaryFileName.c_str());
    }
    else
-      iFd = open(FileName.c_str(), fileflags, AccessMode & ~current_umask);
+      iFd = open(FileName.c_str(), fileflags, FilePermissions);
 
    this->FileName = FileName;
    if (iFd == -1 || OpenInternDescriptor(Mode, compressor) == false)