From 30bab71f7bd8b3b31fedb90c2510fc89ade04619 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Sat, 25 Aug 2007 21:14:55 +0000
Subject: make copy_file() a bit easier to understand, and smaller

function                                             old     new   delta
copy_file                                           1565    1447    -118
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-118)           Total: -118 bytes
   text    data     bss     dec     hex filename
 770938    1063   10788  782789   bf1c5 busybox_old
 770814    1063   10788  782665   bf149 busybox_unstripped

---
 coreutils/cp.c                      | 1 -
 coreutils/libcoreutils/cp_mv_stat.c | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'coreutils')

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 5b57581..76dc566 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -69,7 +69,6 @@ int cp_main(int argc, char **argv)
 	if (argc == 2) {
 		s_flags = cp_mv_stat2(*argv, &source_stat,
 				      (flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
-		/* TODO: does coreutils cp exit? "cp BAD GOOD dir"... */
 		if (s_flags < 0)
 			return EXIT_FAILURE;
 		d_flags = cp_mv_stat(last, &dest_stat);
diff --git a/coreutils/libcoreutils/cp_mv_stat.c b/coreutils/libcoreutils/cp_mv_stat.c
index 2e4f25e..43583d4 100644
--- a/coreutils/libcoreutils/cp_mv_stat.c
+++ b/coreutils/libcoreutils/cp_mv_stat.c
@@ -31,7 +31,8 @@ int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf)
 			return -1;
 		}
 		return 0;
-	} else if (S_ISDIR(fn_stat->st_mode)) {
+	}
+	if (S_ISDIR(fn_stat->st_mode)) {
 		return 3;
 	}
 	return 1;
-- 
cgit v1.1