Changeset 1939

Timestamp:

05/12/2007 22:40:01 (4 years ago)

Author:

chris

Message:

Close process token in EnableBackupRights?(), thanks Charles!

Improve error messages in EnableBackupRights?() when failing to
enable the backup privilege.

Use file size returned by GetFileInformationByHandle? in emu_fstat
instead of calling GetFileSizeEx?(), thanks Charles!

File:

• box/chris/general/lib/win32/emu.cpp (modified) (7 diffs)

box/chris/general/lib/win32/emu.cpp

@@ -165 +165 @@
 struct passwd gTempPasswd;
 
-bool EnableBackupRights( void )
+bool EnableBackupRights()
 {
         HANDLE hToken;
@@ -171 +171 @@
 
         //open current process to adjust privileges
-        if( !OpenProcessToken( GetCurrentProcess( ), 
-                TOKEN_ADJUST_PRIVILEGES, 
-                &hToken ))
-        {
-                printf( "Cannot open process token: error %d\n", 
-                        (int)GetLastError() );
+        if(!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, 
+                &hToken))
+        {
+                ::syslog(LOG_ERR, "Failed to open process token: %s",
+                        GetErrorMessage(GetLastError()).c_str());
                 return false;
         }
@@ -183 +182 @@
         //first, look up the LUID for the backup privilege
 
-        if( !LookupPrivilegeValue( NULL, //this system
+        if (!LookupPrivilegeValue(
+                NULL, //this system
                 SE_BACKUP_NAME, //the name of the privilege
-                &( token_priv.Privileges[0].Luid )) ) //result
-        {
-                printf( "Cannot lookup backup privilege: error %d\n", 
-                        (int)GetLastError( ) );
+                &( token_priv.Privileges[0].Luid ))) //result
+        {
+                ::syslog(LOG_ERR, "Failed to lookup backup privilege: %s",
+                        GetErrorMessage(GetLastError()).c_str());
+                CloseHandle(hToken);
                 return false;
         }
@@ -199 +200 @@
         // any need to save current state
 
-        if( !AdjustTokenPrivileges( hToken, //our process token
+        if (!AdjustTokenPrivileges(
+                hToken, //our process token
                 false,  //we're not disabling everything
                 &token_priv, //address of structure
-                sizeof( token_priv ), //size of structure
-                NULL, NULL )) //don't save current state
+                sizeof(token_priv), //size of structure
+                NULL, NULL)) //don't save current state
         {
                 //this function is a little tricky - if we were adjusting
                 //more than one privilege, it could return success but not
                 //adjust them all - in the general case, you need to trap this
-                printf( "Could not enable backup privileges: error %d\n", 
-                        (int)GetLastError( ) );
+                ::syslog(LOG_ERR, "Failed to enable backup privilege: %s",
+                        GetErrorMessage(GetLastError()).c_str());
+                CloseHandle(hToken);
                 return false;
 
         }
-        else
-        {
-                return true;
-        }
+
+        CloseHandle(hToken);
+        return true;
 }
 
@@ -703 +705 @@
         ULARGE_INTEGER conv;
         conv.HighPart = fi.nFileIndexHigh;
-        conv.LowPart = fi.nFileIndexLow;
+        conv.LowPart  = fi.nFileIndexLow;
         st->st_ino = (_ino_t)conv.QuadPart;
 
@@ -717 +719 @@
         else
         {
-                // size of the file
-                LARGE_INTEGER st_size;
-                memset(&st_size, 0, sizeof(st_size));
-
-                if (!GetFileSizeEx(hdir, &st_size))
-                {
-                        ::syslog(LOG_WARNING, "Failed to get file size: "
-                                "%s", GetErrorMessage(GetLastError()).c_str());
-                        errno = EACCES;
-                        return -1;
-                }
-
-                conv.HighPart = st_size.HighPart;
-                conv.LowPart = st_size.LowPart;
+                conv.HighPart = fi.nFileSizeHigh;
+                conv.LowPart  = fi.nFileSizeLow;
                 st->st_size = (_off_t)conv.QuadPart;
         }
@@ -1079 +1069 @@
 
         pDir->name = ConvertUtf8ToWideString(dirName.c_str());
-        // We are responsible for freeing dir->name
+        // We are responsible for freeing dir->name with delete[]
         
         if (pDir->name == NULL)