X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2FDiskTool%2Fsrc%2Factions.c;h=51f5cd3f34f926eeb1ce7d02cad8ee1944e1102c;hb=97159caf60a26cff3cc8f52e050a44d2492430f8;hp=f1f868642482c83671e2f4732e3c2d002928eceb;hpb=d212a6f1517af8a9c1d550f566a202418f04fffe;p=tpg%2Facess2.git

diff --git a/Tools/DiskTool/src/actions.c b/Tools/DiskTool/src/actions.c
index f1f86864..51f5cd3f 100644
--- a/Tools/DiskTool/src/actions.c
+++ b/Tools/DiskTool/src/actions.c
@@ -8,14 +8,12 @@
  */
 #include <acess.h>
 #include <disktool_common.h>
-#include <ctype.h>
 
 // === IMPORTS ===
 extern int	NativeFS_Install(char **Arguments);
 
 // === PROTOTYPES ===
 void	DiskTool_Initialise(void)	__attribute__((constructor(101)));
-size_t	DiskTool_int_TranslatePath(char *Buffer, const char *Path);
  int	DiskTool_int_TranslateOpen(const char *File, int Mode);
 
 // === CODE ===
@@ -48,42 +46,62 @@ int DiskTool_MountImage(const char *Identifier, const char *Path)
 
 int DiskTool_Copy(const char *Source, const char *Destination)
 {
-	return -1;
+	int src = DiskTool_int_TranslateOpen(Source, VFS_OPENFLAG_READ);
+	if( src == -1 ) {
+		Log_Error("DiskTool", "Unable to open %s for reading", Source);
+		return -1;
+	}
+	int dst = DiskTool_int_TranslateOpen(Destination, VFS_OPENFLAG_WRITE|VFS_OPENFLAG_CREATE);
+	if( dst == -1 ) {
+		Log_Error("DiskTool", "Unable to open %s for writing", Destination);
+		VFS_Close(src);
+		return -1;
+	}
+
+	char	buf[1024];
+	size_t	len, total = 0;
+	while( (len = VFS_Read(src, sizeof(buf), buf)) == sizeof(buf) )
+		VFS_Write(dst, len, buf), total += len;
+	VFS_Write(dst, len, buf), total += len;
+
+	Log_Notice("DiskTool", "Copied %i from %s to %s", total, Source, Destination);
+
+	VFS_Close(dst);
+	VFS_Close(src);
+	
+	return 0;
 }
 
-// --- Internal helpers ---
-size_t DiskTool_int_TranslatePath(char *Buffer, const char *Path)
+int DiskTool_ListDirectory(const char *Directory)
 {
-	const char *colon = strchr(Path, ':');
-	if( colon )
-	{
-		const char *pos;
-		for(pos = Path; pos < colon; pos ++)
-		{
-			if( !isalpha(*pos) )
-				goto native_path;
-		}
-		
+	int fd = DiskTool_int_TranslateOpen(Directory, VFS_OPENFLAG_READ|VFS_OPENFLAG_DIRECTORY);
+	if(fd == -1) {
+//		fprintf(stderr, "Can't open '%s'\n", Directory);
 		return -1;
 	}
-	
-native_path: {
-	 int	len = strlen("/Native");
-	len += strlen( getenv("PWD") ) + 1;
-	len += strlen(Path);
-	if( Buffer ) {
-		strcpy(Buffer, "/Native");
-		strcat(Buffer, getenv("PWD"));
-		strcat(Buffer, "/");
-		strcat(Buffer, Path);
-	}
-	return len;
+
+	Log("Directory listing of '%s'", Directory);	
+
+	char	name[256];
+	while( VFS_ReadDir(fd, name) )
+	{
+		Log("- %s", name);
 	}
+	
+	VFS_Close(fd);
+	
+	return 0;
 }
 
-int DiskTool_int_TranslateOpen(const char *File, int Mode)
+// --- Internal helpers ---
+int DiskTool_int_TranslateOpen(const char *File, int Flags)
 {
-	// Determine if the source is a mounted image or a file on the source FS
-	return -1;
+	size_t tpath_len = DiskTool_int_TranslatePath(NULL, File);
+	if(tpath_len == -1)
+		return -1;
+	char tpath[tpath_len-1];
+	DiskTool_int_TranslatePath(tpath, File);
+
+	return VFS_Open(tpath, Flags);
 }