diff options
| -rw-r--r-- | modutils/insmod.c | 4 | ||||
| -rw-r--r-- | modutils/lsmod.c | 17 | ||||
| -rw-r--r-- | modutils/modprobe.c | 6 | ||||
| -rw-r--r-- | modutils/rmmod.c | 17 |
4 files changed, 9 insertions, 35 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index f38daa257..f8464dbd1 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -58,6 +58,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ +#include "busybox.h" #include <stdlib.h> #include <stdio.h> #include <stddef.h> @@ -70,7 +71,6 @@ #include <getopt.h> #include <fcntl.h> #include <sys/utsname.h> -#include "busybox.h" #if !defined(CONFIG_FEATURE_2_4_MODULES) && \ !defined(CONFIG_FEATURE_2_6_MODULES) @@ -3313,7 +3313,7 @@ static struct obj_file *obj_load(FILE * fp, int loadprogbits) } if (f->header.e_ident[EI_CLASS] != ELFCLASSM || f->header.e_ident[EI_DATA] != (BB_BIG_ENDIAN - ? ELFDATA2MSB : ELFDATA2LSB) + ? ELFDATA2MSB : ELFDATA2LSB) || f->header.e_ident[EI_VERSION] != EV_CURRENT || !MATCH_MACHINE(f->header.e_machine)) { bb_error_msg("ELF file not for this architecture"); diff --git a/modutils/lsmod.c b/modutils/lsmod.c index 3bbf89e58..10af2bd0d 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c @@ -8,22 +8,10 @@ * Nicolas Ferre <nicolas.ferre@alcove.fr> to support pre 2.1 kernels * (which lack the query_module() interface). * - * 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 <stdlib.h> #include <stdio.h> #include <string.h> @@ -36,7 +24,6 @@ #include <getopt.h> #include <sys/utsname.h> #include <sys/file.h> -#include "busybox.h" #ifndef CONFIG_FEATURE_CHECK_TAINTED_MODULE diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 44460391a..93e510293 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -11,6 +11,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ +#include "busybox.h" #include <sys/utsname.h> #include <sys/types.h> #include <sys/wait.h> @@ -22,7 +23,6 @@ #include <ctype.h> #include <fcntl.h> #include <fnmatch.h> -#include "busybox.h" struct mod_opt_t { /* one-way list of options to pass to a module */ char * m_opt_val; @@ -880,7 +880,7 @@ int modprobe_main(int argc, char** argv) depend = build_dep ( ); 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) { do { @@ -893,7 +893,7 @@ int modprobe_main(int argc, char** argv) } while ( ++optind < argc ); } else { 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 )) bb_error_msg_and_die ( "failed to load module %s", argv [optind] ); diff --git a/modutils/rmmod.c b/modutils/rmmod.c index 36bea3486..97650a4b2 100644 --- a/modutils/rmmod.c +++ b/modutils/rmmod.c @@ -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 <errno.h> #include <unistd.h> @@ -29,7 +17,6 @@ #include <string.h> #include <sys/utsname.h> #include <sys/syscall.h> -#include "busybox.h" #ifdef CONFIG_FEATURE_2_6_MODULES static inline void filename2modname(char *modname, const char *afterslash) |