X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=libbb%2Fmessages.c;h=ab4c5d4b136556e1343af4b802da3c912ac8a1a0;hb=fa939aae8178b1675e6fa118c7da05ae575f87cd;hp=adfd1ffcce31241f599d9f170dbb5d2681ba2154;hpb=dc4e75ef7ca135c836d22e380847672cf5b3773b;p=oweals%2Fbusybox.git

diff --git a/libbb/messages.c b/libbb/messages.c
index adfd1ffcc..ab4c5d4b1 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -1,28 +1,20 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.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
- * 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
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  */
 
-#include "busybox.h"
 #include "libbb.h"
 
 #ifdef L_full_version
-	const char * const bb_msg_full_version = BB_BANNER " multi-call binary";
+#ifndef BB_EXTRA_VERSION
+#define LIBBB_BANNER "BusyBox's library v" BB_VER " (" BB_BT ")"
+#else
+#define LIBBB_BANNER "BusyBox's library v" BB_VER " (" BB_EXTRA_VERSION ")"
+#endif
+	const char * const libbb_msg_full_version = LIBBB_BANNER;
 #endif
 #ifdef L_memory_exhausted
 	const char * const bb_msg_memory_exhausted = "memory exhausted";
@@ -36,6 +28,9 @@
 #ifdef L_write_error
 	const char * const bb_msg_write_error = "Write Error";
 #endif
+#ifdef L_read_error
+	const char * const bb_msg_read_error = "Read Error";
+#endif
 #ifdef L_name_longer_than_foo
 	const char * const bb_msg_name_longer_than_foo = "Names longer than %d chars not supported.";
 #endif
@@ -94,3 +89,10 @@ const char * const bb_path_motd_file = MOTD_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