Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sbin/ifconfig Abort on error from prop_dictionary_augment.
details: https://anonhg.NetBSD.org/src/rev/5c6bbf301c5e
branches: trunk
changeset: 784719:5c6bbf301c5e
user: apb <apb%NetBSD.org@localhost>
date: Thu Feb 07 13:21:34 2013 +0000
description:
Abort on error from prop_dictionary_augment.
diffstat:
sbin/ifconfig/ifconfig.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diffs (32 lines):
diff -r 69cbde41dfcc -r 5c6bbf301c5e sbin/ifconfig/ifconfig.c
--- a/sbin/ifconfig/ifconfig.c Thu Feb 07 13:20:51 2013 +0000
+++ b/sbin/ifconfig/ifconfig.c Thu Feb 07 13:21:34 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ifconfig.c,v 1.228 2012/11/01 13:43:23 pgoyette Exp $ */
+/* $NetBSD: ifconfig.c,v 1.229 2013/02/07 13:21:34 apb Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1983, 1993\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: ifconfig.c,v 1.228 2012/11/01 13:43:23 pgoyette Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.229 2013/02/07 13:21:34 apb Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -681,8 +681,12 @@
env = (nmatch > 0) ? match[(int)nmatch - 1].m_env : NULL;
if (env == NULL)
env = oenv;
- else
+ else {
env = prop_dictionary_augment(env, oenv);
+ if (env == NULL)
+ err(EXIT_FAILURE, "%s: prop_dictionary_augment",
+ __func__);
+ }
/* Process any media commands that may have been issued. */
process_media_commands(env);
Home |
Main Index |
Thread Index |
Old Index