61ff4b397

"Vladimir N. Oleynik"

2005-11-26

SOURCE BUG Duration: 9s

Subject

more use const for interface of libbb/compare_string_array, example usage for e2fsprogs/fsck

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 +4 -9 include/libbb.h +1 -1 libbb/compare_string_array.c +2 -1

e2fsprogs/fsck.c+4 -9

@@ -988,8 +988,7 @@ static int fs_match(struct fs_info fs, struct fs_type_compile cmp)
	/* Check if we should ignore this filesystem. */
	static int ignore(struct fs_info *fs)
	{
-	const char * const *ip;
-	int wanted = 0;
+	int wanted;
	char *s;

	/*
@@ -1007,15 +1006,11 @@ static int ignore(struct fs_info *fs)
	if (!fs_match(fs, &fs_type_compiled)) return 1;

	/* Are we ignoring this type? */
-	for(ip = ignored_types; *ip; ip++)
-	if (strcmp(fs->type, *ip) == 0) return 1;
+	if(compare_string_array(ignored_types, fs->type))
+	return 1;

	/* Do we really really want to check this fs? */
-	for(ip = really_wanted; *ip; ip++)
-	if (strcmp(fs->type, *ip) == 0) {
-	wanted = 1;
-	break;
-	}
+	wanted = compare_string_array(really_wanted, fs->type);

	/* See if the <fsck.fs> program is available. */
	s = find_fsck(fs->type);

include/libbb.h+1 -1

@@ -466,7 +466,7 @@ typedef struct {
	} procps_status_t;

	extern procps_status_t * procps_scan(int save_user_arg0);
-	extern unsigned short compare_string_array(const char string_array[], const char key);
+	extern unsigned short compare_string_array(const char * const string_array[], const char *key);

	extern int my_query_module(const char name, int which, void buf, size_t bufsize, size_t *ret);

libbb/compare_string_array.c+2 -1

@@ -17,7 +17,8 @@
	#include <string.h>

	/* returns the array number of the string */
-	extern unsigned short compare_string_array(const char string_array[], const char key)
+	extern unsigned short
+	compare_string_array(const char * const string_array[], const char *key)
	{
	unsigned short i;