From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/libbb/messages.c | 116 +++++++++++++++------------- 1 file changed, 61 insertions(+), 55 deletions(-) (limited to 'release/src/router/busybox/libbb/messages.c') diff --git a/release/src/router/busybox/libbb/messages.c b/release/src/router/busybox/libbb/messages.c index 552c3ab5..90090283 100644 --- a/release/src/router/busybox/libbb/messages.c +++ b/release/src/router/busybox/libbb/messages.c @@ -1,67 +1,73 @@ /* vi: set sw=4 ts=4: */ /* - * Copyright (C) 2001 by Lineo, inc. - * Written by Erik Andersen , - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 1999-2004 by Erik Andersen * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include "libbb.h" -#ifdef L_full_version - const char * const full_version = BB_BANNER " multi-call binary"; -#endif -#ifdef L_name_too_long - const char * const name_too_long = "file name too long"; +/* allow default system PATH to be extended via CFLAGS */ +#ifndef BB_ADDITIONAL_PATH +#define BB_ADDITIONAL_PATH "" #endif -#ifdef L_omitting_directory - const char * const omitting_directory = "%s: omitting directory"; -#endif -#ifdef L_not_a_directory - const char * const not_a_directory = "%s: not a directory"; -#endif -#ifdef L_memory_exhausted - const char * const memory_exhausted = "memory exhausted"; -#endif -#ifdef L_invalid_date - const char * const invalid_date = "invalid date `%s'"; -#endif -#ifdef L_invalid_option - const char * const invalid_option = "invalid option -- %c"; -#endif -#ifdef L_io_error - const char * const io_error = "%s: input/output error -- %s"; -#endif -#ifdef L_dash_dash_help - const char * const dash_dash_help = "--help"; -#endif -#ifdef L_write_error - const char * const write_error = "Write Error"; -#endif -#ifdef L_too_few_args - const char * const too_few_args = "too few arguments"; -#endif -#ifdef L_name_longer_than_foo - const char * const name_longer_than_foo = "Names longer than %d chars not supported."; -#endif -#ifdef L_unknown - const char * const unknown = "(unknown)"; +/* allow version to be extended, via CFLAGS */ +#ifndef BB_EXTRA_VERSION +#define BB_EXTRA_VERSION BB_BT #endif -#ifdef L_can_not_create_raw_socket - const char * const can_not_create_raw_socket = "can`t create raw socket"; +#define BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")" + +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[] ALIGN1 = + "PATH=/sbin:/usr/sbin:/bin:/usr/bin" BB_ADDITIONAL_PATH; + + +const int const_int_1 = 1; +/* explicitly = 0, otherwise gcc may make it a common variable + * and it will end up in bss */ +const int const_int_0 = 0; + +#include +/* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */ +const char bb_path_wtmp_file[] ALIGN1 = +#if defined _PATH_WTMP + _PATH_WTMP; +#elif defined WTMP_FILE + WTMP_FILE; +#else +#error unknown path to wtmp file #endif + +/* We use it for "global" data via *(struct global*)&bb_common_bufsiz1. + * Since gcc insists on aligning struct global's members, it would be a pity + * (and an alignment fault on some CPUs) to mess it up. */ +char bb_common_bufsiz1[COMMON_BUFSIZE] ALIGNED(sizeof(long long)); -- cgit v1.2.3-54-g00ecf