From a49735ae5a672336c5ee902b84b6fc3b7d251f4e Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Fri, 13 Dec 2019 10:59:07 +0800
Subject: [PATCH] fdfs_trackerd and fdfs_storaged print the server version in
 usage

---
 HISTORY                 |  5 +++++
 client/storage_client.c |  2 +-
 storage/fdfs_storaged.c | 14 ++++++++++++--
 tracker/fdfs_trackerd.c | 14 ++++++++++++--
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index 65c41d3..5592bab 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,4 +1,9 @@
 
+Version 6.05  2019-12-13
+ * fdfs_trackerd and fdfs_storaged print the server version in usage.
+   you can execute fdfs_trackerd or fdfs_storaged without parameters
+   to show the server version
+
 Version 6.04  2019-12-05
  * storage_report_ip_changed ignore result EEXIST
  * use get_gzip_command_filename from libfastcommon v1.42
diff --git a/client/storage_client.c b/client/storage_client.c
index 576990b..18d528e 100644
--- a/client/storage_client.c
+++ b/client/storage_client.c
@@ -1808,7 +1808,7 @@ int storage_do_append_file(ConnectionInfo *pTrackerServer, \
 }
 
 /**
-STORAGE_PROTO_CMD_APPEND_FILE:
+STORAGE_PROTO_CMD_MODIFY_FILE:
 8 bytes: appender filename length
 8 bytes: file offset
 8 bytes: file size
diff --git a/storage/fdfs_storaged.c b/storage/fdfs_storaged.c
index 69326c8..376b4b1 100644
--- a/storage/fdfs_storaged.c
+++ b/storage/fdfs_storaged.c
@@ -77,8 +77,10 @@ static void sigDumpHandler(int sig);
 
 static void usage(const char *program)
 {
-	fprintf(stderr, "Usage: %s <config_file> [start | stop | restart]\n",
-		program);
+	fprintf(stderr, "FastDFS server v%d.%02d\n"
+            "Usage: %s <config_file> [start | stop | restart]\n",
+            g_fdfs_version.major, g_fdfs_version.minor,
+            program);
 }
 
 int main(int argc, char *argv[])
@@ -104,6 +106,14 @@ int main(int argc, char *argv[])
 	trunk_shared_init();
 
 	conf_filename = argv[1];
+    if (!fileExists(conf_filename))
+    {
+        if (starts_with(conf_filename, "-"))
+        {
+            usage(argv[0]);
+            return 0;
+        }
+    }
 	if ((result=get_base_path_from_conf_file(conf_filename,
 		g_fdfs_base_path, sizeof(g_fdfs_base_path))) != 0)
 	{
diff --git a/tracker/fdfs_trackerd.c b/tracker/fdfs_trackerd.c
index 1d40141..da914e7 100644
--- a/tracker/fdfs_trackerd.c
+++ b/tracker/fdfs_trackerd.c
@@ -70,8 +70,10 @@ static void sigDumpHandler(int sig);
 
 static void usage(const char *program)
 {
-	fprintf(stderr, "Usage: %s <config_file> [start | stop | restart]\n",
-		program);
+	fprintf(stderr, "FastDFS server v%d.%02d\n"
+            "Usage: %s <config_file> [start | stop | restart]\n",
+            g_fdfs_version.major, g_fdfs_version.minor,
+            program);
 }
 
 int main(int argc, char *argv[])
@@ -100,6 +102,14 @@ int main(int argc, char *argv[])
 	log_init2();
 
 	conf_filename = argv[1];
+    if (!fileExists(conf_filename))
+    {
+        if (starts_with(conf_filename, "-"))
+        {
+            usage(argv[0]);
+            return 0;
+        }
+    }
 	if ((result=get_base_path_from_conf_file(conf_filename,
 		g_fdfs_base_path, sizeof(g_fdfs_base_path))) != 0)
 	{