Fix pull request https://github.com/Unidata/netcdf-c/pull/374 (dap4.dmh)

1. When running under windows (as opposed to cygwin)
   we need to make sure to not user /cygdrive/ file paths.
   This was ocurring in libdap4/d4read.c, but may occur
   elsewhere.
2. Shell scripts in the git repo are not being checked-out
   with the executable mode set. Had core.filemode set to false.
   Was a major hassle to fix.

CMakeLists.txt

@@ -753,15 +753,11 @@ ENDIF(USE_HDF5 OR ENABLE_NETCDF_4)
 
 # Option to Build DAP2+DAP4 Clients
 OPTION(ENABLE_DAP "Enable DAP2 and DAP4 Client." ON)
-OPTION(ENABLE_DAP4 "Enable DAP4 Client." OFF) # Temporary
 IF(ENABLE_DAP)
   SET(USE_DAP ON)
   SET(ENABLE_DAP2 ON)
-  IF(ENABLE_NETCDF_4)
-    IF(ENABLE_DAP4)
-      SET(ENABLE_DAP4 ON)
-    ENDIF()
-  ELSE()
+  SET(ENABLE_DAP4 ON)
+  IF(NOT ENABLE_NETCDF_4)
     SET(ENABLE_DAP4 OFF)
   ENDIF()
   FIND_PACKAGE(CURL)
@@ -1201,8 +1197,8 @@ CHECK_SYMBOL_EXISTS(vprintf "stdio.h" HAVE_VPRINTF)
 SET(HAVE_ST_BLKSIZE ${HAVE_STRUCT_STAT_ST_BLKSIZE})
 
 # Type checks
-CHECK_TYPE_SIZE("void*"     SIZEOF_VOIDSTAR)
-# Alias for automake consistency
+# Aliases for automake consistency
+SET(SIZEOF_VOIDSTAR ${CMAKE_SIZEOF_VOID_P})
 SET(SIZEOF_VOIDP ${SIZEOF_VOIDSTAR})
 CHECK_TYPE_SIZE("char"      SIZEOF_CHAR)
 CHECK_TYPE_SIZE("double"    SIZEOF_DOUBLE)

cf.cmake

@@ -18,6 +18,8 @@ FLAGS="$FLAGS -DCMAKE_INSTALL_PREFIX=d:/ignore"
 
 if test "x$DAP" = x ; then
 FLAGS="$FLAGS -DENABLE_DAP=false"
+else
+FLAGS="$FLAGS -DENABLE_DAP=true"
 fi
 if test "x$NC4" = x ; then
 FLAGS="$FLAGS -DENABLE_NETCDF_4=false"
@@ -26,7 +28,6 @@ FLAGS="$FLAGS -DENABLE_CONVERSION_WARNINGS=false"
 FLAGS="$FLAGS -DENABLE_DAP_REMOTE_TESTS=true"
 FLAGS="$FLAGS -DENABLE_TESTS=true"
 FLAGS="$FLAGS -DENABLE_EXAMPLES=false"
-#FLAGS="$FLAGS -DENABLE_DAP4=true"
 #FLAGS="$FLAGS -DENABLE_HDF4=true"
 
 rm -fr build

config.h.cmake.in

@@ -498,6 +498,9 @@ are set when opening a binary file on Windows. */
 /* The size of `ushort', as computed by sizeof. */
 #cmakedefine SIZEOF_USHORT ${SIZEOF_USHORT}
 
+/* The size of `void*', as computed by sizeof. */
+#cmakedefine SIZEOF_VOIDP ${SIZEOF_VOIDP}
+
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at runtime.

configure.ac

@@ -863,9 +863,11 @@ AC_C_BIGENDIAN
 SLEEPCMD=""
 PLTFORMOUT="$(uname | cut -d '_' -f 1)"
 if test "$PLTFORMOUT" = "CYGWIN"; then
+   ISCYGWIN=yes
    SLEEPCMD="sleep 5"
    AC_MSG_NOTICE([Pausing between sizeof() checks to mitigate a Cygwin issue.])
 fi
+AM_CONDITIONAL(ISCYGWIN, [test "x$ISCYGWIN" = xyes])
 
 $SLEEPCMD
 AC_CHECK_SIZEOF(short)

dap4_test/CMakeLists.txt

@@ -24,7 +24,7 @@ IF(ENABLE_TESTS)
     BUILD_BIN_TEST(findtestserver4)
 
     IF(BUILD_UTILITIES)
-       add_sh_test(dap4_test test_remote)
+# disable for now       add_sh_test(dap4_test test_remote)
     ENDIF(BUILD_UTILITIES)
   ENDIF(ENABLE_DAP_REMOTE_TESTS)
 ENDIF(ENABLE_TESTS)

dap4_test/test_data.sh

@@ -87,3 +87,4 @@ fi
 
 finish
 
+

dap4_test/test_hyrax.sh

@@ -29,7 +29,7 @@ if test "x${RESET}" = x1 ; then rm -fr ${BASELINEH}/*.dmp ; fi
 for f in $F ; do
     URL="dap4://test.opendap.org:8080/opendap/nc4_test_files/${f}${FRAG}"
     echo "testing: $URL"
-    if ! ../ncdump/ncdump ${URL} > ./results/${f}.hyrax; then
+    if ! ${NCDUMP} "${URL}" > ./results/${f}.hyrax; then
         failure "${URL}"
     fi
     if test "x${TEST}" = x1 ; then
@@ -44,3 +44,4 @@ done
 
 echo "*** Pass"
 exit 0
+

dap4_test/test_meta.sh

@@ -52,3 +52,4 @@ fi
 
 finish
 
+

dap4_test/test_parse.sh

@@ -40,3 +40,4 @@ finish
 
 exit 0
 
+

dap4_test/test_raw.sh

@@ -5,6 +5,8 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 . ${srcdir}/d4test_common.sh
 
+set -x
+
 # Compute the set of testfiles
 PUSHD ${srcdir}/daptestfiles
 F=`ls -1d *.dap`
@@ -42,7 +44,7 @@ if test "x${RESET}" = x1 ; then rm -fr ${BASELINERAW}/*.dmp ; fi
 for f in $F ; do
     echo "testing: $f"
     URL="[dap4]file:${DAPTESTFILES}/${f}"
-    if ! ${VG} ${NCDUMP} ${URL} > ./results/${f}.dmp; then
+    if ! ${VG} ${NCDUMP} "${URL}" > ./results/${f}.dmp; then
         failure "${URL}"
     fi
     if test "x${TEST}" = x1 ; then
@@ -63,3 +65,4 @@ for f in $F ; do
 done
 
 finish
+

dap4_test/test_remote.sh

@@ -67,7 +67,7 @@ for f in $F ; do
     if test "x$NOCSUM" = x1; then
 	URL="[ucar.checksummode=none]${URL}"
     fi
-    if ! ${VG} ${NCDUMP} ${URL} > ./results/${f}.dmp; then
+    if ! ${VG} ${NCDUMP} "${URL}" > ./results/${f}.dmp; then
         failure "${URL}"
     fi
     if test "x${TEST}" = x1 ; then
@@ -81,3 +81,4 @@ for f in $F ; do
 done
 
 finish
+

dap4_test/tst_data.sh

@@ -0,0 +1,89 @@
+#!/bin/sh
+
+if test "x$srcdir" = x ; then srcdir=`pwd`; fi
+. ../test_common.sh
+
+. ${srcdir}/d4test_common.sh
+
+cd ${DAPTESTFILES}
+F=`ls -1 *.dap | sed -e 's/[.]dap//g' | tr '\r\n' '  '`
+cd $WD
+
+if test "x${RESET}" = x1 ; then rm -fr ${BASELINE}/*.d4d ; fi
+for f in $F ; do
+    echo "testing: ${f}"
+    if ! ${VG} ${execdir}/test_data ${DAPTESTFILES}/${f} ./results/${f}.nc ; then
+        failure "${execdir}/test_data ${DAPTESTFILES}/${f} ./results/${f}.nc"
+    fi
+    ${NCDUMP} ./results/${f}.nc > ./results/${f}.d4d
+    if test "x${TEST}" = x1 ; then
+	if ! diff -wBb ${BASELINE}/${f}.d4d ./results/${f}.d4d ; then
+	    failure "diff -wBb ${BASELINE}/${f}.d4d ./results/${f}.d4d"
+	fi
+    elif test "x${RESET}" = x1 ; then
+	echo "${f}:" 
+	cp ./results/${f}.d4d ${BASELINE}/${f}.d4d
+    fi
+done
+
+# Remove empty lines and trim lines in a cdl file
+trim() {
+  if test $# != 2 ; then
+    echo "simplify: too few args"
+  else
+    rm -f $2
+    while read -r iline; do
+      oline=`echo $iline | sed -e 's/^[\t ]*\([^\t ]*\)[\t ]*$/\\1/'`
+      if test "x$oline" = x ; then continue ; fi
+      echo "$oline" >> $2
+    done < $1
+  fi
+}
+
+# Do cleanup on the baseline file
+baseclean() {
+  if test $# != 2 ; then
+    echo "simplify: too few args"
+  else
+    rm -f $2
+    while read -r iline; do
+      oline=`echo $iline | tr "'" '"'`
+      echo "$oline" >> $2
+    done < $1
+  fi
+}
+
+# Do cleanup on the result file
+resultclean() {
+  if test $# != 2 ; then
+    echo "simplify: too few args"
+  else
+    rm -f $2
+    while read -r iline; do
+      oline=`echo $iline | sed -e 's|^\(netcdf.*\)[.]nc\(.*\)$|\\1\\2|'`
+      echo "$oline" >> $2
+    done < $1
+  fi
+}
+
+if test "x${CDLDIFF}" = x1 ; then
+  for f in $F ; do
+    STEM=`echo $f | cut -d. -f 1`
+    if ! test -e ${CDLTESTFILES}/${STEM}.cdl ; then
+      echo "Not found: ${CDLTESTFILES}/${STEM}.cdl"
+      continue
+    fi
+    echo "diff -wBb ${CDLTESTFILES}/${STEM}.cdl ./results/${f}.d4d"
+    rm -f ./b1 ./b2 ./r1 ./r2
+    trim ${CDLTESTFILES}/${STEM}.cdl ./b1
+    trim ./results/${f}.d4d ./r1
+    baseclean b1 b2
+    resultclean r1 r2  
+    if ! diff -wBb ./b2 ./r2 ; then
+	failure "${f}" 
+    fi
+  done
+fi
+
+finish
+

dap4_test/tst_meta.sh

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+if test "x$srcdir" = x ; then srcdir=`pwd`; fi
+. ../test_common.sh
+
+. ${srcdir}/d4test_common.sh
+
+cd ${DMRTESTFILES}
+F=`ls -1 *.dmr | sed -e 's/[.]dmr//g' | tr '\r\n' '  '`
+cd $WD
+
+CDL=
+for f in ${F} ; do
+STEM=`echo $f | cut -d. -f 1`
+if test -e ${CDLTESTFILES}/${STEM}.cdl ; then
+  CDL="${CDL} ${STEM}"
+else
+  echo "Not found: ${CDLTESTFILES}/${STEM}.cdl"
+fi
+done
+
+if test "x${RESET}" = x1 ; then rm -fr ${BASELINE}/*.d4m ; fi
+
+for f in ${F} ; do
+    echo "checking: $f"
+    if ! ${VG} ${execdir}/test_meta ${DMRTESTFILES}/${f}.dmr ./results/${f} ; then
+        failure "${execdir}/test_meta ${DMRTESTFILES}/${f}.dmr ./results/${f}"
+    fi
+    ${NCDUMP} -h ./results/${f} > ./results/${f}.d4m
+    if test "x${TEST}" = x1 ; then
+	if ! diff -wBb ${BASELINE}/${f}.d4m ./results/${f}.d4m ; then
+	    failure "diff -wBb ${BASELINE}/${f}.ncdump ./results/${f}.d4m"
+	fi
+    elif test "x${RESET}" = x1 ; then
+	echo "${f}:" 
+	cp ./results/${f}.d4m ${BASELINE}/${f}.d4m
+    fi
+done
+
+if test "x${CDLDIFF}" = x1 ; then
+  for f in $CDL ; do
+    echo "diff -wBb ${CDLTESTFILES}/${f}.cdl ./results/${f}.d4m"
+    rm -f ./tmp
+    cat ${CDLTESTFILES}/${f}.cdl \
+    cat >./tmp
+    echo diff -wBbu ./tmp ./results/${f}.d4m
+    if ! diff -wBbu ./tmp ./results/${f}.d4m ; then
+	failure "${f}" 
+    fi
+  done
+fi
+
+finish
+

dap4_test/tst_parse.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+if test "x$srcdir" = x ; then srcdir=`pwd`; fi
+. ../test_common.sh
+
+. ${srcdir}/d4test_common.sh
+
+cd ${DMRTESTFILES}
+F=`ls -1 *.dmr | sed -e 's/[.]dmr//' |tr '\r\n' '  '`
+cd $WD
+
+if test "x${RESET}" = x1 ; then rm -fr ${BASELINE}/*.d4p ; fi
+for f in $F ; do
+    echo "testing: $f"
+    if ! ${VG} ${execdir}/test_parse ${DMRTESTFILES}/${f}.dmr > ./results/${f}.d4p ; then
+	failure "${f}"
+    fi
+    if test "x${TEST}" = x1 ; then
+	if ! diff -wBb ${BASELINE}/${f}.d4p ./results/${f}.d4p ; then
+	    failure "${f}"
+	fi
+    elif test "x${DIFF}" = x1 ; then
+	echo "diff -wBb ${DMRTESTFILES}/${f}.dmr ./results/${f}.d4p"
+	rm -f ./tmp
+	cat ./results/${f}.d4p \
+	| sed -e '/<Dimensions>/d' -e '/<Types>'/d -e '/<Variables>'/d -e '/<Groups>'/d \
+	| sed -e '/<\/Dimensions>/d' -e '/<\/Types>'/d -e '/<\/Variables>'/d -e '/<\/Groups>'/d  \
+	| sed -e '/_edu.ucar.opaque.size/,+2d' \
+	| cat > ./tmp
+	if ! diff -wBb ${DMRTESTFILES}/${f}.dmr ./tmp ; then
+	    failure "${f}" 
+	fi
+    elif test "x${RESET}" = x1 ; then
+	echo "${f}:" 
+	cp ./results/${f}.d4p ${BASELINE}/${f}.d4p	
+    fi
+done
+
+finish
+
+exit 0
+

dap4_test/tst_raw.sh

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+if test "x$srcdir" = x ; then srcdir=`pwd`; fi
+. ../test_common.sh
+
+. ${srcdir}/d4test_common.sh
+
+set -x
+
+# Compute the set of testfiles
+PUSHD ${srcdir}/daptestfiles
+F=`ls -1d *.dap`
+POPD
+F=`echo $F | tr '\r\n' '  '`
+F=`echo $F | sed -e s/.dap//g`
+
+# Do cleanup on the baseline file
+baseclean() {
+  if test $# != 2 ; then
+    echo "simplify: too few args"
+  else
+    rm -f $2
+    while read -r iline; do
+      oline=`echo $iline | tr "'" '"'`
+      echo "$oline" >> $2
+    done < $1
+  fi
+}
+
+# Do cleanup on the result file
+resultclean() {
+  if test $# != 2 ; then
+    echo "simplify: too few args"
+  else
+    rm -f $2
+    while read -r iline; do
+      oline=`echo $iline | sed -e 's|^\(netcdf.*\)[.]nc\(.*\)$|\\1\\2|'`
+      echo "$oline" >> $2
+    done < $1
+  fi
+}
+
+if test "x${RESET}" = x1 ; then rm -fr ${BASELINERAW}/*.dmp ; fi
+for f in $F ; do
+    echo "testing: $f"
+    URL="[dap4]file:${DAPTESTFILES}/${f}"
+    if ! ${VG} ${NCDUMP} "${URL}" > ./results/${f}.dmp; then
+        failure "${URL}"
+    fi
+    if test "x${TEST}" = x1 ; then
+	if ! diff -wBb ${BASELINERAW}/${f}.dmp ./results/${f}.dmp ; then
+	    failure "diff ${f}.dmp"
+	fi
+    elif test "x${RESET}" = x1 ; then
+	echo "${f}:" 
+	cp ./results/${f}.dmp ${BASELINERAW}/${f}.dmp
+    elif test "x${DIFF}" = x1 ; then
+	echo "hdrtest: ${f}"
+	rm -f ./tr1 ./tr2 ./tb1 ./tb2
+	baseclean 
+        if ! diff -wBb ./${BASELINERAW}/${f}.dmp ./${BASELINE}/${f}.ncdump ; then
+          failure diff -wBb ./${BASELINERAW}/${f}.dmp ./${BASELINE}/${f}.ncdump
+	fi
+    fi
+done
+
+finish

include/Makefile.am

@@ -19,7 +19,7 @@ nclist.h ncuri.h ncutf8.h ncdispatch.h ncdimscale.h		\
 netcdf_f.h err_macros.h ncbytes.h nchashmap.h ceconstraints.h rnd.h	\
 nclog.h ncconfigure.h nc4internal.h nctime.h nc3internal.h \
 onstack.h nc_hashmap.h ncrc.h ncoffsets.h nctestserver.h \
-nc4dispatch.h nc3dispatch.h
+nc4dispatch.h nc3dispatch.h ncexternl.h
 
 if USE_DAP
 noinst_HEADERS += ncdap.h

include/nc4dispatch.h

@@ -18,13 +18,6 @@
 extern "C" {
 #endif
 
-	/* We use EXTERNL instead of extern.
-	   On Windows system, EXTERNL has been defined (see netcdf.h) such
-	   that symbols are properly exported/imported between
-	   libraries and executables.  On non-windows systems,
-	   EXTERNL is defined as extern. */
-
-
 extern int
 NC4_create(const char *path, int cmode,
            size_t initialsz, int basepe, size_t *chunksizehintp,

include/ncbytes.h

@@ -4,6 +4,8 @@
 #ifndef NCBYTES_H
 #define NCBYTES_H 1
 
+#include "ncexternl.h"
+
 typedef struct NCbytes {
   int nonextendible; /* 1 => fail if an attempt is made to extend this buffer*/
   unsigned long alloc;
@@ -15,38 +17,38 @@ typedef struct NCbytes {
 extern "C" {
 #endif
 
-extern NCbytes* ncbytesnew(void);
-extern void ncbytesfree(NCbytes*);
-extern int ncbytessetalloc(NCbytes*,unsigned long);
-extern int ncbytessetlength(NCbytes*,unsigned long);
-extern int ncbytesfill(NCbytes*, char fill);
+EXTERNL NCbytes* ncbytesnew(void);
+EXTERNL void ncbytesfree(NCbytes*);
+EXTERNL int ncbytessetalloc(NCbytes*,unsigned long);
+EXTERNL int ncbytessetlength(NCbytes*,unsigned long);
+EXTERNL int ncbytesfill(NCbytes*, char fill);
 
 /* Produce a duplicate of the contents*/
-extern char* ncbytesdup(NCbytes*);
+EXTERNL char* ncbytesdup(NCbytes*);
 /* Extract the contents and leave buffer empty */
-extern char* ncbytesextract(NCbytes*);
+EXTERNL char* ncbytesextract(NCbytes*);
 
 /* Return the ith byte; -1 if no such index */
-extern int ncbytesget(NCbytes*,unsigned long);
+EXTERNL int ncbytesget(NCbytes*,unsigned long);
 /* Set the ith byte */
-extern int ncbytesset(NCbytes*,unsigned long,char);
+EXTERNL int ncbytesset(NCbytes*,unsigned long,char);
 
 /* Append one byte */
-extern int ncbytesappend(NCbytes*,char); /* Add at Tail */
+EXTERNL int ncbytesappend(NCbytes*,char); /* Add at Tail */
 /* Append n bytes */
-extern int ncbytesappendn(NCbytes*,const void*,unsigned long); /* Add at Tail */
+EXTERNL int ncbytesappendn(NCbytes*,const void*,unsigned long); /* Add at Tail */
 
 /* Null terminate the byte string without extending its length (for debugging) */
-extern int ncbytesnull(NCbytes*);
+EXTERNL int ncbytesnull(NCbytes*);
 
 /* Remove char at position i */
-extern int ncbytesremove(NCbytes*,unsigned long);
+EXTERNL int ncbytesremove(NCbytes*,unsigned long);
 
 /* Concatenate a null-terminated string to the end of the buffer */
-extern int ncbytescat(NCbytes*,const char*);
+EXTERNL int ncbytescat(NCbytes*,const char*);
 
 /* Set the contents of the buffer; mark the buffer as non-extendible */
-extern int ncbytessetcontents(NCbytes*, char*, unsigned long);
+EXTERNL int ncbytessetcontents(NCbytes*, char*, unsigned long);
 
 /* Following are always "in-lined"*/
 #define ncbyteslength(bb) ((bb)!=NULL?(bb)->length:0)

include/ncexternl.h

@@ -0,0 +1,23 @@
+/*********************************************************************
+ *   Copyright 2010, UCAR/Unidata
+ *   See netcdf/COPYRIGHT file for copying and redistribution conditions.
+ *   $Header$
+ *********************************************************************/
+
+#ifndef NCEXTERNL_H
+#define NCEXTERNL_H
+
+#if defined(DLL_NETCDF) /* define when library is a DLL */
+#  if defined(DLL_EXPORT) /* define when building the library */
+#   define MSC_EXTRA __declspec(dllexport)
+#  else
+#   define MSC_EXTRA __declspec(dllimport)
+#  endif
+#else
+#  define MSC_EXTRA
+#endif	/* defined(DLL_NETCDF) */
+#ifndef EXTERNL
+# define EXTERNL MSC_EXTRA extern
+#endif
+
+#endif /*NCEXTERNL_H*/

include/nclog.h

@@ -7,6 +7,8 @@
 #ifndef NCLOG_H
 #define NCLOG_H
 
+#include "ncexternl.h"
+
 #define NCENVFLAG "NCLOGFILE"
 
 /* Suggested tag values */
@@ -19,18 +21,18 @@
 extern "C" {
 #endif
 
-extern void ncloginit(void);
-extern int ncsetlogging(int tf);
-extern int nclogopen(const char* file);
-extern void nclogclose(void);
+EXTERNL void ncloginit(void);
+EXTERNL int ncsetlogging(int tf);
+EXTERNL int nclogopen(const char* file);
+EXTERNL void nclogclose(void);
 
 /* The tag value is an arbitrary integer */
-extern void nclog(int tag, const char* fmt, ...);
-extern void nclogtext(int tag, const char* text);
-extern void nclogtextn(int tag, const char* text, size_t count);
+EXTERNL void nclog(int tag, const char* fmt, ...);
+EXTERNL void nclogtext(int tag, const char* text);
+EXTERNL void nclogtextn(int tag, const char* text, size_t count);
 
 /* Provide printable names for tags */
-extern void nclogsettags(char** tagset, char* dfalt);
+EXTERNL void nclogsettags(char** tagset, char* dfalt);
 
 #if defined(_CPLUSPLUS_) || defined(__CPLUSPLUS__)
 }

libdap4/d4file.c

@@ -224,7 +224,6 @@ done:
     if(ret) {
 	freeInfo(d4info);
         nc->dispatchdata = NULL;
-	fprintf(stderr,"XXX: %d\n",ret); fflush(stderr);
     }
     return THROW(ret);
 }

libdap4/d4read.c

@@ -8,6 +8,7 @@
 static int readpacket(NCD4INFO* state, NCURI*, NCbytes*, NCD4mode, long*);
 static int readfile(const NCURI*, const char* suffix, NCbytes* packet);
 static int readfiletofile(const NCURI*, const char* suffix, FILE* stream, d4size_t*);
+static void cvtpath(const char* inpath, char* outpath);
 
 int
 NCD4_readDMR(NCD4INFO* state)
@@ -154,20 +155,25 @@ readfile(const NCURI* uri, const char* suffix, NCbytes* packet)
     d4size_t totalread = 0;
     NCbytes* tmp = ncbytesnew();
     char* filename = NULL;
+    char* cvtname = NULL;
 
     ncbytescat(tmp,uri->path);
     if(suffix != NULL) ncbytescat(tmp,suffix);
     ncbytesnull(tmp);
     filename = ncbytesextract(tmp);
     ncbytesfree(tmp);
+    cvtname = (char*)malloc(strlen(filename)+strlen("/cygdrive/X/")+1);
+    cvtpath(filename,cvtname);
     flags = O_RDONLY;
 #ifdef O_BINARY
     flags |= O_BINARY;
 #endif
-    fd = open(filename,flags);
+    fd = open(cvtname,flags);
     if(fd < 0) {
-	nclog(NCLOGERR,"open failed:%s",filename);
-	return THROW(NC_ENOTFOUND);
+	nclog(NCLOGERR,"open failed:%s",cvtname);
+	fprintf(stderr,"XXX: open failed: flags=0x%x file=%s\n",flags,cvtname); fflush(stderr);
+	stat = NC_ENOTFOUND;
+	goto done;
     }
     /* Get the file size */
     filesize = lseek(fd,(d4size_t)0,SEEK_END);
@@ -203,8 +209,82 @@ done:
 fprintf(stderr,"readfile: filesize=%lu totalread=%lu\n",
 		(unsigned long)filesize,(unsigned long)totalread);
 #endif
+    nullfree(cvtname);
     if(fd >= 0) close(fd);
     return THROW(stat);
 }
 
 
+/**************************************************/
+/* Support conversion of cygwin /cygdrive paths to windows drive: format
+   and vice versa
+*/
+
+#ifdef _MSC_VER
+static const int isvs = 1;
+#else
+static const int isvs = 0;
+#endif
+
+static char* drive = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+static size_t cdlen = 10; /* strlen("/cygdrive/") */
+
+static void
+cvtpath(const char* inpath, char* outpath)
+{
+    int iswin = 0;
+
+    /* Quick discriminant */
+    if(strlen(inpath) < 2) 
+	iswin = 0;
+    else if(strchr(drive,inpath[0]) != NULL && inpath[1] == ':')
+	iswin = 1;
+    else
+	iswin = 0;
+
+    /* 4 cases isvs X iswin */
+    if(isvs && iswin)
+	goto pass; /* nothing to do */
+
+    if(!isvs && !iswin)
+	goto pass; /* nothing to do */
+
+    if(isvs && !iswin) { /* Convert cygwin to windows but using forward slash*/
+        size_t cdlen = strlen("/cygdrive/");
+        int letter;
+        int slash;
+        if(strlen(inpath) < cdlen+1)
+	    goto pass; /* not cygwin */
+        letter = inpath[cdlen];
+        slash = inpath[cdlen+1];
+        if(memcmp(inpath,"/cygdrive/",cdlen)==0
+	   && strchr(drive,letter) != NULL
+           && (slash == '/' || slash == '\0')) { /* cygwin path */
+	    outpath[0] = (char)letter;
+	    outpath[1] = ':';
+	    strcpy(&outpath[2],&inpath[cdlen+1]);
+	    goto done;
+	} else
+	    goto pass; /* not cygwin */
+    }
+
+    if(!isvs && iswin) { /* Convert windows to cygwin; also '\\' -> '/' */
+	char* p;
+        char lc[2];
+	lc[0] = inpath[0];
+	lc[1] = '\0';
+	strcpy(outpath,"/cygdrive/");
+	strcat(outpath,lc);
+	strcat(outpath,&inpath[2]);
+	for(p=outpath;*p;p++) {
+	    if(*p == '\\') *p = '/';
+	}
+	goto done;
+    }
+
+pass:
+    strcpy(outpath,inpath);
+
+done:
+    return;
+}

nc_test/run_diskless.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
@@ -36,7 +37,7 @@ rm -f $FILE1
 ${execdir}/tst_diskless persist
 if test -f $FILE1 ; then
 echo "**** $FILE1 created"
-# ../ncdump/ncdump $FILE1
+# ${NCDUMP} $FILE1
 echo "PASS: diskless netCDF classic file with persistence"
 else
 echo "#### $FILE1 not created"
@@ -50,7 +51,7 @@ rm -f $FILE1
 ${execdir}/tst_diskless netcdf4 persist
 if test -f $FILE1 ; then
 echo "**** $FILE1 created"
-# ../ncdump/ncdump $FILE1
+# ${NCDUMP} $FILE1
 echo "PASS: diskless netCDF enhanced file with persistence"
 else
 echo "$FILE1 not created"

nc_test/run_diskless2.sh

@@ -33,13 +33,13 @@ echo ""
 rm -f $FILE4
 time ./tst_diskless4 $SIZE create
 # Validate it
-../ncdump/ncdump -h $FILE4 |diff -w - tst_diskless4.cdl
+${NCDUMP} -h $FILE4 |diff -w - tst_diskless4.cdl
 
 echo ""
 rm -f $FILE4
 time ./tst_diskless4 $SIZE creatediskless
 # Validate it
-../ncdump/ncdump -h $FILE4 |diff -w - tst_diskless4.cdl
+${NCDUMP} -h $FILE4 |diff -w - tst_diskless4.cdl
 
 echo ""
 time ./tst_diskless4 $SIZE open

nc_test/run_mmap.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
@@ -27,7 +28,7 @@ rm -f $FILE1
 ${execdir}/tst_diskless mmap persist
 if test -f $FILE1 ; then
 echo "**** $FILE1 created"
-# ../ncdump/ncdump $FILE1
+# ${NCDUMP} $FILE1
 echo "PASS: diskless+mmap netCDF classic file with persistence"
 else
 echo "#### $FILE1 not created"

nc_test4/Makefile.am

@@ -20,10 +20,16 @@ tst_enums tst_coords tst_coords2 tst_coords3 tst_vars3 tst_vars4	\
 tst_chunks tst_chunks2 tst_utf8 tst_fills tst_fills2 tst_fillbug	\
 tst_xplatform tst_xplatform2 tst_h_atts2 tst_endian_fill tst_atts	\
 t_type cdm_sea_soundings tst_camrun tst_vl tst_atts1 tst_atts2		\
-tst_vars2 tst_files5 tst_files6 tst_sync tst_h_strbug tst_h_refs        \
-tst_h_scalar tst_rename tst_h5_endians tst_atts_string_rewrite \
+tst_vars2 tst_files5 tst_files6 tst_sync         			\
+tst_h_scalar tst_rename tst_h5_endians tst_atts_string_rewrite 		\
 tst_hdf5_file_compat tst_fill_attr_vanish tst_rehash
 
+# Temporary I hope
+if !ISCYGWIN 
+NC4_TESTS += tst_h_strbug tst_h_refs
+endif
+
+
 check_PROGRAMS = $(NC4_TESTS) renamegroup tst_empty_vlen_unlim
 
 # Add these if large file tests are turned on.

nc_test4/run_empty_vlen_test.sh

@@ -26,9 +26,9 @@ ${execdir}/tst_empty_vlen_unlim
 # if this is useful.
 #echo "Validating Files with ncdump."
 #echo "======================================"
-#../ncdump/ncdump -s tst_empty_vlen_unlim.nc
+#${NCDUMP} -s tst_empty_vlen_unlim.nc
 #echo "---------------------------------------"
-#../ncdump/ncdump -s tst_empty_vlen_lim.nc
+#${NCDUMP} -s tst_empty_vlen_lim.nc
 #echo "======================================"
 
 

ncdap_test/testauth.sh

@@ -205,7 +205,7 @@ if test "x$RCEMBED" = x1 ; then
   URL="${PROTO}://${BASICCOMBO}@${URLSERVER}/$URLPATH"
   unset NETRC
   # Invoke ncdump to extract a file the URL
-  echo "command: ${NCDUMP} -h $URL > $OUTPUT"
+  echo "command: ${NCDUMP} -h ${URL} > $OUTPUT"
   ${NCDUMP} -h "$URL" > $OUTPUT
   show
 fi
@@ -222,7 +222,7 @@ if test "x$RCLOCAL" = x1 ; then
   createrc $LOCALRC
 
   # Invoke ncdump to extract a file using the URL
-  echo "command: ${NCDUMP} -h $URL > $OUTPUT"
+  echo "command: ${NCDUMP} -h ${URL} > $OUTPUT"
   ${NCDUMP} -h "$URL" > $OUTPUT
   show
 fi
@@ -235,7 +235,7 @@ if test "x$RCHOME" = x1 ; then
   createrc $HOMERC
 
   # Invoke ncdump to extract a file the URL
-  echo "command: ${NCDUMP} -h $URL > $OUTPUT"
+  echo "command: ${NCDUMP} -h ${URL} > $OUTPUT"
   ${NCDUMP} -h "$URL" > $OUTPUT
   show
 fi
@@ -248,7 +248,7 @@ if test "x$RCSPEC" == x1 ; then
   createrc $SPECRC
 
   # Invoke ncdump to extract a file the URL
-  echo "command: ${NCDUMP} -h $URL > $OUTPUT"
+  echo "command: ${NCDUMP} -h ${URL} > $OUTPUT"
   ${NCDUMP} -h "$URL" > $OUTPUT
   show
 fi
@@ -263,7 +263,7 @@ if test "x$RCENV" = x1 ; then
   createrc $DAPRCFILE
 
   # Invoke ncdump to extract a file the URL
-  echo "command: ${NCDUMP} -h $URL > $OUTPUT"
+  echo "command: ${NCDUMP} -h ${URL} > $OUTPUT"
   ${NCDUMP} -h "$URL" > $OUTPUT
   show
   export DAPRCFILE=
@@ -280,7 +280,7 @@ if test "x$RCPREC" = x1 ; then
   createrc $LOCALRC
 
   # Invoke ncdump to extract a file using the URL
-  echo "command: ${NCDUMP} -h $URL > $OUTPUT"
+  echo "command: ${NCDUMP} -h ${URL} > $OUTPUT"
   ${NCDUMP} -h "$URL" > $OUTPUT
   ${NCDUMP} -h "$URL"
   show

ncdap_test/tst_formatx.sh

@@ -20,7 +20,7 @@ URL="$DTS/test.03"
 ECODE=0
 echo "Test extended format output for a DAP2  file"
 rm -f tmp
-${NCDUMP} -K $URL >tmp
+${NCDUMP} -K "${URL}" >tmp
 if ! grep 'DAP2 mode=00000000' <tmp ; then
 echo "*** Fail: extended format for a DAP2 file"
 ECODE=1

ncdap_test/tst_ncdap.sh

@@ -59,8 +59,6 @@ RESULTSDIR="./results"
 NCDUMP="${builddir}/ncdump/ncdump $FLAGS"
 if test "x$leakcheck" = "x1" ; then
 VALGRIND="valgrind -q --error-exitcode=2 --leak-check=full"
-else
-VALGRIND=
 fi
 
 rm -fr ${RESULTSDIR}

ncdap_test/tst_remote.sh

@@ -204,8 +204,6 @@ RESULTSDIR="./results"
 # Locate some tools
 if test "x$leakcheck" = x1 ; then
 VALGRIND="valgrind -q --error-exitcode=2 --leak-check=full"
-else
-VALGRIND=
 fi
 if test "x$timing" = "x1" ; then TIMECMD="time"; else TIMECMD=""; fi
 

ncdap_test/tst_special.sh

@@ -66,8 +66,6 @@ RESULTSDIR="./results"
 # Locate some tools
 if test "x$leakcheck" = x1 ; then
 VALGRIND="valgrind -q --error-exitcode=2 --leak-check=full"
-else
-VALGRIND=
 fi
 
 rm -fr ${RESULTSDIR}

ncdap_test/tst_tds.sh

@@ -93,8 +93,6 @@ NCCOPY="${builddir}/ncdump/nccopy"
 
 if test "x$leakcheck" = x1 ; then
 VALGRIND="valgrind -q --error-exitcode=2 --leak-check=full"
-else
-VALGRIND=
 fi
 
 rm -fr ${RESULTSDIR}