ef08184d9

Rob Landley

2006-09-08

SOURCE BUG Duration: 48s

Subject

Fix warnings.

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/bbsh.c +14 -16

shell/bbsh.c+14 -16

@@ -105,14 +105,14 @@ static char parse_word(char start, struct command **cmd)
	// Parse a line of text into a pipeline.
	// Returns a pointer to the next line.

-	static char parse_pipeline(char cmdline, struct pipeline *pipe)
+	static char parse_pipeline(char cmdline, struct pipeline *line)
	{
-	struct command **cmd = &(pipe->cmd);
-	char *start = pipe->cmdline = cmdline;
+	struct command **cmd = &(line->cmd);
+	char *start = line->cmdline = cmdline;

	if (!cmdline) return 0;

-	if (ENABLE_BBSH_JOBCTL) pipe->cmdline = cmdline;
+	if (ENABLE_BBSH_JOBCTL) line->cmdline = cmdline;

	// Parse command into argv[]
	for (;;) {
@@ -121,7 +121,7 @@ static char parse_pipeline(char cmdline, struct pipeline *pipe)
	// Skip leading whitespace and detect end of line.
	while (isspace(*start)) start++;
	if (!start \|\| start=='#') {
-	if (ENABLE_BBSH_JOBCTL) pipe->cmdlinelen = start-cmdline;
+	if (ENABLE_BBSH_JOBCTL) line->cmdlinelen = start-cmdline;
	return 0;
	}

@@ -145,15 +145,15 @@ static char parse_pipeline(char cmdline, struct pipeline *pipe)
	start = end;
	}

-	if (ENABLE_BBSH_JOBCTL) pipe->cmdlinelen = start-cmdline;
+	if (ENABLE_BBSH_JOBCTL) line->cmdlinelen = start-cmdline;

	return start;
	}

	// Execute the commands in a pipeline
-	static int run_pipeline(struct pipeline *pipe)
+	static int run_pipeline(struct pipeline *line)
	{
-	struct command *cmd = pipe->cmd;
+	struct command *cmd = line->cmd;
	if (!cmd \|\| !cmd->argc) return 0;

	// Handle local commands. This is totally fake and plastic.
@@ -185,16 +185,16 @@ static void free_cmd(void *data)

	static void handle(char *command)
	{
-	struct pipeline pipe;
+	struct pipeline line;
	char *start = command;

	for (;;) {
-	memset(&pipe,0,sizeof(struct pipeline));
-	start = parse_pipeline(start, &pipe);
-	if (!pipe.cmd) break;
+	memset(&line,0,sizeof(struct pipeline));
+	start = parse_pipeline(start, &line);
+	if (!line.cmd) break;

-	run_pipeline(&pipe);
-	free_list(pipe.cmd, free_cmd);
+	run_pipeline(&line);
+	free_list(line.cmd, free_cmd);
	}
	}

@@ -210,8 +210,6 @@ int bbsh_main(int argc, char *argv[])
	else {
	unsigned cmdlen=0;
	for (;;) {
-	struct pipeline pipe;
-
	if(!f) putchar('$');
	if(1 > getline(&command, &cmdlen,f ? : stdin)) break;