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

modutils/*: move applet bits into corresponding *.c files

Browse Source 
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko
2010-10-15 11:29:02 +02:00
parent f2710d0221
commit c15613c975
7 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modutils/depmod.c
View File

@ -8,6 +8,8 @@
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
//applet:IF_DEPMOD(APPLET(depmod, _BB_DIR_SBIN, _BB_SUID_DROP))
#include "libbb.h"
#include "modutils.h"
#include <sys/utsname.h> /* uname() */

2
modutils/insmod.c
View File

@ -7,6 +7,8 @@
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
//applet:IF_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_DROP))
#include "libbb.h"
#include "modutils.h"

3
modutils/lsmod.c
View File

@ -7,6 +7,9 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
//applet:IF_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_DROP))
#include "libbb.h"
#include "unicode.h"

6
modutils/modprobe-small.c
View File

@ -8,6 +8,12 @@
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
//applet:IF_MODPROBE_SMALL(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
#include "libbb.h"
/* After libbb.h, since it needs sys/types.h on some systems */
#include <sys/utsname.h> /* uname() */

25
modutils/modprobe.c
View File

@ -8,17 +8,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
/* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
* we expect the full dependency list to be specified in modules.dep.
* Older versions would only export the direct dependency list.
*/
#include "libbb.h"
#include "modutils.h"
#include <sys/utsname.h>
#include <fnmatch.h>
//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
#define DBG(...) ((void)0)
//applet:IF_MODPROBE(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
//usage:#if !ENABLE_MODPROBE_SMALL
//usage:#define modprobe_notes_usage
@ -98,6 +88,19 @@
//usage: )
//usage:#endif /* !ENABLE_MODPROBE_SMALL */
#include "libbb.h"
#include "modutils.h"
#include <sys/utsname.h>
#include <fnmatch.h>
//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
#define DBG(...) ((void)0)
/* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
* we expect the full dependency list to be specified in modules.dep.
* Older versions would only export the direct dependency list.
*/
/* Note that usage text doesn't document various 2.4 options
* we pull in through INSMOD_OPTS define */

2
modutils/rmmod.c
View File

@ -8,6 +8,8 @@
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
//applet:IF_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_DROP))
#include "libbb.h"
#include "modutils.h"