diff options
| author | John.Zolnowsky@Sun.COM <none@none> | 2010-08-02 10:54:24 -0700 |
|---|---|---|
| committer | John.Zolnowsky@Sun.COM <none@none> | 2010-08-02 10:54:24 -0700 |
| commit | e9a193fce9f1bf8520f55929577e0175e1e7625b (patch) | |
| tree | 2a9d532ee63263a71458d9b3754a6323a66a0e84 /usr/src/cmd/logadm/err.c | |
| parent | fff7ec1d8ce71b3d8a998ac4391a99860ce07180 (diff) | |
| download | illumos-joyent-e9a193fce9f1bf8520f55929577e0175e1e7625b.tar.gz | |
4685009 logadm(1M) should avoid silent updates of /etc/logadm.conf
Diffstat (limited to 'usr/src/cmd/logadm/err.c')
| -rw-r--r-- | usr/src/cmd/logadm/err.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/cmd/logadm/err.c b/usr/src/cmd/logadm/err.c index 32b3a4ce9a..5663232ec2 100644 --- a/usr/src/cmd/logadm/err.c +++ b/usr/src/cmd/logadm/err.c @@ -19,15 +19,12 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * * logadm/err.c -- some basic error routines * */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <unistd.h> #include <libintl.h> @@ -37,6 +34,7 @@ #include <errno.h> #include "err.h" +jmp_buf *Err_env_ptr; static const char *Myname; static int Exitcode; static FILE *Errorfile; @@ -143,7 +141,7 @@ err(int flags, const char *fmt, ...) va_end(ap); if (jump) - longjmp(Err_env, 1); + longjmp(*Err_env_ptr, 1); if (!warning && !fileline) { err_done(1); |