Changeset 3008 in kBuild for trunk/src/lib/nt/ntstat.c

Timestamp:

Nov 6, 2016 4:50:03 PM (8 years ago)

Author:

bird

Message:

birdStatHandle*: Don't get the filename it's a directory, birdFileInfoToMode won't need it.

File:

• trunk/src/lib/nt/ntstat.c (modified) (2 diffs)

trunk/src/lib/nt/ntstat.c

@@ -69 +69 @@
 static int birdIsFileExecutable(const char *pszName)
 {
-    const char     *pszExt = NULL;
-    char            szExt[8];
-    size_t          cchExt;
-    unsigned        i;
-    char            ch;
-
-    /* Look for a 3 char extension. */
-    ch = *pszName++;
-    if (!ch)
-        return 0;
-
-    while ((ch = *pszName++) != '\0')
-        if (ch == '.')
-            pszExt = pszName;
-
-    if (!pszExt)
-        return 0;
-    pszExt++;
-    cchExt = pszName - pszExt;
-    if (cchExt != 3)
-        return 0;
-
-    /* Copy the extension out and lower case it.  Fail immediately on non-alpha chars. */
-    for (i = 0; i < cchExt; i++, pszExt++)
-    {
-        ch = *pszExt;
-        if (ch >= 'a' && ch <= 'z')
-        { /* likely */ }
-        else if (ch >= 'A' && ch <= 'Z')
-            ch += 'a' - 'A';
-        else
+    if (pszName)
+    {
+        const char     *pszExt = NULL;
+        char            szExt[8];
+        size_t          cchExt;
+        unsigned        i;
+        char            ch;
+
+        /* Look for a 3 char extension. */
+        ch = *pszName++;
+        if (!ch)
             return 0;
-        szExt[i] = ch;
-    }
-    szExt[i] = '\0';
-
-    return birdIsExecutableExtension(szExt);
+
+        while ((ch = *pszName++) != '\0')
+            if (ch == '.')
+                pszExt = pszName;
+
+        if (!pszExt)
+            return 0;
+        pszExt++;
+        cchExt = pszName - pszExt;
+        if (cchExt != 3)
+            return 0;
+
+        /* Copy the extension out and lower case it.  Fail immediately on non-alpha chars. */
+        for (i = 0; i < cchExt; i++, pszExt++)
+        {
+            ch = *pszExt;
+            if (ch >= 'a' && ch <= 'z')
+            { /* likely */ }
+            else if (ch >= 'A' && ch <= 'Z')
+                ch += 'a' - 'A';
+            else
+                return 0;
+            szExt[i] = ch;
+        }
+        szExt[i] = '\0';
+
+        return birdIsExecutableExtension(szExt);
+    }
+
+    return 0;
 }
 
@@ -389 +394 @@
     }
 
-    if (MY_NT_SUCCESS(rcNt) && !pszPath && !pwszPath)
+    if (   MY_NT_SUCCESS(rcNt)
+        && !pszPath
+        && !pwszPath
+        && !(BasicInfo.FileAttributes & FILE_ATTRIBUTE_DIRECTORY))
     {
         cbNameInfo = 0x10020;