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

build.sh

@@ -1,24 +1,46 @@
 # Main and minor version definition 
 mainverstr="s/ver_1/4/g"
-minverstr="s/ver_2/0/g"
+minver="01"
+minverstr="s/ver_2/"
 oem="${1}"
+cpu=`arch`
 
-#if [ "${1}" -gt 0 ] 2>/dev/null ; then
-#    echo "${1}"
-#else
-#    echo "usage: build.sh <main ver> [minver 0] [hw | lsc]"
-#    exit
-#fi
-#mainverstr="s/ver_1/""${1}""/g"
-#minverstr="s/ver_2/"
-#oem="${2}"
-#if [ "$oem" == "minver" ]; then
-#    minverstr=${minverstr}"${3}"
-#    oem="${4}"
-#else
-#    minverstr=${minverstr}"0"
-#fi
-#minverstr=${minverstr}"/g"
+if cat /etc/*release | grep ^NAME | grep uos ; then
+    # uos ...
+    if [ "$cpu" == "x86_64" ]; then
+        minver="20"${minver}
+    elif [ "$cpu" == "aarch64" ]; then
+        minver="21"${minver}
+    elif [ "$cpu" == "mips64" ]; then
+        minver="22"${minver}
+    else
+        minver="29"${minver}
+    fi
+elif cat /etc/*release | grep ^NAME | grep Kylin ; then
+    # kylin ...
+    if [ "$cpu" == "x86_64" ]; then
+        minver="30"${minver}
+    elif [ "$cpu" == "aarch64" ]; then
+        minver="31"${minver}
+    elif [ "$cpu" == "mips64" ]; then
+        minver="32"${minver}
+    else
+        minver="39"${minver}
+    fi
+else
+    # unknown OS
+    if [ "$cpu" == "x86_64" ]; then
+        minver="90"${minver}
+    elif [ "$cpu" == "aarch64" ]; then
+        minver="91"${minver}
+    elif [ "$cpu" == "mips64" ]; then
+        minver="92"${minver}
+    else
+        minver="99"${minver}
+    fi
+fi
+minverstr=${minverstr}${minver}"/g"
+echo "minor version replacing pattern: "${minverstr}
 
 sysarch=$(arch)
 sys=$(cat /etc/issue)

hgdriver/wrapper/hg_log.cpp

@@ -250,7 +250,7 @@ extern "C"
 
 			return u2utf8(path);
 #else
-			char path[256];
+			char path[256] = { 0 };
 			int	 len = readlink("/proc/self/exe", path, sizeof(path) - 1);
 
 			if (len > 0 && len < sizeof(path))