From 6f15105d69ff49de75650fc14bf558b8b58184c9 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Mon, 14 Jan 2002 18:05:35 +0000 Subject: - Open /dev/apm read-only; - don't leak file descripton if for fome reasom ioctl(2) on /dev/apm has failed. Submitted by: Anders Andersson (ro /dev/apm) sobomax (descriptor leak) --- .../files/patch-battery::read-battery.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 x11/gnomeapplets/files/patch-battery::read-battery.c (limited to 'x11/gnomeapplets/files/patch-battery::read-battery.c') diff --git a/x11/gnomeapplets/files/patch-battery::read-battery.c b/x11/gnomeapplets/files/patch-battery::read-battery.c new file mode 100644 index 000000000000..b21c4f82e519 --- /dev/null +++ b/x11/gnomeapplets/files/patch-battery::read-battery.c @@ -0,0 +1,22 @@ + +$FreeBSD$ + +--- battery/read-battery.c 2002/01/14 14:23:46 1.1 ++++ battery/read-battery.c 2002/01/14 14:25:45 +@@ -170,7 +170,7 @@ + *hours_remaining = -1; + *minutes_remaining = 1; + +- fd = open(APMDEV, O_RDWR); ++ fd = open(APMDEV, O_RDONLY); + if (fd == -1) + { + g_error (_("Cannot open /dev/apm; can't get data.")); +@@ -179,6 +179,7 @@ + + if (ioctl(fd, APMIO_GETINFO, &aip) == -1) { + g_error(_("ioctl failed on /dev/apm.")); ++ close(fd); + return FALSE; + } + -- cgit v1.2.3