721b46e0e

Rob Landley

2006-08-08

SOURCE BUG Duration: 28s

Subject

Fix a typo (|| instead of |) and remove two comments about a problem fixed in the previous patch.

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 →

util-linux/mount.c +2 -3

util-linux/mount.c+2 -3

@@ -233,7 +233,6 @@ static int mount_it_now(struct mntent mp, int vfsflags, char filteropts)

	for(i=0; mount_options[i].flags != MS_REMOUNT; i++)
	if (mount_options[i].flags > 0)
-	// Shut up about the darn const. It's not important. I don't care. (char *)
	append_mount_options(&(mp->mnt_opts), mount_options[i].name);

	// Remove trailing / (if any) from directory we mounted on
@@ -292,7 +291,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
	// Look at the file. (Not found isn't a failure for remount, or for
	// a synthetic filesystem like proc or sysfs.)

-	if (!lstat(mp->mnt_fsname, &st) && !(vfsflags & (MS_REMOUNT \| MS_BIND \| MS_MOVE \| MS_SHARED \| MS_PRIVATE \|\| MS_SLAVE \| MS_UNBINDABLE)))
+	if (!lstat(mp->mnt_fsname, &st) && !(vfsflags & (MS_REMOUNT \| MS_BIND \| MS_MOVE \| MS_SHARED \| MS_PRIVATE \| MS_SLAVE \| MS_UNBINDABLE)))
	{
	// Do we need to allocate a loopback device for it?

@@ -463,7 +462,7 @@ int mount_main(int argc, char **argv)
	// Open either fstab or mtab

	if (parse_mount_options(cmdopts,0) & MS_REMOUNT)
-	fstabname = bb_path_mtab_file; // Again with the evil const (char *).
+	fstabname = bb_path_mtab_file;
	else fstabname="/etc/fstab";

	if (!(fstab=setmntent(fstabname,"r")))