(baidu#1279)

see the comments for the details.

Author: lpstudy

build.conf.template

@@ -61,7 +61,6 @@ elif [ $MIRROR == "baidu" ]; then
     GPERFTOOLS_URL=http://gitlab.baidu.com/baidups/third/raw/master/gperftools-${GPERFTOOLS_VERSION}.tar.gz
     INS_URL=http://gitlab.baidu.com/baidups/third/raw/master/ins-${INS_VERSION}.tar.gz
     NOSE_URL=http://gitlab.baidu.com/baidups/third/raw/master/nose-${NOSE_VERSION}.tar.gz
-    READLINE_URL=http://git.savannah.gnu.org/cgit/readline.git/snapshot/readline-${READLINE_VERSION}.tar.gz
 else
     return 1
 fi

src/common/file/file_path.cc

@@ -2,22 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "common/file/file_path.h"
+
 #include <dirent.h>
 #include <grp.h>
+#include <libgen.h>
+#include <linux/limits.h>
 #include <pwd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <libgen.h>
 
 #include <gflags/gflags.h>
 
 #include "common/base/string_ext.h"
-#include "common/file/file_path.h"
+
 
 DECLARE_int32(file_op_retry_times);
 
@@ -106,17 +110,17 @@ bool CreateDirWithRetry(const std::string& dir_path) {
     }
     return is_success;
 }
-std::string GetCWD(){
-    char buf[1024];
-    if(getcwd(buf, 1024) == NULL){
+std::string GetCWD() {
+    char buf[PATH_MAX];
+    if(getcwd(buf, PATH_MAX) == NULL){
         return "";
     }
 	return buf;
 }
 
-std::string GetProcessDir(){
-    char buf[1024];
-    ssize_t count = readlink("/proc/self/exe", buf, 1024);
+std::string GetProcessDir() {
+    char buf[PATH_MAX];
+    ssize_t count = readlink("/proc/self/exe", buf, PATH_MAX);
     if(count == 0) {
         return "";
     } else{

src/sdk/client_impl.cc

@@ -1189,7 +1189,7 @@ static int SpecifiedFlagfileCount(const std::string& confpath) {
 
 static int InitFlags(const std::string& confpath, const std::string& log_prefix) {
     // search conf file, priority:
-    //   user-specified > ./tera.flag > ../conf/tera.flag
+    //   user-specified > ./tera.flag > ../conf/tera.flag > exeDir/tera.flag > exeDir/../tera.flag
     std::string flagfile;
     if (SpecifiedFlagfileCount(confpath) > 1) {
         LOG(ERROR) << "should specify no more than one config file";
@@ -1220,10 +1220,15 @@ static int InitFlags(const std::string& confpath, const std::string& log_prefix)
     } else {
         LOG(ERROR) << "hasn't specify the flagfile, but default config file not found";
         return -1;
-        }
+    }
 
     utils::LoadFlagFile(flagfile);
 
+    if(!IsDir(FLAGS_log_dir)) {
+        LOG(ERROR) << "wrong log directory: "<<FLAGS_log_dir;
+        return -1;
+    }
+
     if (!g_is_glog_init) {
         ::google::InitGoogleLogging(log_prefix.c_str());
         utils::SetupLog(log_prefix);