← Commit list

b6adbf1be

Denis Vlasenko

2007-05-26

FAILED Duration: 16s

Subject

usage.c: remove reference to busybox.h *: s/include "busybox.h"/include "libbb.h"

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

applets/usage.c+0 -1

@@ -2,7 +2,6 @@
	#include <unistd.h>

	#include "../include/autoconf.h"
-	#include "../include/busybox.h"

	static const char usage_messages[] = ""
	#define MAKE_USAGE

archival/ar.c+1 -1

@@ -14,7 +14,7 @@
	* http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "unarchive.h"

	static void header_verbose_list_ar(const file_header_t *file_header)

archival/bbunzip.c+1 -1

@@ -5,7 +5,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "unarchive.h"

	enum {

archival/cpio.c+1 -1

@@ -16,7 +16,7 @@
	#include <string.h>
	#include <unistd.h>
	#include "unarchive.h"
-	#include "busybox.h"
+	#include "libbb.h"

	#define CPIO_OPT_EXTRACT 0x01
	#define CPIO_OPT_TEST 0x02

archival/dpkg.c+1 -1

@@ -24,7 +24,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "unarchive.h"

	/* note: if you vary hash_prime sizes be aware,

archival/dpkg_deb.c+1 -1

@@ -4,7 +4,7 @@
	*
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/
-	#include "busybox.h"
+	#include "libbb.h"
	#include "unarchive.h"

	#define DPKG_DEB_OPT_CONTENTS 1

archival/gzip.c+1 -1

@@ -39,7 +39,7 @@ gzip: bogus: No such file or directory
	aa: 85.1% -- replaced with aa.gz
	*/

-	#include "busybox.h"
+	#include "libbb.h"


	/* ===========================================================================

archival/rpm.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "unarchive.h"

	#define RPM_HEADER_MAGIC "\216\255\350"

archival/rpm2cpio.c+1 -1

@@ -6,7 +6,7 @@
	*
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/
-	#include "busybox.h"
+	#include "libbb.h"
	#include "unarchive.h"

	#define RPM_MAGIC "\355\253\356\333"

archival/tar.c+1 -1

@@ -25,7 +25,7 @@

	#include <fnmatch.h>
	#include <getopt.h>
-	#include "busybox.h"
+	#include "libbb.h"
	#include "unarchive.h"

	#if ENABLE_FEATURE_TAR_CREATE

archival/unzip.c+1 -1

@@ -24,7 +24,7 @@
	* - central directory
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "unarchive.h"

	#define ZIP_FILEHEADER_MAGIC SWAP_LE32(0x04034b50)

console-tools/chvt.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* From <linux/vt.h> */
	enum {

console-tools/clear.c+1 -1

@@ -12,7 +12,7 @@

	#include <stdio.h>
	#include <stdlib.h>
-	#include "busybox.h"
+	#include "libbb.h"


	int clear_main(int argc, char **argv);

console-tools/deallocvt.c+1 -1

@@ -10,7 +10,7 @@

	/* no options, no getopt */

-	#include "busybox.h"
+	#include "libbb.h"

	/* From <linux/vt.h> */
	enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */

console-tools/dumpkmap.c+1 -1

@@ -8,7 +8,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* From <linux/kd.h> */
	struct kbentry {

console-tools/loadfont.c+1 -1

@@ -7,7 +7,7 @@
	* Loads the console font, and possibly the corresponding screen map(s).
	* (Adapted for busybox by Matej Vela.)
	*/
-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/kd.h>

	enum {

console-tools/loadkmap.c+1 -1

@@ -8,7 +8,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define BINARY_KEYMAP_MAGIC "bkeymap"

console-tools/openvt.c+1 -1

@@ -10,7 +10,7 @@

	/* getopt not needed */

-	#include "busybox.h"
+	#include "libbb.h"

	int openvt_main(int argc, char **argv);
	int openvt_main(int argc, char **argv)

console-tools/reset.c+1 -1

@@ -13,7 +13,7 @@
	#include <stdio.h>
	#include <stdlib.h>
	#include <unistd.h>
-	#include "busybox.h"
+	#include "libbb.h"

	int reset_main(int argc, char **argv);
	int reset_main(int argc, char **argv)

console-tools/resize.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/
	/* no options, no getopt */
-	#include "busybox.h"
+	#include "libbb.h"

	#define ESC "\033"

console-tools/setconsole.c+1 -1

@@ -8,7 +8,7 @@
	*/

	#include <getopt.h>
-	#include "busybox.h"
+	#include "libbb.h"

	#if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
	static const struct option setconsole_long_options[] = {

console-tools/setkeycodes.c+1 -1

@@ -10,7 +10,7 @@
	*/

	#include <sys/ioctl.h>
-	#include "busybox.h"
+	#include "libbb.h"


	/* From <linux/kd.h> */

console-tools/setlogcons.c+1 -1

@@ -9,7 +9,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int setlogcons_main(int argc, char **argv);
	int setlogcons_main(int argc, char **argv)

coreutils/basename.c+1 -1

@@ -20,7 +20,7 @@
	* 3) Save some space by using strcmp(). Calling strncmp() here was silly.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/cal.c+1 -1

@@ -17,7 +17,7 @@
	* Major size reduction... over 50% (>1.5k) on i386.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define THURSDAY 4 /* for reformation */
	#define SATURDAY 6 /* 1 Jan 1 was a Saturday */

coreutils/cat.c+1 -1

@@ -10,7 +10,7 @@
	/* BB_AUDIT SUSv3 compliant */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/catv.c+1 -1

@@ -10,7 +10,7 @@
	/* See "Cat -v considered harmful" at
	* http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz */

-	#include "busybox.h"
+	#include "libbb.h"

	int catv_main(int argc, char **argv);
	int catv_main(int argc, char **argv)

coreutils/chgrp.c+1 -1

@@ -11,7 +11,7 @@
	/* BB_AUDIT GNU defects - unsupported long options. */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/chgrp.html */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOEXEC applet. Be very careful! */

coreutils/chmod.c+1 -1

@@ -14,7 +14,7 @@
	/* BB_AUDIT GNU defects - unsupported long options. */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/chmod.html */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOEXEC applet. Be very careful! */

coreutils/chown.c+1 -1

@@ -11,7 +11,7 @@
	/* BB_AUDIT GNU defects - unsupported long options. */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/chown.html */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOEXEC applet. Be very careful! */

coreutils/chroot.c+1 -1

@@ -9,7 +9,7 @@

	/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */

-	#include "busybox.h"
+	#include "libbb.h"

	int chroot_main(int argc, char **argv);
	int chroot_main(int argc, char **argv)

coreutils/cksum.c+1 -1

@@ -6,7 +6,7 @@
	*
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */

-	#include "busybox.h"
+	#include "libbb.h"

	int cksum_main(int argc, char **argv);
	int cksum_main(int argc, char **argv)

coreutils/cmp.c+1 -1

@@ -21,7 +21,7 @@
	* in the '-l' case.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	static FILE cmp_xfopen_input(const char filename)
	{

coreutils/comm.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define COMM_OPT_1 (1 << 0)
	#define COMM_OPT_2 (1 << 1)

coreutils/cp.c+1 -1

@@ -15,7 +15,7 @@
	* Size reduction.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "libcoreutils/coreutils.h"

	/* This is a NOEXEC applet. Be very careful! */

coreutils/cut.c+1 -1

@@ -9,7 +9,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOEXEC applet. Be very careful! */

coreutils/date.c+1 -1

@@ -10,7 +10,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This 'date' command supports only 2 time setting formats,
	all the GNU strftime stuff (its in libc, lets use it),

coreutils/dd.c+1 -1

@@ -9,7 +9,7 @@
	*/

	#include <signal.h> /* For FEATURE_DD_SIGNAL_HANDLING */
-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOEXEC applet. Be very careful! */

coreutils/df.c+1 -1

@@ -24,7 +24,7 @@
	#include <unistd.h>
	#include <mntent.h>
	#include <sys/vfs.h>
-	#include "busybox.h"
+	#include "libbb.h"

	#ifndef CONFIG_FEATURE_HUMAN_READABLE
	static long kscale(long b, long bs)

coreutils/diff.c+1 -1

@@ -12,7 +12,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define FSIZE_MAX 32768

coreutils/dirname.c+1 -1

@@ -10,7 +10,7 @@
	/* BB_AUDIT SUSv3 compliant */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/dirname.html */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/dos2unix.c+1 -1

@@ -12,7 +12,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	enum ConvType {
	CT_UNIX2DOS = 1,

coreutils/du.c+1 -1

@@ -23,7 +23,7 @@
	* 4) Fixed busybox bug #1284 involving long overflow with human_readable.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#if ENABLE_FEATURE_HUMAN_READABLE
	# if ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K

coreutils/echo.c+1 -1

@@ -23,7 +23,7 @@
	* The previous version did not allow 4-digit octals.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int bb_echo(char **argv)
	{

coreutils/env.c+2 -2

@@ -29,11 +29,11 @@
	* - use xfunc_error_retval
	*/

-	#include "busybox.h"
-	#include <errno.h>
	#include <getopt.h> /* struct option */
	extern char **environ;

+	#include "libbb.h"
+
	#if ENABLE_FEATURE_ENV_LONG_OPTIONS
	static const struct option env_long_options[] = {
	{ "ignore-environment", 0, NULL, 'i' },

coreutils/expr.c+1 -1

@@ -25,7 +25,7 @@

	/* no getopt needed */

-	#include "busybox.h"
+	#include "libbb.h"
	#include "xregex.h"

	/* The kinds of value we can have. */

coreutils/false.c+1 -1

@@ -10,7 +10,7 @@
	/* BB_AUDIT SUSv3 compliant */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/false.html */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/fold.c+1 -1

@@ -10,7 +10,7 @@
	Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	static unsigned long flags;
	#define FLAG_COUNT_BYTES 1

coreutils/head.c+1 -1

@@ -11,7 +11,7 @@
	/* BB_AUDIT GNU compatible -c, -q, and -v options in 'fancy' configuration. */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/head.html */

-	#include "busybox.h"
+	#include "libbb.h"

	static const char head_opts[] =
	"n:"

coreutils/hostid.c+1 -1

@@ -9,7 +9,7 @@

	/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/id.c+1 -1

@@ -13,7 +13,7 @@
	* -Z option support: by Yuichi Nakamura <[email protected]>
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <stdio.h>
	#include <unistd.h>
	#include <sys/types.h>

coreutils/install.c+3 -2

@@ -9,11 +9,12 @@
	* owner/group, will probably modify bb_make_directory(...)
	*/

-	#include "busybox.h"
-	#include "libcoreutils/coreutils.h"
	#include <libgen.h>
	#include <getopt.h> /* struct option */

+	#include "libbb.h"
+	#include "libcoreutils/coreutils.h"
+
	#if ENABLE_FEATURE_INSTALL_LONG_OPTIONS
	static const struct option install_long_options[] = {
	{ "directory", 0, NULL, 'd' },

coreutils/length.c+1 -1

@@ -2,7 +2,7 @@

	/* BB_AUDIT SUSv3 N/A -- Apparently a busybox (obsolete?) extension. */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/ln.c+1 -1

@@ -11,7 +11,7 @@
	/* BB_AUDIT GNU options missing: -d, -F, -i, and -v. */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOEXEC applet. Be very careful! */

coreutils/logname.c+1 -1

@@ -20,7 +20,7 @@
	* a diagnostic message and an error return.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/ls.c+1 -1

@@ -30,7 +30,7 @@
	*/

	#include <getopt.h>
-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOEXEC applet. Be very careful! */

coreutils/md5_sha1_sum.c+1 -1

@@ -6,7 +6,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;

coreutils/mkdir.c+1 -1

@@ -20,7 +20,7 @@
	*/

	#include <getopt.h> /* struct option */
-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/mkfifo.c+1 -1

@@ -10,7 +10,7 @@
	/* BB_AUDIT SUSv3 compliant */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/mkfifo.html */

-	#include "busybox.h"
+	#include "libbb.h"
	#include "libcoreutils/coreutils.h"

	int mkfifo_main(int argc, char **argv);

coreutils/mknod.c+1 -1

@@ -11,7 +11,7 @@

	#include <sys/sysmacros.h> // For makedev

-	#include "busybox.h"
+	#include "libbb.h"
	#include "libcoreutils/coreutils.h"

	static const char modes_chars[] = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };

coreutils/mv.c+1 -1

@@ -20,7 +20,7 @@
	#include <errno.h>
	#include <stdlib.h>
	#include <getopt.h> /* struct option */
-	#include "busybox.h"
+	#include "libbb.h"
	#include "libcoreutils/coreutils.h"

	#if ENABLE_FEATURE_MV_LONG_OPTIONS

coreutils/nice.c+1 -1

@@ -8,7 +8,7 @@
	*/

	#include <sys/resource.h>
-	#include "busybox.h"
+	#include "libbb.h"

	int nice_main(int argc, char **argv);
	int nice_main(int argc, char **argv)

coreutils/nohup.c+1 -1

@@ -10,7 +10,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int nohup_main(int argc, char **argv);
	int nohup_main(int argc, char **argv)

coreutils/od.c+1 -1

@@ -12,7 +12,7 @@
	*/


-	#include "busybox.h"
+	#include "libbb.h"
	#if ENABLE_DESKTOP
	/* This one provides -t (busybox's own build script needs it) */
	#include "od_bloaty.c"

coreutils/od_bloaty.c+1 -2

@@ -49,8 +49,7 @@ diff -u -a std bbox >bbox.diff \|\| { echo Different!; sleep 1; }

	*/

-
-	#include "busybox.h"
+	#include "libbb.h"
	#include <getopt.h>

	#define assert(a) ((void)0)

coreutils/printenv.c+1 -1

@@ -11,7 +11,7 @@
	#include <stdio.h>
	#include <string.h>
	#include <stdlib.h>
-	#include "busybox.h"
+	#include "libbb.h"
	extern char **environ;

	int printenv_main(int argc, char **argv);

coreutils/printf.c+1 -1

@@ -38,7 +38,7 @@

	// 19990508 Busy Boxed! Dave Cinege

-	#include "busybox.h"
+	#include "libbb.h"

	typedef void (converter)(const char arg, void *result);

coreutils/pwd.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/realpath.c+1 -1

@@ -10,7 +10,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int realpath_main(int argc, char **argv);
	int realpath_main(int argc, char **argv)

coreutils/rm.c+1 -1

@@ -15,7 +15,7 @@
	* Size reduction.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/rmdir.c+1 -1

@@ -11,7 +11,7 @@
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */

	#include <libgen.h>
-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/seq.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under the GPL v2, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/sleep.c+1 -1

@@ -18,7 +18,7 @@
	* time suffixes for seconds, minutes, hours, and days.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/sort.c+1 -1

@@ -12,7 +12,7 @@
	* http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOEXEC applet. Be very careful! */

coreutils/split.c+1 -1

@@ -9,7 +9,7 @@
	* SUSv3 requirements:
	* http://www.opengroup.org/onlinepubs/009695399/utilities/split.html
	*/
-	#include "busybox.h"
+	#include "libbb.h"

	static const struct suffix_mult split_suffices[] = {
	#if ENABLE_FEATURE_SPLIT_FANCY

coreutils/stat.c+1 -1

@@ -13,7 +13,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* vars to control behavior */
	#define OPT_FILESYS (1<<0)

coreutils/stty.c+1 -1

@@ -21,7 +21,7 @@

	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#ifndef _POSIX_VDISABLE
	# define _POSIX_VDISABLE ((unsigned char) 0)

coreutils/sum.c+1 -1

@@ -13,7 +13,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	enum { SUM_BSD, PRINT_NAME, SUM_SYSV };

coreutils/sync.c+1 -1

@@ -9,7 +9,7 @@

	/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/tail.c+1 -1

@@ -24,7 +24,7 @@
	* 7) lseek attempted when count==0 even if arg was +0 (from top)
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	static const struct suffix_mult tail_suffixes[] = {
	{ "b", 512 },

coreutils/tee.c+1 -1

@@ -10,7 +10,7 @@
	/* BB_AUDIT SUSv3 compliant */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */

-	#include "busybox.h"
+	#include "libbb.h"
	#include <signal.h>

	int tee_main(int argc, char **argv);

coreutils/test.c+1 -1

@@ -20,7 +20,7 @@
	* "This program is in the Public Domain."
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <setjmp.h>

	/* This is a NOEXEC applet. Be very careful! */

coreutils/touch.c+1 -1

@@ -17,7 +17,7 @@
	* Also, exiting on a failure was a bug. All args should be processed.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/tr.c+1 -1

@@ -18,7 +18,7 @@
	/* http://www.opengroup.org/onlinepubs/009695399/utilities/tr.html
	* TODO: xdigit, graph, print
	*/
-	#include "busybox.h"
+	#include "libbb.h"

	#define ASCII 0377

coreutils/true.c+1 -1

@@ -10,7 +10,7 @@
	/* BB_AUDIT SUSv3 compliant */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/true.html */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/tty.c+1 -1

@@ -10,7 +10,7 @@
	/* BB_AUDIT SUSv3 compliant */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/tty.html */

-	#include "busybox.h"
+	#include "libbb.h"

	int tty_main(int argc, char **argv);
	int tty_main(int argc, char **argv)

coreutils/uname.c+1 -1

@@ -37,7 +37,7 @@
	#include <unistd.h>
	#include <sys/types.h>
	#include <sys/utsname.h>
-	#include "busybox.h"
+	#include "libbb.h"

	typedef struct {
	struct utsname name;

coreutils/uniq.c+1 -1

@@ -10,7 +10,7 @@
	/* BB_AUDIT SUSv3 compliant */
	/* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */

-	#include "busybox.h"
+	#include "libbb.h"

	static const char uniq_opts[] = "cdu" "f:s:" "cdu\0\1\2\4";

coreutils/usleep.c+1 -1

@@ -9,7 +9,7 @@

	/* BB_AUDIT SUSv3 N/A -- Apparently a busybox extension. */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/uudecode.c+1 -1

@@ -12,7 +12,7 @@
	*/


-	#include "busybox.h"
+	#include "libbb.h"

	static void read_stduu(FILE src_stream, FILE dst_stream)
	{

coreutils/uuencode.c+1 -1

@@ -8,7 +8,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"


	#define SRC_BUF_SIZE 45 // This MUST be a multiple of 3

coreutils/watch.c+1 -1

@@ -11,7 +11,7 @@
	/* BB_AUDIT SUSv3 N/A */
	/* BB_AUDIT GNU defects -- only option -n is supported. */

-	#include "busybox.h"
+	#include "libbb.h"

	// procps 2.0.18:
	// watch [-d] [-n seconds]

coreutils/wc.c+1 -1

@@ -41,7 +41,7 @@
	* for which 'wc -c' should output '0'.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#ifdef CONFIG_LOCALE_SUPPORT
	#define isspace_given_isprint(c) isspace(c)

coreutils/who.c+1 -1

@@ -17,7 +17,7 @@
	*----------------------------------------------------------------------
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <utmp.h>
	#include <time.h>

coreutils/whoami.c+1 -1

@@ -9,7 +9,7 @@

	/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

coreutils/yes.c+1 -1

@@ -14,7 +14,7 @@
	* Size reductions and removed redundant applet name prefix from error messages.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOFORK applet. Be very careful! */

debianutils/mktemp.c+1 -1

@@ -9,7 +9,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <stdio.h>
	#include <errno.h>
	#include <string.h>

debianutils/pipe_progress.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <stdio.h>
	#include <stdlib.h>
	#include <unistd.h>

debianutils/readlink.c+2 -4

@@ -7,12 +7,10 @@
	* Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
-	#include <errno.h>
-	#include <unistd.h>
-	#include <stdlib.h>
	#include <getopt.h>

+	#include "libbb.h"
+
	int readlink_main(int argc, char **argv);
	int readlink_main(int argc, char **argv)
	{

debianutils/run_parts.c+2 -2

@@ -30,10 +30,10 @@
	* -u MASK umask. Set the umask of the program executed to MASK.
	*/

-
-	#include "busybox.h"
	#include <getopt.h>

+	#include "libbb.h"
+
	#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
	static const struct option runparts_long_options[] = {
	{ "arg", 1, NULL, 'a' },

debianutils/start_stop_daemon.c+2 -1

@@ -8,10 +8,11 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
	#include <getopt.h>
	#include <sys/resource.h>

+	#include "libbb.h"
+
	static int signal_nr = 15;
	static int user_id = -1;
	static char *userspec;

debianutils/which.c+1 -1

@@ -10,7 +10,7 @@
	* Based on which from debianutils
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int which_main(int argc, char **argv);
	int which_main(int argc, char **argv)

docs/new-applet-HOWTO.txt+2 -2

@@ -19,7 +19,7 @@ such as who you stole the code from and so forth. Also include the mini-GPL
	boilerplate. Be sure to name the main function <applet>_main instead of main.
	And be sure to put it in <applet>.c. Usage does not have to be taken care of by
	your applet.
-	Make sure to #include "busybox.h" as the first include file in your applet so
+	Make sure to #include "libbb.h" as the first include file in your applet so
	the bb_config.h and appropriate platform specific files are included properly.

	For a new applet mu, here is the code that would go in mu.c:
@@ -39,7 +39,7 @@ For a new applet mu, here is the code that would go in mu.c:
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "other.h"

	int mu_main(int argc, char **argv);

e2fsprogs/chattr.c+1 -1

@@ -19,7 +19,7 @@
	* 98/12/29 - Display version info only when -V specified (G M Sipe)
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "e2fs_lib.h"

	#define OPT_ADD 1

e2fsprogs/fsck.c+1 -1

@@ -37,7 +37,7 @@
	* It doesn't guess filesystem types from on-disk format.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define EXIT_OK 0
	#define EXIT_NONDESTRUCT 1

e2fsprogs/lsattr.c+1 -1

@@ -18,7 +18,7 @@
	* 98/12/29 - Display version info only when -V specified (G M Sipe)
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "e2fs_lib.h"

	enum {

e2fsprogs/old_e2fsprogs/e2fsck.h+1 -1

@@ -39,7 +39,7 @@
	#include "blkid/blkid.h"
	#include "ext2fs/ext2_ext_attr.h"
	#include "uuid/uuid.h"
-	#include "busybox.h"
+	#include "libbb.h"

	#ifdef HAVE_CONIO_H
	#undef HAVE_TERMIOS_H

e2fsprogs/old_e2fsprogs/e2p/e2p.h+1 -1

@@ -1,5 +1,5 @@
	/* vi: set sw=4 ts=4: */
-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/types.h> /* Needed by dirent.h on netbsd */
	#include <stdio.h>
	#include <dirent.h>

e2fsprogs/old_e2fsprogs/fsck.c+1 -1

@@ -46,7 +46,7 @@

	#include "e2fsbb.h"

-	#include "busybox.h"
+	#include "libbb.h"

	#ifndef _PATH_MNTTAB
	#define _PATH_MNTTAB "/etc/fstab"

e2fsprogs/old_e2fsprogs/tune2fs.c+1 -1

@@ -44,7 +44,7 @@
	#include "util.h"
	#include "blkid/blkid.h"

-	#include "busybox.h"
+	#include "libbb.h"

	static char * device_name = NULL;
	static char * new_label, new_last_mounted, new_UUID;

editors/awk.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "xregex.h"
	#include <math.h>
	extern char **environ;

editors/ed.c+1 -1

@@ -7,7 +7,7 @@
	* The "ed" built-in command (much simplified)
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	enum {
	USERSIZE = sizeof(bb_common_bufsiz1) > 1024 ? 1024

editors/patch.c+2 -4

@@ -20,10 +20,8 @@
	*/

	#include <getopt.h>
-	#include <string.h>
-	#include <stdlib.h>
-	#include <unistd.h>
-	#include "busybox.h"
+
+	#include "libbb.h"

	static unsigned int copy_lines(FILE src_stream, FILE dest_stream, const unsigned int lines_count)
	{

editors/sed.c+1 -1

@@ -58,7 +58,7 @@
	Reference http://www.opengroup.org/onlinepubs/007904975/utilities/sed.html
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "xregex.h"

	/* Each sed command turns into one of these structures. */

editors/vi.c+1 -1

@@ -21,7 +21,7 @@
	* An "ex" line oriented mode- maybe using "cmdedit"
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define ENABLE_FEATURE_VI_CRASHME 0

findutils/find.c+1 -1

@@ -46,7 +46,7 @@
	*/

	#include <fnmatch.h>
-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOEXEC applet. Be very careful! */

findutils/grep.c+1 -1

@@ -19,7 +19,7 @@
	* (C) 2006 Jac Goudsmit added -o option
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "xregex.h"

	/* options */

findutils/xargs.c+1 -1

@@ -17,7 +17,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* This is a NOEXEC applet. Be very careful! */

init/halt.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPL version 2, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/reboot.h>

	int halt_main(int argc, char **argv);

init/init.c+1 -1

@@ -9,7 +9,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <paths.h>
	#include <signal.h>
	#include <sys/ioctl.h>

init/mesg.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#ifdef USE_TTY_GROUP
	#define S_IWGRP_OR_S_IWOTH S_IWGRP

ipsvd/ipsvd_perhost.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPLv2, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "ipsvd_perhost.h"

	static struct hcc *cc;

ipsvd/tcpudp.c+1 -1

@@ -32,7 +32,7 @@
	#include <limits.h>
	#include <linux/netfilter_ipv4.h> /* wants <limits.h> */

-	#include "busybox.h"
+	#include "libbb.h"
	#include "ipsvd_perhost.h"

	#ifdef SSLSVD

libbb/getopt32.c+1 -1

@@ -7,8 +7,8 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "libbb.h"
	#include <getopt.h>
+	#include "libbb.h"

	/* Documentation

libbb/lineedit.c+1 -1

@@ -29,7 +29,7 @@
	*/

	#include <sys/ioctl.h>
-	#include "busybox.h"
+	#include "libbb.h"


	/* FIXME: obsolete CONFIG item? */

libbb/selinux_common.c+1 -1

@@ -4,7 +4,7 @@
	*
	* Copyright 2007 KaiGai Kohei <[email protected]>
	*/
-	#include "busybox.h"
+	#include "libbb.h"
	#include <selinux/context.h>

	context_t set_security_context_component(security_context_t cur_context,

libbb/xfuncs.c+1 -1

@@ -9,7 +9,7 @@
	* Licensed under GPL version 2, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* All the functions starting with "x" call bb_error_msg_and_die() if they
	* fail, so callers never need to check for errors. If it returned, it

libpwdgrp/uidgid_get.c+1 -1

@@ -25,7 +25,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* Always sets uid and gid */
	int get_uidgid(struct bb_uidgid_t u, const char ug, int numeric_ok)

loginutils/addgroup.c+1 -1

@@ -10,7 +10,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	static void xgroup_study(struct group *g)
	{

loginutils/adduser.c+1 -1

@@ -8,7 +8,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define OPT_DONT_SET_PASS (1 << 4)
	#define OPT_DONT_MAKE_HOME (1 << 6)

loginutils/cryptpw.c+1 -1

@@ -5,7 +5,7 @@
	* Cooked from passwd.c by Thomas Lundquist <[email protected]>
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int cryptpw_main(int argc, char **argv);
	int cryptpw_main(int argc, char **argv)

loginutils/deluser.c+1 -1

@@ -10,7 +10,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* Status */
	#define STATUS_OK 0

loginutils/getty.c+1 -1

@@ -16,7 +16,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <syslog.h>

	#if ENABLE_FEATURE_UTMP

loginutils/login.c+1 -1

@@ -3,7 +3,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <utmp.h>
	#include <sys/resource.h>
	#include <syslog.h>

loginutils/passwd.c+1 -1

@@ -3,7 +3,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <syslog.h>

loginutils/su.c+1 -1

@@ -5,7 +5,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <syslog.h>

	#define SU_OPT_mp (3)

loginutils/sulogin.c+1 -1

@@ -7,7 +7,7 @@

	#include <syslog.h>

-	#include "busybox.h"
+	#include "libbb.h"

	static const char * const forbid[] = {
	"ENV",

loginutils/vlock.c+1 -1

@@ -16,7 +16,7 @@
	/* Fixed by Erik Andersen to do passwords the tinylogin way...
	* It now works with md5, sha1, etc passwords. */

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/vt.h>

	static struct passwd *pw;

miscutils/adjtimex.c+1 -1

@@ -11,7 +11,7 @@
	* Licensed under GPLv2 or later, see file License in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/timex.h>

	static const struct {int bit; const char *name;} statlist[] = {

miscutils/bbconfig.c+1 -1

@@ -1,7 +1,7 @@
	/* vi: set sw=4 ts=4: */
	/* This file was released into the public domain by Paul Fox.
	*/
-	#include "busybox.h"
+	#include "libbb.h"
	#include "bbconfigopts.h"

	int bbconfig_main(int argc, char **argv);

miscutils/chrt.c+1 -1

@@ -6,10 +6,10 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
	#include <unistd.h>
	#include <sched.h>
	#include <getopt.h> /* optind */
+	#include "libbb.h"
	#ifndef _POSIX_PRIORITY_SCHEDULING
	#warning your system may be foobared
	#endif

miscutils/crond.c+1 -1

@@ -12,7 +12,7 @@

	#define VERSION "2.3.2"

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/syslog.h>

	#define arysize(ary) (sizeof(ary)/sizeof((ary)[0]))

miscutils/crontab.c+1 -1

@@ -10,7 +10,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#ifndef CRONTABS
	#define CRONTABS "/var/spool/cron/crontabs"

miscutils/dc.c+1 -1

@@ -3,7 +3,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <math.h>

	/* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */

miscutils/devfsd.c+1 -1

@@ -54,7 +54,7 @@
	Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "xregex.h"
	#include <unistd.h>
	#include <stdio.h>

miscutils/eject.c+1 -1

@@ -13,7 +13,7 @@
	* Most of the dirty work blatantly ripped off from cat.c =)
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* various defines swiped from linux/cdrom.h */
	#define CDROMCLOSETRAY 0x5319 /* pendant of CDROMEJECT */

miscutils/hdparm.c+1 -1

@@ -12,7 +12,7 @@
	* - by Mark Lord (C) 1994-2002 -- freely distributable
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <linux/hdreg.h>

	/* device types */

miscutils/last.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under the GPL version 2, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <utmp.h>

	#ifndef SHUTDOWN_TIME

miscutils/less.c+1 -1

@@ -23,7 +23,7 @@

	#include <sched.h> /* sched_yield() */

-	#include "busybox.h"
+	#include "libbb.h"
	#if ENABLE_FEATURE_LESS_REGEXP
	#include "xregex.h"
	#endif

miscutils/makedevs.c+1 -1

@@ -7,7 +7,7 @@
	* known bugs: can't deal with alpha ranges
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#ifdef CONFIG_FEATURE_MAKEDEVS_LEAF
	int makedevs_main(int argc, char **argv);

miscutils/mountpoint.c+1 -1

@@ -9,7 +9,7 @@
	* Based on sysvinit's mountpoint
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int mountpoint_main(int argc, char **argv);
	int mountpoint_main(int argc, char **argv)

miscutils/mt.c+1 -1

@@ -3,7 +3,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/mtio.h>

	struct mt_opcodes {

miscutils/nmeter.c+1 -1

@@ -12,7 +12,7 @@
	// disk_io: (3,0):(22272,17897,410702,4375,54750)
	// btime 1059401962

-	#include "busybox.h"
+	#include "libbb.h"
	#include <time.h>

	typedef unsigned long long ullong;

miscutils/raidautorun.c+1 -1

@@ -8,7 +8,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#include <linux/major.h>
	#include <linux/raid/md_u.h>

miscutils/readahead.c+1 -1

@@ -10,7 +10,7 @@
	* Licensed under GPLv2 or later, see file License in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int readahead_main(int argc, char **argv);
	int readahead_main(int argc, char **argv)

miscutils/runlevel.c+1 -1

@@ -12,7 +12,7 @@
	* initially busyboxified by Bernhard Fischer
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <stdio.h>
	#include <utmp.h>
	#include <time.h>

miscutils/rx.c+1 -1

@@ -19,7 +19,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define SOH 0x01
	#define STX 0x02

miscutils/setsid.c+1 -1

@@ -14,7 +14,7 @@
	* - busyboxed
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int setsid_main(int argc, char **argv);
	int setsid_main(int argc, char **argv)

miscutils/strings.c+2 -4

@@ -7,11 +7,9 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
-	#include <stdio.h>
-	#include <stdlib.h>
	#include <getopt.h>
-	#include <ctype.h>
+
+	#include "libbb.h"

	#define WHOLE_FILE 1
	#define PRINT_NAME 2

miscutils/taskset.c+1 -1

@@ -6,9 +6,9 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
	#include <sched.h>
	#include <getopt.h> /* optind */
+	#include "libbb.h"

	#if ENABLE_FEATURE_TASKSET_FANCY
	#define TASKSET_PRINTF_MASK "%s"

miscutils/time.c+1 -1

@@ -9,7 +9,7 @@
	Heavily modified for busybox by Erik Andersen <[email protected]>
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define TV_MSEC tv_usec / 1000

miscutils/watchdog.c+1 -1

@@ -8,7 +8,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define OPT_FOREGROUND 0x01
	#define OPT_TIMER 0x02

modutils/insmod.c+1 -1

@@ -58,7 +58,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <libgen.h>
	#include <sys/utsname.h>

modutils/lsmod.c+1 -1

@@ -11,7 +11,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"


	#ifndef CONFIG_FEATURE_CHECK_TAINTED_MODULE

modutils/modprobe.c+1 -1

@@ -11,7 +11,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/utsname.h>
	#include <fnmatch.h>

modutils/rmmod.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/syscall.h>

	#ifdef CONFIG_FEATURE_2_6_MODULES

networking/arp.c+1 -1

@@ -13,7 +13,7 @@
	* modified for getopt32 by Arne Bernin <arne [at] alamut.de>
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "inet_common.h"

	#include <arpa/inet.h>

networking/arping.c+1 -1

@@ -16,7 +16,7 @@
	#include <netinet/ether.h>
	#include <netpacket/packet.h>

-	#include "busybox.h"
+	#include "libbb.h"

	static struct in_addr src;
	static struct in_addr dst;

networking/dnsd.c+1 -1

@@ -18,7 +18,7 @@
	*/

	#include <syslog.h>
-	#include "busybox.h"
+	#include "libbb.h"

	//#define DEBUG 1
	#define DEBUG 0

networking/ether-wake.c+1 -1

@@ -70,7 +70,7 @@
	#include <netinet/ether.h>
	#include <linux/if.h>

-	#include "busybox.h"
+	#include "libbb.h"

	/* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
	* work as non-root, but we need SOCK_PACKET to specify the Ethernet

networking/ftpgetput.c+1 -1

@@ -13,8 +13,8 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
	#include <getopt.h>
+	#include "libbb.h"

	typedef struct ftp_host_info_s {
	const char *user;

networking/hostname.c+1 -1

@@ -12,7 +12,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	static void do_sethostname(char *s, int isfile)
	{

networking/httpd.c+1 -1

@@ -91,7 +91,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* amount of buffering in a pipe */
	#ifndef PIPE_BUF

networking/ifconfig.c+1 -1

@@ -37,7 +37,7 @@
	#include <netinet/if_ether.h>
	#endif
	#include "inet_common.h"
-	#include "busybox.h"
+	#include "libbb.h"

	#if ENABLE_FEATURE_IFCONFIG_SLIP
	# include <net/if_slip.h>

networking/ifupdown.c+2 -1

@@ -15,11 +15,12 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
	#include <sys/utsname.h>
	#include <fnmatch.h>
	#include <getopt.h>

+	#include "libbb.h"
+
	#define MAX_OPT_DEPTH 10
	#define EUNBALBRACK 10001
	#define EUNDEFVAR 10002

networking/inetd.c+1 -1

@@ -155,7 +155,7 @@
	* setuid()
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <syslog.h>
	#include <sys/un.h>

networking/interface.c+1 -1

@@ -34,7 +34,7 @@
	#include <net/if.h>
	#include <net/if_arp.h>
	#include "inet_common.h"
-	#include "busybox.h"
+	#include "libbb.h"

	#if ENABLE_FEATURE_IPV6
	# define HAVE_AFINET6 1

networking/ip.c+1 -1

@@ -13,7 +13,7 @@
	* Bernhard Fischer rewrote to use index_in_substr_array
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#include "libiproute/utils.h"
	#include "libiproute/ip_common.h"

networking/ipcalc.c+2 -2

@@ -12,12 +12,12 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
-	#include <ctype.h>
	#include <getopt.h>
	#include <sys/socket.h>
	#include <arpa/inet.h>

+	#include "libbb.h"
+
	#define CLASS_A_NETMASK ntohl(0xFF000000)
	#define CLASS_B_NETMASK ntohl(0xFFFF0000)
	#define CLASS_C_NETMASK ntohl(0xFFFFFF00)

networking/isrv.c+1 -1

@@ -8,7 +8,7 @@
	* Licensed under GPL version 2, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "isrv.h"

	#define DEBUG 0

networking/isrv_identd.c+1 -1

@@ -8,7 +8,7 @@
	*/

	#include <syslog.h>
-	#include "busybox.h"
+	#include "libbb.h"
	#include "isrv.h"

	enum { TIMEOUT = 20 };

networking/libiproute/ip_common.h+1 -1

@@ -2,7 +2,7 @@
	#ifndef _IP_COMMON_H
	#define _IP_COMMON_H 1

-	#include "busybox.h"
+	#include "libbb.h"
	#include <asm/types.h>
	#include <linux/netlink.h>
	#include <linux/rtnetlink.h>

networking/nameif.c+1 -1

@@ -9,7 +9,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <syslog.h>
	#include <net/if.h>
	#include <netinet/ether.h>

networking/nc.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#if ENABLE_DESKTOP
	#include "nc_bloaty.c"

networking/nc_bloaty.c+1 -1

@@ -48,7 +48,7 @@
	* are closed, but nc doesn't exit - continues to listen/accept.
	*/

-	/* done in nc.c: #include "busybox.h" */
+	/* done in nc.c: #include "libbb.h" */

	enum {
	SLEAZE_PORT = 31337, /* for UDP-scan RTT trick, change if ya want */

networking/netstat.c+1 -1

@@ -11,7 +11,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "inet_common.h"

	enum {

networking/nslookup.c+1 -1

@@ -12,7 +12,7 @@
	*/

	#include <resolv.h>
-	#include "busybox.h"
+	#include "libbb.h"

	/*
	* I'm only implementing non-interactive mode;

networking/ping.c+1 -1

@@ -27,7 +27,7 @@

	#include <net/if.h>
	#include <netinet/ip_icmp.h>
-	#include "busybox.h"
+	#include "libbb.h"

	#if ENABLE_PING6
	#include <netinet/icmp6.h>

networking/route.c+3 -2

@@ -25,12 +25,13 @@
	* remove ridiculous amounts of bloat.
	*/

-	#include "busybox.h"
-	#include "inet_common.h"
	#include <getopt.h>
	#include <net/route.h>
	#include <net/if.h>

+	#include "libbb.h"
+	#include "inet_common.h"
+

	#ifndef RTF_UP
	/* Keep this in sync with /usr/src/linux/include/linux/route.h */

networking/telnet.c+1 -1

@@ -24,7 +24,7 @@
	#include <termios.h>
	#include <arpa/telnet.h>
	#include <netinet/in.h>
-	#include "busybox.h"
+	#include "libbb.h"

	#ifdef DOTRACE
	#define TRACE(x, y) do { if (x) printf y; } while (0)

networking/telnetd.c+1 -1

@@ -24,7 +24,7 @@
	/#define DEBUG 1 /
	#define DEBUG 0

-	#include "busybox.h"
+	#include "libbb.h"

	#if DEBUG
	#define TELCMDS

networking/tftp.c+1 -1

@@ -19,7 +19,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	* ------------------------------------------------------------------------- */

-	#include "busybox.h"
+	#include "libbb.h"


	#if ENABLE_FEATURE_TFTP_GET \|\| ENABLE_FEATURE_TFTP_PUT

networking/traceroute.c+1 -1

@@ -215,7 +215,7 @@
	#include <netinet/ip.h>
	#include <netinet/ip_icmp.h>

-	#include "busybox.h"
+	#include "libbb.h"
	#include "inet_common.h"

networking/udhcp/common.h+1 -1

@@ -10,7 +10,7 @@
	#ifndef _COMMON_H
	#define _COMMON_H

-	#include "busybox.h"
+	#include "libbb.h"

	#define DEFAULT_SCRIPT "/usr/share/udhcpc/default.script"

networking/vconfig.c+1 -1

@@ -9,7 +9,7 @@

	/* BB_AUDIT SUSv3 N/A */

-	#include "busybox.h"
+	#include "libbb.h"
	#include <net/if.h>

	/* Stuff from linux/if_vlan.h, kernel version 2.4.23 */

networking/wget.c+1 -1

@@ -10,8 +10,8 @@
	/* http://www.unix.org/version2/whatsnew/lfs20mar.html */
	#define _LARGEFILE64_SOURCE 1

-	#include "busybox.h"
	#include <getopt.h> /* for struct option */
+	#include "libbb.h"

	struct host_info {
	// May be used if we ever will want to free() all xstrdup()s...

networking/zcip.c+1 -1

@@ -23,7 +23,7 @@
	// - avoid silent script failures, especially under load...
	// - link status monitoring (restart on link-up; stop on link-down)

-	#include "busybox.h"
+	#include "libbb.h"
	#include <syslog.h>
	#include <poll.h>
	#include <sys/wait.h>

procps/free.c+1 -1

@@ -9,7 +9,7 @@

	/* getopt not needed */

-	#include "busybox.h"
+	#include "libbb.h"

	int free_main(int argc, char **argv);
	int free_main(int argc, char **argv)

procps/fuser.c+1 -1

@@ -8,7 +8,7 @@
	* GNU Library General Public License
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define FUSER_PROC_DIR "/proc"
	#define FUSER_MAX_LINE 255

procps/kill.c+1 -1

@@ -8,7 +8,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* Note: kill_main is directly called from shell in order to implement
	* kill built-in. Shell substitutes job ids with process groups first.

procps/pidof.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under the GPL version 2, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	enum {
	USE_FEATURE_PIDOF_SINGLE(OPTBIT_SINGLE,)

procps/ps.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under the GPL version 2, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#if ENABLE_DESKTOP

procps/renice.c+1 -1

@@ -19,7 +19,7 @@
	* following IDs (if any). Multiple switches are allowed.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/resource.h>

	void BUG_bad_PRIO_PROCESS(void);

procps/sysctl.c+1 -1

@@ -14,7 +14,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/*
	* Function Prototypes

procps/top.c+1 -1

@@ -28,7 +28,7 @@
	* GNU Library General Public License
	*/

-	#include "busybox.h"
+	#include "libbb.h"


	typedef struct top_status_t {

procps/uptime.c+1 -1

@@ -15,7 +15,7 @@

	/* getopt not needed */

-	#include "busybox.h"
+	#include "libbb.h"

	#ifndef FSHIFT
	# define FSHIFT 16 /* nr of bits of precision */

runit/chpst.c+1 -1

@@ -28,7 +28,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	/* Busyboxed by Denis Vlasenko <[email protected]> */
	/* Dependencies on runit_lib.c removed */

-	#include "busybox.h"
+	#include "libbb.h"

	#include <dirent.h>

runit/runsv.c+1 -1

@@ -30,7 +30,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

	#include <sys/poll.h>
	#include <sys/file.h>
-	#include "busybox.h"
+	#include "libbb.h"
	#include "runit_lib.h"

	static int selfpipe[2];

runit/runsvdir.c+1 -1

@@ -30,7 +30,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

	#include <sys/poll.h>
	#include <sys/file.h>
-	#include "busybox.h"
+	#include "libbb.h"
	#include "runit_lib.h"

	#define MAXSERVICES 1000

runit/sv.c+1 -1

@@ -153,7 +153,7 @@ Exit Codes

	#include <sys/poll.h>
	#include <sys/file.h>
-	#include "busybox.h"
+	#include "libbb.h"
	#include "runit_lib.h"

	static const char *acts;

runit/svlogd.c+1 -1

@@ -30,7 +30,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

	#include <sys/poll.h>
	#include <sys/file.h>
-	#include "busybox.h"
+	#include "libbb.h"
	#include "runit_lib.h"

	static unsigned verbose;

selinux/chcon.c+2 -1

@@ -5,10 +5,11 @@
	*
	* Copyright (C) 2006 - 2007 KaiGai Kohei <[email protected]>
	*/
-	#include "busybox.h"
	#include <getopt.h>
	#include <selinux/context.h>

+	#include "libbb.h"
+
	#define OPT_RECURSIVE (1<<0) /* 'R' */
	#define OPT_CHANHES (1<<1) /* 'c' */
	#define OPT_NODEREFERENCE (1<<2) /* 'h' */

selinux/getenforce.c+1 -1

@@ -6,7 +6,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int getenforce_main(int argc, char **argv);
	int getenforce_main(int argc, char **argv)

selinux/getsebool.c+1 -1

@@ -6,7 +6,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int getsebool_main(int argc, char **argv);
	int getsebool_main(int argc, char **argv)

selinux/load_policy.c+1 -1

@@ -3,7 +3,7 @@
	* This implementation is based on old load_policy to be small.
	* Author: Yuichi Nakamura <[email protected]>
	*/
-	#include "busybox.h"
+	#include "libbb.h"

	int load_policy_main(int argc, char **argv);
	int load_policy_main(int argc, char **argv)

selinux/matchpathcon.c+1 -1

@@ -4,7 +4,7 @@
	* Port to busybox: KaiGai Kohei <[email protected]>
	*
	*/
-	#include "busybox.h"
+	#include "libbb.h"

	static int print_matchpathcon(char *path, int noprint)
	{

selinux/runcon.c+2 -1

@@ -26,11 +26,12 @@
	* Port to busybox: KaiGai Kohei <[email protected]>
	* - based on coreutils-5.97 (in Fedora Core 6)
	*/
-	#include "busybox.h"
	#include <getopt.h>
	#include <selinux/context.h>
	#include <selinux/flask.h>

+	#include "libbb.h"
+
	static context_t runcon_compute_new_context(char user, char role, char type, char range,
	char *command, int compute_trans)
	{

selinux/selinuxenabled.c+1 -1

@@ -5,7 +5,7 @@
	* Port to BusyBox Hiroshi Shinji <[email protected]>
	*
	*/
-	#include "busybox.h"
+	#include "libbb.h"

	int selinuxenabled_main(int argc, char **argv);
	int selinuxenabled_main(int argc, char **argv)

selinux/setenforce.c+1 -1

@@ -6,7 +6,7 @@
	*
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* These strings are arranged so that odd ones
	* result in security_setenforce(1) being done,

shell/ash.c+1 -1

@@ -53,7 +53,7 @@
	#if DEBUG
	#define _GNU_SOURCE
	#endif
-	#include "busybox.h"
+	#include "busybox.h" /* for struct bb_applet */
	#include <paths.h>
	#include <setjmp.h>
	#include <fnmatch.h>

shell/bbsh.c+1 -1

@@ -36,7 +36,7 @@
	echo `echo hello#comment " woot` and more
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	// A single executable, its arguments, and other information we know about it.
	#define BBSH_FLAG_EXIT 1

shell/hush.c+4 -1

@@ -76,12 +76,15 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+
	#include <glob.h> /* glob, of course */
	#include <getopt.h> /* should be pretty obvious */
	/* #include <dmalloc.h> */
+
	extern char *environ; / This is in <unistd.h>, but protected with __USE_GNU */

+	#include "busybox.h" /* for struct bb_applet */
+

	/* If you comment out one of these below, it will be #defined later
	* to perform debug printfs to stderr: */

shell/lash.c+3 -2

@@ -20,10 +20,11 @@
	//For debugging/development on the shell only...
	//#define DEBUG_SHELL

-
-	#include "busybox.h"
	#include <getopt.h>
	#include <glob.h>
+
+	#include "busybox.h" /* for struct bb_applet */
+
	#define expand_t glob_t

	/* Always enable for the moment... */

sysklogd/klogd.c+1 -1

@@ -17,7 +17,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/syslog.h>
	#include <sys/klog.h>

sysklogd/logger.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#if !defined CONFIG_SYSLOGD

sysklogd/logread.c+1 -1

@@ -9,7 +9,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/ipc.h>
	#include <sys/sem.h>
	#include <sys/shm.h>

sysklogd/syslogd.c+1 -1

@@ -13,7 +13,7 @@
	* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <paths.h>
	#include <sys/un.h>

util-linux/dmesg.c+1 -1

@@ -9,7 +9,7 @@
	* Licensed under GPLv2, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <unistd.h>
	#include <sys/klog.h>

util-linux/fbset.c+1 -1

@@ -12,7 +12,7 @@
	* Geert Uytterhoeven ([email protected])
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	#define DEFAULTFBDEV FB_0
	#define DEFAULTFBMODE "/etc/fb.modes"

util-linux/fdformat.c+1 -1

@@ -9,7 +9,7 @@
	* 5 July 2003 -- modified for Busybox by Erik Andersen
	*/

-	#include "busybox.h"
+	#include "libbb.h"


	/* Stuff extracted from linux/fd.h */

util-linux/fdisk.c+1 -1

@@ -8,7 +8,7 @@
	*/

	#include <assert.h> /* assert */
-	#include "busybox.h"
+	#include "libbb.h"

	/* Looks like someone forgot to add this to config system */
	#ifndef ENABLE_FEATURE_FDISK_BLKSIZE

util-linux/freeramdisk.c+1 -1

@@ -9,7 +9,7 @@
	* Licensed under GPLv2, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* From <linux/fd.h> */
	#define FDFLUSH _IO(2,0x4b)

util-linux/fsck_minix.c+1 -1

@@ -87,7 +87,7 @@
	* enforced (but it's not much fun on a character device :-).
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <mntent.h>

	#include "minix.h"

util-linux/getopt.c+1 -1

@@ -31,8 +31,8 @@
	*
	*/

-	#include "busybox.h"
	#include <getopt.h>
+	#include "libbb.h"

	/* NON_OPT is the code that is returned when a non-option is found in '+'
	mode */

util-linux/hexdump.c+1 -1

@@ -10,7 +10,7 @@
	*/

	#include <getopt.h>
-	#include "busybox.h"
+	#include "libbb.h"
	#include "dump.h"

	/* This is a NOEXEC applet. Be very careful! */

util-linux/hwclock.c+1 -1

@@ -11,7 +11,7 @@
	#include <sys/ioctl.h>
	#include <sys/utsname.h>
	#include <getopt.h>
-	#include "busybox.h"
+	#include "libbb.h"

	/* Copied from linux/rtc.h to eliminate the kernel dependency */
	struct linux_rtc_time {

util-linux/ipcrm.c+1 -1

@@ -8,7 +8,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	/* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */
	/* X/OPEN tells us to use <sys/{types,ipc,msg}.h> for msgctl() */

util-linux/ipcs.c+1 -1

@@ -8,7 +8,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <errno.h>
	#include <time.h>
	#include <pwd.h>

util-linux/losetup.c+1 -2

@@ -8,9 +8,8 @@
	*/

	#include <getopt.h>
-	#include <stdlib.h>

-	#include "busybox.h"
+	#include "libbb.h"

	int losetup_main(int argc, char **argv);
	int losetup_main(int argc, char **argv)

util-linux/mdev.c+1 -1

@@ -9,7 +9,7 @@
	* Licensed under GPL version 2, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include "xregex.h"

	#define DEV_PATH "/dev"

util-linux/mkfs_minix.c+1 -1

@@ -62,7 +62,7 @@
	* removed getopt based parser and added a hand rolled one.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <mntent.h>

	#include "minix.h"

util-linux/mkswap.c+1 -1

@@ -6,7 +6,7 @@
	* Licensed under GPL version 2, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	int mkswap_main(int argc, char **argv);
	int mkswap_main(int argc, char **argv)

util-linux/more.c+1 -1

@@ -14,7 +14,7 @@
	* Licensed under GPLv2 or later, see file License in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"


	#if ENABLE_FEATURE_USE_TERMIOS

util-linux/mount.c+1 -1

@@ -18,7 +18,7 @@
	mount_it_now() does the actual mount.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <mntent.h>

	/* Needed for nfs support only... */

util-linux/pivot_root.c+1 -1

@@ -8,7 +8,7 @@
	*
	* Licensed under GPL version 2, see file LICENSE in this tarball for details.
	*/
-	#include "busybox.h"
+	#include "libbb.h"

	extern int pivot_root(const char * new_root,const char * put_old);

util-linux/rdate.c+1 -1

@@ -8,7 +8,7 @@
	* Licensed under GPL v2 or later, see file License for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"

	enum { RFC_868_BIAS = 2208988800UL };

util-linux/readprofile.c+1 -1

@@ -32,7 +32,7 @@
	* Paul Mundt <[email protected]>.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/utsname.h>

	#define S_LEN 128

util-linux/setarch.c+1 -1

@@ -14,7 +14,7 @@
	#include <stdio.h>
	#include <sys/personality.h>

-	#include "busybox.h"
+	#include "libbb.h"

	int setarch_main(int ATTRIBUTE_UNUSED argc, char **argv);
	int setarch_main(int ATTRIBUTE_UNUSED argc, char **argv)

util-linux/swaponoff.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under the GPL version 2, see the file LICENSE in this tarball.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <mntent.h>
	#include <sys/swap.h>

util-linux/switch_root.c+1 -1

@@ -6,7 +6,7 @@
	* Licensed under GPL version 2, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
+	#include "libbb.h"
	#include <sys/vfs.h>

util-linux/umount.c+1 -1

@@ -8,9 +8,9 @@
	* Licensed under GPL version 2, see file LICENSE in this tarball for details.
	*/

-	#include "busybox.h"
	#include <mntent.h>
	#include <getopt.h>
+	#include "libbb.h"

	#define OPTION_STRING "flDnravdt:"
	#define OPT_FORCE 1