From 33819c0b3a218fe8c6f13b60cf5b3351ce99826f Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Wed, 10 Jun 2020 13:36:33 +0800
Subject: [PATCH] td-459: TSDB_FILENAME_LEN

---
 src/dnode/src/dnodeSystem.c      | 2 +-
 src/kit/shell/src/shellDarwin.c  | 2 +-
 src/kit/shell/src/shellLinux.c   | 2 +-
 src/kit/shell/src/shellWindows.c | 2 +-
 src/kit/taosdump/taosdump.c      | 4 ++--
 src/util/src/tconfig.c           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dnode/src/dnodeSystem.c b/src/dnode/src/dnodeSystem.c
index 3efa1c728d..2fa738e480 100644
--- a/src/dnode/src/dnodeSystem.c
+++ b/src/dnode/src/dnodeSystem.c
@@ -29,7 +29,7 @@ int32_t main(int32_t argc, char *argv[]) {
   for (int32_t i = 1; i < argc; ++i) {
     if (strcmp(argv[i], "-c") == 0) {
       if (i < argc - 1) {        
-        if (strlen(argv[++i]) > TSDB_FILENAME_LEN - 1) {
+        if (strlen(argv[++i]) >= TSDB_FILENAME_LEN) {
           printf("config file path overflow");
           exit(EXIT_FAILURE);
         }
diff --git a/src/kit/shell/src/shellDarwin.c b/src/kit/shell/src/shellDarwin.c
index 439ca6edad..1a75a2aa85 100644
--- a/src/kit/shell/src/shellDarwin.c
+++ b/src/kit/shell/src/shellDarwin.c
@@ -97,7 +97,7 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
       }
     } else if (strcmp(argv[i], "-c") == 0) {
       if (i < argc - 1) { 
-        if (strlen(argv[++i]) > TSDB_FILENAME_LEN - 1) {
+        if (strlen(argv[++i]) >= TSDB_FILENAME_LEN) {
           fprintf(stderr, "config file path: %s overflow max len %d\n", argv[i], TSDB_FILENAME_LEN - 1);
           exit(EXIT_FAILURE);
         }
diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c
index 7d035126c0..829ceb9e5f 100644
--- a/src/kit/shell/src/shellLinux.c
+++ b/src/kit/shell/src/shellLinux.c
@@ -81,7 +81,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
         fprintf(stderr, "Invalid path %s\n", arg);
         return -1;
       }       
-      if (strlen(full_path.we_wordv[0]) > TSDB_FILENAME_LEN - 1) {
+      if (strlen(full_path.we_wordv[0]) >= TSDB_FILENAME_LEN) {
         fprintf(stderr, "config file path: %s overflow max len %d\n", full_path.we_wordv[0], TSDB_FILENAME_LEN - 1);
         wordfree(&full_path);
         return -1;
diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c
index cf96bce5a8..8a7996d682 100644
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
@@ -77,7 +77,7 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
       }
     } else if (strcmp(argv[i], "-c") == 0) {
       if (i < argc - 1) {   
-        if (strlen(argv[++i]) > TSDB_FILENAME_LEN - 1) {
+        if (strlen(argv[++i]) >= TSDB_FILENAME_LEN) {
           fprintf(stderr, "config file path: %s overflow max len %d\n", argv[i], TSDB_FILENAME_LEN - 1);
           exit(EXIT_FAILURE);
         }
diff --git a/src/kit/taosdump/taosdump.c b/src/kit/taosdump/taosdump.c
index 6cb57ef0d5..ee792c5116 100644
--- a/src/kit/taosdump/taosdump.c
+++ b/src/kit/taosdump/taosdump.c
@@ -177,8 +177,8 @@ typedef struct SDumpArguments {
   char *password;
   uint16_t port;
   // output file
-  char output[TSDB_FILENAME_LEN + 1];
-  char input[TSDB_FILENAME_LEN + 1];
+  char output[TSDB_FILENAME_LEN];
+  char input[TSDB_FILENAME_LEN];
   char *encode;
   // dump unit option
   bool all_databases;
diff --git a/src/util/src/tconfig.c b/src/util/src/tconfig.c
index 203a34fd15..543a84dc44 100644
--- a/src/util/src/tconfig.c
+++ b/src/util/src/tconfig.c
@@ -242,7 +242,7 @@ void taosReadGlobalLogCfg() {
   wordexp_t full_path;
   wordexp(configDir, &full_path, 0);
   if (full_path.we_wordv != NULL && full_path.we_wordv[0] != NULL) {    
-    if (strlen(full_path.we_wordv[0]) > TSDB_FILENAME_LEN - 1) {
+    if (strlen(full_path.we_wordv[0]) >= TSDB_FILENAME_LEN) {
       printf("\nconfig file: %s path overflow max len %d, all variables are set to default\n", full_path.we_wordv[0], TSDB_FILENAME_LEN - 1);
       wordfree(&full_path);
       return;
-- 
GitLab