350865e33

"Vladimir N. Oleynik"

2005-11-26

SOURCE BUG Duration: 7s

Subject

remove bug: fsck do not know path

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 →

e2fsprogs/fsck.c +1 -3 e2fsprogs/fsck.h +1 -1 e2fsprogs/util.c +7 -5 e2fsprogs/util.h +1 -1

e2fsprogs/fsck.c+1 -3

@@ -1361,7 +1361,7 @@ int fsck_main(int argc, char *argv[])
	fstab = _PATH_MNTTAB;
	load_fs_info(fstab);

-	e2fs_set_sbin_path();
+	fsck_path = e2fs_set_sbin_path();

	if ((num_devices == 1) \|\| (serialize))
	interactive = 1;
@@ -1405,8 +1405,6 @@ int fsck_main(int argc, char *argv[])
	}
	}
	status \|= wait_many(FLAG_WAIT_ALL);
-	if (ENABLE_FEATURE_CLEAN_UP)
-	free(fsck_path);
	blkid_put_cache(cache);
	return status;
	}

e2fsprogs/fsck.h+1 -1

@@ -13,4 +13,4 @@
	#define FSCK_CANCELED 32 /* Aborted with a signal or ^C */
	#define EXIT_LIBRARY 128

-	extern void e2fs_set_sbin_path(void);
+	extern char *e2fs_set_sbin_path(void);

e2fsprogs/util.c+7 -5

@@ -254,13 +254,15 @@ void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, in
	puts("done");
	}

-	void e2fs_set_sbin_path(void)
+	char *e2fs_set_sbin_path(void)
	{
	char *oldpath = getenv("PATH");
	/* Update our PATH to include /sbin */
	#define PATH_SET "/sbin"
-	if (oldpath)
-	putenv (bb_xasprintf("%s:%s", PATH_SET, oldpath));
-	else
-	putenv (PATH_SET);
+	if (oldpath)
+	oldpath = bb_xasprintf("%s:%s", PATH_SET, oldpath);
+	else
+	oldpath = PATH_SET;
+	putenv (oldpath);
+	return oldpath;
	}

e2fsprogs/util.h+1 -1

@@ -18,4 +18,4 @@ extern int figure_journal_size(int size, ext2_filsys fs);
	extern void print_check_message(ext2_filsys fs);
	extern void make_journal_device(char *journal_device, ext2_filsys fs, int quiet, int force);
	extern void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, int quiet);
-	extern void e2fs_set_sbin_path(void);
+	extern char *e2fs_set_sbin_path(void);