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

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Cc: linux-mips <linux-mips@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/871/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Yoichi Yuasa 2010-01-26 18:07:02 +09:00 committed by Ralf Baechle
parent e0e53dee69
commit 9feb836799

View file

@ -56,22 +56,12 @@ char * __init prom_getcmdline(void)
static void __init ar7_init_cmdline(int argc, char *argv[]) static void __init ar7_init_cmdline(int argc, char *argv[])
{ {
char *cp; int i;
int actr;
actr = 1; /* Always ignore argv[0] */ for (i = 1; i < argc; i++) {
strlcat(arcs_cmdline, argv[i], COMMAND_LINE_SIZE);
cp = &(arcs_cmdline[0]); if (i < (argc - 1))
while (actr < argc) { strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);
strcpy(cp, argv[actr]);
cp += strlen(argv[actr]);
*cp++ = ' ';
actr++;
}
if (cp != &(arcs_cmdline[0])) {
/* get rid of trailing space */
--cp;
*cp = '\0';
} }
} }
@ -250,7 +240,7 @@ static void __init console_config(void)
else else
sprintf(console_string, " console=ttyS0,%d%c%c", baud, parity, sprintf(console_string, " console=ttyS0,%d%c%c", baud, parity,
bits); bits);
strcat(prom_getcmdline(), console_string); strlcat(arcs_cmdline, console_string, COMMAND_LINE_SIZE);
#endif #endif
} }