svn commit: trunk/busybox: coreutils libbb networking procps shell etc...

vda at busybox.net vda at busybox.net
Tue Nov 25 01:36:03 UTC 2008


Author: vda
Date: 2008-11-24 17:36:03 -0800 (Mon, 24 Nov 2008)
New Revision: 24137

Log:
ash,hush: add TODO for rare build failure
*: remove some redundant includes



Modified:
   trunk/busybox/coreutils/dd.c
   trunk/busybox/coreutils/tee.c
   trunk/busybox/libbb/bb_askpass.c
   trunk/busybox/libbb/speed_table.c
   trunk/busybox/networking/telnet.c
   trunk/busybox/procps/top.c
   trunk/busybox/shell/ash.c
   trunk/busybox/shell/hush.c
   trunk/busybox/util-linux/more.c


Changeset:
Modified: trunk/busybox/coreutils/dd.c
===================================================================
--- trunk/busybox/coreutils/dd.c	2008-11-25 01:34:52 UTC (rev 24136)
+++ trunk/busybox/coreutils/dd.c	2008-11-25 01:36:03 UTC (rev 24137)
@@ -8,7 +8,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <signal.h>  /* For FEATURE_DD_SIGNAL_HANDLING */
 #include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */

Modified: trunk/busybox/coreutils/tee.c
===================================================================
--- trunk/busybox/coreutils/tee.c	2008-11-25 01:34:52 UTC (rev 24136)
+++ trunk/busybox/coreutils/tee.c	2008-11-25 01:36:03 UTC (rev 24137)
@@ -11,7 +11,6 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */
 
 #include "libbb.h"
-#include <signal.h>
 
 int tee_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int tee_main(int argc, char **argv)

Modified: trunk/busybox/libbb/bb_askpass.c
===================================================================
--- trunk/busybox/libbb/bb_askpass.c	2008-11-25 01:34:52 UTC (rev 24136)
+++ trunk/busybox/libbb/bb_askpass.c	2008-11-25 01:36:03 UTC (rev 24137)
@@ -8,8 +8,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <termios.h>
-
 #include "libbb.h"
 
 /* do nothing signal handler */

Modified: trunk/busybox/libbb/speed_table.c
===================================================================
--- trunk/busybox/libbb/speed_table.c	2008-11-25 01:34:52 UTC (rev 24136)
+++ trunk/busybox/libbb/speed_table.c	2008-11-25 01:36:03 UTC (rev 24137)
@@ -7,7 +7,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <termios.h>
 #include "libbb.h"
 
 struct speed_map {

Modified: trunk/busybox/networking/telnet.c
===================================================================
--- trunk/busybox/networking/telnet.c	2008-11-25 01:34:52 UTC (rev 24136)
+++ trunk/busybox/networking/telnet.c	2008-11-25 01:36:03 UTC (rev 24137)
@@ -21,7 +21,6 @@
  *
  */
 
-#include <termios.h>
 #include <arpa/telnet.h>
 #include <netinet/in.h>
 #include "libbb.h"

Modified: trunk/busybox/procps/top.c
===================================================================
--- trunk/busybox/procps/top.c	2008-11-25 01:34:52 UTC (rev 24136)
+++ trunk/busybox/procps/top.c	2008-11-25 01:36:03 UTC (rev 24137)
@@ -644,8 +644,6 @@
 }
 
 #if ENABLE_FEATURE_USE_TERMIOS
-#include <termios.h>
-#include <signal.h>
 
 static void reset_term(void)
 {

Modified: trunk/busybox/shell/ash.c
===================================================================
--- trunk/busybox/shell/ash.c	2008-11-25 01:34:52 UTC (rev 24136)
+++ trunk/busybox/shell/ash.c	2008-11-25 01:36:03 UTC (rev 24137)
@@ -53,11 +53,21 @@
 #endif
 
 #include "busybox.h" /* for applet_names */
+//TODO: pull in some .h and find out do we have SINGLE_APPLET_MAIN?
+//#include "applet_tables.h" doesn't work
 #include <paths.h>
 #include <setjmp.h>
 #include <fnmatch.h>
-#if JOBS || ENABLE_ASH_READ_NCHARS
-#include <termios.h>
+
+#if defined SINGLE_APPLET_MAIN
+/* STANDALONE does not make sense, and won't compile */
+#undef CONFIG_FEATURE_SH_STANDALONE
+#undef ENABLE_FEATURE_SH_STANDALONE
+#undef USE_FEATURE_SH_STANDALONE
+#undef SKIP_FEATURE_SH_STANDALONE(...)
+#define ENABLE_FEATURE_SH_STANDALONE 0
+#define USE_FEATURE_SH_STANDALONE(...)
+#define SKIP_FEATURE_SH_STANDALONE(...) __VA_ARGS__
 #endif
 
 #ifndef PIPE_BUF

Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c	2008-11-25 01:34:52 UTC (rev 24136)
+++ trunk/busybox/shell/hush.c	2008-11-25 01:36:03 UTC (rev 24137)
@@ -67,6 +67,8 @@
  */
 
 #include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */
+//TODO: pull in some .h and find out do we have SINGLE_APPLET_MAIN?
+//#include "applet_tables.h" doesn't work
 #include <glob.h>
 /* #include <dmalloc.h> */
 #if ENABLE_HUSH_CASE
@@ -75,6 +77,17 @@
 
 #define HUSH_VER_STR "0.91"
 
+#if defined SINGLE_APPLET_MAIN
+/* STANDALONE does not make sense, and won't compile */
+#undef CONFIG_FEATURE_SH_STANDALONE
+#undef ENABLE_FEATURE_SH_STANDALONE
+#undef USE_FEATURE_SH_STANDALONE
+#define SKIP_FEATURE_SH_STANDALONE(...) __VA_ARGS__
+#define ENABLE_FEATURE_SH_STANDALONE 0
+#define USE_FEATURE_SH_STANDALONE(...)
+#define SKIP_FEATURE_SH_STANDALONE(...) __VA_ARGS__
+#endif
+
 #if !BB_MMU && ENABLE_HUSH_TICK
 //#undef ENABLE_HUSH_TICK
 //#define ENABLE_HUSH_TICK 0

Modified: trunk/busybox/util-linux/more.c
===================================================================
--- trunk/busybox/util-linux/more.c	2008-11-25 01:34:52 UTC (rev 24136)
+++ trunk/busybox/util-linux/more.c	2008-11-25 01:36:03 UTC (rev 24137)
@@ -15,11 +15,7 @@
  */
 
 #include "libbb.h"
-#if ENABLE_FEATURE_USE_TERMIOS
-#include <termios.h>
-#endif /* FEATURE_USE_TERMIOS */
 
-
 #if ENABLE_FEATURE_USE_TERMIOS
 
 struct globals {




More information about the busybox-cvs mailing list