X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Fmount_src%2Fmain.c;h=602aefd439fd527ce3c8e19fc52e58c3afea5b76;hb=700d4228ad14b3a7406eefc9a58735748c254d42;hp=16081088a5c727c2c5517ae3817c53e519ece8fa;hpb=bd8dc898108f10c0498f4dc5d0164a50b5ff2e5c;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/mount_src/main.c b/Usermode/Applications/mount_src/main.c
index 16081088..602aefd4 100644
--- a/Usermode/Applications/mount_src/main.c
+++ b/Usermode/Applications/mount_src/main.c
@@ -9,7 +9,7 @@
 #define	MOUNTED_FILE	"/Devices/System/VFS/Mounts"
 
 // === PROTOTYPES ===
-void	ShowUsage();
+void	ShowUsage(char *ProgName);
  int	GetMountDefs(char *Ident, char **spDevice, char **spDir, char **spType, char **spOptions);
 
 // === CODE ===
@@ -27,8 +27,21 @@ int main(int argc, char *argv[])
 	char	*sDir = NULL;
 	char	*sOptions = NULL;
 
+	// List mounted filesystems
+	// - This is cheating, isn't it?
+	if(argc == 1) {
+		// Dump the contents of /Devices/system/VFS/Mounts
+		FILE	*fp = fopen("/Devices/system/VFS/Mounts", "r");
+		char	buf[1024];
+		 int	len;
+		while( (len = fread(buf, 1024, 1, fp)) )
+			fwrite(buf, len, 1, stdout);
+		printf("\n");
+		return 0;
+	}
+
 	if(argc < 3) {
-		ShowUsage();
+		ShowUsage(argv[0]);
 		return EXIT_FAILURE;
 	}
 	
@@ -43,6 +56,7 @@ int main(int argc, char *argv[])
 			{
 			// -t <driver> :: Filesystem driver to use
 			case 't':	sType = argv[++i];	break;
+			case 'o':	sOptions = argv[++i];	break;
 			case '-':
 				//TODO: Long Arguments
 			default:
@@ -133,10 +147,11 @@ int main(int argc, char *argv[])
 
 void ShowUsage(char *ProgName)
 {
-	fprintf(stderr, "Usage:\n", ProgName);
-	fprintf(stderr, "    %s [-t <type>] <device> <directory>\n");
-	fprintf(stderr, "or  %s <device>\n");
-	fprintf(stderr, "or  %s <directory>\n");
+	fprintf(stderr, "Usage:\n");
+	fprintf(stderr, "    %s [-t <type>] <device> <directory> [-o <options>]\n", ProgName);
+	fprintf(stderr, "or  %s <device>\n", ProgName);
+	fprintf(stderr, "or  %s <directory>\n", ProgName);
+	fprintf(stderr, "or  %s\n", ProgName);
 }
 
 /**