forked from Imagelibrary/rtems
* libcsupport/Makefile.am: Add mount-mgr.c.
* libcsupport/src/mount-mgr.c: New.
* include/rtems/fs.h: Added rtems_filesystem_location_mount.
* libcsupport/include/rtems/libio.h, libcsupport/src/mount.c: New
mount interface. It is similar to Linux.
* libcsupport/include/rtems/libio_.h: Remove the
init_fs_mount_table call.
* libcsupport/src/base_fs.c: Remove init_fs_mount_table_call. Use
the new mount call. Remove setting the root node in the global
pathloc. Mount does this now.
* libcsupport/src/privateenv.c: Remove the hack to set the root
mount table entry in the environment.
* libcsupport/src/unmount.cL Free the target string.
* libblock/src/bdpart-mount.c: New mount API.
* libfs/src/devfs/devfs.h, libfs/src/devfs/devfs_init.c,
libfs/src/dosfs/dosfs.h, libfs/src/dosfs/msdos.h,
libfs/src/dosfs/msdos_init.c, libfs/src/imfs/imfs.h,
libfs/src/imfs/imfs_eval.c, libfs/src/imfs/imfs_init.c,
libfs/src/imfs/miniimfs_init.c,
libfs/src/nfsclient/src/librtemsNfs.h,
libfs/src/rfs/rtems-rfs-rtems.c, libfs/src/rfs/rtems-rfs.h,
libnetworking/lib/ftpfs.c, libnetworking/rtems/ftpfs.h,
libnetworking/rtems/tftp.h: New mount_h API.
* libfs/src/devfs/devfs_eval.c: Local include of extern ops.
* libfs/src/nfsclient/src/nfs.c: New mount API. Removed the mount
me call and fixed the initialisation to happen when mounting.
* libmisc/Makefile.am, libmisc/shell/shellconfig.h: Remove mount
filesystem files.
* libmisc/fsmount/fsmount.c, libmisc/fsmount/fsmount.h: Updated to
the new mount table values.
* libmisc/shell/main_mount_ftp.c,
libmisc/shell/main_mount_msdos.c, libmisc/shell/main_mount_rfs.c,
libmisc/shell/main_mount_tftp.c: Removed.
* libmisc/shell/main_mount.c: Use the new mount API. Also access
the file system table for the file system types.
* libnetworking/lib/tftpDriver.c: Updated to the new mount
API. Fixed to allow mounting from any mount point. Also can now
have more than file system mounted.
* sapi/include/confdefs.h: Add file system configuration support.
132 lines
3.1 KiB
C
132 lines
3.1 KiB
C
/*
|
|
* Shell Command Implmentation
|
|
*
|
|
* Author: Fernando RUIZ CASAS
|
|
* Work: fernando.ruiz@ctv.es
|
|
* Home: correo@fernando-ruiz.com
|
|
*
|
|
* The license and distribution terms for this file may be
|
|
* found in the file LICENSE in this distribution or at
|
|
* http://www.rtems.com/license/LICENSE.
|
|
*
|
|
* $Id$
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
#include <rtems.h>
|
|
#include <rtems/shell.h>
|
|
#include <rtems/shellconfig.h>
|
|
#include <rtems/libio.h>
|
|
#include "internal.h"
|
|
|
|
int rtems_shell_main_mount(
|
|
int argc,
|
|
char *argv[]
|
|
)
|
|
{
|
|
rtems_filesystem_options_t options = RTEMS_FILESYSTEM_READ_WRITE;
|
|
char* type = NULL;
|
|
char* source = NULL;
|
|
char* target = NULL;
|
|
char* fsoptions = NULL;
|
|
int arg;
|
|
|
|
for (arg = 1; arg < argc; arg++) {
|
|
if (argv[arg][0] == '-') {
|
|
if (argv[arg][1] == 't') {
|
|
arg++;
|
|
if (arg == argc) {
|
|
fprintf(
|
|
stderr,
|
|
"%s: -t needs a type of file-system;; see -L.\n",
|
|
argv[0]
|
|
);
|
|
return 1;
|
|
}
|
|
type = argv[arg];
|
|
} else if (argv[arg][1] == 'r') {
|
|
options = RTEMS_FILESYSTEM_READ_ONLY;
|
|
} else if (argv[arg][1] == 'L') {
|
|
const rtems_filesystem_table_t* fs;
|
|
fs = rtems_filesystem_table_first();
|
|
printf ("File systems: ");
|
|
while (fs) {
|
|
printf ("%s ", fs->type);
|
|
fs = rtems_filesystem_table_next(fs);
|
|
}
|
|
printf ("\n");
|
|
return 0;
|
|
} else if (argv[arg][1] == 'o') {
|
|
arg++;
|
|
if (arg == argc) {
|
|
fprintf(
|
|
stderr,
|
|
"%s: -o needs a list if filesystem options.\n",
|
|
argv[0]
|
|
);
|
|
return 1;
|
|
}
|
|
fsoptions = argv[arg];
|
|
} else {
|
|
fprintf (stderr, "unknown option: %s\n", argv[arg]);
|
|
return 1;
|
|
}
|
|
} else {
|
|
if (!source)
|
|
source = argv[arg];
|
|
else if (!target)
|
|
target = argv[arg];
|
|
else {
|
|
fprintf (
|
|
stderr, "mount: source and mount only require: %s\n", argv[arg]);
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!type) {
|
|
fprintf (stderr, "mount: no file-system; see the -L option\n");
|
|
return 1;
|
|
}
|
|
|
|
if (!source) {
|
|
fprintf (stderr, "mount: no source\n");
|
|
return 1;
|
|
}
|
|
|
|
if (!target) {
|
|
fprintf (stderr, "mount: no mount point\n");
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* Mount the disk.
|
|
*/
|
|
|
|
if (mount (source, target, type, options, fsoptions) < 0) {
|
|
fprintf (stderr, "error: %s\n", strerror(errno));
|
|
return 1;
|
|
}
|
|
|
|
printf ("mounted %s -> %s\n", source, target);
|
|
|
|
return 0;
|
|
}
|
|
|
|
rtems_shell_cmd_t rtems_shell_MOUNT_Command = {
|
|
"mount", /* name */
|
|
"mount [-t type] [-r] [-L] source target", /* usage */
|
|
"files", /* topic */
|
|
rtems_shell_main_mount, /* command */
|
|
NULL, /* alias */
|
|
NULL /* next */
|
|
};
|