Branch: master

0009cb81 2019-08-15 08:23:01 OBATA Akio
fix some sh portability fixes

Replace bash specific way with POSIX one.

Signed-off-by: OBATA Akio <obache@...>
M karm/test/__lib.sh
M karm/test/booktime-baddate.sh
M karm/test/booktime-badduration.sh
M karm/test/booktime-badtime.sh
M karm/test/booktime-baduid.sh
M karm/test/booktime-works.sh
M karm/test/bug94447.sh
M karm/test/delete.sh
M karm/test/refresh_on_change.sh
M karm/test/version.sh
M karm/test/webdav.sh

karm/test/__lib.sh

diff --git a/karm/test/__lib.sh b/karm/test/__lib.sh
index 06fd9df..0f8be7b 100644
--- a/karm/test/__lib.sh
+++ b/karm/test/__lib.sh
@@ -1,7 +1,7 @@
 
 # Expects karm test file in $TESTFILE 
 # Returns dcop id in $DCOP_ID
-function set_up()
+set_up()
 {
   DCOPID=`dcop 2>/dev/null | grep karm`
 
@@ -44,7 +44,7 @@
     then
       break
     else
-      let "idx += 1"
+      idx=$(( idx + 1 ))
     fi
     sleep 1
   done
@@ -64,12 +64,12 @@
   fi
 }
 
-function test_func()
+test_func()
 {
   echo "Yep, that works."
 }
 
-function tear_down()
+tear_down()
 {
   if [ -n "$DCOPID" ]; then dcop "$DCOPID" KarmDCOPIface quit; fi;
 

karm/test/booktime-baddate.sh

diff --git a/karm/test/booktime-baddate.sh b/karm/test/booktime-baddate.sh
index d89e54c..fa94a6c 100755
--- a/karm/test/booktime-baddate.sh
+++ b/karm/test/booktime-baddate.sh
@@ -2,7 +2,7 @@
 
 TESTFILE="/tmp/testkarm1.ics"
 
-source __lib.sh
+. ./__lib.sh
 
 set_up
 
@@ -13,7 +13,7 @@
 tear_down
 
 EXPECTED=5
-if [ "$RVAL" == "$EXPECTED" ]; then 
+if [ "$RVAL" = "$EXPECTED" ]; then 
   echo "PASS $0"
   exit 0;
 else 

karm/test/booktime-badduration.sh

diff --git a/karm/test/booktime-badduration.sh b/karm/test/booktime-badduration.sh
index 2b1e8c9..b18f59a 100755
--- a/karm/test/booktime-badduration.sh
+++ b/karm/test/booktime-badduration.sh
@@ -2,7 +2,7 @@
 
 TESTFILE="/tmp/testkarm1.ics"
 
-source __lib.sh
+. ./__lib.sh
 
 set_up
 
@@ -13,7 +13,7 @@
 tear_down
 
 EXPECTED=7
-if [ "$RVAL" == "$EXPECTED" ]; then 
+if [ "$RVAL" = "$EXPECTED" ]; then 
   echo "PASS $0"
   exit 0;
 else 

karm/test/booktime-badtime.sh

diff --git a/karm/test/booktime-badtime.sh b/karm/test/booktime-badtime.sh
index 1bbaa3d..abc98c3 100755
--- a/karm/test/booktime-badtime.sh
+++ b/karm/test/booktime-badtime.sh
@@ -2,7 +2,7 @@
 
 TESTFILE="/tmp/testkarm1.ics"
 
-source __lib.sh
+. ./__lib.sh
 
 set_up
 
@@ -13,7 +13,7 @@
 tear_down
 
 EXPECTED=5
-if [ "$RVAL" == "$EXPECTED" ]; then 
+if [ "$RVAL" = "$EXPECTED" ]; then 
   echo "PASS $0"
   exit 0;
 else 

karm/test/booktime-baduid.sh

diff --git a/karm/test/booktime-baduid.sh b/karm/test/booktime-baduid.sh
index 8cb0642..94364b3 100755
--- a/karm/test/booktime-baduid.sh
+++ b/karm/test/booktime-baduid.sh
@@ -4,7 +4,7 @@
 
 TESTFILE="/tmp/testkarm1.ics"
 
-source __lib.sh
+. ./__lib.sh
 
 set_up
 
@@ -13,7 +13,7 @@
 tear_down
 
 EXPECTED=4
-if [ "$RVAL" == "$EXPECTED" ]; then 
+if [ "$RVAL" = "$EXPECTED" ]; then 
   echo "PASS $0"
   exit 0;
 else 

karm/test/booktime-works.sh

diff --git a/karm/test/booktime-works.sh b/karm/test/booktime-works.sh
index 280e123..4f24216 100755
--- a/karm/test/booktime-works.sh
+++ b/karm/test/booktime-works.sh
@@ -2,7 +2,7 @@
 
 TESTFILE="/tmp/testkarm1.ics"
 
-source __lib.sh
+. ./__lib.sh
 
 set_up
 
@@ -21,7 +21,7 @@
 SKIP_TESTFILE_DELETE=true
 tear_down
 
-if [ "x$RVAL" == "x$DURATION" ]; then 
+if [ "x$RVAL" = "x$DURATION" ]; then 
   echo "PASS $0"
   exit 0;
 else 

karm/test/bug94447.sh

diff --git a/karm/test/bug94447.sh b/karm/test/bug94447.sh
index fa16373..630d1ff 100755
--- a/karm/test/bug94447.sh
+++ b/karm/test/bug94447.sh
@@ -8,7 +8,7 @@
 TESTFILE="testkarm.ics"
 TESTTODO="testtodo"
 
-source __lib.sh 
+. ./__lib.sh 
 
 set_up
 

karm/test/delete.sh

diff --git a/karm/test/delete.sh b/karm/test/delete.sh
index 78f04a7..b0ea38b 100755
--- a/karm/test/delete.sh
+++ b/karm/test/delete.sh
@@ -7,7 +7,7 @@
 TESTFILE="/tmp/testkarm1.ics"
 rm $TESTFILE
 
-source __lib.sh
+. ./__lib.sh
 
 set_up
 
@@ -24,7 +24,7 @@
 
 tear_down
 
-if [ "$RVAL" == "" ]; then 
+if [ "$RVAL" = "" ]; then 
   echo "FAIL $0: got no version."
   exit 1;
 else 

karm/test/refresh_on_change.sh

diff --git a/karm/test/refresh_on_change.sh b/karm/test/refresh_on_change.sh
index 6253c63..0f02008 100755
--- a/karm/test/refresh_on_change.sh
+++ b/karm/test/refresh_on_change.sh
@@ -6,7 +6,7 @@
 
 exec >>check.log 2>&1
 
-source __lib.sh
+. /__lib.sh
 
 TESTFILE="/tmp/testkarm.ics"
 
@@ -48,7 +48,7 @@
 tear_down
 
 # check that todo was found
-if [ "$RVAL" == "$TODO_UID" ]; then 
+if [ "$RVAL" = "$TODO_UID" ]; then 
   echo "PASS $0"
   exit 0;
 else 

karm/test/version.sh

diff --git a/karm/test/version.sh b/karm/test/version.sh
index 64fbc8f..6350e73 100755
--- a/karm/test/version.sh
+++ b/karm/test/version.sh
@@ -7,7 +7,7 @@
 TESTFILE="/tmp/testkarm1.ics"
 VERSION="1.6.0"
 
-source __lib.sh
+. ./__lib.sh
 
 set_up
 
@@ -15,7 +15,7 @@
 
 tear_down
 
-if [ "$RVAL" == "$VERSION" ]; then 
+if [ "$RVAL" = "$VERSION" ]; then 
   echo "PASS $0"
   exit 0;
 else 

karm/test/webdav.sh

diff --git a/karm/test/webdav.sh b/karm/test/webdav.sh
index 8d51db9..39ca081 100755
--- a/karm/test/webdav.sh
+++ b/karm/test/webdav.sh
@@ -4,7 +4,7 @@
 
 exec >>check.log 2>&1
 
-source __lib.sh
+. ./__lib.sh
 
 # check for required perl stuff
 perl -e "use Net::DAV::Server;" > /dev/null 2>&1
0031121f 2019-08-15 20:31:09 OBATA Akio
Declare supplement prototypes conditionally

It should be declared for the case missing, or may be mismatched with builtin.

Signed-off-by: OBATA Akio <obache@...>
M ConfigureChecks.cmake
M config.h.cmake

ConfigureChecks.cmake

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 7fe40e2..2382d6d 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -16,6 +16,8 @@
 
 tde_setup_largefiles( )
 
+check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO )
+check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO )
 
** Diff limit reached (max: 250 lines) **

Branch: r14.0.x

2ba631e7 2019-08-15 20:32:43 OBATA Akio
Declare supplement prototypes conditionally

It should be declared for the case missing, or may be mismatched with builtin.

Signed-off-by: OBATA Akio <obache@...>
(cherry picked from commit 0031121f7ea2a9fc177c1d41785eda78442eeb2e)
M ConfigureChecks.cmake
M config.h.cmake
** Diff limit reached (max: 250 lines) **