From 921607aa94e3ca3741a8997da50fc9872380f2d8 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 18 六月 2020 15:44:29 +0800
Subject: [PATCH] update
---
device/libnetdisk.a | 0
Makefile | 15 ++-------------
device/libnetdisk.so | 0
service/netdisk_service | 0
device/hcnetdisk.c | 3 ++-
service/test | 0
6 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index 75a2d0c..a2ae35a 100755
--- a/Makefile
+++ b/Makefile
@@ -24,23 +24,12 @@
ls ./build/common > /dev/null 2> /dev/null || mkdir -p ./build/common && cp ./common/libusgcommon.a ./build/common && cp ./common/libusgcommon.so ./build/common
cp -a ./data ./build
cp -avx ./script/* ./build
- tar -czvf $(PACKAGE_NAME) ./build
+ tar -czvf $(PACKAGE_NAME) build
-tarname = basic_pack.tar.gz
+tarname = netdis_str.tar.gz
tar:
rm -f $(tarname)
git archive --format tar.gz --output "./$(tarname)" $(branch)
-tar2:
- rm -f $(tarname)
- mkdir -p basic_pack/include
- mkdir -p basic_pack/lib
- cp -a ./common/include/* basic_pack/include/
- cp -a ./algorithm/include/* basic_pack/include/
- cp ./common/libusgcommon.so basic_pack/lib/
- cp ./algorithm/libalg.so basic_pack/lib/
- cp README.mk basic_pack
- cp test/test_right_walk2.c basic_pack
- tar -czvf $(tarname) basic_pack
diff --git a/device/hcnetdisk.c b/device/hcnetdisk.c
index 4c5353b..a99f339 100644
--- a/device/hcnetdisk.c
+++ b/device/hcnetdisk.c
@@ -183,7 +183,8 @@
char strFileName[256] = {0};
if (destfile != NULL) {
sprintf(strFileName, "%s", destfile);
- char *dir = dirname(strdup(destfile));
+ //char *dir = dirname(strdup(destfile));
+ char *dir = dirname(const_cast<char *>(destfile));
printf("dir === %s\n", dir);
if ((mkdir(dir, DIR_MODE) == -1) && (errno != EEXIST)) {
err_msg(errno, "hc_downloadByTime mkdir error ");
diff --git a/device/libnetdisk.a b/device/libnetdisk.a
index 1f45562..7488ddc 100644
--- a/device/libnetdisk.a
+++ b/device/libnetdisk.a
Binary files differ
diff --git a/device/libnetdisk.so b/device/libnetdisk.so
index 018ffef..59d1974 100755
--- a/device/libnetdisk.so
+++ b/device/libnetdisk.so
Binary files differ
diff --git a/service/netdisk_service b/service/netdisk_service
index fd9bbc1..d0e9580 100755
--- a/service/netdisk_service
+++ b/service/netdisk_service
Binary files differ
diff --git a/service/test b/service/test
index f5f368d..21aa19a 100755
--- a/service/test
+++ b/service/test
Binary files differ
--
Gitblit v1.8.0