← Commit list

c89982dcd

Bernhard Reutner-Fischer
Bernhard Reutner-Fischer
2006-06-03
SOURCE BUG Duration: 38s

Subject

- move #include busybox.h to the very top so we pull in the config and eventual platform specific includes in early.

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)

→ Bu hatanin tam hikayesini ve duzeltme diffini gor

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

miscutils/adjtimex.c +3 -2miscutils/crond.c +1 -2miscutils/crontab.c +1 -2miscutils/dc.c +1 -1miscutils/eject.c +2 -1miscutils/hdparm.c +1 -3miscutils/last.c +1 -1miscutils/less.c +1 -2miscutils/makedevs.c +1 -1miscutils/mountpoint.c +1 -1miscutils/mt.c +1 -1miscutils/runlevel.c +2 -2miscutils/rx.c +1 -1miscutils/setsid.c +2 -1miscutils/strings.c +1 -1miscutils/time.c +1 -1miscutils/watchdog.c +1 -1
miscutils/adjtimex.c+3 -2
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
/*
* adjtimex.c - read, and possibly modify, the Linux kernel `timex' variables.
*
@@ -6,16 +7,16 @@
* Copyright 1997, 2000, 2001 Larry Doolittle <[email protected]>
*
* busyboxed 20 March 2001, Larry Doolittle <[email protected]>
- *
+ *
* Licensed under GPLv2 or later, see file License in this tarball for details.
*/
+#include "busybox.h"
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/timex.h>
-#include "busybox.h"
static const struct {int bit; const char *name;} statlist[] = {
{ STA_PLL, "PLL" },
miscutils/crond.c+1 -2
@@ -12,6 +12,7 @@
#define VERSION "2.3.2"
+#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -29,8 +30,6 @@
#include <sys/stat.h>
#include <sys/resource.h>
-#include "busybox.h"
-
#define arysize(ary) (sizeof(ary)/sizeof((ary)[0]))
#ifndef CRONTABS
miscutils/crontab.c+1 -2
@@ -10,6 +10,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 <stdarg.h>
@@ -40,8 +41,6 @@
#define PATH_VI "/bin/vi" /* location of vi */
#endif
-#include "busybox.h"
-
static const char *CDir = CRONTABS;
static void EditFile(const char *user, const char *file);
miscutils/dc.c+1 -1
@@ -1,11 +1,11 @@
/* vi: set sw=4 ts=4: */
+#include "busybox.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <math.h>
-#include "busybox.h"
/* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */
miscutils/eject.c+2 -1
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
/*
* eject implementation for busybox
*
@@ -12,12 +13,12 @@
* Most of the dirty work blatantly ripped off from cat.c =)
*/
+#include "busybox.h"
#include <fcntl.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <sys/mount.h>
#include <mntent.h>
-#include "busybox.h"
/* various defines swiped from linux/cdrom.h */
#define CDROMCLOSETRAY 0x5319 /* pendant of CDROMEJECT */
miscutils/hdparm.c+1 -3
@@ -12,12 +12,12 @@
* - by Mark Lord (C) 1994-2002 -- freely distributable
*/
+#include "busybox.h"
#include <string.h>
#include <stdlib.h>
#include <fcntl.h>
#include <errno.h>
#include <ctype.h>
-#include <endian.h>
#include <sys/ioctl.h>
#include <sys/sysmacros.h>
#include <sys/times.h>
@@ -31,8 +31,6 @@
#endif
#include <unistd.h>
-#include "busybox.h"
-
/* device types */
/* ------------ */
#define NO_DEV 0xffff
miscutils/last.c+1 -1
@@ -7,6 +7,7 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
+#include "busybox.h"
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
@@ -16,7 +17,6 @@
#include <errno.h>
#include <string.h>
#include <time.h>
-#include "busybox.h"
#ifndef SHUTDOWN_TIME
# define SHUTDOWN_TIME 254
miscutils/less.c+1 -2
@@ -30,6 +30,7 @@
* redirected input has been read from stdin
*/
+#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -37,8 +38,6 @@
#include <unistd.h>
#include <ctype.h>
-#include "busybox.h"
-
#ifdef CONFIG_FEATURE_LESS_REGEXP
#include "xregex.h"
#endif
miscutils/makedevs.c+1 -1
@@ -7,6 +7,7 @@
* known bugs: can't deal with alpha ranges
*/
+#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -16,7 +17,6 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/sysmacros.h> /* major() and minor() */
-#include "busybox.h"
#ifdef CONFIG_FEATURE_MAKEDEVS_LEAF
int makedevs_main(int argc, char **argv)
miscutils/mountpoint.c+1 -1
@@ -9,11 +9,11 @@
* Based on sysvinit's mountpoint
*/
+#include "busybox.h"
#include <sys/stat.h>
#include <errno.h> /* errno */
#include <string.h> /* strerror */
#include <getopt.h> /* optind */
-#include "busybox.h"
int mountpoint_main(int argc, char **argv)
{
miscutils/mt.c+1 -1
@@ -1,10 +1,10 @@
/* vi: set sw=4 ts=4: */
+#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mtio.h>
#include <fcntl.h>
-#include "busybox.h"
struct mt_opcodes {
char *name;
miscutils/runlevel.c+2 -2
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
/*
* runlevel Prints out the previous and the current runlevel.
*
@@ -11,13 +12,12 @@
* initially busyboxified by Bernhard Fischer
*/
+#include "busybox.h"
#include <stdio.h>
#include <utmp.h>
#include <time.h>
#include <stdlib.h>
-#include "busybox.h"
-
int runlevel_main(int argc, char *argv[])
{
struct utmp *ut;
miscutils/rx.c+1 -1
@@ -20,6 +20,7 @@
*
*/
+#include "busybox.h"
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
@@ -31,7 +32,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
-#include "busybox.h"
#define SOH 0x01
miscutils/setsid.c+2 -1
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
/*
* setsid.c -- execute a command in a new session
* Rick Sladkey <[email protected]>
@@ -13,10 +14,10 @@
* - busyboxed
*/
+#include "busybox.h"
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
-#include "busybox.h"
int setsid_main(int argc, char *argv[])
{
miscutils/strings.c+1 -1
@@ -13,11 +13,11 @@
* Badly hacked by Tito Ragusa <[email protected]>
*/
+#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <getopt.h>
#include <ctype.h>
-#include "busybox.h"
#define WHOLE_FILE 1
#define PRINT_NAME 2
miscutils/time.c+1 -1
@@ -21,6 +21,7 @@
Heavily modified for busybox by Erik Andersen <[email protected]>
*/
+#include "busybox.h"
#include <stdlib.h>
#include <stdio.h>
#include <signal.h>
@@ -35,7 +36,6 @@
#define TV_MSEC tv_usec / 1000
#include <sys/resource.h>
-#include "busybox.h"
/* Information on the resources used by a child process. */
typedef struct
miscutils/watchdog.c+1 -1
@@ -7,12 +7,12 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
+#include "busybox.h"
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
#include <signal.h>
-#include "busybox.h"
/* Userspace timer duration, in seconds */
static unsigned int timer_duration = 30;