Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/libcoreutils

Timestamp:

Nov 4, 2007, 3:16:40 AM (18 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

Location:

branches/2.2.5/mindi-busybox/coreutils/libcoreutils

Files:

• Kbuild (added)
• Makefile (deleted)
• Makefile.in (deleted)
• coreutils.h (modified) (2 diffs)
• cp_mv_stat.c (modified) (2 diffs)
• getopt_mk_fifo_nod.c (modified) (2 diffs)

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

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
@@ -8 +9 @@
 typedef int (*stat_func)(const char *fn, struct stat *ps);
 
-extern int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf);
-extern 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);
+int cp_mv_stat(const char *fn, struct stat *fn_stat);
 
-extern mode_t getopt_mk_fifo_nod(int argc, char **argv);
+mode_t getopt_mk_fifo_nod(int argc, char **argv);
 
 #endif

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

@@ -21 +21 @@
  */
 
-#include <errno.h>
-#include <sys/stat.h>
 #include "libbb.h"
 #include "coreutils.h"
@@ -30 +28 @@
     if (sf(fn, fn_stat) < 0) {
         if (errno != ENOENT) {
-            bb_perror_msg("unable to stat `%s'", fn);
+            bb_perror_msg("cannot stat '%s'", fn);
             return -1;
         }

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

@@ -21 +21 @@
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include "libbb.h"
 #include "coreutils.h"
@@ -31 +28 @@
     mode_t mode = 0666;
     char *smode = NULL;
-
-    bb_getopt_ulflags(argc, argv, "m:", &smode);
-    if(smode) {
+#if ENABLE_SELINUX
+    security_context_t scontext;
+#endif
+    int opt;
+    opt = getopt32(argv, "m:" USE_SELINUX("Z:"), &smode USE_SELINUX(,&scontext));
+    if (opt & 1) {
         if (bb_parse_mode(smode, &mode))
             umask(0);
     }
+
+#if ENABLE_SELINUX
+    if (opt & 2) {
+        selinux_or_die();
+        setfscreatecon_or_die(scontext);
+    }
+#endif
+
     return mode;
 }