[src/trunk]: src/sys/arch/sparc/stand/ofwboot Allow hyphen in kernel names. B...

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

details:   https://anonhg.NetBSD.org/src/rev/64d22bac7648
branches:  trunk
changeset: 538449:64d22bac7648
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Oct 20 20:55:38 2002 +0000

description:
Allow hyphen in kernel names. Bump version.
Should fix PR 13429 and PR 18691.

diffstat:

 sys/arch/sparc/stand/ofwboot/boot.c  |   4 ++--
 sys/arch/sparc/stand/ofwboot/ofdev.c |  12 +++++++++---
 sys/arch/sparc/stand/ofwboot/version |   3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r de89feb3e900 -r 64d22bac7648 sys/arch/sparc/stand/ofwboot/boot.c
--- a/sys/arch/sparc/stand/ofwboot/boot.c       Sun Oct 20 20:21:07 2002 +0000
+++ b/sys/arch/sparc/stand/ofwboot/boot.c       Sun Oct 20 20:55:38 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.4 2002/06/06 05:04:28 martin Exp $  */
+/*     $NetBSD: boot.c,v 1.5 2002/10/20 20:55:38 martin Exp $  */
 #define DEBUG
 /*
  * Copyright (c) 1997, 1999 Eduardo E. Horvath.  All rights reserved.
@@ -143,7 +143,7 @@
        }
        *howtop = 0;
        for (cp = str; *cp; cp++)
-               if (*cp == ' ' || *cp == '-')
+               if (*cp == ' ')
                        break;
        if (!*cp)
                return;
diff -r de89feb3e900 -r 64d22bac7648 sys/arch/sparc/stand/ofwboot/ofdev.c
--- a/sys/arch/sparc/stand/ofwboot/ofdev.c      Sun Oct 20 20:21:07 2002 +0000
+++ b/sys/arch/sparc/stand/ofwboot/ofdev.c      Sun Oct 20 20:55:38 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofdev.c,v 1.2 2002/07/29 14:34:12 mrg Exp $    */
+/*     $NetBSD: ofdev.c,v 1.3 2002/10/20 20:55:38 martin Exp $ */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -94,8 +94,14 @@
 #ifdef NOTDEF_DEBUG
                                printf("filename: hunting for arguments in %s\n", str);
 #endif
-                               for (cp = lp;
-                                    --cp >= str && *cp != '/' && *cp != '-';);
+                               for (cp = lp; ; ) {
+                                       cp--;
+                                       if (cp < str) break;
+                                       if (cp[0] == '/') break;
+                                       if (cp[0] == ' ' && (cp+1) != lp &&
+                                           cp[1] == '-')
+                                               break;
+                               }
                                if (cp >= str && *cp == '-') {
                                        /* found arguments, make firmware ignore them */
                                        *cp = 0;
diff -r de89feb3e900 -r 64d22bac7648 sys/arch/sparc/stand/ofwboot/version
--- a/sys/arch/sparc/stand/ofwboot/version      Sun Oct 20 20:21:07 2002 +0000
+++ b/sys/arch/sparc/stand/ofwboot/version      Sun Oct 20 20:55:38 2002 +0000
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.6 2001/08/30 23:00:20 eeh Exp $
+$NetBSD: version,v 1.7 2002/10/20 20:55:39 martin Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important - make sure the entries are appended on end, last item
@@ -9,3 +9,4 @@
 1.3:   Support verbose/quiet boot.
 1.4:   Align end of BSS on 4MB boundary
 1.5:   Fix previous.
+1.6:   Allow hyphen in kernel names