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.
- remove two supposedly superfluous newlines from ...error_msg() in modprobe
  and use shorter boilerplate while at it.
This commit is contained in:
Bernhard Reutner-Fischer 2006-06-03 19:35:15 +00:00
parent 2c351a8f98
commit deda6a5c0d
4 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modutils/insmod.c
View File

@ -58,6 +58,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#include "busybox.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h> #include <stddef.h>
@ -70,7 +71,6 @@
#include <getopt.h> #include <getopt.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include "busybox.h"
#if !defined(CONFIG_FEATURE_2_4_MODULES) && \ #if !defined(CONFIG_FEATURE_2_4_MODULES) && \
!defined(CONFIG_FEATURE_2_6_MODULES) !defined(CONFIG_FEATURE_2_6_MODULES)

17
modutils/lsmod.c
View File

@ -8,22 +8,10 @@
* Nicolas Ferre <nicolas.ferre@alcove.fr> to support pre 2.1 kernels * Nicolas Ferre <nicolas.ferre@alcove.fr> to support pre 2.1 kernels
* (which lack the query_module() interface). * (which lack the query_module() interface).
* *
* This program is free software; you can redistribute it and/or modify * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* 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
*
*/ */
#include "busybox.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -36,7 +24,6 @@
#include <getopt.h> #include <getopt.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <sys/file.h> #include <sys/file.h>
#include "busybox.h"
#ifndef CONFIG_FEATURE_CHECK_TAINTED_MODULE #ifndef CONFIG_FEATURE_CHECK_TAINTED_MODULE

6
modutils/modprobe.c
View File

@ -11,6 +11,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#include "busybox.h"
#include <sys/utsname.h> #include <sys/utsname.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
@ -22,7 +23,6 @@
#include <ctype.h> #include <ctype.h>
#include <fcntl.h> #include <fcntl.h>
#include <fnmatch.h> #include <fnmatch.h>
#include "busybox.h"
struct mod_opt_t { /* one-way list of options to pass to a module */ struct mod_opt_t { /* one-way list of options to pass to a module */
char * m_opt_val; char * m_opt_val;
@ -880,7 +880,7 @@ int modprobe_main(int argc, char** argv)
depend = build_dep ( ); depend = build_dep ( );
if ( !depend ) if ( !depend )
bb_error_msg_and_die ( "could not parse modules.dep\n" ); bb_error_msg_and_die ( "could not parse modules.dep" );
if (remove_opt) { if (remove_opt) {
do { do {
@ -893,7 +893,7 @@ int modprobe_main(int argc, char** argv)
} while ( ++optind < argc ); } while ( ++optind < argc );
} else { } else {
if (optind >= argc) if (optind >= argc)
bb_error_msg_and_die ( "No module or pattern provided\n" ); bb_error_msg_and_die ( "No module or pattern provided" );
if ( mod_insert ( argv [optind], argc - optind - 1, argv + optind + 1 )) if ( mod_insert ( argv [optind], argc - optind - 1, argv + optind + 1 ))
bb_error_msg_and_die ( "failed to load module %s", argv [optind] ); bb_error_msg_and_die ( "failed to load module %s", argv [optind] );

17
modutils/rmmod.c
View File

@ -4,22 +4,10 @@
* *
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
* *
* This program is free software; you can redistribute it and/or modify * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* 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
*
*/ */
#include "busybox.h"
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
@ -29,7 +17,6 @@
#include <string.h> #include <string.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include "busybox.h"
#ifdef CONFIG_FEATURE_2_6_MODULES #ifdef CONFIG_FEATURE_2_6_MODULES
static inline void filename2modname(char *modname, const char *afterslash) static inline void filename2modname(char *modname, const char *afterslash)