S_IMMUTABLE = 512, /* Immutable file */
MS_NOATIME = 1024, /* Do not update access times. */
MS_NODIRATIME = 2048, /* Do not update directory access times */
+ MS_BIND = 4096, /* Use the new linux 2.4.x "mount --bind" feature */
};
{"rw", ~MS_RDONLY, 0},
{"suid", ~MS_NOSUID, 0},
{"sync", ~0, MS_SYNCHRONOUS},
+ {"bind", ~0, MS_BIND},
{0, 0, 0}
};
while ((m = getmntent(mountTable)) != 0) {
char *blockDevice = m->mnt_fsname;
if (strcmp(blockDevice, "/dev/root") == 0) {
- find_real_root_device_name( blockDevice);
+ blockDevice = find_real_root_device_name(blockDevice);
}
printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
m->mnt_type, m->mnt_opts);
+#ifdef BB_FEATURE_CLEAN_UP
+ if(blockDevice != m->mnt_fsname)
+ free(blockDevice);
+#endif
}
endmntent(mountTable);
} else {
extern int mount_main(int argc, char **argv)
{
+ struct stat statbuf;
char string_flags_buf[1024] = "";
char *string_flags = string_flags_buf;
char *extra_opts = string_flags_buf;
int flags = 0;
char *filesystemType = "auto";
- char device[PATH_MAX], directory[PATH_MAX];
+ char *device = xmalloc(PATH_MAX);
+ char *directory = xmalloc(PATH_MAX);
int all = FALSE;
int fakeIt = FALSE;
int useMtab = TRUE;
show_mounts();
if (optind < argc) {
- /* Don't canonicalize NFS devices. */
- if (strchr(argv[optind], ':') != NULL)
+ /* if device is a filename get its real path */
+ if (stat(argv[optind], &statbuf) == 0) {
+ realpath(argv[optind], device);
+ } else {
safe_strncpy(device, argv[optind], PATH_MAX);
- else if (realpath(argv[optind], device) == NULL)
- perror_msg_and_die("%s", device);
+ }
}
- if (optind + 1 < argc)
- if (realpath(argv[optind + 1], directory) == NULL)
+ if (optind + 1 < argc) {
+ if (realpath(argv[optind + 1], directory) == NULL) {
perror_msg_and_die("%s", directory);
-
+ }
+ }
+
if (all == TRUE || optind + 1 == argc) {
- struct mntent *m;
+ struct mntent *m = NULL;
FILE *f = setmntent("/etc/fstab", "r");
fstabmount = TRUE;