Merge remote-tracking branch 'toybox/master' into HEAD am: b62e8ff3da am: 63a7993a8f

[android-x86/external-toybox.git] / scripts / install.c

diff --git a/scripts/install.c b/scripts/install.c
index 317b180..3ffb867 100644 (file)
--- a/scripts/install.c
+++ b/scripts/install.c
@@ -1,40 +1,37 @@
-/* vi: set ts=4 :*/
 /* Wrapper to make installation easier with cross-compiling.
  *
  * Copyright 2006 Rob Landley <rob@landley.net>
  */
 
-#include "toys.h"
+#include <stdio.h>
+#include "generated/config.h"
+#include "lib/toyflags.h"
 
-#undef NEWTOY
-#undef OLDTOY
-#define NEWTOY(name, opts, flags) {#name, 0, opts, flags},
-#define OLDTOY(name, oldname, opts, flags) {#name, 0, opts, flags},
+#define NEWTOY(name, opts, flags) {#name, flags},
+#define OLDTOY(name, oldname, flags) {#name, flags},
 
 // Populate toy_list[].
 
-struct toy_list toy_list[] = {
+struct {char *name; int flags;} toy_list[] = {
 #include "generated/newtoys.h"
 };
 
-#define TOY_LIST_LEN (sizeof(toy_list)/sizeof(struct toy_list))
-
 int main(int argc, char *argv[])
 {
-       static char *toy_paths[]={"usr/","bin/","sbin/",0};
-       int i, len = 0;
+  static char *toy_paths[]={"usr/","bin/","sbin/",0};
+  int i, len = 0;
 
-       // Output list of applets.
-       for (i=1; i<TOY_LIST_LEN; i++) {
-               int fl = toy_list[i].flags;
-               if (fl & TOYMASK_LOCATION) {
-                       if (argc>1) {
-                               int j;
-                               for (j=0; toy_paths[j]; j++)
-                                       if (fl & (1<<j)) len += printf("%s", toy_paths[j]);
-                       }
-                       len += printf("%s\n",toy_list[i].name);
-               }
-       }
-       return 0;
+  // Output list of applets.
+  for (i=1; i<sizeof(toy_list)/sizeof(*toy_list); i++) {
+    int fl = toy_list[i].flags;
+    if (fl & TOYMASK_LOCATION) {
+      if (argc>1) {
+        int j;
+        for (j=0; toy_paths[j]; j++)
+          if (fl & (1<<j)) len += printf("%s", toy_paths[j]);
+      }
+      len += printf("%s\n",toy_list[i].name);
+    }
+  }
+  return 0;
 }