From b075e176c84bb3a5518bbabc5172212886a763b5 Mon Sep 17 00:00:00 2001
From: erik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Wed, 29 Dec 1999 02:36:29 +0000
Subject: Fixed mv so it now does the right thing (same method used in cp).
Removed some cruft from cp. -Erik
git-svn-id: svn://busybox.net/trunk/busybox@268 69ca8d6d-28ef-0310-b511-8ec308f3f277
---
cp.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
(limited to 'cp.c')
diff --git a/cp.c b/cp.c
index 1e10f2868..83460190a 100644
--- a/cp.c
+++ b/cp.c
@@ -43,7 +43,6 @@ static int preserveFlag = FALSE;
static const char *srcName;
static const char *destName;
static int destDirFlag = FALSE;
-static int destExistsFlag = FALSE;
static int srcDirFlag = FALSE;
static int fileAction(const char *fileName, struct stat* statbuf)
@@ -71,8 +70,6 @@ static int fileAction(const char *fileName, struct stat* statbuf)
extern int cp_main(int argc, char **argv)
{
- struct stat statBuf;
-
if (argc < 3) {
usage (cp_usage);
}
@@ -106,11 +103,7 @@ extern int cp_main(int argc, char **argv)
destName = argv[argc - 1];
- if (stat(destName, &statBuf) >= 0) {
- destExistsFlag = TRUE;
- if (S_ISDIR(statBuf.st_mode))
- destDirFlag = TRUE;
- }
+ destDirFlag = isDirectory(destName);
if ((argc > 3) && destDirFlag==FALSE) {
fprintf(stderr, "%s: not a directory\n", destName);
--
cgit v1.2.3-55-g6feb