Change method used to get file information. It turns out that

GetFileInformationByHandle is returning incorrect time stamps for
files on a Samba filesystem, but FindFirstFile returns correct time
stamps in the same circumstance.  This discrepancy becomes apparent
when switching between daylight-savings and standard time.

diff --git a/v7/src/microcode/ntfs.c b/v7/src/microcode/ntfs.c
index b2f3fbe0dc9fbc963cbd389c7997d420000d2656..d779f5c814d29bd8a5a2d57ea61b88ce1f285041 100644 (file)
--- a/v7/src/microcode/ntfs.c
+++ b/v7/src/microcode/ntfs.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ntfs.c,v 1.16 1997/08/23 02:51:59 cph Exp $
+$Id: ntfs.c,v 1.17 1997/10/26 09:15:04 cph Exp $
 
 Copyright (c) 1992-97 Massachusetts Institute of Technology
 
@@ -37,47 +37,26 @@ MIT in each case. */
 #include <string.h>
 #include "outf.h"
 \f
-static HANDLE create_file_for_info (const char *);
-
-static enum get_file_info_result get_file_info_from_dir
-  (const char *, BY_HANDLE_FILE_INFORMATION *);
-
-enum get_file_info_result
-NT_get_file_info (const char * namestring, BY_HANDLE_FILE_INFORMATION * info)
-{
-  HANDLE hfile = (create_file_for_info (namestring));
-  if (hfile == INVALID_HANDLE_VALUE)
-    {
-      DWORD code = (GetLastError ());
-      if (STAT_NOT_FOUND_P (code))
-       return (gfi_not_found);
-      if (STAT_NOT_ACCESSIBLE_P (code))
-       return (get_file_info_from_dir (namestring, info));
-      NT_error_api_call (code, apicall_CreateFile);
-    }
-  if (!GetFileInformationByHandle (hfile, info))
-    {
-      DWORD code = (GetLastError ());
-      (void) CloseHandle (hfile);
-      if (STAT_NOT_FOUND_P (code))
-       return (gfi_not_found);
-      if (STAT_NOT_ACCESSIBLE_P (code))
-       return (gfi_not_accessible);
-      NT_error_api_call (code, apicall_GetFileInformationByHandle);
-    }
-  NT_close_file_handle (hfile);
-  return (gfi_ok);
-}
-
 /* Incredible kludge.  Some files (e.g. \pagefile.sys) cannot be
    accessed by the usual technique, but much of the same information
-   is available by reading the directory.  More M$ bullshit.  */
-static enum get_file_info_result
-get_file_info_from_dir (const char * namestring,
-                       BY_HANDLE_FILE_INFORMATION * info)
+   is available by reading the directory.  Additionally,
+   GetFileInformationByHandle returns incorrect time-stamp information
+   for some files (specifically, Samba files), but FindFirstFile
+   returns correct information.  Go figure.  More M$ bullshit.  */
+enum get_file_info_result
+NT_get_file_info (const char * namestring, BY_HANDLE_FILE_INFORMATION * info)
 {
+  char nscopy [MAX_PATH];
   WIN32_FIND_DATA fi;
-  HANDLE handle = (FindFirstFile (namestring, (&fi)));
+  HANDLE handle;
+
+  strcpy (nscopy, namestring);
+  {
+    unsigned int len = (strlen (nscopy));
+    if ((len > 0) && ((nscopy [len - 1]) == '\\'))
+      (nscopy [len - 1]) = '\0';
+  }
+  handle = (FindFirstFile (nscopy, (&fi)));
   if (handle == INVALID_HANDLE_VALUE)
     {
       DWORD code = (GetLastError ());
@@ -101,25 +80,6 @@ get_file_info_from_dir (const char * namestring,
   return (gfi_ok);
 }
 
-static HANDLE
-create_file_for_info (const char * namestring)
-{
-  return
-    (CreateFile (namestring,
-                0,
-                (FILE_SHARE_READ | FILE_SHARE_WRITE),
-                0,
-                OPEN_EXISTING,
-                FILE_FLAG_BACKUP_SEMANTICS,
-                NULL));
-}
-
-void
-NT_close_file_handle (HANDLE hfile)
-{
-  STD_BOOL_API_CALL (CloseHandle, (hfile));
-}
-\f
 enum file_existence
 DEFUN (OS_file_existence_test, (name), CONST char * name)
 {

diff --git a/v7/src/microcode/ntfs.h b/v7/src/microcode/ntfs.h
index 1d643a74052c50d0550f67169aac1584a0a14884..ae2fbdb440c2f21e9d99265b76c9d24bab4033f2 100644 (file)
--- a/v7/src/microcode/ntfs.h
+++ b/v7/src/microcode/ntfs.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ntfs.h,v 1.1 1997/08/23 02:52:23 cph Exp $
+$Id: ntfs.h,v 1.2 1997/10/26 09:15:18 cph Exp $
 
 Copyright (c) 1997 Massachusetts Institute of Technology
 
@@ -39,7 +39,6 @@ enum get_file_info_result { gfi_ok, gfi_not_found, gfi_not_accessible };
 
 extern enum get_file_info_result NT_get_file_info
   (const char *, BY_HANDLE_FILE_INFORMATION *);
-extern void NT_close_file_handle (HANDLE);
 
 #define STAT_NOT_FOUND_P(code)                                         \
   (((code) == ERROR_FILE_NOT_FOUND)                                    \

diff --git a/v7/src/microcode/prntfs.c b/v7/src/microcode/prntfs.c
index ff98fc24b9c404767b6a5dfc0280744a16901f38..99cdb627f47544f8747d92c9e03624b9abf3b1e9 100644 (file)
--- a/v7/src/microcode/prntfs.c
+++ b/v7/src/microcode/prntfs.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: prntfs.c,v 1.13 1997/08/23 02:52:05 cph Exp $
+$Id: prntfs.c,v 1.14 1997/10/26 09:15:10 cph Exp $
 
 Copyright (c) 1993-97 Massachusetts Institute of Technology
 
@@ -185,7 +185,7 @@ The file must exist and you must be the owner.")
     }
   if (disable_ro)
     STD_BOOL_API_CALL (SetFileAttributes, (filename, attributes));
-  NT_close_file_handle (hfile);
+  STD_BOOL_API_CALL (CloseHandle, (hfile));
   PRIMITIVE_RETURN (UNSPECIFIC);
 }
 \f