feat(Lib/os): unlink,remove supports dir_fd

Author: litlighilit

src/pylib/Lib/os_impl/posix_like/unlink.nim

@@ -1,11 +1,39 @@
 
 import ./unlinkImpl
+import ./pyCfg
+import ./chkarg
+import ../private/iph_utils
 
+when not InJS:
+  importConfig [
+    os
+  ]
+else:
+  template decl(f, val) =
+    const `HAVE f` = val
+  decl unlinkat, false
 
-proc unlink*[T](p: PathLike[T]) =
-  sys.audit("os.remove", p, -1)
-  unlinkImpl p
+proc unlink*[T](p: PathLike[T], dir_fd=DEFAULT_DIR_FD) =
+  sys.audit("os.remove", p, if dir_fd==DEFAULT_DIR_FD: -1 else: dir_fd)
+  var res: cint
+  with_Py_SUPPRESS_IPH:
+    when HAVE_UNLINKAT:
+      var unlinkat_unavailable = false
+      if dir_fd != DEFAULT_DIR_FD:
+        when HAVE_UNLINKAT_RUNTIME:
+          res = unlinkat(dir_fd.cint, cstring $p, 0)
+        else:
+          unlinkat_unavailable = true
+      else:
+        unlinkImpl(p)
+    else:
+      unlinkImpl(p)
+  when HAVE_UNLINKAT:
+    if unlinkat_unavailable:
+      argument_unavailable_error("dir_fd")
+  if res != 0:
+    raiseExcWithPath(p)
 
-proc remove*[T](p: PathLike[T]) =
+proc remove*[T](p: PathLike[T], dir_fd=DEFAULT_DIR_FD) =
   ## This function is semantically identical to `unlink`_
-  unlink(p)
+  unlink(p, dir_fd)

src/pylib/Lib/os_impl/posix_like/unlinkImpl.nim

@@ -17,13 +17,44 @@ when InJs:
     ]#
 else:
   when defined(windows):
-    template deleteFile(file: untyped): untyped  = deleteFileW(file)
-    template setFileAttributes(file, attrs: untyped): untyped =
-      setFileAttributesW(file, attrs)
+    import ../util/mywinlean
+    type
+      GET_FILEEX_INFO_LEVELS = enum
+        GetFileExInfoStandard = cint 0
+        GetFileExMaxInfoLevel = cint 1
+      WIN32_FILE_ATTRIBUTE_DATA{.importc, header: "<fileapi.h>",
+          incompleteStruct.} = object
+        dwFileAttributes: mywinlean.DWORD
+
+    proc GetFileAttributesExW(lpFileName: LPCWSTR, fInfoLevelId: GET_FILEEX_INFO_LEVELS,
+      lpFileInformation: pointer): BOOL{.importc, header: "<fileapi.h>".}
+    proc Py_DeleteFileW*(lpFileName: LPCWSTR): BOOL =
+      var info: WIN32_FILE_ATTRIBUTE_DATA
+      var find_data: WIN32_FIND_DATAW
+      var is_directory = false
+      var is_link = false
+
+      if GetFileAttributesExW(lpFileName, GetFileExInfoStandard, addr info):
+        is_directory = bool info.dwFileAttributes and FILE_ATTRIBUTE_DIRECTORY
+
+        # Get WIN32_FIND_DATA structure for the path to determine if it is a symlink
+        if is_directory and (info.dwFileAttributes and FILE_ATTRIBUTE_REPARSE_POINT) != 0:
+          let find_data_handle = FindFirstFileW(lpFileName, find_data)
+
+          if find_data_handle != INVALID_HANDLE_VALUE:
+            # IO_REPARSE_TAG_SYMLINK if it is a symlink and
+            # IO_REPARSE_TAG_MOUNT_POINT if it is a junction point.
+            is_link = (find_data.dwReserved0 == IO_REPARSE_TAG_SYMLINK) or
+                      (find_data.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT)
+            FindClose(find_data_handle)
+
+      if is_directory and is_link:
+        return BOOL removeDirectoryW(lpFileName)
+
+      return BOOL deleteFileW(lpFileName)
 
   # from nim-2.1.2/lib/std/private/osfiles.nim `proc tryRemoveFile`
-  proc unlinkAux[T](p: PathLike[T],
-      winIgnoreRO: static[bool] = false  # Python does not
+  proc unlinkAux[T](p: PathLike[T]
     ): bool {.noWeirdTarget.} =
     ## Removes the file at `p`.
     ##
@@ -36,14 +67,8 @@ else:
     let file = $p
     when defined(windows):
       let f = newWideCString(file)
-      if deleteFile(f) != 0:  ## returns TRUE
+      if Py_DeleteFileW(f) != 0:  ## returns TRUE
         return true
-      when winIgnoreRO:
-        let err = getLastError()
-        if err == ERROR_ACCESS_DENIED and
-            setFileAttributes(f, FILE_ATTRIBUTE_NORMAL) != 0 and
-            deleteFile(f) != 0:
-          return true # success
     else:
       if unlink(cstring file) == 0'i32: return true  # success
   proc unlinkImpl*(p: PathLike) =

src/pylib/Lib/os_impl/util/mywinlean.nim

@@ -3,7 +3,7 @@ import std/winlean except DWORD, ULONG
 export winlean except DWORD, ULONG,
   OPEN_EXISTING, FILE_SHARE_READ, FILE_SHARE_WRITE,
   FILE_FLAG_OPEN_REPARSE_POINT, FILE_ATTRIBUTE_DIRECTORY,
-  BY_HANDLE_FILE_INFORMATION
+  BY_HANDLE_FILE_INFORMATION, FILE_ATTRIBUTE_REPARSE_POINT
 import ./get_osfhandle
 export get_osfhandle
 type
@@ -60,7 +60,7 @@ typedef union _LARGE_INTEGER {
 
   WCHAR* = uint16
 
-  WIN32_FIND_DATAW*{.pure, importc, header: "<minwinbase.h>".} = object
+  WIN32_FIND_DATAW*{.importc, header: "<minwinbase.h>".} = object
     dwFileAttributes*: DWORD
     ftCreationTime*: FILETIME
     ftLastAccessTime*: FILETIME
@@ -75,7 +75,7 @@ typedef union _LARGE_INTEGER {
     dwCreatorType*: DWORD ## Obsolete. Do not use.
     wFinderFlags*: WORD ## Obsolete. Do not use.
 
-  BY_HANDLE_FILE_INFORMATION*{.pure, importc, header: "<fileapi.h>".} = object
+  BY_HANDLE_FILE_INFORMATION*{.importc, header: "<fileapi.h>".} = object
     dwFileAttributes*: DWORD
     ftCreationTime*: FILETIME
     ftLastAccessTime*: FILETIME
@@ -87,9 +87,8 @@ typedef union _LARGE_INTEGER {
     nFileIndexHigh*: DWORD
     nFileIndexLow*: DWORD
 
-  FILE_ATTRIBUTE_TAG_INFO*{.pure, importc, header: "<winbase.h>".} = object
+  FILE_ATTRIBUTE_TAG_INFO*{.importc, header: "<winbase.h>".} = object
     FileAttributes*, ReparseTag*: DWORD
-
 const
   ERROR_INVALID_HANDLE* = 6
   ERROR_NOT_ENOUGH_MEMORY* = 8
@@ -204,3 +203,6 @@ proc CreateFileW*(
 
 proc IsReparseTagNameSurrogate*(tag: DWORD): BOOL {.
     importc, header: "<winnt.h>".}
+
+proc FindClose*(hFindFile: Handle): BOOL{.discardable,
+  importc, header: "<fileapi.h>".}

src/pylib/pyconfig/os.nim

@@ -1,8 +1,20 @@
 
 import ./util
+import ./have_x_runtime
 const
   DEFAULT_DIR_FD* = from_c_int(AT_FDCWD, "<fcntl.h>", -100)
   AT_SYMLINK_NOFOLLOW* = from_c_int(AT_SYMLINK_NOFOLLOW, "<fcntl.h>", 0x100)
 
   HAVE_OPENAT* = true
   HAVE_FTRUNCATE* = true
+
+AC_CHECK_FUNC(unlinkat)
+
+check_func_runtime unlinkat, 10.10, 8.0
+
+
+when HAVE_UNLINKAT_RUNTIME and not declared(unlinkat):
+  proc unlinkat*(dir_fd: cint, path: cstring, flag: cint): cint{.importc,
+    header: "<unistd.h>".}
+  let AT_REMOVEDIR*{.importc, header: "<fcntl.h>".}: cint
+