lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.5:8099/sane/code_device

This commit is contained in:
13038267101 2023-02-07 08:59:33 +08:00
parent d65c731879 786640bcba
commit 1783a8c183
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.sh
View File

@ -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/hgdev/CMakeLists.txt
sed -i "s/DOEM_HUAGAO/DOEM_CANGTIAN/g" hgdriver/wrapper/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 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 fi
if [ "$oem" != "" ]; then if [ "$oem" != "" ]; then

2
hgdriver/wrapper/hg_log.cpp
View File

@ -297,7 +297,7 @@ extern "C"
char path[256] = { 0 }; char path[256] = { 0 };
int len = readlink(lnk, path, sizeof(path) - 1); 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) static int enum_files(const char* dir, bool recursive, bool(*found_file)(const char* path_file, void* param), void* param)
{ {