6e98521d6

Rob Landley

2005-08-14

SOURCE BUG Duration: 5s

Subject

Stephane Billiart noticed that the return code of the new mount was horked. (Cleaned up the return code path to consistently use numbers so I don't keep confusing EXIT_SUCCESS with TRUE and EXIT_FAILURE with FALSE...)

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 +4 -4

util-linux/mount.c+4 -4

@@ -123,7 +123,7 @@ extern int mount_main(int argc, char **argv)
	loopFile = 0, buf = 0,
	*files[] = {"/etc/filesystems", "/proc/filesystems", 0};
	int i, opt, all = FALSE, fakeIt = FALSE, allowWrite = FALSE,
-	rc = EXIT_FAILURE, useMtab = ENABLE_FEATURE_MTAB_SUPPORT;
+	rc = 1, useMtab = ENABLE_FEATURE_MTAB_SUPPORT;
	int flags=0xc0ed0000; // Needed for linux 2.2, ignored by 2.4 and 2.6.
	FILE file = 0,f = 0;
	char path[PATH_MAX*2];
@@ -284,7 +284,7 @@ singlemount:
	if(nfsmount(blockDevice, directory, &flags, &string_flags, 1))
	bb_perror_msg("nfsmount failed");
	else {
-	rc=EXIT_SUCCESS;
+	rc = 0;
	fsType="nfs";
	}
	} else {
@@ -380,7 +380,7 @@ mount_it_now:
	if(ENABLE_FEATURE_CLEAN_UP) free(loopFile);
	}
	// Don't whine about already mounted fs when mounting all.
-	if(rc<0 && errno == EBUSY && all) rc=0;
+	if(rc<0 && errno == EBUSY && all) rc = 0;
	else if (errno == EPERM)
	bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
	}
@@ -396,5 +396,5 @@ mount_it_now:
	if(file) endmntent(file);
	if(rc) bb_perror_msg("Mounting %s on %s failed", blockDevice, directory);

-	return rc ? : EXIT_FAILURE;
+	return rc;
	}