From bab89cefc7d662656a9c91fe2af968c2af1f7f3f Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Wed, 16 Jan 2013 05:00:51 +0000 Subject: [PATCH] Avoid clobbering errno with a call to fprintf PR: bin/173923 Submitted by: Garrett Cooper Approved by: cperciva MFC After: 3 days --- usr.sbin/cpucontrol/intel.c | 3 +++ usr.sbin/cpucontrol/via.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/usr.sbin/cpucontrol/intel.c b/usr.sbin/cpucontrol/intel.c index 15ac939f9e5..96ab704931d 100644 --- a/usr.sbin/cpucontrol/intel.c +++ b/usr.sbin/cpucontrol/intel.c @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -266,7 +267,9 @@ matched: args.size = data_size; error = ioctl(devfd, CPUCTL_UPDATE, &args); if (error < 0) { + error = errno; fprintf(stderr, "failed.\n"); + errno = error; WARN(0, "ioctl()"); goto fail; } diff --git a/usr.sbin/cpucontrol/via.c b/usr.sbin/cpucontrol/via.c index 71ae406ed78..d17e31f5870 100644 --- a/usr.sbin/cpucontrol/via.c +++ b/usr.sbin/cpucontrol/via.c @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -203,7 +204,9 @@ via_update(const char *dev, const char *path) args.size = data_size; error = ioctl(devfd, CPUCTL_UPDATE, &args); if (error < 0) { + error = errno; fprintf(stderr, "failed.\n"); + errno = error; WARN(0, "ioctl()"); goto fail; }