diff --git a/build.sh b/build.sh index c4c8618..06ef7d3 100755 --- a/build.sh +++ b/build.sh @@ -49,6 +49,13 @@ elif [ "$oem" == "cts" ] || [ "$oem" == "ctsweb" ]; then sed -i "s/DOEM_HUAGAO/DOEM_CANGTIAN/g" hgdriver/hgdev/CMakeLists.txt sed -i "s/DOEM_HUAGAO/DOEM_CANGTIAN/g" hgdriver/wrapper/CMakeLists.txt sed -i "s/1%m%d1/1%m%d8/g" hgdriver/wrapper/CMakeLists.txt + +elif [ "$oem" == "zj" ] || [ "$oem" == "zjweb" ]; then + ver3=20 + + sed -i "s/DOEM_HUAGAO/DOEM_ZHONGJING/g" hgdriver/hgdev/CMakeLists.txt + sed -i "s/DOEM_HUAGAO/DOEM_ZHONGJING/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/1%m%d1/1%m%d9/g" hgdriver/wrapper/CMakeLists.txt fi if [ "$oem" != "" ]; then @@ -142,4 +149,4 @@ if [ -f ../code_device/hgdriver/wrapper/CMakeLists.txtbkp ]; then pwd fi -exit $err \ No newline at end of file +exit $err diff --git a/hgdriver/wrapper/hg_log.cpp b/hgdriver/wrapper/hg_log.cpp index b040ea2..377cca9 100644 --- a/hgdriver/wrapper/hg_log.cpp +++ b/hgdriver/wrapper/hg_log.cpp @@ -297,7 +297,7 @@ extern "C" char path[256] = { 0 }; int len = readlink(lnk, path, sizeof(path) - 1); - return path; + return len > 0 ? path : lnk; } static int enum_files(const char* dir, bool recursive, bool(*found_file)(const char* path_file, void* param), void* param) {