9a643149d

Rob Landley

2005-08-30

SOURCE BUG Duration: 7s

Subject

Amir Shalem found some bugs in the new mount code; unknown options didn't get added to the list, and my assumption that nfsmount() actually called mount() was incorrect (and I coded it wrong anyway; I hate having to touch codepaths I can't personally test).

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 -2

util-linux/mount.c+4 -2

@@ -99,12 +99,12 @@ static void parse_mount_options(char options, int flags, char **strflags)
	}
	}
	// Unrecognized mount option?
-	if(i == sizeof(mount_options)) {
+	if(i == (sizeof(mount_options) / sizeof(*mount_options))) {
	// Add it to strflags, to pass on to kernel
	i = strflags ? strlen(strflags) : 0;
	strflags = xrealloc(strflags, i+strlen(options)+2);
	// Comma separated if it's not the first one
-	if(i) (*strflags)[i] = ',';
+	if(i) (*strflags)[i++] = ',';
	strcpy((*strflags)+i, options);
	}
	// Advance to next option, or finish
@@ -286,6 +286,8 @@ singlemount:
	else {
	rc = 0;
	fsType="nfs";
+	// Strangely enough, nfsmount() doesn't actually mount()
+	goto mount_it_now;
	}
	} else {