diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-12 17:55:51 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-12 17:55:51 +0000 |
commit | dac7ff15b7d32deeeef3d9665744fc5774c21d70 (patch) | |
tree | 0e4c34863628d79fdad0c6217f4deb0ca0a91c33 /util-linux/fbset.c | |
parent | 79865bc5077cf6d17b27e9599921d4c85b1575fd (diff) | |
download | busybox-w32-dac7ff15b7d32deeeef3d9665744fc5774c21d70.tar.gz busybox-w32-dac7ff15b7d32deeeef3d9665744fc5774c21d70.tar.bz2 busybox-w32-dac7ff15b7d32deeeef3d9665744fc5774c21d70.zip |
- patch from Denis Vlasenko to add and use bb_xsocket() and to use
bb_xopen some more while at it.
Also use shorter boilerplate while at it.
Diffstat (limited to 'util-linux/fbset.c')
-rw-r--r-- | util-linux/fbset.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c index d2667cf84..7d3cae251 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c | |||
@@ -4,19 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> | 5 | * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify | 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
15 | * General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | * | 8 | * |
21 | * This is a from-scratch implementation of fbset; but the de facto fbset | 9 | * This is a from-scratch implementation of fbset; but the de facto fbset |
22 | * implementation was a good reference. fbset (original) is released under | 10 | * implementation was a good reference. fbset (original) is released under |
@@ -408,8 +396,7 @@ int fbset_main(int argc, char **argv) | |||
408 | } | 396 | } |
409 | } | 397 | } |
410 | 398 | ||
411 | if ((fh = open(fbdev, O_RDONLY)) < 0) | 399 | fh = bb_xopen(fbdev, O_RDONLY); |
412 | bb_perror_msg_and_die("fbset(open)"); | ||
413 | if (ioctl(fh, FBIOGET_VSCREENINFO, &var)) | 400 | if (ioctl(fh, FBIOGET_VSCREENINFO, &var)) |
414 | bb_perror_msg_and_die("fbset(ioctl)"); | 401 | bb_perror_msg_and_die("fbset(ioctl)"); |
415 | if (g_options & OPT_READMODE) { | 402 | if (g_options & OPT_READMODE) { |