d25a2645f

Denis Vlasenko

2006-09-05

SOURCE BUG Duration: 32s

Subject

xfunc: fix: && -> &. Also nuked two double semicolons...

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 →

console-tools/setlogcons.c +1 -1 libbb/xfuncs.c +2 -2

console-tools/setlogcons.c+1 -1

@@ -25,7 +25,7 @@ extern int setlogcons_main(int argc, char **argv)
	arg.subarg = atoi(argv[1]);

	if (ioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg))
-	bb_perror_msg_and_die("TIOCLINUX");;
+	bb_perror_msg_and_die("TIOCLINUX");

	return 0;
	}

libbb/xfuncs.c+2 -2

@@ -108,7 +108,7 @@ FILE xfopen(const char path, const char *mode)
	/* Die if we can't open an existing file and return an fd. */
	int xopen(const char *pathname, int flags)
	{
-	if (ENABLE_DEBUG && (flags && O_CREAT))
+	if (ENABLE_DEBUG && (flags & O_CREAT))
	bb_error_msg_and_die("xopen() with O_CREAT\n");

	return xopen3(pathname, flags, 0777);
@@ -349,7 +349,7 @@ off_t fdlength(int fd)
	do {
	char temp;

-	pos = bottom + (top - bottom) / 2;;
+	pos = bottom + (top - bottom) / 2;

	/* If we can read from the current location, it's bigger. */