Patch from vodz:

[oweals/busybox.git] / libbb / messages.c

diff --git a/libbb/messages.c b/libbb/messages.c
index cc7e2146c9a812d42daaf5075476529d4f2fb3a2..11493db124e76d8951bd16a0e843488e40a413c4 100644 (file)
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -1,7 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2003 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
@@ -23,82 +22,71 @@
 #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";
-#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";
+       const char * const bb_msg_full_version = BB_BANNER " multi-call binary";
 #endif
 #ifdef L_memory_exhausted
-       const char * const memory_exhausted = "memory exhausted";
+       const char * const bb_msg_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";
+       const char * const bb_msg_invalid_date = "invalid date `%s'";
 #endif
 #ifdef L_io_error
-       const char * const io_error = "%s: input/output error -- %m";
-#endif
-#ifdef L_dash_dash_help
-       const char * const dash_dash_help = "--help";
+       const char * const bb_msg_io_error = "%s: input/output error -- %m";
 #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";
+       const char * const bb_msg_write_error = "Write Error";
 #endif
 #ifdef L_name_longer_than_foo
-       const char * const 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 unknown = "(unknown)";
+       const char * const bb_msg_unknown = "(unknown)";
 #endif
-
 #ifdef L_can_not_create_raw_socket
-       const char * const can_not_create_raw_socket = "can`t 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 passwd_file = PASSWD_FILE;
+const char * const bb_path_passwd_file = PASSWD_FILE;
 #endif
 
 #ifdef L_shadow_file
 #define SHADOW_FILE        "/etc/shadow"
-const char * const shadow_file = SHADOW_FILE;
+const char * const bb_path_shadow_file = SHADOW_FILE;
 #endif
 
 #ifdef L_group_file
 #define GROUP_FILE         "/etc/group"
-const char * const group_file = GROUP_FILE;
+const char * const bb_path_group_file = GROUP_FILE;
 #endif
 
 #ifdef L_gshadow_file
 #define GSHADOW_FILE       "/etc/gshadow"
-const char * const gshadow_file = GSHADOW_FILE;
+const char * const bb_path_gshadow_file = GSHADOW_FILE;
 #endif
 
 #ifdef L_nologin_file
 #define NOLOGIN_FILE       "/etc/nologin"
-const char * const nologin_file = NOLOGIN_FILE;
+const char * const bb_path_nologin_file = NOLOGIN_FILE;
 #endif
 
 #ifdef L_securetty_file
 #define SECURETTY_FILE     "/etc/securetty"
-const char * const securetty_file = SECURETTY_FILE;
+const char * const bb_path_securetty_file = SECURETTY_FILE;
 #endif
 
 #ifdef L_motd_file
 #define MOTD_FILE          "/etc/motd"
-const char * const motd_file = MOTD_FILE;
+const char * const bb_path_motd_file = MOTD_FILE;
 #endif