From 03136b8b3ca798f2b4b1770cd84150561515b28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sun, 19 Dec 2004 00:35:16 +0000
Subject: [PATCH] Use BPath to normalise paths so [un]trash foo/ actually works

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10490 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/bin/trash.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/apps/bin/trash.cpp b/src/apps/bin/trash.cpp
index 670cc2b033..ecfdcd93ba 100644
--- a/src/apps/bin/trash.cpp
+++ b/src/apps/bin/trash.cpp
@@ -35,6 +35,7 @@ status_t untrash(const char *f)
 {
 	status_t err;
 	char original_path[B_PATH_NAME_LENGTH];
+	BPath path(f);
 	BNode node(f);
 	err = node.InitCheck();
 	if (err)
@@ -42,7 +43,7 @@ status_t untrash(const char *f)
 	err = node.ReadAttr(kAttrOriginalPath, B_STRING_TYPE, 0LL, original_path, B_PATH_NAME_LENGTH);
 	if (err < 0)
 		return err;
-	err = rename(f, original_path);
+	err = rename(path.Path(), original_path);
 	if (err < 0)
 		return err;
 	node.RemoveAttr(kAttrOriginalPath);
@@ -92,7 +93,7 @@ status_t trash(const char *f)
 		if (!trashDir.Contains(trashed_file))
 			break;
 	}
-	err = rename(f, trashed_file);
+	err = rename(original_path, trashed_file);
 	if (err < 0)
 		return err;