mirror of
https://github.com/topjohnwu/ndk-busybox.git
synced 2024-11-29 22:50:48 +00:00
"mount" now reports errors from nfsmount() and assumes NFS mount
if ':' is present in the device name - Pavel Roskin
This commit is contained in:
parent
68480dc30f
commit
680d65a646
@ -57,6 +57,8 @@
|
||||
* Implemented "rm -- <foo>"
|
||||
* "which" rewritten to use stat(). Fixes to improve its compatability
|
||||
with traditional implementations -- Pavel Roskin.
|
||||
* "mount" now reports errors from nfsmount() and assumes NFS mount
|
||||
if ':' is present in the device name - Pavel Roskin
|
||||
* More doc updates
|
||||
|
||||
|
||||
|
11
mount.c
11
mount.c
@ -483,11 +483,14 @@ extern int mount_main(int argc, char **argv)
|
||||
} else {
|
||||
if (device && directory) {
|
||||
#ifdef BB_NFSMOUNT
|
||||
if (strchr(device, ':') != NULL)
|
||||
filesystemType = "nfs";
|
||||
if (strcmp(filesystemType, "nfs") == 0) {
|
||||
if (nfsmount
|
||||
(device, directory, &flags, &extra_opts, &string_flags,
|
||||
1) != 0)
|
||||
exit(FALSE);
|
||||
int ret;
|
||||
ret = nfsmount (device, directory, &flags,
|
||||
&extra_opts, &string_flags, 1);
|
||||
if (ret != 0)
|
||||
fatalError("nfsmount failed: %s\n", strerror(errno));
|
||||
}
|
||||
#endif
|
||||
exit(mount_one(device, directory, filesystemType,
|
||||
|
@ -483,11 +483,14 @@ extern int mount_main(int argc, char **argv)
|
||||
} else {
|
||||
if (device && directory) {
|
||||
#ifdef BB_NFSMOUNT
|
||||
if (strchr(device, ':') != NULL)
|
||||
filesystemType = "nfs";
|
||||
if (strcmp(filesystemType, "nfs") == 0) {
|
||||
if (nfsmount
|
||||
(device, directory, &flags, &extra_opts, &string_flags,
|
||||
1) != 0)
|
||||
exit(FALSE);
|
||||
int ret;
|
||||
ret = nfsmount (device, directory, &flags,
|
||||
&extra_opts, &string_flags, 1);
|
||||
if (ret != 0)
|
||||
fatalError("nfsmount failed: %s\n", strerror(errno));
|
||||
}
|
||||
#endif
|
||||
exit(mount_one(device, directory, filesystemType,
|
||||
|
Loading…
Reference in New Issue
Block a user