X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fmount.c;h=1823857f57552fa223de2ac20722d93865d73a61;hb=HEAD;hp=eb6a5b1fdb91abf25bcca0369aaf45bc85c407e1;hpb=243bdab4e7acc8516d9b1c138f45dc1195f97767;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/mount.c b/Kernel/vfs/mount.c
deleted file mode 100644
index eb6a5b1f..00000000
--- a/Kernel/vfs/mount.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* 
- * Acess Micro - VFS Server version 1
- */
-#include <common.h>
-#include <vfs.h>
-#include <vfs_int.h>
-#include <fs_sysfs.h>
-
-// === IMPORTS ===
-extern int	giVFS_MountFileID;
-extern char	*gsVFS_MountFile;
-
-// === PROTOTYPES ===
- int	VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *ArgString);
-void	VFS_UpdateMountFile();
-
-// === GLOBALS ===
- int	glVFS_MountList = 0;
-tVFS_Mount	*gVFS_Mounts;
-tVFS_Mount	*gVFS_RootMount = NULL;
-
-// === CODE ===
-/**
- * \fn int VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *ArgString)
- * \brief Mount a device
- * \param Device	Device string to mount
- * \param MountPoint	Destination for the mount
- * \param Filesystem	Filesystem to use for the mount
- * \param ArgString		Options to be passed to the filesystem
- * \return -1 on Invalid FS, -2 on No Mem, 0 on success
- */
-int VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *ArgString)
-{
-	tVFS_Mount	*mnt;
-	tVFS_Driver	*fs;
-	 int	deviceLen = strlen(Device);
-	 int	mountLen = strlen(MountPoint);
-	 int	argLen = strlen(ArgString);
-	
-	// Get the filesystem
-	fs = VFS_GetFSByName(Filesystem);
-	if(!fs) {
-		Warning("VFS_Mount - Unknown FS Type '%s'", Filesystem);
-		return -1;
-	}
-	
-	// Create mount information
-	mnt = malloc( sizeof(tVFS_Mount)+deviceLen+1+mountLen+1+argLen+1 );
-	if(!mnt) {
-		return -2;
-	}
-	
-	// HACK: Forces VFS_ParsePath to fall back on root  
-	if(mountLen == 1 && MountPoint[0] == '/')
-		mnt->MountPointLen = 0;
-	else
-		mnt->MountPointLen = mountLen;
-	
-	// Fill Structure
-	mnt->Filesystem = fs;
-	
-	mnt->Device = &mnt->StrData[0];
-	memcpy( mnt->Device, Device, deviceLen+1 );
-	
-	mnt->MountPoint = &mnt->StrData[deviceLen+1];
-	memcpy( mnt->MountPoint, MountPoint, mountLen+1 );
-	
-	mnt->Options = &mnt->StrData[deviceLen+1+mountLen+1];
-	memcpy( mnt->Options, ArgString, argLen+1 );
-	
-	// Initialise Volume
-	mnt->RootNode = fs->InitDevice(Device, NULL);	//&ArgString);
-	if(!mnt->RootNode) {
-		free(mnt);
-		return -2;
-	}
-	
-	// Set root
-	if(!gVFS_RootMount)	gVFS_RootMount = mnt;
-	
-	// Add to mount list
-	LOCK( &glVFS_MountList );
-	{
-		tVFS_Mount	*tmp;
-		mnt->Next = NULL;
-		if(gVFS_Mounts) {
-			for( tmp = gVFS_Mounts; tmp->Next; tmp = tmp->Next );
-			tmp->Next = mnt;
-		}
-		else {
-			gVFS_Mounts = mnt;
-		}
-	}
-	RELEASE( &glVFS_MountList );
-	
-	Log("VFS_Mount: Mounted '%s' to '%s' ('%s')", Device, MountPoint, Filesystem);
-	
-	VFS_UpdateMountFile();
-	
-	return 0;
-}
-
-/**
- * \fn void VFS_UpdateMountFile()
- * \brief Updates the mount file buffer
- */
-void VFS_UpdateMountFile()
-{
-	 int	len = 0;
-	char	*buf;
-	tVFS_Mount	*mnt;
-	
-	// Format:
-	// <device>\t<location>\t<type>\t<options>\n
-	
-	for(mnt = gVFS_Mounts; mnt; mnt = mnt->Next)
-	{
-		len += 4 + strlen(mnt->Device) + strlen(mnt->MountPoint)
-			+ strlen(mnt->Filesystem->Name) + strlen(mnt->Options);
-	}
-	
-	buf = malloc( len + 1 );
-	len = 0;
-	for(mnt = gVFS_Mounts; mnt; mnt = mnt->Next)
-	{
-		strcpy( &buf[len], mnt->Device );
-		len += strlen(mnt->Device);
-		buf[len++] = '\t';
-		
-		strcpy( &buf[len], mnt->MountPoint );
-		len += strlen(mnt->MountPoint);
-		buf[len++] = '\t';
-		
-		strcpy( &buf[len], mnt->Filesystem->Name );
-		len += strlen(mnt->Filesystem->Name);
-		buf[len++] = '\t';
-		
-		strcpy( &buf[len], mnt->Options );
-		len += strlen(mnt->Options);
-		buf[len++] = '\n';
-	}
-	buf[len] = 0;
-	
-	SysFS_UpdateFile( giVFS_MountFileID, buf, len );
-	if( gsVFS_MountFile )	free( gsVFS_MountFile );
-	gsVFS_MountFile = buf;
-}