deda6a5c0
Bernhard Reutner-Fischer
2006-06-03
Subject
- move #include busybox.h to the very top so we pull in the config and eventual platform specific includes in early. - remove two supposedly superfluous newlines from ...error_msg() in modprobe and use shorter boilerplate while at it.
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
modutils/insmod.c+2 -2
| @@ -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"); | |
modutils/lsmod.c+2 -15
| @@ -8,22 +8,10 @@ | |
| * Nicolas Ferre <[email protected]> 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 | |
modutils/modprobe.c+3 -3
| @@ -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] ); | |
modutils/rmmod.c+2 -15
| @@ -4,22 +4,10 @@ | |
| * | |
| * Copyright (C) 1999-2004 by Erik Andersen <[email protected]> | |
| * | |
| - | * 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) | |