X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fmessages.c;h=e11dddc50f87933d33fe61598a17fce590dffc73;hb=7600eec7325f0bbce1dcbf08e76c1653bf35b397;hp=16ac63f6920f983d5a355d30bca616d93b69ec9f;hpb=04095e58fb4d3a083f77962714080ffe8139b39c;p=oweals%2Fbusybox.git

diff --git a/libbb/messages.c b/libbb/messages.c
index 16ac63f69..e11dddc50 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -1,7 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Copyright (C) 2001 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * 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
@@ -19,43 +18,89 @@
  *
  */
 
-#include "../busybox.h"
+#include "busybox.h"
+#include "libbb.h"
 
 #ifdef L_full_version
-	const char *full_version = BB_BANNER " multi-call binary";
-#endif
-#ifdef L_name_too_long
-	const char *name_too_long = "file name too long";
-#endif
-
-#ifdef L_omitting_directory
-	const char *omitting_directory = "%s: omitting directory";
-#endif
-#ifdef L_not_a_directory
-	const char *not_a_directory = "%s: not a directory";
+	const char * const bb_msg_full_version = BB_BANNER " multi-call binary";
 #endif
 #ifdef L_memory_exhausted
-	const char *memory_exhausted = "memory exhausted";
+	const char * const bb_msg_memory_exhausted = "memory exhausted";
 #endif
 #ifdef L_invalid_date
-	const char *invalid_date = "invalid date `%s'";
-#endif
-#ifdef L_invalid_option
-	const char *invalid_option = "invalid option -- %c";
+	const char * const bb_msg_invalid_date = "invalid date `%s'";
 #endif
 #ifdef L_io_error
-	const char *io_error = "%s: input/output error -- %s";
-#endif
-#ifdef L_dash_dash_help
-	const char *dash_dash_help = "--help";
+	const char * const bb_msg_io_error = "%s: input/output error -- %m";
 #endif
 #ifdef L_write_error
-	const char *write_error = "Write Error";
+	const char * const bb_msg_write_error = "Write Error";
 #endif
-#ifdef L_too_few_args
-	const char *too_few_args = "too few arguments";
+#ifdef L_read_error
+	const char * const bb_msg_read_error = "Read Error";
 #endif
 #ifdef L_name_longer_than_foo
-	const char *name_longer_than_foo = "Names longer than %d chars not supported.";
+	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_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
+
+#ifdef L_passwd_file
+#define PASSWD_FILE        "/etc/passwd"
+const char * const bb_path_passwd_file = PASSWD_FILE;
+#endif
+
+#ifdef L_shadow_file
+#define SHADOW_FILE        "/etc/shadow"
+const char * const bb_path_shadow_file = SHADOW_FILE;
 #endif
 
+#ifdef L_group_file
+#define GROUP_FILE         "/etc/group"
+const char * const bb_path_group_file = GROUP_FILE;
+#endif
+
+#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
+
+#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_common_bufsiz1
+char bb_common_bufsiz1[BUFSIZ+1];
+#endif