mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-27 07:30:33 +08:00
36102e3c32
re: Issue https://github.com/Unidata/netcdf-c/issues/2190 The primary purpose of this PR is to improve the utf8 support for windows. This is persuant to a change in Windows that supports utf8 natively (almost). The almost means that it is still utf16 internally and the set of characters representable by utf8 is larger than those representable by utf16. This leaves open the question in the Issue about handling the Windows 1252 character set. This required the following changes: 1. Test the Windows build and major version in order to see if native utf8 is supported. 2. If native utf8 is supported, Modify dpathmgr.c to call the 8-bit version of the windows fopen() and open() functions. 3. In support of this, programs that use XGetOpt (Windows versions) need to get the command line as utf8 and then parse to arc+argv as utf8. This requires using a homegrown command line parser named XCommandLineToArgvA. 4. Add a utility program called "acpget" that prints out the current Windows code page and locale. Additionally, some technical debt was cleaned up as follows: 1. Unify all the places which attempt to read all or a part of a file into the dutil.c#NC_readfile code. 2. Similary unify all the code that creates temp files into dutil.c#NC_mktmp code. 3. Convert almost all remaining calls to fopen() and open() to NCfopen() and NCopen3(). This is to ensure that path management is used consistently. This touches a number of files. 4. extern->EXTERNL as needed to get it to work under Windows.
51 lines
1.5 KiB
Bash
Executable File
51 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Test to make sure ncdump works with a subdirectory which starts
|
|
# with a unicode character.
|
|
# See https://github.com/Unidata/netcdf-c/issues/1666 for more information.
|
|
# Ward Fisher
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
set -e
|
|
|
|
# Passing a utf8 name using either \x or actual characters
|
|
# to Visual Studio does not work well.
|
|
if test "x$FP_ISMSVC" = x ; then
|
|
#UNISTRING='\xe6\xb5\xb7'
|
|
UNISTRING='海'
|
|
else
|
|
UNISTRING='海'
|
|
fi
|
|
|
|
UNIFILE="tst_utf8_${UNISTRING}"
|
|
|
|
echo ""
|
|
|
|
echo "*** Generating netcdf-3 binary file ${UNIFILE}.nc ..."
|
|
${NCGEN} -3 -b -o "${UNIFILE}.nc" "${srcdir}/ref_tst_utf8.cdl"
|
|
echo "*** Accessing binary file ${UNIFILE}.nc ..."
|
|
${NCDUMP} -h "${UNIFILE}.nc"
|
|
|
|
if test "x$FEATURE_HDF5" = xyes ; then
|
|
echo "*** Generating netcdf-4 binary file ${UNIFILE}.nc ..."
|
|
rm -f "${UNIFILE}.nc"
|
|
${NCGEN} -4 -b -o "${UNIFILE}.nc" "${srcdir}/ref_tst_utf8.cdl"
|
|
echo "*** Accessing binary file ${UNIFILE}.nc ..."
|
|
${NCDUMP} -h "${UNIFILE}.nc"
|
|
fi
|
|
|
|
# This test was moved here from tst_nccopy4.sh
|
|
# to unify all the unicode path tests
|
|
echo "*** Test nccopy ${UNIFILe} copy_of_${UNIFILE} ..."
|
|
${NCCOPY} ${UNIFILE}.nc copy_of_${UNIFILE}.nc
|
|
${NCDUMP} -n copy_of_${UNIFILE} ${UNIFILE}.nc > tmp_${UNIFILE}.cdl
|
|
${NCDUMP} copy_of_${UNIFILE}.nc > copy_of_${UNIFILE}.cdl
|
|
echo "*** compare " with copy_of_${UNIFILE}.cdl
|
|
diff copy_of_${UNIFILE}.cdl tmp_${UNIFILE}.cdl
|
|
rm copy_of_${UNIFILE}.nc copy_of_${UNIFILE}.cdl tmp_${UNIFILE}.cdl
|
|
|
|
echo "Test Passed. Cleaning up."
|
|
rm ${UNIFILE}.nc
|