diff options
| author | Matt Kraai <kraai@debian.org> | 2000-09-13 02:46:14 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2000-09-13 02:46:14 +0000 |
| commit | 322ae93a5e0b78b65831f9fd87fd456eb84d21a1 (patch) | |
| tree | 5b967e1d873ff6eff8296bf9fda73825f0c55884 /util-linux | |
| parent | b89075298edf0a471b9046b1f3c8a936e18ead20 (diff) | |
| download | busybox-w32-322ae93a5e0b78b65831f9fd87fd456eb84d21a1.tar.gz busybox-w32-322ae93a5e0b78b65831f9fd87fd456eb84d21a1.tar.bz2 busybox-w32-322ae93a5e0b78b65831f9fd87fd456eb84d21a1.zip | |
Fix calls to {m,c,re}alloc so that they use x{m,c,re}alloc instead of
segfaulting or handling errors the same way themselves.
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/mount.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index b4f5746bc..15ab5c997 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
| @@ -273,7 +273,7 @@ mount_one(char *blockDevice, char *directory, char *filesystemType, | |||
| 273 | numfilesystems = ioctl (fd, DEVMTAB_COUNT_FILESYSTEMS); | 273 | numfilesystems = ioctl (fd, DEVMTAB_COUNT_FILESYSTEMS); |
| 274 | if (numfilesystems<0) | 274 | if (numfilesystems<0) |
| 275 | fatalError("\nDEVMTAB_COUNT_FILESYSTEMS: %s\n", strerror (errno)); | 275 | fatalError("\nDEVMTAB_COUNT_FILESYSTEMS: %s\n", strerror (errno)); |
| 276 | fslist = (struct k_fstype *) calloc ( numfilesystems, sizeof(struct k_fstype)); | 276 | fslist = (struct k_fstype *) xcalloc ( numfilesystems, sizeof(struct k_fstype)); |
| 277 | 277 | ||
| 278 | /* Grab the list of available filesystems */ | 278 | /* Grab the list of available filesystems */ |
| 279 | status = ioctl (fd, DEVMTAB_GET_FILESYSTEMS, fslist); | 279 | status = ioctl (fd, DEVMTAB_GET_FILESYSTEMS, fslist); |
| @@ -343,7 +343,7 @@ extern int mount_main(int argc, char **argv) | |||
| 343 | numfilesystems = ioctl (fd, DEVMTAB_COUNT_MOUNTS); | 343 | numfilesystems = ioctl (fd, DEVMTAB_COUNT_MOUNTS); |
| 344 | if (numfilesystems<0) | 344 | if (numfilesystems<0) |
| 345 | fatalError( "\nDEVMTAB_COUNT_MOUNTS: %s\n", strerror (errno)); | 345 | fatalError( "\nDEVMTAB_COUNT_MOUNTS: %s\n", strerror (errno)); |
| 346 | mntentlist = (struct k_mntent *) calloc ( numfilesystems, sizeof(struct k_mntent)); | 346 | mntentlist = (struct k_mntent *) xcalloc ( numfilesystems, sizeof(struct k_mntent)); |
| 347 | 347 | ||
| 348 | /* Grab the list of mounted filesystems */ | 348 | /* Grab the list of mounted filesystems */ |
| 349 | if (ioctl (fd, DEVMTAB_GET_MOUNTS, mntentlist)<0) | 349 | if (ioctl (fd, DEVMTAB_GET_MOUNTS, mntentlist)<0) |