Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if there is no "name" properly, don't assert(), pretend it is empty.

Browse Source 
now "ofctl" works on the shark.  fixes PR#36733.
This commit is contained in:
mrg 2009-05-18 05:51:53 +00:00
parent 07b81fef7e
commit b71ffbf87a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/ofctl/ofctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofctl.c,v 1.10 2009/04/26 04:54:27 lukem Exp $ */ /* $NetBSD: ofctl.c,v 1.11 2009/05/18 05:51:53 mrg Exp $ */
/*- /*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
#ifndef lint #ifndef lint
__COPYRIGHT("@(#) Copyright (c) 2006, 2007\ __COPYRIGHT("@(#) Copyright (c) 2006, 2007\
The NetBSD Foundation, Inc. All rights reserved."); The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: ofctl.c,v 1.10 2009/04/26 04:54:27 lukem Exp $"); __RCSID("$NetBSD: ofctl.c,v 1.11 2009/05/18 05:51:53 mrg Exp $");
#endif /* not lint */ #endif /* not lint */
#include <stdio.h> #include <stdio.h>
@ -564,7 +564,8 @@ ofname(int node, char *buf, size_t buflen)
int len; int len;
len = OF_getprop(node, "name", name, sizeof(name)); len = OF_getprop(node, "name", name, sizeof(name));
assert(len > 0); if (len <= 0)
name[0] = '\0';
off += snprintf(buf + off, buflen - off, "/%s", name); off += snprintf(buf + off, buflen - off, "/%s", name);
reglen = OF_getprop(node, "reg", reg_buf, sizeof(reg_buf)); reglen = OF_getprop(node, "reg", reg_buf, sizeof(reg_buf));