From 6ca409e0e4c198fe3081346eebbae3f068fe605a Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sun, 12 Aug 2007 20:58:27 +0000 Subject: trylink: produce even more info about final link stage trylink: explain how to modify link and drastically decrease amount of padding (unfortunately, needs hand editing ATM). *: add ALIGN1 / ALIGN2 to global strings and arrays of bytes and shorts size saving: 0.5k --- libbb/messages.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'libbb/messages.c') diff --git a/libbb/messages.c b/libbb/messages.c index 8cab2dcc8..c4052b187 100644 --- a/libbb/messages.c +++ b/libbb/messages.c @@ -12,34 +12,34 @@ #else #define BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")" #endif -const char bb_banner[] = BANNER; - -const char bb_msg_memory_exhausted[] = "memory exhausted"; -const char bb_msg_invalid_date[] = "invalid date '%s'"; -const char bb_msg_write_error[] = "write error"; -const char bb_msg_read_error[] = "read error"; -const char bb_msg_unknown[] = "(unknown)"; -const char bb_msg_can_not_create_raw_socket[] = "can't create raw socket"; -const char bb_msg_perm_denied_are_you_root[] = "permission denied. (are you root?)"; -const char bb_msg_requires_arg[] = "%s requires an argument"; -const char bb_msg_invalid_arg[] = "invalid argument '%s' to '%s'"; -const char bb_msg_standard_input[] = "standard input"; -const char bb_msg_standard_output[] = "standard output"; - -const char bb_str_default[] = "default"; -const char bb_hexdigits_upcase[] = "0123456789ABCDEF"; - -const char bb_path_passwd_file[] = "/etc/passwd"; -const char bb_path_shadow_file[] = "/etc/shadow"; -const char bb_path_group_file[] = "/etc/group"; -const char bb_path_gshadow_file[] = "/etc/gshadow"; -const char bb_path_motd_file[] = "/etc/motd"; -const char bb_dev_null[] = "/dev/null"; -const char bb_busybox_exec_path[] = CONFIG_BUSYBOX_EXEC_PATH; -const char bb_default_login_shell[] = LIBBB_DEFAULT_LOGIN_SHELL; +const char bb_banner[] ALIGN1 = BANNER; + +const char bb_msg_memory_exhausted[] ALIGN1 = "memory exhausted"; +const char bb_msg_invalid_date[] ALIGN1 = "invalid date '%s'"; +const char bb_msg_write_error[] ALIGN1 = "write error"; +const char bb_msg_read_error[] ALIGN1 = "read error"; +const char bb_msg_unknown[] ALIGN1 = "(unknown)"; +const char bb_msg_can_not_create_raw_socket[] ALIGN1 = "can't create raw socket"; +const char bb_msg_perm_denied_are_you_root[] ALIGN1 = "permission denied. (are you root?)"; +const char bb_msg_requires_arg[] ALIGN1 = "%s requires an argument"; +const char bb_msg_invalid_arg[] ALIGN1 = "invalid argument '%s' to '%s'"; +const char bb_msg_standard_input[] ALIGN1 = "standard input"; +const char bb_msg_standard_output[] ALIGN1 = "standard output"; + +const char bb_str_default[] ALIGN1 = "default"; +const char bb_hexdigits_upcase[] ALIGN1 = "0123456789ABCDEF"; + +const char bb_path_passwd_file[] ALIGN1 = "/etc/passwd"; +const char bb_path_shadow_file[] ALIGN1 = "/etc/shadow"; +const char bb_path_group_file[] ALIGN1 = "/etc/group"; +const char bb_path_gshadow_file[] ALIGN1 = "/etc/gshadow"; +const char bb_path_motd_file[] ALIGN1 = "/etc/motd"; +const char bb_dev_null[] ALIGN1 = "/dev/null"; +const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH; +const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL; /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin, * but I want to save a few bytes here. Check libbb.h before changing! */ -const char bb_PATH_root_path[] = "PATH=/sbin:/usr/sbin:/bin:/usr/bin"; +const char bb_PATH_root_path[] ALIGN1 = "PATH=/sbin:/usr/sbin:/bin:/usr/bin"; const int const_int_0; @@ -47,7 +47,7 @@ const int const_int_1 = 1; #include /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */ -const char bb_path_wtmp_file[] = +const char bb_path_wtmp_file[] ALIGN1 = #if defined _PATH_WTMP _PATH_WTMP; #elif defined WTMP_FILE -- cgit v1.2.3