Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/applets

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

Location:

branches/3.2/mindi-busybox/applets

Files:

• .gitignore (modified) (1 diff)
• Kbuild.src (modified) (1 diff)
• applet_tables.c (modified) (2 diffs)
• busybox.mkll (modified) (1 diff)
• individual.c (modified) (1 diff)
• install.sh (modified) (4 diffs)
• usage_pod.c (modified) (1 diff)

branches/3.2/mindi-busybox/applets/.gitignore

@@ -1 +1 @@
 /applet_tables
 /usage
+/usage_pod

branches/3.2/mindi-busybox/applets/Kbuild.src

@@ -43 +43 @@
 include/applet_tables.h: applets/applet_tables
     $(call cmd,gen_applet_tables)
+
+include/NUM_APPLETS.h: applets/applet_tables
+    $(call cmd,gen_applet_tables)

branches/3.2/mindi-busybox/applets/applet_tables.c

@@ -8 +8 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <unistd.h>
+
+#undef ARRAY_SIZE
+#define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0])))
 
 #include "../include/autoconf.h"
-#include "../include/busybox.h"
+#include "../include/applet_metadata.h"
 
 struct bb_applet {
@@ -76 +82 @@
     if (NUM_APPLETS == 1) {
         printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name);
-        printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name);
+        printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].main);
     }
     printf("\n");

branches/3.2/mindi-busybox/applets/busybox.mkll

@@ -15 +15 @@
 $HOSTCC -E -DMAKE_LINKS -include $CONFIG_H $APPLETS_H |
   awk '/^[ \t]*LINK/{
-    dir=substr($2,8)
+    dir=substr($2,7)
     gsub("_","/",dir)
     if(dir=="/ROOT") dir=""

branches/3.2/mindi-busybox/applets/individual.c

@@ -15 +15 @@
 {
     applet_name = argv[0];
-    return APPLET_main(argc,argv);
+    return APPLET_main(argc, argv);
 }
 

branches/3.2/mindi-busybox/applets/install.sh

@@ -4 +4 @@
 export LC_CTYPE=POSIX
 
-prefix=${1}
+prefix=$1
 if [ -z "$prefix" ]; then
     echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--scriptwrapper]"
-    exit 1;
+    exit 1
 fi
+
 h=`sort busybox.links | uniq`
+
+linkopts=""
 scriptwrapper="n"
 cleanup="0"
@@ -34 +37 @@
     fi
 
-    mkdir -p $prefix/$libdir || exit 1
+    mkdir -p "$prefix/$libdir" || exit 1
     for i in $DO_INSTALL_LIBS; do
-        rm -f $prefix/$libdir/$i || exit 1
-        if [ -f $i ]; then
-            cp -pPR $i $prefix/$libdir/ || exit 1
-            chmod 0644 $prefix/$libdir/$i || exit 1
+        rm -f "$prefix/$libdir/$i" || exit 1
+        if [ -f "$i" ]; then
+            cp -pPR "$i" "$prefix/$libdir/" || exit 1
+            chmod 0644 "$prefix/$libdir/$i" || exit 1
         fi
     done
@@ -47 +50 @@
     inode=`ls -i "$prefix/bin/busybox" | awk '{print $1}'`
     sub_shell_it=`
-    cd "$prefix"
-    for d in usr/sbin usr/bin sbin bin; do
-        pd=$PWD
-        if [ -d "$d" ]; then
-            cd $d
-            ls -iL . | grep "^ *$inode" | awk '{print $2}' | env -i xargs rm -f
-        fi
-        cd "$pd"
-    done
-    `
+        cd "$prefix"
+        for d in usr/sbin usr/bin sbin bin; do
+            pd=$PWD
+            if [ -d "$d" ]; then
+                cd "$d"
+                ls -iL . | grep "^ *$inode" | awk '{print $2}' | env -i xargs rm -f
+            fi
+            cd "$pd"
+        done
+        `
     exit 0
 fi
 
-rm -f $prefix/bin/busybox || exit 1
-mkdir -p $prefix/bin || exit 1
-install -m 755 busybox $prefix/bin/busybox || exit 1
+rm -f "$prefix/bin/busybox" || exit 1
+mkdir -p "$prefix/bin" || exit 1
+install -m 755 busybox "$prefix/bin/busybox" || exit 1
 
 for i in $h; do
-    appdir=`dirname $i`
-    mkdir -p $prefix/$appdir || exit 1
+    appdir=`dirname "$i"`
+    mkdir -p "$prefix/$appdir" || exit 1
     if [ "$scriptwrapper" = "y" ]; then
         if [ "$swrapall" != "y" ] && [ "$i" = "/bin/sh" ]; then
-            ln $linkopts busybox $prefix$i || exit 1
+            ln $linkopts busybox "$prefix/$i" || exit 1
         else
-            rm -f $prefix$i
-            echo "#!/bin/busybox" > $prefix$i
-            chmod +x $prefix/$i
+            rm -f "$prefix/$i"
+            echo "#!/bin/busybox" >"$prefix/$i"
+            chmod +x "$prefix/$i"
         fi
-        echo "  $prefix$i"
+        echo "  $prefix/$i"
     else
         if [ "$2" = "--hardlinks" ]; then
@@ -90 +93 @@
                 bb_path="../bin/busybox"
             ;;
-            /usr/bin|/usr/sbin)
+            /usr/bin | /usr/sbin)
                 bb_path="../../bin/busybox"
             ;;
             *)
-            echo "Unknown installation directory: $appdir"
-            exit 1
+                echo "Unknown installation directory: $appdir"
+                exit 1
             ;;
             esac
         fi
-        if [ "$noclobber" = "0" ] || [ ! -e "$prefix$i" ]; then
-            echo "  $prefix$i -> $bb_path"
-            ln $linkopts $bb_path $prefix$i || exit 1
+        if [ "$noclobber" = "0" ] || [ ! -e "$prefix/$i" ]; then
+            echo "  $prefix/$i -> $bb_path"
+            ln $linkopts "$bb_path" "$prefix/$i" || exit 1
         else
-            echo "  $prefix$i already exists"
+            echo "  $prefix/$i already exists"
         fi
     fi

branches/3.2/mindi-busybox/applets/usage_pod.c

@@ -32 +32 @@
 #define MAKE_USAGE(aname, usage) { aname, usage },
 static struct usage_data {
-        const char *aname;
-        const char *usage;
+    const char *aname;
+    const char *usage;
 } usage_array[] = {
 #include "applets.h"