aboutsummaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-04-06 05:17:57 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-04-06 05:17:57 +0000
commitb9bae5ea10dd9deae8b073a65c6fba03bdf16824 (patch)
treeb692176a654613bb68ca37c42f88201aeb48d8ba /applets
parent4b7512e7a69a3c66bf7288ca72946575267cd12a (diff)
downloadbusybox-w32-b9bae5ea10dd9deae8b073a65c6fba03bdf16824.tar.gz
busybox-w32-b9bae5ea10dd9deae8b073a65c6fba03bdf16824.tar.bz2
busybox-w32-b9bae5ea10dd9deae8b073a65c6fba03bdf16824.zip
Apply lash_patch35 from vodz, which brings several nice size_optimizations.
git-svn-id: svn://busybox.net/trunk/busybox@4548 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'applets')
-rw-r--r--applets/busybox.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/applets/busybox.c b/applets/busybox.c
index 858358175..4f1ef2661 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -18,12 +18,15 @@ const char *applet_name;
18 * this should be consistent w/ the enum, busybox.h::Location, 18 * this should be consistent w/ the enum, busybox.h::Location,
19 * or else... 19 * or else...
20 */ 20 */
21static char* install_dir[] = { 21static const char usr_bin [] ="/usr/bin";
22 "/", 22static const char usr_sbin[] ="/usr/sbin";
23 "/bin", 23
24 "/sbin", 24static const char* const install_dir[] = {
25 "/usr/bin", 25 &usr_bin [8], /* "", equivalent to "/" for concat_path_file() */
26 "/usr/sbin", 26 &usr_bin [4], /* "/bin" */
27 &usr_sbin[4], /* "/sbin" */
28 usr_bin,
29 usr_sbin
27}; 30};
28 31
29/* abstract link() */ 32/* abstract link() */
@@ -35,7 +38,7 @@ typedef int (*__link_f)(const char *, const char *);
35 * malloc'd string w/ full pathname of busybox's location 38 * malloc'd string w/ full pathname of busybox's location
36 * NULL on failure 39 * NULL on failure
37 */ 40 */
38static char *busybox_fullpath(void) 41static inline char *busybox_fullpath(void)
39{ 42{
40 return xreadlink("/proc/self/exe"); 43 return xreadlink("/proc/self/exe");
41} 44}