From 4aff731fd50f27689a3ba443785464a24fb22c63 Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Mon, 31 Aug 2020 10:48:54 +0800
Subject: [PATCH] fix action fetch in argv

---
 client/storage_client.c | 6 ------
 storage/fdfs_storaged.c | 4 +++-
 tracker/fdfs_trackerd.c | 4 +++-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/storage_client.c b/client/storage_client.c
index 18d528e..2e7adb4 100644
--- a/client/storage_client.c
+++ b/client/storage_client.c
@@ -794,22 +794,16 @@ int storage_do_upload_file1(ConnectionInfo *pTrackerServer, \
 STORAGE_PROTO_CMD_UPLOAD_FILE and
 STORAGE_PROTO_CMD_UPLOAD_APPENDER_FILE:
 1 byte: store path index
-8 bytes: meta data bytes
 8 bytes: file size
 FDFS_FILE_EXT_NAME_MAX_LEN bytes: file ext name
-meta data bytes: each meta data seperated by \x01,
-                 name and value seperated by \x02
 file size bytes: file content
 
 STORAGE_PROTO_CMD_UPLOAD_SLAVE_FILE:
 8 bytes: master filename length
-8 bytes: meta data bytes
 8 bytes: file size
 FDFS_FILE_PREFIX_MAX_LEN bytes  : filename prefix
 FDFS_FILE_EXT_NAME_MAX_LEN bytes: file ext name, do not include dot (.)
 master filename bytes: master filename
-meta data bytes: each meta data seperated by \x01,
-                 name and value seperated by \x02
 file size bytes: file content
 **/
 int storage_do_upload_file(ConnectionInfo *pTrackerServer, \
diff --git a/storage/fdfs_storaged.c b/storage/fdfs_storaged.c
index d55b7cf..4cfc046 100644
--- a/storage/fdfs_storaged.c
+++ b/storage/fdfs_storaged.c
@@ -86,6 +86,7 @@ static void usage(const char *program)
 int main(int argc, char *argv[])
 {
 	char *conf_filename;
+    char *action;
 	int result;
 	int sock;
 	int wait_count;
@@ -132,7 +133,8 @@ int main(int argc, char *argv[])
     }
 	snprintf(pidFilename, sizeof(pidFilename),
 		"%s/data/fdfs_storaged.pid", g_fdfs_base_path);
-	if ((result=process_action(pidFilename, argv[2], &stop)) != 0)
+    action = argc >= 3 ? argv[2] : "start";
+	if ((result=process_action(pidFilename, action, &stop)) != 0)
 	{
 		if (result == EINVAL)
 		{
diff --git a/tracker/fdfs_trackerd.c b/tracker/fdfs_trackerd.c
index da914e7..c340432 100644
--- a/tracker/fdfs_trackerd.c
+++ b/tracker/fdfs_trackerd.c
@@ -79,6 +79,7 @@ static void usage(const char *program)
 int main(int argc, char *argv[])
 {
 	char *conf_filename;
+    char *action;
 	int result;
 	int wait_count;
 	int sock;
@@ -119,7 +120,8 @@ int main(int argc, char *argv[])
 
 	snprintf(pidFilename, sizeof(pidFilename),
 		"%s/data/fdfs_trackerd.pid", g_fdfs_base_path);
-	if ((result=process_action(pidFilename, argv[2], &stop)) != 0)
+    action = argc >= 3 ? argv[2] : "start";
+	if ((result=process_action(pidFilename, action, &stop)) != 0)
 	{
 		if (result == EINVAL)
 		{