From 2660a882614505b5b428c545df99ba22608e162b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 3 Mar 2007 10:26:35 +0000 Subject: [PATCH] We don't need ufs_mount anymore. One can simply use mount: mount -t userlandfs -p " " ... The parameters may change later in order to become a proper driver settings string. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20310 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/file_systems/userlandfs/Jamfile | 1 - .../file_systems/userlandfs/ufs_mount/Jamfile | 15 ------ .../userlandfs/ufs_mount/ufs_mount.cpp | 50 ------------------- 3 files changed, 66 deletions(-) delete mode 100644 src/add-ons/kernel/file_systems/userlandfs/ufs_mount/Jamfile delete mode 100644 src/add-ons/kernel/file_systems/userlandfs/ufs_mount/ufs_mount.cpp diff --git a/src/add-ons/kernel/file_systems/userlandfs/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/Jamfile index 71aa65fc65..e755b32047 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/Jamfile @@ -2,4 +2,3 @@ SubDir HAIKU_TOP src add-ons kernel file_systems userlandfs ; SubInclude HAIKU_TOP src add-ons kernel file_systems userlandfs kernel_add_on ; SubInclude HAIKU_TOP src add-ons kernel file_systems userlandfs server ; -#SubInclude HAIKU_TOP src add-ons kernel file_systems userlandfs ufs_mount ; diff --git a/src/add-ons/kernel/file_systems/userlandfs/ufs_mount/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/ufs_mount/Jamfile deleted file mode 100644 index dd86cd3cfe..0000000000 --- a/src/add-ons/kernel/file_systems/userlandfs/ufs_mount/Jamfile +++ /dev/null @@ -1,15 +0,0 @@ -SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs r5 src - ufs_mount ; - -SetSubDirSupportedPlatforms r5 bone dano ; - -local userlandFSTop = [ FDirName $(HAIKU_TOP) src tests add-ons kernel - file_systems userlandfs r5 ] ; -local userlandFSIncludes = [ FDirName $(userlandFSTop) headers ] ; - -SubDirHdrs [ FDirName $(userlandFSIncludes) private ] ; - -SEARCH_SOURCE += [ FDirName $(userlandFSTop) src shared ] ; - -Application ufs_mount : ufs_mount.cpp : be ; - diff --git a/src/add-ons/kernel/file_systems/userlandfs/ufs_mount/ufs_mount.cpp b/src/add-ons/kernel/file_systems/userlandfs/ufs_mount/ufs_mount.cpp deleted file mode 100644 index 4f8bdb58b6..0000000000 --- a/src/add-ons/kernel/file_systems/userlandfs/ufs_mount/ufs_mount.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// ufs_mount.cpp - -#include -#include -#include -#include - -#include - -const char* kUsage = -"Usage: ufs_mount [ ]\n" -; - -// print_usage -void -print_usage(bool error = true) -{ - fprintf((error ? stderr : stdout), kUsage); -} - -// main -int -main(int argc, char** argv) -{ - // check and get the parameters - if (argc < 4 || argc > 5) { - print_usage(); - return 1; - } - const char* fileSystem = argv[1]; - const char* device = argv[2]; - const char* mountPoint = argv[3]; - const char* fsParameters = (argc >= 5 ? argv[4] : NULL); - // get prepare the parameters for the mount() call - if (strlen(device) == 0) - device = NULL; - BString parameters(fileSystem); - if (fsParameters) - parameters << ' ' << fsParameters; - // mount - ulong flags = 0; -printf("mount('userlandfs', '%s', '%s', %lu, '%s', %ld)\n", mountPoint, device, -flags, parameters.String(), parameters.Length() + 1); - if (mount("userlandfs", mountPoint, device, flags, - (void*)parameters.String(), parameters.Length() + 1) < 0) { - fprintf(stderr, "mounting failed: %s\n", strerror(errno)); - return 1; - } - return 0; -}