5bd2a4b6c
Bernhard Reutner-Fischer
2006-08-18
Subject
- remove last reminiscents of IN_BUSYBOX
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 →
networking/udhcp/Makefile.in +3 -3networking/udhcp/arpping.c +0 -4networking/udhcp/dumpleases.c +1 -21
networking/udhcp/Makefile.in+3 -3
| @@ -43,11 +43,11 @@ APPLET_SRC-a+=$(UDHCP-a) | |
| UDHCP_INCLUDES:=$(srcdir) | |
| - | APPLETS_DEFINE-y+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES) |
| - | APPLETS_DEFINE-a+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES) |
| + | APPLETS_DEFINE-y+= -I$(UDHCP_INCLUDES) |
| + | APPLETS_DEFINE-a+= -I$(UDHCP_INCLUDES) |
| $(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS) | |
| $(do_ar) | |
| $(UDHCP_OBJS): $(UDHCP_DIR)%.o : $(srcdir)/%.c | |
| - | $(compile.c) -DIN_BUSYBOX |
| + | $(compile.c) |
networking/udhcp/arpping.c+0 -4
| @@ -44,11 +44,7 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface) | |
| if ((s = socket (PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP))) == -1) { | |
| - | #ifdef IN_BUSYBOX |
| LOG(LOG_ERR, bb_msg_can_not_create_raw_socket); | |
| - | #else |
| - | LOG(LOG_ERR, "Could not open raw socket"); |
| - | #endif |
| return -1; | |
| } | |
networking/udhcp/dumpleases.c+1 -21
| @@ -23,27 +23,7 @@ | |
| #define REMAINING 0 | |
| #define ABSOLUTE 1 | |
| - | |
| - | #ifndef IN_BUSYBOX |
| - | static void ATTRIBUTE_NORETURN show_usage(void) |
| - | { |
| - | printf( |
| - | "Usage: dumpleases -f <file> -[r|a]\n\n" |
| - | " -f, --file=FILENAME Leases file to load\n" |
| - | " -r, --remaining Interepret lease times as time remaining\n" |
| - | " -a, --absolute Interepret lease times as expire time\n"); |
| - | exit(0); |
| - | } |
| - | #else |
| - | #define show_usage bb_show_usage |
| - | #endif |
| - | |
| - | |
| - | #ifdef IN_BUSYBOX |
| int dumpleases_main(int argc, char *argv[]) | |
| - | #else |
| - | int main(int argc, char *argv[]) |
| - | #endif |
| { | |
| FILE *fp; | |
| int i, c, mode = REMAINING; | |
| @@ -71,7 +51,7 @@ int main(int argc, char *argv[]) | |
| file = optarg; | |
| break; | |
| default: | |
| - | show_usage(); |
| + | bb_show_usage(); |
| } | |
| } | |