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

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

Location:

branches/2.2.9/mindi-busybox/coreutils/libcoreutils

Files:

• Kbuild (modified) (1 diff)
• Kbuild.src (added)
• coreutils.h (modified) (1 diff)
• cp_mv_stat.c (modified) (2 diffs)
• getopt_mk_fifo_nod.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/coreutils/libcoreutils/Kbuild

@@ +1 @@
+# DO NOT EDIT. This file is generated from Kbuild.src
 # Makefile for busybox
 #
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
-# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+# Licensed under GPLv2 or later, see file LICENSE in this source tree.
 
 lib-y:=
+
+
 lib-$(CONFIG_MKFIFO)    += getopt_mk_fifo_nod.o
 lib-$(CONFIG_MKNOD) += getopt_mk_fifo_nod.o

branches/2.2.9/mindi-busybox/coreutils/libcoreutils/coreutils.h

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #ifndef COREUTILS_H
-#define COREUTILS_H     1
+#define COREUTILS_H 1
+
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
 typedef int (*stat_func)(const char *fn, struct stat *ps);
 
-int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf);
-int cp_mv_stat(const char *fn, struct stat *fn_stat);
+int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf) FAST_FUNC;
+int cp_mv_stat(const char *fn, struct stat *fn_stat) FAST_FUNC;
 
-mode_t getopt_mk_fifo_nod(int argc, char **argv);
+mode_t getopt_mk_fifo_nod(char **argv) FAST_FUNC;
+
+POP_SAVED_FUNCTION_VISIBILITY
 
 #endif

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);

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

@@ -24 +24 @@
 #include "coreutils.h"
 
-mode_t getopt_mk_fifo_nod(int argc, char **argv)
+mode_t FAST_FUNC getopt_mk_fifo_nod(char **argv)
 {
     mode_t mode = 0666;
@@ -32 +32 @@
 #endif
     int opt;
-    opt = getopt32(argv, "m:" USE_SELINUX("Z:"), &smode USE_SELINUX(,&scontext));
+    opt = getopt32(argv, "m:" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
     if (opt & 1) {
         if (bb_parse_mode(smode, &mode))