[src/trunk]: src/sys/arch/usermode/usermode don't modify command-line parameters

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5d27dfb49714
branches:  trunk
changeset: 772763:5d27dfb49714
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jan 15 10:30:21 2012 +0000

description:
don't modify command-line parameters

diffstat:

 sys/arch/usermode/usermode/machdep.c |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (50 lines):

diff -r 5d5836a27e69 -r 5d27dfb49714 sys/arch/usermode/usermode/machdep.c
--- a/sys/arch/usermode/usermode/machdep.c      Sun Jan 15 10:18:58 2012 +0000
+++ b/sys/arch/usermode/usermode/machdep.c      Sun Jan 15 10:30:21 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.51 2012/01/15 10:18:58 jmcneill Exp $ */
+/* $NetBSD: machdep.c,v 1.52 2012/01/15 10:30:21 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud%netbsd.org@localhost>
@@ -37,7 +37,7 @@
 #include "opt_memsize.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2012/01/15 10:18:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.52 2012/01/15 10:30:21 jmcneill Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -128,21 +128,21 @@
                        if (strncmp(argv[i], "net=", strlen("net=")) == 0) {
                                char *tap = argv[i] + strlen("net=");
                                char *mac = strchr(tap, ',');
+                               char *p = usermode_tap_devicebuf;
                                if (mac == NULL) {
                                        printf("bad net= format\n");
                                        return;
                                }
-                               *mac++ = '\0';
-                               if (*tap != '/')
-                                       snprintf(usermode_tap_devicebuf,
-                                           sizeof(usermode_tap_devicebuf),
-                                           "/dev/%s", tap);
-                               else
-                                       snprintf(usermode_tap_devicebuf,
-                                           sizeof(usermode_tap_devicebuf),
-                                           "%s", tap);
+                               memset(usermode_tap_devicebuf, 0,
+                                   sizeof(usermode_tap_devicebuf));
+                               if (*tap != '/') {
+                                       memcpy(p, "/dev/", strlen("/dev/"));
+                                       p += strlen("/dev/");
+                               }
+                               for (; *tap != ','; p++, tap++)
+                                       *p = *tap;
                                usermode_tap_device = usermode_tap_devicebuf;
-                               usermode_tap_eaddr = mac;
+                               usermode_tap_eaddr = mac + 1;
                        } else if (strncmp(argv[i], "audio=",
                            strlen("audio=")) == 0) {
                                char *audio = argv[i] + strlen("audio=");