copy_file_chunk uses streams now.

[oweals/busybox.git] / messages.c

diff --git a/messages.c b/messages.c
index 73d64276d94a7add18fda8dcc5d46685f13b916d..65f3875785c64118a54b0120c60434ac556a66d8 100644 (file)
--- a/messages.c
+++ b/messages.c
@@ -27,48 +27,64 @@
  *  may make the binary slightly smaller.
  */
 
-// TO use, do something like this
+// To use this header file, include something like this:
 //
 //#define BB_DECLARE_EXTERN
 //#define bb_need_memory_exhausted
 //#include "messages.c"
 //
+//Then just use the string memory_exhausted when it is needed.
+//
+
+#include "busybox.h"
 #ifndef _BB_MESSAGES_C
 #define _BB_MESSAGES_C
 
-#define _BB_DEF_MESSAGE_PROTO(symbol)                   extern const char *symbol;
-#define _BB_DEF_MESSAGE_INITIALIZE(symbol, string_const) const char *symbol = string_const;
-
 #ifdef BB_DECLARE_EXTERN
-#  define BB_DEF_MESSAGE(symbol, string_const) _BB_DEF_MESSAGE_PROTO(symbol)
+#  define BB_DEF_MESSAGE(symbol, string_const) extern const char *symbol;
 #else
-#  define BB_DEF_MESSAGE(symbol, string_const) _BB_DEF_MESSAGE_INITIALIZE(symbol, string_const)
+#  define BB_DEF_MESSAGE(symbol, string_const) const char *symbol = string_const;
 #endif
 
+
+#if defined bb_need_full_version || ! defined BB_DECLARE_EXTERN
+       BB_DEF_MESSAGE(full_version,
+        "BusyBox v" BB_VER " (" BB_BT ") multi-call binary")
+#endif
 #if defined bb_need_name_too_long || ! defined BB_DECLARE_EXTERN
-BB_DEF_MESSAGE(name_too_long, "%s: file name too long\n")
+       BB_DEF_MESSAGE(name_too_long, "file name too long")
 #endif
 #if defined bb_need_omitting_directory || ! defined BB_DECLARE_EXTERN
-       BB_DEF_MESSAGE(omitting_directory, "%s: %s: omitting directory\n")
+       BB_DEF_MESSAGE(omitting_directory, "%s: omitting directory")
 #endif
 #if defined bb_need_not_a_directory || ! defined BB_DECLARE_EXTERN
-       BB_DEF_MESSAGE(not_a_directory, "%s: %s: not a directory\n")
+       BB_DEF_MESSAGE(not_a_directory, "%s: not a directory")
 #endif
 #if defined bb_need_memory_exhausted || ! defined BB_DECLARE_EXTERN
-       BB_DEF_MESSAGE(memory_exhausted, "%s: memory exhausted\n")
+       BB_DEF_MESSAGE(memory_exhausted, "memory exhausted")
 #endif
 #if defined bb_need_invalid_date || ! defined BB_DECLARE_EXTERN
-       BB_DEF_MESSAGE(invalid_date, "%s: invalid date `%s'\n")
+       BB_DEF_MESSAGE(invalid_date, "invalid date `%s'")
 #endif
 #if defined bb_need_invalid_option || ! defined BB_DECLARE_EXTERN
-       BB_DEF_MESSAGE(invalid_option, "%s: invalid option -- %c\n")
+       BB_DEF_MESSAGE(invalid_option, "invalid option -- %c")
 #endif
 #if defined bb_need_io_error || ! defined BB_DECLARE_EXTERN
-       BB_DEF_MESSAGE(io_error, "%s: input/output error -- %s\n")
+       BB_DEF_MESSAGE(io_error, "%s: input/output error -- %s")
 #endif
 #if defined bb_need_help || ! defined BB_DECLARE_EXTERN
        BB_DEF_MESSAGE(dash_dash_help, "--help")
 #endif
+#if defined bb_need_write_error || ! defined BB_DECLARE_EXTERN
+       BB_DEF_MESSAGE(write_error, "Write Error")
+#endif
+#if defined bb_need_too_few_args || ! defined BB_DECLARE_EXTERN
+       BB_DEF_MESSAGE(too_few_args, "too few arguments")
+#endif
+#if defined bb_need_name_longer_than_foo || ! defined BB_DECLARE_EXTERN
+       BB_DEF_MESSAGE(name_longer_than_foo, "Names longer than %d chars not supported.")
+#endif
+
 
-#endif                                                 /* _BB_MESSAGES_C */
+#endif /* _BB_MESSAGES_C */