From 8d4f0be202eecd3c9250fb5718e5221f3cb2dc11 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 18 Apr 2020 09:58:40 -0700 Subject: [PATCH] io.files.trash: use normalize-path. --- extra/io/files/trash/macosx/macosx.factor | 4 +++- extra/io/files/trash/unix/unix.factor | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/extra/io/files/trash/macosx/macosx.factor b/extra/io/files/trash/macosx/macosx.factor index bee7d06965..f7be3e4179 100644 --- a/extra/io/files/trash/macosx/macosx.factor +++ b/extra/io/files/trash/macosx/macosx.factor @@ -2,7 +2,8 @@ ! See http://factorcode.org/license.txt for BSD license USING: alien.c-types alien.strings alien.syntax classes.struct -core-foundation io.encodings.utf8 io.files.trash kernel system ; +core-foundation io.backend io.encodings.utf8 io.files.trash +kernel system ; IN: io.files.trash.macosx @@ -59,5 +60,6 @@ FUNCTION: OSStatus FSPathMakeRefWithOptions ( PRIVATE> M: macosx send-to-trash ( path -- ) + normalize-path f kFSFileOperationDefaultOptions FSMoveObjectToTrashSync check-err ; diff --git a/extra/io/files/trash/unix/unix.factor b/extra/io/files/trash/unix/unix.factor index 1d27d44000..730de60c0f 100644 --- a/extra/io/files/trash/unix/unix.factor +++ b/extra/io/files/trash/unix/unix.factor @@ -2,10 +2,10 @@ ! See http://factorcode.org/license.txt for BSD license USING: accessors calendar combinators.short-circuit environment -formatting io io.directories io.encodings.utf8 io.files -io.files.info io.files.info.unix io.files.trash io.files.types -io.pathnames kernel math math.parser sequences system unix.stat -unix.users xdg ; +formatting io io.backend io.directories io.encodings.utf8 +io.files io.files.info io.files.info.unix io.files.trash +io.files.types io.pathnames kernel math math.parser sequences +system unix.stat unix.users xdg ; IN: io.files.trash.unix @@ -65,7 +65,7 @@ IN: io.files.trash.unix PRIVATE> M: unix send-to-trash ( path -- ) - dup trash-path [ + normalize-path dup trash-path [ "files" append-path [ make-user-directory ] keep to-directory safe-file-name ] [