From 4ea9b38ad933eccfe64edde3d7120c4f76f71ec4 Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Tue, 26 Jan 2010 18:07:02 +0900 Subject: [PATCH] --- yaml --- r: 182075 b: refs/heads/master c: 9feb8367999265b8a300cb96e7a66f79b651c820 h: refs/heads/master i: 182073: 48a5fcf98de3f6da002a35fd2e0a2ba35cf2d3dd 182071: 2ba4cf47f6ccecad77a5a6ba0dbd874146285254 v: v3 --- [refs] | 2 +- trunk/arch/mips/ar7/prom.c | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 9732831b0d3a..df0596c3d8d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0e53dee69e07e9446eb16ceabd55a1116611696 +refs/heads/master: 9feb8367999265b8a300cb96e7a66f79b651c820 diff --git a/trunk/arch/mips/ar7/prom.c b/trunk/arch/mips/ar7/prom.c index f1cfd90a31d7..f5a6ed6deb3f 100644 --- a/trunk/arch/mips/ar7/prom.c +++ b/trunk/arch/mips/ar7/prom.c @@ -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 }