Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/libcoreutils/cp_mv_stat.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/libcoreutils/cp_mv_stat.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/coreutils/libcoreutils/cp_mv_stat.c

@@ -24 +24 @@
 #include "coreutils.h"
 
-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("cannot stat '%s'", fn);
+#if ENABLE_FEATURE_VERBOSE_CP_MESSAGE
+            if (errno == ENOTDIR) {
+                bb_error_msg("can't stat '%s': Path has non-directory component", fn);
+                return -1;
+            }
+#endif
+            bb_perror_msg("can't stat '%s'", fn);
             return -1;
         }
         return 0;
-    } else if (S_ISDIR(fn_stat->st_mode)) {
+    }
+    if (S_ISDIR(fn_stat->st_mode)) {
         return 3;
     }
@@ -38 +45 @@
 }
 
-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);