emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- move #include busybox.h to the very top so we pull in the config

Browse Source 
and eventual platform specific includes in early.
This commit is contained in:
Bernhard Reutner-Fischer 2006-06-02 20:56:16 +00:00
parent ecae66ac16
commit e15d7573a1
34 changed files with 77 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applets/applets.c
View File

@ -12,12 +12,12 @@
* Licensed under GPLv2 or later, see file License in this tarball for details.
*/
#include "busybox.h"
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "busybox.h"
#if ENABLE_SHOW_USAGE && !ENABLE_FEATURE_COMPRESS_USAGE
static const char usage_messages[] =

4
applets/busybox.c
View File

@ -1,13 +1,15 @@
/* vi: set sw=4 ts=4: */
/*
* BusyBox' main applet dispatcher.
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include "busybox.h"
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
#include "busybox.h"
#if ENABLE_LOCALE_SUPPORT
#include <locale.h>
#else

7
applets/version.c
View File

@ -1,3 +1,10 @@
/* vi: set sw=4 ts=4: */
/*
* Version stuff.
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include "busybox.h"
#ifndef BB_EXTRA_VERSION

2
debianutils/mktemp.c
View File

@ -9,12 +9,12 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
#include "busybox.h"
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include "busybox.h"
int mktemp_main(int argc, char **argv)
{

29
debianutils/pipe_progress.c
View File

@ -1,35 +1,22 @@
/* vi: set sw=4 ts=4: */
/*
* Monitor a pipe with a simple progress display.
*
* Copyright (C) 2003 by Rob Landley <rob@landley.net>, Joey Hess
*
* 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 <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <time.h>
#include "busybox.h"
#define PIPE_PROGRESS_SIZE 4096
/* Read a block of data from stdin, write it to stdout.
* Activity is indicated by a '.' to stderr
/* Read a block of data from stdin, write it to stdout.
* Activity is indicated by a '.' to stderr
*/
int pipe_progress_main(int argc, char **argv)
{
@ -48,8 +35,8 @@ int pipe_progress_main(int argc, char **argv)
fputc('\n', stderr);
#ifdef CONFIG_FEATURE_CLEAN_UP
RELEASE_CONFIG_BUFFER(buf);
#endif
if (ENABLE_FEATURE_CLEAN_UP)
RELEASE_CONFIG_BUFFER(buf);
return 0;
}

5
debianutils/readlink.c
View File

@ -7,11 +7,11 @@
* Licensed under GPL v2, see file LICENSE in this tarball for details.
*/
#include "busybox.h"
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
#include <getopt.h>
#include "busybox.h"
#define READLINK_FLAG_f (1 << 0)
@ -33,7 +33,8 @@ int readlink_main(int argc, char **argv)
return EXIT_FAILURE;
puts(buf);
if (ENABLE_FEATURE_CLEAN_UP && buf != bb_common_bufsiz1) free(buf);
if (ENABLE_FEATURE_CLEAN_UP && buf != bb_common_bufsiz1)
free(buf);
return EXIT_SUCCESS;
}

18
debianutils/run_parts.c
View File

@ -10,21 +10,7 @@
* Copyright (C) 1996-1999 Guy Maor <maor@debian.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 GPL v2, see file LICENSE in this tarball for details.
*/
/* This is my first attempt to write a program in C (well, this is my first
@ -49,10 +35,10 @@
* done - declare run_parts_main() as extern and any other function as static?
*/
#include "busybox.h"
#include <getopt.h>
#include <stdlib.h>
#include "busybox.h"
static const struct option runparts_long_options[] = {
{ "test", 0, NULL, 't' },

3
debianutils/start_stop_daemon.c
View File

@ -7,6 +7,7 @@
* Adapted for busybox David Kimdon <dwhedon@gordian.com>
*/
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -17,8 +18,6 @@
#include <dirent.h>
#include <unistd.h>
#include <getopt.h> /* struct option */
#include "busybox.h"
#include "pwd_.h"
static int signal_nr = 15;

2
debianutils/which.c
View File

@ -9,12 +9,12 @@
* Based on which from debianutils
*/
#include "busybox.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
#include "busybox.h"
int which_main(int argc, char **argv)
{

4
docs/new-applet-HOWTO.txt
View File

@ -16,6 +16,8 @@ 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
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:
@ -25,13 +27,13 @@ For a new applet mu, here is the code that would go in mu.c:
/*
* Mini mu implementation for busybox
*
*
* Copyright (C) [YEAR] by [YOUR NAME] <YOUR EMAIL>
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include "busybox.h"
#include <other.h>
int mu_main(int argc, char **argv)
{

17
findutils/find.c
View File

@ -7,22 +7,10 @@
* Reworked by David Douthitt <n9ubh@callsign.net> and
* Matt Kraai <kraai@alumni.carnegiemellon.edu>.
*
* 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 the GPL v2 or later, see the file LICENSE in this tarball.
*/
#include "busybox.h"
#include <stdio.h>
#include <unistd.h>
#include <dirent.h>
@ -31,7 +19,6 @@
#include <fnmatch.h>
#include <time.h>
#include <ctype.h>
#include "busybox.h"
//XXX just found out about libbb/messages.c . maybe move stuff there ? - ghoz
static const char msg_req_arg[] = "option `%s' requires an argument";

2
findutils/grep.c
View File

@ -16,12 +16,12 @@
* precompiled regex
*/
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <getopt.h>
#include <string.h>
#include <errno.h>
#include "busybox.h"
#include "xregex.h"

17
findutils/xargs.c
View File

@ -1,3 +1,4 @@
/* vi: set sw=4 ts=4: */
/*
* Mini xargs implementation for busybox
* Options are supported: "-prtx -n max_arg -s max_chars -e[ouf_str]"
@ -9,25 +10,14 @@
* - Mike Rendell <michael@cs.mun.ca>
* and David MacKenzie <djm@gnu.ai.mit.edu>.
*
* 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 the GPL v2 or later, see the file LICENSE in this tarball.
*
* xargs is described in the Single Unix Specification v3 at
* http://www.opengroup.org/onlinepubs/007904975/utilities/xargs.html
*
*/
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -37,7 +27,6 @@
#include <fcntl.h>
#include <sys/types.h>
#include <sys/wait.h>
#include "busybox.h"
/* COMPAT: SYSV version defaults size (and has a max value of) to 470.
We try to make it as large as possible. */

3
init/halt.c
View File

@ -7,10 +7,9 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include "busybox.h"
#include <signal.h>
#include <sys/reboot.h>
#include "busybox.h"
#include <unistd.h>
int halt_main(int argc, char *argv[])

2
init/init_shared.c
View File

@ -7,6 +7,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include "busybox.h"
#include <signal.h>
#include <stdlib.h>
#include <sys/types.h>
@ -14,7 +15,6 @@
#include <getopt.h>
#include <sys/reboot.h>
#include <sys/syslog.h>
#include "busybox.h"
#include "init_shared.h"
const char * const init_sending_format = "Sending SIG%s to all processes.";

6
init/init_shared.h
View File

@ -1,3 +1,9 @@
/* vi: set sw=4 ts=4: */
/*
* Helper functions shared by init et al.
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
extern int kill_init(int sig);
extern int bb_shutdown_system(unsigned long magic);
extern const char * const init_sending_format;

21
init/mesg.c
View File

@ -1,26 +1,15 @@
/* vi: set sw=4 ts=4: */
/*
* mesg implementation for busybox
* mesg implementation for busybox
*
* Copyright (c) 2002 Manuel Novoa III <mjn3@codepoet.org>
* Copyright (c) 2002 Manuel Novoa III <mjn3@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 the GPL v2 or later, see the file LICENSE in this tarball.
*/
#include "busybox.h"
#include <unistd.h>
#include <stdlib.h>
#include "busybox.h"
#ifdef USE_TTY_GROUP
#define S_IWGRP_OR_S_IWOTH S_IWGRP

17
procps/free.c
View File

@ -4,28 +4,15 @@
*
* 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 the GPL v2 or later, see the file LICENSE in this tarball.
*/
/* getopt not needed */
#include "busybox.h"
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
#include "busybox.h"
int free_main(int argc, char **argv)
{

3
procps/fuser.c
View File

@ -1,3 +1,4 @@
/* vi: set sw=4 ts=4: */
/*
* tiny fuser implementation
*
@ -7,6 +8,7 @@
* GNU Library General Public License
*/
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -19,7 +21,6 @@
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/sysmacros.h>
#include "busybox.h"
#define FUSER_PROC_DIR "/proc"
#define FUSER_MAX_LINE 255

18
procps/kill.c
View File

@ -5,23 +5,10 @@
* Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
* 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 the GPL v2 or later, see the file LICENSE in this tarball.
*/
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
@ -30,7 +17,6 @@
#include <ctype.h>
#include <string.h>
#include <unistd.h>
#include "busybox.h"
#define KILL 0
#define KILLALL 1

3
procps/pidof.c
View File

@ -7,7 +7,7 @@
* Licensed under the GPL v2, see the file LICENSE in this tarball.
*/
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
@ -17,7 +17,6 @@
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
#include "busybox.h"
#if ENABLE_FEATURE_PIDOF_SINGLE
#define _SINGLE_COMPL(a) a

2
procps/ps.c
View File

@ -7,6 +7,7 @@
* Licensed under the GPL v2, see the file LICENSE in this tarball.
*/
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -17,7 +18,6 @@
#include <string.h>
#include <termios.h>
#include <sys/ioctl.h>
#include "busybox.h"
#if ENABLE_SELINUX
#include <selinux/selinux.h> /* for is_selinux_enabled() */
#endif

17
procps/renice.c
View File

@ -4,20 +4,7 @@
*
* Copyright (C) 2005 Manuel Novoa III <mjn3@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 the GPL v2 or later, see the file LICENSE in this tarball.
*/
/* Notes:
@ -32,6 +19,7 @@
* following IDs (if any). Multiple switches are allowed.
*/
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -39,7 +27,6 @@
#include <errno.h>
#include <unistd.h>
#include <sys/resource.h>
#include "busybox.h"
#if (PRIO_PROCESS < CHAR_MIN) || (PRIO_PROCESS > CHAR_MAX)
#error Assumption violated : PRIO_PROCESS value

4
procps/sysctl.c
View File

@ -1,4 +1,4 @@
/* vi: set sw=4 ts=4: */
/*
* Sysctl 1.01 - A utility to read and manipulate the sysctl parameters
*
@ -14,6 +14,7 @@
*
*/
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -23,7 +24,6 @@
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include "busybox.h"
/*
* Function Prototypes

2
procps/top.c
View File

@ -28,13 +28,13 @@
* GNU Library General Public License
*/
#include "busybox.h"
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <sys/ioctl.h>
#include "busybox.h"
//#define CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE /* + 2k */

18
procps/uptime.c
View File

@ -4,20 +4,7 @@
*
* 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 the GPL v2 or later, see the file LICENSE in this tarball.
*/
/* This version of uptime doesn't display the number of users on the system,
@ -28,12 +15,11 @@
/* getopt not needed */
#include "busybox.h"
#include <stdio.h>
#include <time.h>
#include <errno.h>
#include <stdlib.h>
#include "busybox.h"
#ifndef FSHIFT
# define FSHIFT 16 /* nr of bits of precision */

7
shell/ash.c
View File

@ -44,11 +44,12 @@
*/
#define IFS_BROKEN
#define PROFILE 0
#include "busybox.h"
#ifdef DEBUG
#define _GNU_SOURCE
#endif
@ -76,12 +77,10 @@
#include <paths.h>
#include <setjmp.h>
#include <signal.h>
#include <stdint.h>
/*#include <stdint.h>*/
#include <time.h>
#include <fnmatch.h>
#include "busybox.h"
#include "pwd_.h"
#ifdef CONFIG_ASH_JOB_CONTROL

3
shell/cmdedit.c
View File

@ -31,6 +31,7 @@
*/
#include "busybox.h"
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
@ -41,8 +42,6 @@
#include <signal.h>
#include <limits.h>
#include "busybox.h"
#include "../shell/cmdedit.h"

3
shell/hush.c
View File

@ -77,6 +77,8 @@
*
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
#include "busybox.h"
#include <ctype.h> /* isalpha, isdigit */
#include <unistd.h> /* getpid */
#include <stdlib.h> /* getenv, atoi */
@ -97,7 +99,6 @@
/* #define DEBUG_SHELL */
#if 1
#include "busybox.h"
#include "cmdedit.h"
#else
#define bb_applet_name "hush"

2
shell/lash.c
View File

@ -21,6 +21,7 @@
//#define DEBUG_SHELL
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@ -33,7 +34,6 @@
#include <unistd.h>
#include <getopt.h>
#include <termios.h>
#include "busybox.h"
#include "cmdedit.h"
#ifdef CONFIG_LOCALE_SUPPORT

2
shell/msh.c
View File

@ -27,6 +27,7 @@
* Original copyright notice is retained at the end of this file.
*/
#include "busybox.h"
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
@ -46,7 +47,6 @@
#include <sys/wait.h>
#include "cmdedit.h"
#include "busybox.h"
/* Conditional use of "register" keyword */

3
sysklogd/klogd.c
View File

@ -17,6 +17,7 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <signal.h> /* for our signal() handlers */
@ -27,8 +28,6 @@
#include <sys/syslog.h>
#include <sys/klog.h>
#include "busybox.h"
static void klogd_signal(int sig ATTRIBUTE_UNUSED)
{
klogctl(7, NULL, 0);

17
sysklogd/logger.c
View File

@ -4,22 +4,10 @@
*
* 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 <stdio.h>
#include <unistd.h>
#include <sys/types.h>
@ -28,7 +16,6 @@
#include <string.h>
#include <stdlib.h>
#include "busybox.h"
#if !defined CONFIG_SYSLOGD
#define SYSLOG_NAMES

3
sysklogd/syslogd.c
View File

@ -13,6 +13,7 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@ -32,8 +33,6 @@
#include <sys/un.h>
#include <sys/param.h>
#include "busybox.h"
/* SYSLOG_NAMES defined to pull some extra junk from syslog.h */
#define SYSLOG_NAMES
#include <sys/syslog.h>