summaryrefslogtreecommitdiff
path: root/mkswap.c
diff options
context:
space:
mode:
authorMatt Kraai2000-12-22 01:48:07 +0000
committerMatt Kraai2000-12-22 01:48:07 +0000
commita9819b290848e0a760f3805d5937fa050235d707 (patch)
treeb8cb8d939032c0806d62161b01e5836cb808dc3f /mkswap.c
parente9f07fb6e83b75a50760599a5d31f494841eddf7 (diff)
downloadbusybox-a9819b290848e0a760f3805d5937fa050235d707.zip
busybox-a9819b290848e0a760f3805d5937fa050235d707.tar.gz
Use busybox error handling functions wherever possible.
Diffstat (limited to 'mkswap.c')
-rw-r--r--mkswap.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/mkswap.c b/mkswap.c
index 60ae286..e7fab4e 100644
--- a/mkswap.c
+++ b/mkswap.c
@@ -260,11 +260,8 @@ static long get_size(const char *file)
int fd;
long size;
- fd = open(file, O_RDONLY);
- if (fd < 0) {
- perror(file);
- exit(1);
- }
+ if ((fd = open(file, O_RDONLY)) < 0)
+ perror_msg_and_die("%s", file);
if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
int sectors_per_page = pagesize / 512;
@@ -367,10 +364,8 @@ int mkswap_main(int argc, char **argv)
}
DEV = open(device_name, O_RDWR);
- if (DEV < 0 || fstat(DEV, &statbuf) < 0) {
- perror(device_name);
- return EXIT_FAILURE;
- }
+ if (DEV < 0 || fstat(DEV, &statbuf) < 0)
+ perror_msg_and_die("%s", device_name);
if (!S_ISBLK(statbuf.st_mode))
check = 0;
else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)