From ecacda21ac605a1466b32a8ebccd4f0d57aab48a Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Mon, 1 Feb 2010 22:06:56 +0900 Subject: [PATCH] --- yaml --- r: 182095 b: refs/heads/master c: 10229f3761fdc1050f972bf3a4c4623bde20002f h: refs/heads/master i: 182093: 06ec311c6af20462ccc4c1edb5140a653eb21a2f 182091: 810ebbf4f68d8aacb957371adee4c7ec6ac67f14 182087: 3c8d6fef70a84466569de9b823e9b7fd02c71c51 182079: 7af2a49d253151bf9839e2850e8b4f456aef08b2 v: v3 --- [refs] | 2 +- trunk/arch/mips/alchemy/common/prom.c | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 501286d55f2e..7bcdf4c5cee4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae7cbef5e5789e2ee6855222a3b83eb94591ef0b +refs/heads/master: 10229f3761fdc1050f972bf3a4c4623bde20002f diff --git a/trunk/arch/mips/alchemy/common/prom.c b/trunk/arch/mips/alchemy/common/prom.c index 79e099fbc0bf..c29511b11d44 100644 --- a/trunk/arch/mips/alchemy/common/prom.c +++ b/trunk/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)