summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Bentele2020-10-30 15:50:36 +0100
committerManuel Bentele2020-10-30 15:50:36 +0100
commit38d4cfd428450b687bca0e1554a1f74ab8469804 (patch)
tree673b45daf0b9ac990b38212688495c7ba6f7929b
parent[BUILD] do not ignore C flags that are passed to CMake (diff)
downloaddnbd3-38d4cfd428450b687bca0e1554a1f74ab8469804.tar.gz
dnbd3-38d4cfd428450b687bca0e1554a1f74ab8469804.tar.xz
dnbd3-38d4cfd428450b687bca0e1554a1f74ab8469804.zip
[CLIENT] add documentation for adding/removing dnbd3-server to help
-rw-r--r--src/client/CMakeLists.txt3
-rw-r--r--src/client/client.c16
2 files changed, 9 insertions, 10 deletions
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index b29825f..2ab1971 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -4,9 +4,6 @@ cmake_minimum_required(VERSION 3.10)
project(dnbd3-client
LANGUAGES C)
-# suppress -Wmultichar warnings
-add_compile_options(-Wno-multichar)
-
# add compile option to enable enhanced BSD netdb features
add_definitions(-D_GNU_SOURCE)
diff --git a/src/client/client.c b/src/client/client.c
index dd62050..81d408b 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -44,7 +44,7 @@
static int openDevices[MAX_DEVS];
-static const char *optString = "f:h:i:r:d:a:cs:SHV?k";
+static const char *optString = "f:h:i:r:d:a:cs:SA:R:HV?k";
static const struct option longOpts[] = {
{ "file", required_argument, NULL, 'f' },
{ "host", required_argument, NULL, 'h' },
@@ -55,8 +55,8 @@ static const struct option longOpts[] = {
{ "close", no_argument, NULL, 'c' },
{ "switch", required_argument, NULL, 's' },
{ "sticky", no_argument, NULL, 'S' },
- { "add", required_argument, NULL, 'adds' },
- { "remove", required_argument, NULL, 'rems' },
+ { "add", required_argument, NULL, 'A' },
+ { "remove", required_argument, NULL, 'R' },
{ "help", no_argument, NULL, 'H' },
{ "version", no_argument, NULL, 'V' },
{ "daemon", no_argument, NULL, 'D' },
@@ -246,11 +246,11 @@ int main(int argc, char *argv[])
case 'S':
learnNewServers = false;
break;
- case 'adds':
+ case 'A':
dnbd3_get_ip( optarg, &msg.host );
action = IOCTL_ADD_SRV;
break;
- case 'rems':
+ case 'R':
dnbd3_get_ip( optarg, &msg.host );
action = IOCTL_REM_SRV;
break;
@@ -463,11 +463,11 @@ static void dnbd3_daemon_action(int client, int argc, char **argv)
case 'S':
learnNewServers = false;
break;
- case 'adds':
+ case 'A':
action = IOCTL_ADD_SRV;
actionName = "Add Server";
break;
- case 'rems':
+ case 'R':
action = IOCTL_REM_SRV;
actionName = "Remove Server";
break;
@@ -673,6 +673,8 @@ static void dnbd3_print_help(char *argv_0)
printf( "-c or --close \t\t Disconnect and close device.\n" );
printf( "-s or --switch \t\t Switch dnbd3-server on device (DEBUG).\n" );
printf( "-S or --sticky \t\t Use only servers from command line (no learning from servers)\n" );
+ printf( "-A or --add \t\t Add given dnbd3-server on device.\n");
+ printf( "-R or --remove \t\t Remove given dnbd3-server on device.\n");
printf( "-H or --help \t\t Show this help text and quit.\n" );
printf( "-V or --version \t Show version and quit.\n\n" );
printf( "\t--daemon \t Run as helper daemon\n" );