Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9feb8367 authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Ralf Baechle
Browse files

MIPS: AR7: use strlcat() for the command line arguments 



Signed-off-by: default avatarYoichi Yuasa <yuasa@linux-mips.org>
Cc: linux-mips <linux-mips@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/871/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e0e53dee

arch/mips/ar7/prom.c

+6 −16
Original line number Diff line number Diff line
@@ -56,22 +56,12 @@ char * __init prom_getcmdline(void) 


static void  __init ar7_init_cmdline(int argc, char *argv[])

{

	char *cp;

	int actr;



	actr = 1; /* Always ignore argv[0] */

	int i;



	cp = &(arcs_cmdline[0]);

	while (actr < argc) {

		strcpy(cp, argv[actr]);

		cp += strlen(argv[actr]);

		*cp++ = ' ';

		actr++;

	}

	if (cp != &(arcs_cmdline[0])) {

		/* get rid of trailing space */

		--cp;

		*cp = '\0';

	for (i = 1; i < argc; i++) {

		strlcat(arcs_cmdline, argv[i], COMMAND_LINE_SIZE);

		if (i < (argc - 1))

			strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);

	}

}
@@ -250,7 +240,7 @@ static void __init console_config(void) 
	else

		sprintf(console_string, " console=ttyS0,%d%c%c", baud, parity,

			bits);

	strcat(prom_getcmdline(), console_string);

	strlcat(arcs_cmdline, console_string, COMMAND_LINE_SIZE);

#endif

}