summaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
authorDenis Vlasenko2007-11-29 03:31:20 +0000
committerDenis Vlasenko2007-11-29 03:31:20 +0000
commit745cd17926a9d75cdd6482d5ce58227b492d1ebe (patch)
tree568f3236704000eed61d3460f9eef92e9535b746 /applets
parentc253778de92441b61806e1e4e7806e91f17ea50f (diff)
downloadbusybox-745cd17926a9d75cdd6482d5ce58227b492d1ebe.zip
busybox-745cd17926a9d75cdd6482d5ce58227b492d1ebe.tar.gz
Further optimize applet tables; prettify build output
text data bss dec hex filename 775923 929 9100 785952 bfe20 busybox_old 775565 929 9100 785594 bfcba busybox_unstripped
Diffstat (limited to 'applets')
-rw-r--r--applets/Kbuild18
-rw-r--r--applets/applet_tables.c55
2 files changed, 47 insertions, 26 deletions
diff --git a/applets/Kbuild b/applets/Kbuild
index b9dba03..ef4b76f 100644
--- a/applets/Kbuild
+++ b/applets/Kbuild
@@ -14,20 +14,20 @@ always:= $(hostprogs-y)
# Generated files need additional love
-quiet_cmd_gen_usage_compressed = GEN include/usage_compressed.h
- cmd_gen_usage_compressed = $(srctree)/applets/usage_compressed include/usage_compressed.h applets
-
HOSTCFLAGS_usage.o = -I$(srctree)/include
-applets/applets.o: include/usage_compressed.h include/applet_tables.h
+applets/applets.o: include/usage_compressed.h include/applet_tables.h
-applets/usage: .config $(srctree)/applets/usage_compressed
+applets/usage: .config $(srctree)/applets/usage_compressed
+
+quiet_cmd_gen_usage_compressed = GEN include/usage_compressed.h
+ cmd_gen_usage_compressed = $(srctree)/applets/usage_compressed include/usage_compressed.h applets
include/usage_compressed.h: applets/usage $(srctree)/applets/usage_compressed
$(call cmd,gen_usage_compressed)
-# Two-stage file creation, to avoid having target file still created
-# in case applet_tables fails
+quiet_cmd_gen_applet_tables = GEN include/applet_tables.h
+ cmd_gen_applet_tables = applets/applet_tables include/applet_tables.h
+
include/applet_tables.h: applets/applet_tables
- applets/applet_tables >include/applet_tables.h.tmp
- mv include/applet_tables.h.tmp include/applet_tables.h
+ $(call cmd,gen_applet_tables)
diff --git a/applets/applet_tables.c b/applets/applet_tables.c
index b5df740..9f42ebf 100644
--- a/applets/applet_tables.c
+++ b/applets/applet_tables.c
@@ -50,45 +50,66 @@ int main(int argc, char **argv)
qsort(applets, NUM_APPLETS, sizeof(applets[0]), cmp_name);
- /* Keep in sync with include/busybox.h! */
-
- puts("const char applet_names[] ALIGN1 =");
ofs = 0;
- i = 0;
for (i = 0; i < NUM_APPLETS; i++) {
offset[i] = ofs;
ofs += strlen(applets[i].name) + 1;
+ }
+ /* We reuse 4 high-order bits of offset array for other purposes,
+ * so if they are indeed needed, refuse to proceed */
+ if (ofs > 0xfff)
+ return 1;
+ if (!argv[1])
+ return 1;
+
+ i = open(argv[1], O_WRONLY | O_TRUNC | O_CREAT, 0666);
+ if (i < 0)
+ return 1;
+ dup2(i, 1);
+
+ /* Keep in sync with include/busybox.h! */
+
+ puts("/* This is a generated file, don't edit */");
+
+ puts("const char applet_names[] ALIGN1 =");
+ for (i = 0; i < NUM_APPLETS; i++) {
printf("\"%s\" \"\\0\"\n", applets[i].name);
}
puts(";");
- puts("int (*const applet_mains[])(int argc, char **argv) = {");
+ puts("int (*const applet_main[])(int argc, char **argv) = {");
for (i = 0; i < NUM_APPLETS; i++) {
printf("%s_main,\n", applets[i].main);
}
puts("};");
-#if ENABLE_FEATURE_INSTALLER || ENABLE_FEATURE_PREFER_APPLETS
- puts("const uint32_t applet_nameofs[] = {");
-#else
puts("const uint16_t applet_nameofs[] ALIGN2 = {");
-#endif
for (i = 0; i < NUM_APPLETS; i++) {
- printf("0x%08x,\n",
+ printf("0x%04x,\n",
offset[i]
+#if ENABLE_FEATURE_PREFER_APPLETS
+ + (applets[i].nofork << 12)
+ + (applets[i].noexec << 13)
+#endif
#if ENABLE_FEATURE_SUID
+ (applets[i].need_suid << 14) /* 2 bits */
#endif
-#if ENABLE_FEATURE_INSTALLER
- + (applets[i].install_loc << 16) /* 3 bits */
-#endif
-#if ENABLE_FEATURE_PREFER_APPLETS
- + (applets[i].nofork << 19)
- + (applets[i].noexec << 20)
-#endif
);
}
puts("};");
+#if ENABLE_FEATURE_INSTALLER
+ puts("const uint8_t applet_install_loc[] ALIGN1 = {");
+ i = 0;
+ while (i < NUM_APPLETS) {
+ int v = applets[i].install_loc; /* 3 bits */
+ if (++i < NUM_APPLETS)
+ v |= applets[i].install_loc << 4; /* 3 bits */
+ printf("0x%02x,\n", v);
+ i++;
+ }
+ puts("};");
+#endif
+
return 0;
}