* [PATCH] MIPS: Cobalt use strlcat() for the command line arguments
@ 2009-12-24 8:06 Yoichi Yuasa
2009-12-24 15:10 ` Ralf Baechle
0 siblings, 1 reply; 2+ messages in thread
From: Yoichi Yuasa @ 2009-12-24 8:06 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yuasa, linux-mips
Tested with CoLo v1.22
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
arch/mips/cobalt/setup.c | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index b516442..ec3b2c4 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -97,26 +97,18 @@ void __init plat_mem_setup(void)
void __init prom_init(void)
{
- int narg, indx, posn, nchr;
unsigned long memsz;
+ int argc, i;
char **argv;
memsz = fw_arg0 & 0x7fff0000;
- narg = fw_arg0 & 0x0000ffff;
-
- if (narg) {
- arcs_cmdline[0] = '\0';
- argv = (char **) fw_arg1;
- posn = 0;
- for (indx = 1; indx < narg; ++indx) {
- nchr = strlen(argv[indx]);
- if (posn + 1 + nchr + 1 > sizeof(arcs_cmdline))
- break;
- if (posn)
- arcs_cmdline[posn++] = ' ';
- strcpy(arcs_cmdline + posn, argv[indx]);
- posn += nchr;
- }
+ argc = fw_arg0 & 0x0000ffff;
+ argv = (char **)fw_arg1;
+
+ for (i = 1; i < argc; i++) {
+ strlcat(arcs_cmdline, argv[i], COMMAND_LINE_SIZE);
+ if (i < (argc - 1))
+ strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);
}
add_memory_region(0x0, memsz, BOOT_MEM_RAM);
--
1.6.5.7
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] MIPS: Cobalt use strlcat() for the command line arguments
2009-12-24 8:06 [PATCH] MIPS: Cobalt use strlcat() for the command line arguments Yoichi Yuasa
@ 2009-12-24 15:10 ` Ralf Baechle
0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2009-12-24 15:10 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: linux-mips
On Thu, Dec 24, 2009 at 05:06:34PM +0900, Yoichi Yuasa wrote:
Thanks Yoichi-San! Also applied.
Ralf
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-24 15:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-24 8:06 [PATCH] MIPS: Cobalt use strlcat() for the command line arguments Yoichi Yuasa
2009-12-24 15:10 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).