From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- .../router/busybox/coreutils/libcoreutils/cp_mv_stat.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'release/src/router/busybox/coreutils/libcoreutils/cp_mv_stat.c') diff --git a/release/src/router/busybox/coreutils/libcoreutils/cp_mv_stat.c b/release/src/router/busybox/coreutils/libcoreutils/cp_mv_stat.c index 5a70b022..0fd467c3 100644 --- a/release/src/router/busybox/coreutils/libcoreutils/cp_mv_stat.c +++ b/release/src/router/busybox/coreutils/libcoreutils/cp_mv_stat.c @@ -20,26 +20,31 @@ * */ -#include -#include #include "libbb.h" #include "coreutils.h" -extern int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf) +int FAST_FUNC cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf) { if (sf(fn, fn_stat) < 0) { if (errno != ENOENT) { - bb_perror_msg("unable to stat `%s'", fn); +#if ENABLE_FEATURE_VERBOSE_CP_MESSAGE + if (errno == ENOTDIR) { + bb_error_msg("cannot stat '%s': Path has non-directory component", fn); + return -1; + } +#endif + bb_perror_msg("cannot stat '%s'", fn); return -1; } return 0; - } else if (S_ISDIR(fn_stat->st_mode)) { + } + if (S_ISDIR(fn_stat->st_mode)) { return 3; } return 1; } -extern int cp_mv_stat(const char *fn, struct stat *fn_stat) +int FAST_FUNC cp_mv_stat(const char *fn, struct stat *fn_stat) { return cp_mv_stat2(fn, fn_stat, stat); } -- cgit v1.2.3-54-g00ecf