From 7b4e1ea36dfe42ed980ebc58b7a1f34fb87e1bbd Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Thu, 22 Dec 2016 09:27:30 -0500 Subject: [PATCH] remove clone command --- src/clone.cpp | 61 ------------------------------------------------ src/clone.hpp | 22 ----------------- src/mergerfs.cpp | 18 +------------- 3 files changed, 1 insertion(+), 100 deletions(-) delete mode 100644 src/clone.cpp delete mode 100644 src/clone.hpp diff --git a/src/clone.cpp b/src/clone.cpp deleted file mode 100644 index d10a1e8a..00000000 --- a/src/clone.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - Copyright (c) 2016, Antonio SJ Musumeci - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ - -#include -#include - -#include - -#include "errno.hpp" -#include "fs.hpp" -#include "fs_clonefile.hpp" -#include "fs_clonepath.hpp" - -namespace clonetool -{ - static - void - print_usage_and__exit(void) - { - std::cerr << "usage: clone " - << "[path ]" - << " | " - << "[file ]" - << std::endl; - _exit(1); - } - - int - main(const int argc, - char * const argv[]) - { - int rv = 0; - - if(argc == 4 && !strcmp(argv[1],"file")) - rv = fs::clonefile(argv[2],argv[3]); - else if(argc == 5 && !strcmp(argv[1],"path")) - rv = fs::clonepath(argv[2],argv[3],argv[4]); - else - print_usage_and__exit(); - - if(rv == -1) - std::cerr << "error: " - << strerror(errno) - << std::endl; - - return 0; - } -} diff --git a/src/clone.hpp b/src/clone.hpp deleted file mode 100644 index ec558fd5..00000000 --- a/src/clone.hpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - Copyright (c) 2016, Antonio SJ Musumeci - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ - -namespace clonetool -{ - int - main(const int argc, - char * const *argv); -} diff --git a/src/mergerfs.cpp b/src/mergerfs.cpp index d4c40d85..5b65b732 100644 --- a/src/mergerfs.cpp +++ b/src/mergerfs.cpp @@ -20,12 +20,10 @@ #include #include +#include "fs_path.hpp" #include "mergerfs.hpp" #include "option_parser.hpp" #include "resources.hpp" -#include "fs_path.hpp" - -#include "clone.hpp" #include "access.hpp" #include "chmod.hpp" @@ -68,14 +66,6 @@ namespace local { - static - std::string - getappname(const int argc, - char * const *argv) - { - return fs::path::basename(argv[0]); - } - static void get_fuse_operations(struct fuse_operations &ops, @@ -190,11 +180,5 @@ int main(int argc, char **argv) { - std::string appname; - - appname = local::getappname(argc,argv); - if(appname == "clone") - return clonetool::main(argc,argv); - return mergerfs::main(argc,argv); }