summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorEric Andersen2001-04-25 05:39:18 +0000
committerEric Andersen2001-04-25 05:39:18 +0000
commit04095e58fb4d3a083f77962714080ffe8139b39c (patch)
treeaa3580587822774ffed9831aacee11d977d0a5f9 /coreutils
parent3676374915866fb06224a19e2274afe026eb9377 (diff)
downloadbusybox-04095e58fb4d3a083f77962714080ffe8139b39c.zip
busybox-04095e58fb4d3a083f77962714080ffe8139b39c.tar.gz
Move messages.c to libbb. Make each string in messages.c be its own .o file.
This way, we can new get rid of all that tedious #define rubbish we used to need to enable specific messages. This way is enormously simpler, and as a bonus also ends up saving us 96 bytes. -Erik
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/chgrp.c4
-rw-r--r--coreutils/chmod.c3
-rw-r--r--coreutils/chown.c4
-rw-r--r--coreutils/date.c4
-rw-r--r--coreutils/du.c5
-rw-r--r--coreutils/ln.c3
-rw-r--r--coreutils/mkdir.c3
-rw-r--r--coreutils/test.c3
-rw-r--r--coreutils/tr.c3
9 files changed, 1 insertions, 31 deletions
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c
index 739d09f..c6312a7 100644
--- a/coreutils/chgrp.c
+++ b/coreutils/chgrp.c
@@ -27,10 +27,6 @@
#include <string.h>
#include <unistd.h>
#include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_invalid_option
-#define bb_need_too_few_args
-#include "messages.c"
/* Don't use lchown for libc5 or glibc older then 2.1.x */
#if (__GLIBC__ < 2) && (__GLIBC_MINOR__ < 1)
diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index c3bef4e..5e12e76 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -28,9 +28,6 @@
#include <unistd.h>
#include <getopt.h>
#include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_too_few_args
-#include "messages.c"
struct stat *theMode;
diff --git a/coreutils/chown.c b/coreutils/chown.c
index f044a75..b6059d0 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -27,10 +27,6 @@
#include <string.h>
#include <unistd.h>
#include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_too_few_args
-#include "messages.c"
-
/* Don't use lchown for libc5 or glibc older then 2.1.x */
#if (__GLIBC__ < 2) && (__GLIBC_MINOR__ < 1)
diff --git a/coreutils/date.c b/coreutils/date.c
index 4b2f66a..22a1304 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -29,10 +29,6 @@
#include <string.h>
#include <getopt.h>
#include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_invalid_date
-#define bb_need_memory_exhausted
-#include "messages.c"
/* This 'date' command supports only 2 time setting formats,
diff --git a/coreutils/du.c b/coreutils/du.c
index 119895e..3f7621b 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -31,9 +31,6 @@
#include <string.h>
#include <errno.h>
#include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_name_too_long
-#include "messages.c"
#ifdef BB_FEATURE_HUMAN_READABLE
@@ -192,7 +189,7 @@ int du_main(int argc, char **argv)
return status;
}
-/* $Id: du.c,v 1.44 2001/04/09 22:48:11 andersen Exp $ */
+/* $Id: du.c,v 1.45 2001/04/25 05:39:18 andersen Exp $ */
/*
Local Variables:
c-file-style: "linux"
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 6d41cce..7412a86 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -28,9 +28,6 @@
#include <errno.h>
#include <unistd.h>
#include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_not_a_directory
-#include "messages.c"
static const int LN_SYMLINK = 1;
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 902da7c..d78f57e 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -26,9 +26,6 @@
#include <string.h>
#include <stdlib.h>
#include "busybox.h"
-#define bb_need_name_too_long
-#define BB_DECLARE_EXTERN
-#include "messages.c"
static int parentFlag = FALSE;
diff --git a/coreutils/test.c b/coreutils/test.c
index 79db8cb..9c66cbb 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -38,9 +38,6 @@
#include <stdlib.h>
#include <string.h>
#include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_help
-#include "messages.c"
/* test(1) accepts the following grammar:
oexpr ::= aexpr | aexpr "-o" oexpr ;
diff --git a/coreutils/tr.c b/coreutils/tr.c
index ce15cfd..ff0f331 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -30,9 +30,6 @@
#include <unistd.h>
#include <sys/types.h>
#include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_write_error
-#include "messages.c"
static const int ASCII = 0377;