Changeset 3223 in kBuild

Timestamp:

Mar 31, 2018 2:29:56 AM (7 years ago)

Author:

bird

Message:

nt/ntstat.c: Use NtQueryFullAttributesFile for implementing birdStatModTimeOnly instead of open+query+close, only using the latter if we encounter a reparse point.

Location:

trunk/src/lib/nt

Files:

• nthlp.h (modified) (2 diffs)
• nthlpfs.c (modified) (1 diff)
• ntstat.c (modified) (1 diff)
• ntstuff.h (modified) (1 diff)

trunk/src/lib/nt/nthlp.h

@@ -54 +54 @@
 int         birdSetErrnoToBadFileNo(void);
 
-
 HANDLE      birdOpenFile(const char *pszPath, ACCESS_MASK fDesiredAccess, ULONG fFileAttribs,
                          ULONG fShareAccess, ULONG fCreateDisposition, ULONG fCreateOptions, ULONG fObjAttribs);
@@ -74 +73 @@
 HANDLE      birdOpenCurrentDirectory(void);
 void        birdCloseFile(HANDLE hFile);
+
+int         birdIsPathDirSpec(const char *pszPath);
 int         birdDosToNtPath(const char *pszPath, MY_UNICODE_STRING *pNtPath);
 int         birdDosToNtPathW(const wchar_t *pwszPath, MY_UNICODE_STRING *pNtPath);

trunk/src/lib/nt/nthlpfs.c

@@ -83 +83 @@
 
 
-static int birdIsPathDirSpec(const char *pszPath)
+int birdIsPathDirSpec(const char *pszPath)
 {
     char ch, ch2;

trunk/src/lib/nt/ntstat.c

@@ -955 +955 @@
 int birdStatModTimeOnly(const char *pszPath, BirdTimeSpec_T *pTimeSpec, int fFollowLink)
 {
-    MY_FILE_BASIC_INFORMATION BasicInfo;
-    int rc = birdStatOnlyInternal(pszPath, fFollowLink, &BasicInfo);
-    if (!rc)
-        birdNtTimeToTimeSpec(BasicInfo.LastWriteTime.QuadPart, pTimeSpec);
-    return rc;
-}
-
-
-
+    /*
+     * Convert the path and call NtQueryFullAttributesFile.
+     *
+     * Note! NtQueryAttributesFile cannot be used as it only returns attributes.
+     */
+    MY_UNICODE_STRING  NtPath;
+
+    birdResolveImports();
+    if (birdDosToNtPath(pszPath, &NtPath) == 0)
+    {
+        MY_OBJECT_ATTRIBUTES                ObjAttr;
+        MY_FILE_NETWORK_OPEN_INFORMATION    Info;
+        MY_NTSTATUS                         rcNt;
+
+        memset(&Info, 0xfe, sizeof(Info));
+
+        MyInitializeObjectAttributes(&ObjAttr, &NtPath, OBJ_CASE_INSENSITIVE, NULL /*hRoot*/, NULL /*pSecAttr*/);
+        rcNt = g_pfnNtQueryFullAttributesFile(&ObjAttr, &Info);
+
+        birdFreeNtPath(&NtPath);
+        if (MY_NT_SUCCESS(rcNt))
+        {
+            birdNtTimeToTimeSpec(Info.LastWriteTime.QuadPart, pTimeSpec);
+
+            /* Do the trailing slash check. */
+            if (   (Info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+                || !birdIsPathDirSpec(pszPath))
+            {
+                MY_FILE_BASIC_INFORMATION BasicInfo;
+                if (   !(Info.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
+                    || !fFollowLink)
+                    return 0;
+
+                /* Fallback on birdStatOnlyInternal to follow the reparse point.  */
+                if (!birdStatOnlyInternal(pszPath, fFollowLink, &BasicInfo))
+                {
+                    birdNtTimeToTimeSpec(BasicInfo.LastWriteTime.QuadPart, pTimeSpec);
+                    return 0;
+                }
+            }
+            else
+                errno = ENOTDIR;
+        }
+        else
+            birdSetErrnoFromNt(rcNt);
+    }
+    return -1;
+}
+
+
+

trunk/src/lib/nt/ntstuff.h

@@ -179 +179 @@
     LARGE_INTEGER   EndOfFile;
     ULONG           FileAttributes;
+    ULONG           AlignmentPadding;
 } MY_FILE_NETWORK_OPEN_INFORMATION;