11d7c5291

"Vladimir N. Oleynik"

2005-09-26

SOURCE BUG Duration: 10s

Subject

correct set prompt if CONFIG_ASH_EXPAND_PRMT enabled, small automatic space->tabs convert by my personal editor

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 →

shell/ash.c +12 -3

shell/ash.c+12 -3

@@ -6016,10 +6016,19 @@ pfgets(char *line, int len)


	#ifdef CONFIG_FEATURE_COMMAND_EDITING
+	#ifdef CONFIG_ASH_EXPAND_PRMT
+	static char *cmdedit_prompt;
+	#else
	static const char *cmdedit_prompt;
+	#endif
	static inline void putprompt(const char *s)
	{
+	#ifdef CONFIG_ASH_EXPAND_PRMT
+	free(cmdedit_prompt);
+	cmdedit_prompt = bb_xstrdup(s);
+	#else
	cmdedit_prompt = s;
+	#endif
	}
	#else
	static inline void putprompt(const char *s)
@@ -12626,7 +12635,7 @@ readcmd(int argc, char **argv)
	while ((i = nextopt("p:r")) != '\0')
	#endif
	{
-	switch(i) {
+	switch(i) {
	case 'p':
	prompt = optionarg;
	break;
@@ -12643,13 +12652,13 @@ readcmd(int argc, char **argv)
	#endif
	#if defined(CONFIG_ASH_READ_TIMEOUT)
	case 't':
-	ts.tv_sec = strtol(optionarg, &p, 10);
+	ts.tv_sec = strtol(optionarg, &p, 10);
	ts.tv_usec = 0;
	if (*p == '.') {
	char *p2;
	if (*++p) {
	int scale;
-	ts.tv_usec = strtol(p, &p2, 10);
+	ts.tv_usec = strtol(p, &p2, 10);
	if (*p2)
	error("invalid timeout");
	scale = p2 - p;