diff options
author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-02-16 18:43:54 +0000 |
---|---|---|
committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-02-16 18:43:54 +0000 |
commit | 65cb8b76306969313e303fb4f2488fe3bb388ce4 (patch) | |
tree | 8d50753f74b3b92e8daa3852a2fcd47671139723 | |
parent | 8f91b78e3084aff37f7cabf0e6e13500f2b4a12e (diff) | |
download | busybox-w32-65cb8b76306969313e303fb4f2488fe3bb388ce4.tar.gz busybox-w32-65cb8b76306969313e303fb4f2488fe3bb388ce4.tar.bz2 busybox-w32-65cb8b76306969313e303fb4f2488fe3bb388ce4.zip |
Regression testing bugfixes from Larry Doolittle. As an aside,
can I just say how much I am looking forward to having 0.50
released, so we can address this #define stupidness properly
by building a static libbusybox, and then letting the linker
sort out the dependancies.... Ahh, that will be much nicer.
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@1837 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r-- | utility.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1361,8 +1361,9 @@ extern void *xcalloc(size_t nmemb, size_t size) | |||
1361 | } | 1361 | } |
1362 | #endif | 1362 | #endif |
1363 | 1363 | ||
1364 | #if defined BB_NFSMOUNT || defined BB_LS || defined BB_SH || defined BB_WGET || \ | 1364 | #if defined BB_NFSMOUNT || defined BB_LS || defined BB_SH || \ |
1365 | defined BB_DPKG_DEB || defined BB_TAR | 1365 | defined BB_WGET || defined BB_DPKG_DEB || defined BB_TAR || \ |
1366 | defined BB_LN | ||
1366 | # ifndef DMALLOC | 1367 | # ifndef DMALLOC |
1367 | extern char * xstrdup (const char *s) { | 1368 | extern char * xstrdup (const char *s) { |
1368 | char *t; | 1369 | char *t; |
@@ -1731,7 +1732,7 @@ void run_applet_by_name(const char *name, int argc, char **argv) | |||
1731 | } | 1732 | } |
1732 | } | 1733 | } |
1733 | 1734 | ||
1734 | #if defined BB_DD || defined BB_TAIL | 1735 | #if defined BB_DD || defined BB_TAIL || defined BB_STTY |
1735 | unsigned long parse_number(const char *numstr, | 1736 | unsigned long parse_number(const char *numstr, |
1736 | const struct suffix_mult *suffixes) | 1737 | const struct suffix_mult *suffixes) |
1737 | { | 1738 | { |