X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=messages.c;h=65f3875785c64118a54b0120c60434ac556a66d8;hb=4949faf4b2090ca23c2aeb34535fdbe57754913a;hp=f2374eeb5f475b7a8db2b6dd8df3baa209fa8d16;hpb=be84cd4ef66f8956eb4c7ff0542fd1ba823a70e7;p=oweals%2Fbusybox.git diff --git a/messages.c b/messages.c index f2374eeb5..65f387578 100644 --- a/messages.c +++ b/messages.c @@ -36,7 +36,7 @@ //Then just use the string memory_exhausted when it is needed. // -#include "internal.h" +#include "busybox.h" #ifndef _BB_MESSAGES_C #define _BB_MESSAGES_C @@ -47,39 +47,43 @@ #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, "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, "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\n") + 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, "%s: too few arguments\n") + 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 */