Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/messages.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/messages.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/libbb/messages.c

@@ -4 +4 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
  */
 
 #include "libbb.h"
 
-#ifdef L_full_version
 #ifndef BB_EXTRA_VERSION
-#define LIBBB_BANNER "BusyBox's library v" BB_VER " (" BB_BT ")"
+#define BANNER "BusyBox v" BB_VER " (" BB_BT ")"
 #else
-#define LIBBB_BANNER "BusyBox's library v" BB_VER " (" BB_EXTRA_VERSION ")"
+#define BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")"
 #endif
-    const char * const libbb_msg_full_version = LIBBB_BANNER;
-#endif
-#ifdef L_memory_exhausted
-    const char * const bb_msg_memory_exhausted = "memory exhausted";
-#endif
-#ifdef L_invalid_date
-    const char * const bb_msg_invalid_date = "invalid date `%s'";
-#endif
-#ifdef L_io_error
-    const char * const bb_msg_io_error = "%s: input/output error -- %m";
-#endif
-#ifdef L_write_error
-    const char * const bb_msg_write_error = "Write Error";
-#endif
-#ifdef L_read_error
-    const char * const bb_msg_read_error = "Read Error";
-#endif
-#ifdef L_name_longer_than_foo
-    const char * const bb_msg_name_longer_than_foo = "Names longer than %d chars not supported.";
-#endif
-#ifdef L_unknown
-    const char * const bb_msg_unknown = "(unknown)";
-#endif
-#ifdef L_can_not_create_raw_socket
-    const char * const bb_msg_can_not_create_raw_socket = "can't create raw socket";
-#endif
-#ifdef L_perm_denied_are_you_root
-    const char * const bb_msg_perm_denied_are_you_root = "permission denied. (are you root?)";
-#endif
-#ifdef L_msg_requires_arg
-    const char * const bb_msg_requires_arg = "%s requires an argument";
-#endif
-#ifdef L_msg_invalid_arg
-    const char * const bb_msg_invalid_arg = "invalid argument `%s' to `%s'";
-#endif
-#ifdef L_msg_standard_input
-    const char * const bb_msg_standard_input = "standard input";
-#endif
-#ifdef L_msg_standard_output
-    const char * const bb_msg_standard_output = "standard output";
-#endif
+const char bb_banner[] ALIGN1 = BANNER;
 
-#ifdef L_passwd_file
-#define PASSWD_FILE        "/etc/passwd"
-const char * const bb_path_passwd_file = PASSWD_FILE;
-#endif
+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";
 
-#ifdef L_shadow_file
-#define SHADOW_FILE        "/etc/shadow"
-const char * const bb_path_shadow_file = SHADOW_FILE;
-#endif
+const char bb_str_default[] ALIGN1 = "default";
+const char bb_hexdigits_upcase[] ALIGN1 = "0123456789ABCDEF";
 
-#ifdef L_group_file
-#define GROUP_FILE         "/etc/group"
-const char * const bb_path_group_file = GROUP_FILE;
-#endif
+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[] ALIGN1 = "PATH=/sbin:/usr/sbin:/bin:/usr/bin";
 
-#ifdef L_gshadow_file
-#define GSHADOW_FILE       "/etc/gshadow"
-const char * const bb_path_gshadow_file = GSHADOW_FILE;
-#endif
 
-#ifdef L_nologin_file
-#define NOLOGIN_FILE       "/etc/nologin"
-const char * const bb_path_nologin_file = NOLOGIN_FILE;
-#endif
+const int const_int_0;
+const int const_int_1 = 1;
 
-#ifdef L_securetty_file
-#define SECURETTY_FILE     "/etc/securetty"
-const char * const bb_path_securetty_file = SECURETTY_FILE;
-#endif
-
-#ifdef L_motd_file
-#define MOTD_FILE          "/etc/motd"
-const char * const bb_path_motd_file = MOTD_FILE;
-#endif
-
-#ifdef L_shell_file
-const char * const bb_default_login_shell = LIBBB_DEFAULT_LOGIN_SHELL;
-#endif
-
-#ifdef L_bb_dev_null
-const char * const bb_dev_null = "/dev/null";
-#endif
-
-#ifdef L_bb_path_wtmp_file
 #include <utmp.h>
 /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */
-const char * const bb_path_wtmp_file =
+const char bb_path_wtmp_file[] ALIGN1 =
 #if defined _PATH_WTMP
 _PATH_WTMP;
@@ -111 +56 @@
 # error unknown path to wtmp file
 #endif
-#endif
 
+char bb_common_bufsiz1[COMMON_BUFSIZE];
 
-#ifdef L_bb_common_bufsiz1
-char bb_common_bufsiz1[BUFSIZ+1];
-#endif
+struct globals;
+/* Make it reside in R/W memory: */
+struct globals *const ptr_to_globals __attribute__ ((section (".data")));