emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cut 0.5k off mkfs.minix

Browse Source 
assorted strtoul fixes (that's what brought me into minix)...
This commit is contained in:
Denis Vlasenko
2006-11-29 18:15:52 +00:00
parent a35c9e91ba
commit c6ce8733dd
5 changed files with 131 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libbb/find_mount_point.c
View File

@@ -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. */

5
libbb/xfuncs.c
View File

@@ -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;
}