MIPS: Alchemy: 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/928/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 5 insertions, 14 deletions

diff --git a/arch/mips/alchemy/common/prom.c b/arch/mips/alchemy/common/prom.c
index 79e099fbc0b..c29511b11d4 100644
--- a/arch/mips/alchemy/common/prom.c
+++ b/arch/mips/alchemy/common/prom.c
@@ -45,22 +45,13 @@ char **prom_envp;
 
 void prom_init_cmdline(void)
 {
-        char *cp;
-        int actr;
-
-        actr = 1; /* Always ignore argv[0] */
+        int i;
 
-        cp = &(arcs_cmdline[0]);
-        while (actr < prom_argc) {
-                strcpy(cp, prom_argv[actr]);
-                cp += strlen(prom_argv[actr]);
-                *cp++ = ' ';
-                actr++;
+        for (i = 1; i < prom_argc; i++) {
+                strlcat(arcs_cmdline, prom_argv[i], COMMAND_LINE_SIZE);
+                if (i < (prom_argc - 1))
+                        strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);
         }
-        if (cp != &(arcs_cmdline[0])) /* get rid of trailing space */
-                --cp;
-        if (prom_argc > 1)
-                *cp = '\0';
 }
 
 char *prom_getenv(char *envname)