summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenis Vlasenko2006-11-29 18:15:52 +0000
committerDenis Vlasenko2006-11-29 18:15:52 +0000
commitc6ce8733dda7e6f9146e0a040048aebea0c2e589 (patch)
treefb5fd16229f7c9f34423c4f27ed47cc19e7434df /libbb
parenta35c9e91ba53073ff797d1d68d0d4e1836d934f0 (diff)
downloadbusybox-c6ce8733dda7e6f9146e0a040048aebea0c2e589.zip
busybox-c6ce8733dda7e6f9146e0a040048aebea0c2e589.tar.gz
cut 0.5k off mkfs.minix
assorted strtoul fixes (that's what brought me into minix)...
Diffstat (limited to 'libbb')
-rw-r--r--libbb/find_mount_point.c15
-rw-r--r--libbb/xfuncs.c5
2 files changed, 11 insertions, 9 deletions
diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c
index 8341612..cb00b98 100644
--- a/libbb/find_mount_point.c
+++ b/libbb/find_mount_point.c
@@ -7,12 +7,9 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include <stdio.h>
-#include <string.h>
#include "libbb.h"
-
-
#include <mntent.h>
+
/*
* Given a block device, find the mount table entry if that block device
* is mounted.
@@ -36,14 +33,16 @@ struct mntent *find_mount_point(const char *name, const char *table)
mountDevice = s.st_dev;
- if ((mountTable = setmntent(table ? table : bb_path_mtab_file, "r")) == 0)
+ mountTable = setmntent(table ? table : bb_path_mtab_file, "r");
+ if (!mountTable)
return 0;
while ((mountEntry = getmntent(mountTable)) != 0) {
-
- if(strcmp(name, mountEntry->mnt_dir) == 0
- || strcmp(name, mountEntry->mnt_fsname) == 0) /* String match. */
+ if (strcmp(name, mountEntry->mnt_dir) == 0
+ || strcmp(name, mountEntry->mnt_fsname) == 0
+ ) { /* String match. */
break;
+ }
if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice) /* Match the device. */
break;
if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice) /* Match the directory's mount point. */
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index ade6395..313e328 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -147,8 +147,11 @@ void xwrite(int fd, const void *buf, size_t count)
off_t xlseek(int fd, off_t offset, int whence)
{
off_t off = lseek(fd, offset, whence);
- if (off == (off_t)-1)
+ if (off == (off_t)-1) {
+ if (whence == SEEK_SET)
+ bb_perror_msg_and_die("lseek(%"OFF_FMT"u)", offset);
bb_perror_msg_and_die("lseek");
+ }
return off;
}