4e05b9b04
Glenn L McGrath
2002-12-07
Subject
include "busybox" after the libc includes tofix compile errors
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): sysdeps/linux/Config.in "fileutils/Config.in" dosyasini kaynak gosteriyor ama bu dosya repoda hic var olmadi (2002-12-05 - 2003-02-15 arasi orijinal yazar hatasi, 3238ea167 ile duzeltildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
init/reboot.c +3 -1libbb/Makefile.in +2 -2libpwdgrp/__getgrent.c +2 -2libpwdgrp/__getpwent.c +2 -2libpwdgrp/getpwuid.c +2 -2libpwdgrp/pwent.c +1 -2libpwdgrp/shadow.c +2 -2
init/reboot.c+3 -1
| @@ -21,18 +21,20 @@ | |
| * | |
| */ | |
| - | #include "busybox.h" |
| #include <signal.h> | |
| #include <stdlib.h> | |
| #include <unistd.h> | |
| #include <getopt.h> | |
| + | #include "busybox.h" |
| + | |
| #if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__) | |
| #include <sys/reboot.h> | |
| #define init_reboot(magic) reboot(magic) | |
| #else | |
| #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic) | |
| #endif | |
| + | |
| #ifndef RB_ENABLE_CAD | |
| static const int RB_ENABLE_CAD = 0x89abcdef; | |
| static const int RB_AUTOBOOT = 0x01234567; | |
libbb/Makefile.in+2 -2
| @@ -24,8 +24,8 @@ LIBBB_DIR:=$(TOPDIR)libbb/ | |
| endif | |
| LIBBB_SRC:= \ | |
| - | ask_confirmation.c chomp.c compare_string_array.c concat_path_file.c \ |
| - | copy_file.c copy_file_chunk.c dump.c libc5.c device_open.c error_msg.c \ |
| + | ask_confirmation.c chomp.c concat_path_file.c copy_file.c \ |
| + | copy_file_chunk.c dump.c libc5.c device_open.c error_msg.c \ |
| error_msg_and_die.c fgets_str.c find_mount_point.c find_pid_by_name.c \ | |
| find_root_device.c full_read.c full_write.c get_console.c \ | |
| get_last_path_component.c get_line_from_file.c \ | |
libpwdgrp/__getgrent.c+2 -2
| @@ -18,11 +18,11 @@ | |
| * | |
| */ | |
| - | #include "busybox.h" |
| - | |
| #include <unistd.h> | |
| #include <stdlib.h> | |
| #include <string.h> | |
| + | |
| + | #include "busybox.h" |
| #include "grp_.h" | |
| /* | |
libpwdgrp/__getpwent.c+2 -2
| @@ -18,13 +18,13 @@ | |
| * | |
| */ | |
| - | #include "busybox.h" |
| - | |
| #include <stdlib.h> | |
| #include <unistd.h> | |
| #include <string.h> | |
| #include <fcntl.h> | |
| + | |
| #include "pwd_.h" | |
| + | #include "busybox.h" |
| #define PWD_BUFFER_SIZE 256 | |
libpwdgrp/getpwuid.c+2 -2
| @@ -18,12 +18,12 @@ | |
| * | |
| */ | |
| - | #include "busybox.h" |
| - | |
| #include <stdlib.h> | |
| #include <unistd.h> | |
| #include <fcntl.h> | |
| + | |
| #include "pwd_.h" | |
| + | #include "busybox.h" |
| struct passwd *getpwuid(uid_t uid) | |
| { | |
libpwdgrp/pwent.c+1 -2
| @@ -18,14 +18,13 @@ | |
| * | |
| */ | |
| - | #include "busybox.h" |
| - | |
| #include <unistd.h> | |
| #include <stdlib.h> | |
| #include <errno.h> | |
| #include "pwd_.h" | |
| #include <fcntl.h> | |
| + | #include "busybox.h" |
| /* | |
| * setpwent(), endpwent(), and getpwent() are included in the same object | |
| * file, since one cannot be used without the other two, so it makes sense to | |
libpwdgrp/shadow.c+2 -2
| @@ -33,12 +33,12 @@ | |
| * lckpwdf ulckpwdf | |
| */ | |
| - | #include "busybox.h" |
| - | |
| #include <stdio.h> | |
| #include <stdlib.h> | |
| #include <string.h> | |
| #include <unistd.h> | |
| + | |
| + | #include "busybox.h" |
| #include "shadow_.h" | |
| static FILE *shadow; | |