- 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.

3 files changed, 7 insertions, 24 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 @@
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  * This is a from-scratch implementation of fbset; but the de facto fbset
  * implementation was a good reference. fbset (original) is released under
@@ -408,8 +396,7 @@ int fbset_main(int argc, char **argv)
                 }
         }
 
-        if ((fh = open(fbdev, O_RDONLY)) < 0)
-                bb_perror_msg_and_die("fbset(open)");
+        fh = bb_xopen(fbdev, O_RDONLY);
         if (ioctl(fh, FBIOGET_VSCREENINFO, &var))
                 bb_perror_msg_and_die("fbset(ioctl)");
         if (g_options & OPT_READMODE) {
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 904a58ee3..30bc9f12d 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -307,8 +307,7 @@ static inline int get_size(const char *file)
         int fd;
         long size;
 
-        if ((fd = open(file, O_RDWR)) < 0)
-                bb_perror_msg_and_die("%s", file);
+        fd = bb_xopen(file, O_RDWR);
         if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
                 close(fd);
                 return (size * 512);
@@ -821,9 +820,7 @@ goodbye:
         tmp += dirsize;
         *(short *) tmp = 2;
         strcpy(tmp + 2, ".badblocks");
-        DEV = open(device_name, O_RDWR);
-        if (DEV < 0)
-                bb_error_msg_and_die("unable to open %s", device_name);
+        DEV = bb_xopen(device_name, O_RDWR);
         if (fstat(DEV, &statbuf) < 0)
                 bb_error_msg_and_die("unable to stat %s", device_name);
         if (!S_ISBLK(statbuf.st_mode))
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index ce123e502..32021fe08 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -258,8 +258,7 @@ static inline long get_size(const char *file)
         int fd;
         long size;
 
-        if ((fd = open(file, O_RDONLY)) < 0) /* TODO: bb_xopen3 */
-                bb_perror_msg_and_die("%s", file);
+        fd = bb_xopen(file, O_RDONLY);
         if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
                 size /= pagesize / 512;
         } else {
@@ -342,8 +341,8 @@ int mkswap_main(int argc, char **argv)
                                 PAGES * goodpages);
         }
 
-        DEV = open(device_name, O_RDWR);
-        if (DEV < 0 || fstat(DEV, &statbuf) < 0)
+        DEV = bb_xopen(device_name, O_RDWR);
+        if (fstat(DEV, &statbuf) < 0)
                 bb_perror_msg_and_die("%s", device_name);
         if (!S_ISBLK(statbuf.st_mode))
                 check = 0;