b7128c623

Rob Landley

2005-09-11

SOURCE BUG Duration: 5s

Subject

Cleanup patch by Bernhard Fischer, removing unnecessary includes of getopt.h, whitespace changes, typos, etc.

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 →

archival/ar.c+0 -1

@@ -27,7 +27,6 @@
	*/

	#include <fcntl.h>
-	#include <getopt.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>

archival/bunzip2.c+1 -2

@@ -6,7 +6,6 @@
	*/

	#include <fcntl.h>
-	#include <getopt.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
@@ -35,7 +34,7 @@ int bunzip2_main(int argc, char **argv)
	src_fd = STDIN_FILENO;
	filename = 0;
	}
-
+
	/* if called as bzcat force the stdout flag */
	if ((opt & BUNZIP2_OPT_STDOUT) \|\| bb_applet_name[2] == 'c')
	filename = 0;

archival/cpio.c+8 -9

@@ -24,20 +24,19 @@
	*
	*/
	#include <fcntl.h>
-	#include <getopt.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>
	#include "unarchive.h"
	#include "busybox.h"

-	#define CPIO_OPT_EXTRACT 0x01
-	#define CPIO_OPT_TEST 0x02
-	#define CPIO_OPT_UNCONDITIONAL 0x04
-	#define CPIO_OPT_VERBOSE 0x08
-	#define CPIO_OPT_FILE 0x10
+	#define CPIO_OPT_EXTRACT 0x01
+	#define CPIO_OPT_TEST 0x02
+	#define CPIO_OPT_UNCONDITIONAL 0x04
+	#define CPIO_OPT_VERBOSE 0x08
+	#define CPIO_OPT_FILE 0x10
	#define CPIO_OPT_CREATE_LEADING_DIR 0x20
-	#define CPIO_OPT_PRESERVE_MTIME 0x40
+	#define CPIO_OPT_PRESERVE_MTIME 0x40

	extern int cpio_main(int argc, char **argv)
	{
@@ -59,7 +58,7 @@ extern int cpio_main(int argc, char **argv)
	}

	if (opt & CPIO_OPT_TEST) {
-	/* if both extract and test option are given, ignore extract option */
+	/* if both extract and test options are given, ignore extract option */
	if (opt & CPIO_OPT_EXTRACT) {
	opt &= ~CPIO_OPT_EXTRACT;
	}
@@ -79,7 +78,7 @@ extern int cpio_main(int argc, char **argv)
	archive_handle->action_header = header_list;
	}
	}
-	if (cpio_filename) { /* CPIO_OPT_FILE */
+	if (cpio_filename) { /* CPIO_OPT_FILE */
	archive_handle->src_fd = bb_xopen(cpio_filename, O_RDONLY);
	archive_handle->seek = seek_by_jump;
	}

archival/dpkg_deb.c+0 -1

@@ -18,7 +18,6 @@
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>
-	#include <getopt.h>

	#include "unarchive.h"
	#include "busybox.h"

archival/gunzip.c+0 -1

@@ -63,7 +63,6 @@ static char *license_msg[] = {
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>
-	#include <getopt.h>
	#include <sys/types.h>
	#include <sys/stat.h>
	#include <fcntl.h>

archival/libunarchive/unpack_ar_archive.c+0 -1

@@ -16,7 +16,6 @@
	#include <fcntl.h>
	#include <stdlib.h>
	#include <string.h>
-	#include <getopt.h>
	#include "unarchive.h"
	#include "busybox.h"

archival/uncompress.c+0 -1

@@ -20,7 +20,6 @@
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>
-	#include <getopt.h>
	#include <sys/types.h>
	#include <sys/stat.h>
	#include <fcntl.h>

archival/unzip.c+0 -1

@@ -38,7 +38,6 @@
	*/

	#include <fcntl.h>
-	#include <getopt.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

console-tools/setconsole.c+1 -1

@@ -24,7 +24,7 @@
	#include <sys/types.h>
	#include <fcntl.h>
	#include <stdio.h>
-	#include <getopt.h>
+	#include <getopt.h> /* struct option */

	#include "busybox.h"

coreutils/cut.c+0 -1

@@ -23,7 +23,6 @@

	#include <stdio.h>
	#include <stdlib.h>
-	#include <getopt.h>
	#include <unistd.h>
	#include <string.h>
	#include <limits.h>

coreutils/date.c+0 -1

@@ -29,7 +29,6 @@
	#include <time.h>
	#include <stdio.h>
	#include <string.h>
-	#include <getopt.h>
	#include "busybox.h"

coreutils/dos2unix.c+0 -1

@@ -28,7 +28,6 @@
	*/

	#include <string.h>
-	#include <getopt.h>
	#include <unistd.h>
	#include <stdint.h>
	#include <fcntl.h>

coreutils/env.c+1 -1

@@ -47,7 +47,7 @@
	#include <stdlib.h>
	#include <errno.h>
	#include <unistd.h>
-	#include <getopt.h>
+	#include <getopt.h> /* struct option */
	#include "busybox.h"

coreutils/install.c+1 -1

@@ -23,10 +23,10 @@
	#include <sys/stat.h>
	#include <sys/types.h>
	#include <errno.h>
-	#include <getopt.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>
+	#include <getopt.h> /* struct option */

	#include "busybox.h"
	#include "libcoreutils/coreutils.h"

coreutils/ls.c+1 -1

@@ -60,7 +60,7 @@ enum {
	#include <fcntl.h>
	#include <signal.h>
	#include <termios.h>
-	#include <getopt.h>
+	#include <getopt.h> /* struct option */
	#include <sys/ioctl.h>
	#include <sys/sysmacros.h> /* major() and minor() */
	#include "busybox.h"

coreutils/mkdir.c+1 -1

@@ -31,7 +31,7 @@

	#include <stdlib.h>
	#include <unistd.h>
-	#include <getopt.h>
+	#include <getopt.h> /* struct option */
	#include "busybox.h"

	static const struct option mkdir_long_options[] = {

coreutils/mv.c+1 -1

@@ -31,7 +31,7 @@
	#include <dirent.h>
	#include <errno.h>
	#include <stdlib.h>
-	#include <getopt.h>
+	#include <getopt.h> /* struct option */
	#include "busybox.h"
	#include "libcoreutils/coreutils.h"

coreutils/stat.c+1 -1

@@ -30,7 +30,7 @@
	#include <grp.h>
	#include <sys/vfs.h>
	#include <time.h>
-	#include <getopt.h>
+	#include <getopt.h> /* optind */
	#include <sys/stat.h>
	#include <sys/statfs.h>
	#include <sys/statvfs.h>

coreutils/sum.c+0 -1

@@ -18,7 +18,6 @@
	#include <sys/stat.h>
	#include <fcntl.h>
	#include <unistd.h>
-	#include <getopt.h>

	#include "busybox.h"

coreutils/uudecode.c+1 -1

@@ -24,7 +24,7 @@

	#include <stdio.h>
	#include <errno.h>
-	#include <getopt.h>
+	#include <getopt.h> /* optind */
	#include <string.h>
	#include <stdlib.h>

coreutils/uuencode.c+0 -1

@@ -19,7 +19,6 @@
	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
	*/
-	#include <getopt.h>
	#include <stdio.h>
	#include <string.h>
	#include <stdlib.h>

debianutils/readlink.c+2 -5

@@ -43,8 +43,6 @@ int readlink_main(int argc, char **argv)
	RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX);
	#endif

-	/* no options, no getopt */
-
	if (optind + 1 != argc)
	bb_show_usage();

@@ -58,9 +56,8 @@ int readlink_main(int argc, char **argv)
	if (!buf)
	return EXIT_FAILURE;
	puts(buf);
-	#ifdef CONFIG_FEATURE_CLEAN_UP
-	free(buf);
-	#endif
+
+	if (ENABLE_FEATURE_CLEAN_UP) free(buf);

	return EXIT_SUCCESS;
	}

debianutils/start_stop_daemon.c+1 -1

@@ -16,7 +16,7 @@
	#include <sys/stat.h>
	#include <dirent.h>
	#include <unistd.h>
-	#include <getopt.h>
+	#include <getopt.h> /* struct option */

	#include "busybox.h"
	#include "pwd_.h"