Changeset 2851 for trunk/src/lib/nt/ntstat.c

Timestamp:

Aug 31, 2016, 7:30:52 PM (9 years ago)

Author:

bird

Message:

updates

Location:

trunk/src/lib

Files:

• . (modified) (1 prop)
• nt/ntstat.c (modified) (4 diffs)

trunk/src/lib/nt/ntstat.c

@@ -190 +190 @@
  * @param   pBuf                The MY_FILE_ID_FULL_DIR_INFORMATION entry.
  * @param   pszPath             Optionally, the path for X bit checks.
+ * @remarks Caller sets st_dev.
  */
 void birdStatFillFromFileIdFullDirInfo(BirdStat_T *pStat, MY_FILE_ID_FULL_DIR_INFORMATION const *pBuf, const char *pszPath)
@@ -216 +217 @@
 
 
+/**
+ * Fills in a stat structure from an MY_FILE_ID_BOTH_DIR_INFORMATION entry.
+ *
+ * @param   pStat               The stat structure.
+ * @param   pBuf                The MY_FILE_ID_BOTH_DIR_INFORMATION entry.
+ * @param   pszPath             Optionally, the path for X bit checks.
+ * @remarks Caller sets st_dev.
+ */
+void birdStatFillFromFileIdBothDirInfo(BirdStat_T *pStat, MY_FILE_ID_BOTH_DIR_INFORMATION const *pBuf, const char *pszPath)
+{
+    pStat->st_mode          = birdFileInfoToMode(INVALID_HANDLE_VALUE, pBuf->FileAttributes, pszPath,
+                                                 NULL, &pStat->st_dirsymlink);
+    pStat->st_padding0[0]   = 0;
+    pStat->st_padding0[1]   = 0;
+    pStat->st_size          = pBuf->EndOfFile.QuadPart;
+    birdNtTimeToTimeSpec(pBuf->CreationTime.QuadPart,   &pStat->st_birthtim);
+    birdNtTimeToTimeSpec(pBuf->ChangeTime.QuadPart,     &pStat->st_ctim);
+    birdNtTimeToTimeSpec(pBuf->LastWriteTime.QuadPart,  &pStat->st_mtim);
+    birdNtTimeToTimeSpec(pBuf->LastAccessTime.QuadPart, &pStat->st_atim);
+    pStat->st_ino           = pBuf->FileId.QuadPart;
+    pStat->st_nlink         = 1;
+    pStat->st_rdev          = 0;
+    pStat->st_uid           = 0;
+    pStat->st_gid           = 0;
+    pStat->st_padding1[0]   = 0;
+    pStat->st_padding1[1]   = 0;
+    pStat->st_padding1[2]   = 0;
+    pStat->st_blksize       = 65536;
+    pStat->st_blocks        = (pBuf->AllocationSize.QuadPart + BIRD_STAT_BLOCK_SIZE - 1)
+                            / BIRD_STAT_BLOCK_SIZE;
+}
+
+
+/**
+ * Fills in a stat structure from an MY_FILE_BOTH_DIR_INFORMATION entry.
+ *
+ * @param   pStat               The stat structure.
+ * @param   pBuf                The MY_FILE_BOTH_DIR_INFORMATION entry.
+ * @param   pszPath             Optionally, the path for X bit checks.
+ * @remarks Caller sets st_dev.
+ */
+void birdStatFillFromFileBothDirInfo(BirdStat_T *pStat, MY_FILE_BOTH_DIR_INFORMATION const *pBuf, const char *pszPath)
+{
+    pStat->st_mode          = birdFileInfoToMode(INVALID_HANDLE_VALUE, pBuf->FileAttributes, pszPath,
+                                                 NULL, &pStat->st_dirsymlink);
+    pStat->st_padding0[0]   = 0;
+    pStat->st_padding0[1]   = 0;
+    pStat->st_size          = pBuf->EndOfFile.QuadPart;
+    birdNtTimeToTimeSpec(pBuf->CreationTime.QuadPart,   &pStat->st_birthtim);
+    birdNtTimeToTimeSpec(pBuf->ChangeTime.QuadPart,     &pStat->st_ctim);
+    birdNtTimeToTimeSpec(pBuf->LastWriteTime.QuadPart,  &pStat->st_mtim);
+    birdNtTimeToTimeSpec(pBuf->LastAccessTime.QuadPart, &pStat->st_atim);
+    pStat->st_ino           = 0;
+    pStat->st_nlink         = 1;
+    pStat->st_rdev          = 0;
+    pStat->st_uid           = 0;
+    pStat->st_gid           = 0;
+    pStat->st_padding1[0]   = 0;
+    pStat->st_padding1[1]   = 0;
+    pStat->st_padding1[2]   = 0;
+    pStat->st_blksize       = 65536;
+    pStat->st_blocks        = (pBuf->AllocationSize.QuadPart + BIRD_STAT_BLOCK_SIZE - 1)
+                            / BIRD_STAT_BLOCK_SIZE;
+}
+
+
 int birdStatHandle(HANDLE hFile, BirdStat_T *pStat, const char *pszPath)
 {
@@ -359 +426 @@
 
 
+/**
+ * Generates a device number from the volume information.
+ *
+ * @returns Device number.
+ * @param   pVolInfo            Volume information.
+ */
+unsigned __int64 birdVolumeInfoToDeviceNumber(const MY_FILE_FS_VOLUME_INFORMATION *pVolInfo)
+{
+    return pVolInfo->VolumeSerialNumber
+         | (pVolInfo->VolumeCreationTime.QuadPart << 32);
+}
+
+
+/**
+ * Quries the volume information and generates a device number from it.
+ *
+ * @returns NT status code.
+ * @param   hFile               The file/dir/whatever to query the volume info
+ *                              and device number for.
+ * @param   pVolInfo            User provided buffer for volume information.
+ * @param   cbVolInfo           The size of the buffer.
+ * @param   puDevNo             Where to return the device number.  This is set
+ *                              to zero on failure.
+ */
+MY_NTSTATUS birdQueryVolumeDeviceNumber(HANDLE hFile, MY_FILE_FS_VOLUME_INFORMATION *pVolInfo, size_t cbVolInfo,
+                                        unsigned __int64 *puDevNo)
+{
+    MY_IO_STATUS_BLOCK  Ios;
+    MY_NTSTATUS         rcNt;
+
+    Ios.u.Status    = -1;
+    Ios.Information = -1;
+
+    pVolInfo->VolumeSerialNumber = 0;
+    pVolInfo->VolumeCreationTime.QuadPart = 0;
+
+    rcNt = g_pfnNtQueryVolumeInformationFile(hFile, &Ios, pVolInfo, (LONG)cbVolInfo, MyFileFsVolumeInformation);
+    if (MY_NT_SUCCESS(rcNt))
+    {
+        *puDevNo = birdVolumeInfoToDeviceNumber(pVolInfo);
+        return Ios.u.Status;
+    }
+    *puDevNo = 0;
+    return rcNt;
+}
+
+
 static int birdStatInternal(const char *pszPath, BirdStat_T *pStat, int fFollow)
 {
@@ -429 +543 @@
 
                     /* Get the serial number, reusing the buffer from above. */
-                    rcNt = g_pfnNtQueryVolumeInformationFile(hFile, &Ios, pBuf, cbBuf, MyFileFsVolumeInformation);
+                    rcNt = birdQueryVolumeDeviceNumber(hFile, (MY_FILE_FS_VOLUME_INFORMATION *)pBuf, cbBuf, &pStat->st_dev);
                     if (MY_NT_SUCCESS(rcNt))
-                        rcNt = Ios.u.Status;
-                    if (MY_NT_SUCCESS(rcNt))
-                    {
-                        MY_FILE_FS_VOLUME_INFORMATION const *pVolInfo = (MY_FILE_FS_VOLUME_INFORMATION const *)pBuf;
-                        pStat->st_dev       = pVolInfo->VolumeSerialNumber
-                                            | (pVolInfo->VolumeCreationTime.QuadPart << 32);
                         rc = 0;
-                    }
                     else
-                    {
-                        pStat->st_dev       = 0;
                         rc = birdSetErrnoFromNt(rcNt);
-                    }
                 }