Commit Graph

448 Commits

Author SHA1 Message Date
Ed Hartnett
fec47f43b6 merging branches into develop 2017-11-15 11:33:24 -07:00
Ed Hartnett
3b82328902
Merge branch 'master' into ejh_more_warnings 2017-11-15 03:41:12 -07:00
Ed Hartnett
2d5883e8c3
Merge branch 'master' into ejh_ncdump_again 2017-11-14 07:42:19 -07:00
Ward Fisher
16d6f94f30 Merge branch 'master' into filters.dmh 2017-11-13 11:15:02 -07:00
Ed Hartnett
8d583f94a0 removed last use of EXTRA_TESTS, also unneeded setting for tst_h_rdc0.c 2017-11-12 06:57:37 -07:00
Ed Hartnett
83777626e0 working on cmake build 2017-11-12 06:21:31 -07:00
Ed Hartnett
add3e4b46d working on cmake build 2017-11-12 06:12:08 -07:00
Ed Hartnett
84ed36c62c working on cmake build 2017-11-12 05:43:59 -07:00
Ed Hartnett
e9df3fad55 working on cmake build 2017-11-12 05:42:24 -07:00
Ed Hartnett
4e52587864 fixed typo in CMakeLists.txt 2017-11-12 05:34:31 -07:00
Ed Hartnett
05d251bfb5 different attempt to deal with ncdump dependencies 2017-11-11 17:33:51 -07:00
Ed Hartnett
15b4dd9280 added file 2017-11-11 16:52:08 -07:00
Ed Hartnett
8df5c84f31 fixed makefile.am 2017-11-11 16:51:10 -07:00
Ed Hartnett
b17059e750 fixed makefile.am 2017-11-11 16:49:52 -07:00
Ed Hartnett
a80ac592cd attempt at cmake files 2017-11-11 16:46:25 -07:00
Ed Hartnett
f709a7b107 another attempt at reducing ncdump dependencies 2017-11-11 16:45:03 -07:00
Ed Hartnett
93cb051b72 found a few more easy warnings 2017-11-09 06:39:43 -07:00
Ed Hartnett
0e0482bc05 fixed warnings 2017-11-09 06:24:18 -07:00
Ward Fisher
bb2505cf4e
Merge branch 'master' into newrc.dmh 2017-11-03 14:57:27 -06:00
Dennis Heimbigner
9935d54fdf Merge master and resolve conflicts 2017-10-28 13:57:23 -06:00
Dennis Heimbigner
9983b9d911 re e-support UBS-599337
re pull request https://github.com/Unidata/netcdf-c/pull/405
re pull request https://github.com/Unidata/netcdf-c/pull/446

Notes:
1. This branch is a cleanup of the magic.dmh branch.
2. magic.dmh was originally merged, but caused problems with parallel IO.
   It was re-issued as pull request https://github.com/Unidata/netcdf-c/pull/446.
3. This branch + pull request replace any previous pull requests and magic.dmh branch.

Given an otherwise valid netCDF file that has a corrupted header,
the netcdf library currently crashes. Instead, it should return
NC_ENOTNC.

Additionally, the NC_check_file_type code does not do the
forward search required by hdf5 files. It currently only looks
at file position 0 instead of 512, 1024, 2048,... Also, it turns
out that the HDF4 magic number is assumed to always be at the
beginning of the file (unlike HDF5).
The change is localized to libdispatch/dfile.c See
https://support.hdfgroup.org/release4/doc/DSpec_html/DS.pdf

Also, it turns out that the code in NC_check_file_type is duplicated
(mostly) in the function libsrc4/nc4file.c#nc_check_for_hdf.

This branch does the following.
1. Make NC_check_file_type return NC_ENOTNC instead of crashing.
2. Remove nc_check_for_hdf and centralize all file format checking
   NC_check_file_type.
3. Add proper forward search for HDF5 files (but not HDF4 files)
   to look for the magic number at offsets of 0, 512, 1024...
4. Add test tst_hdf5_offset.sh. This tests that hdf5 files with
   an offset are properly recognized. It does so by prefixing
   a legal file with some number of zero bytes: 512, 1024, etc.
5. Off-topic: Added -N flag to ncdump to force a specific output dataset name.
2017-10-24 16:25:09 -06:00
Dennis Heimbigner
440cf724ad Update by merging with master 2017-10-21 13:37:09 -06:00
Ward Fisher
1ca5f8c993 Updated SO version, other little issue with ncdump Makefile.am. 2017-10-17 14:56:22 -06:00
Dennis Heimbigner
5ff3909704 Fix bug in nc4file.c where it improperly handled filters with more than 4 parameters. 2017-10-09 21:24:56 -06:00
Ward Fisher
e8cd6958a9 Merge branch 'v4.5.0-release-branch' into cal366.dmh 2017-10-09 14:08:21 -06:00
Dennis Heimbigner
733da154c5 1. Keep up to date by merging master
2. Factored out the parameter string parsing for ncgen and nccopy
   int libdispatch/dfilter.c + include/ncfilter.h
3. Allow a parameter string to use constant types other than
   unsigned int. See docs/filters.md for details.
4. Moved the old content of  include/netcdf_filter.h into include/netcdf.h
   and removed include/netcdf_filter.h as no longer needed.
5. Force the test filter (bzip2) in nc_test4/filter_test to
   be built using BUILT_SOURCES.
2017-10-08 15:56:45 -06:00
Ward Fisher
ef372357a0 Merge branch 'master' into cal366.dmh 2017-09-29 15:51:06 -06:00
Ward Fisher
37f89515b2 Updatec cleanfiles in makefile.am 2017-09-21 09:58:33 -06:00
Ward Fisher
11f235f86e Fixing more make distcheck errors. 2017-09-20 16:28:28 -06:00
Ward Fisher
10a9d6c4f8 Corrected another error. 2017-09-20 16:03:16 -06:00
Ward Fisher
05ddb3a953 Cleaning up 'make distcheck' 2017-09-20 15:59:24 -06:00
Ward Fisher
3822751043 Corrected a missing break in a switch statement. 2017-09-20 14:18:43 -06:00
Ward Fisher
4a596cea3c Corrected conditional logic syntax in a few shell test scripts. 2017-09-20 11:29:25 -06:00
Ward Fisher
200e17f42c Merge branch 'cdf5-optional' of github.com:Unidata/netcdf-c into cdf5-optional 2017-09-20 11:25:48 -06:00
Ward Fisher
3414a30c1a Updated test to use new file name. 2017-09-20 11:25:36 -06:00
Ward Fisher
585ebc0e00 Corrected typos. 2017-09-20 11:22:33 -06:00
Ward Fisher
2151dbbd44 Giving test output netcdf files unique names. 2017-09-20 11:17:33 -06:00
Ward Fisher
0913eb65f7 Fixed another typo. 2017-09-19 16:18:25 -06:00
Ward Fisher
8ac9c3a524 Corrected typo in script. 2017-09-19 16:14:48 -06:00
Ward Fisher
15dd704fb3 Made small file test dependent on having CDF5. 2017-09-19 14:48:24 -06:00
Ward Fisher
3c410f5257 Made nccopy aware of USE_CDF5 flag. 2017-09-18 14:11:53 -06:00
Ward Fisher
d2cdc4cb5a Working on getting cdf5 tests running. 2017-09-15 18:00:28 -06:00
Ward Fisher
c0244bc4dc Updated inttags4 test. 2017-09-15 17:31:03 -06:00
Ward Fisher
e70fcc9865 Revert a previous change. 2017-09-15 16:29:11 -06:00
Ward Fisher
d048ccf583 Moved tst_inttags4.sh to only run if CDF5 is enabled. 2017-09-15 11:18:42 -06:00
Ward Fisher
eb354c71df Flagging test to only run when CDF5 is enabled. 2017-09-14 15:01:40 -06:00
Ward Fisher
1a56d3fdc8 Making cdf5 tests conditional on cdf5 support setting at configure time. 2017-09-14 14:18:56 -06:00
Ward Fisher
fde8720fd3 Infile given absolute path. 2017-09-05 13:13:08 -06:00
Ward Fisher
eeeef6f2a6 Tweaking makefile.am 2017-09-05 13:05:01 -06:00
Dennis Heimbigner
a2e0f069ec This pr should probably be delayed until after Version 4.5.
Primary change is to cleanup code and remove duplicated code.

1. Unify the rc file reading into libdispatch/drc.c. Eventually extend
   if we need rc file for netcdf itself as opposed to the dap code.
2. Unify the extraction from the rc file of DAP authorization info.
3. Misc. other small unifications: make temp file, read file.
4. Avoid use of libcurl when reading file:// because
   there is some kind of problem with the Visual Studio version.
   Might be related to the winpath problem.
   In any case, do direct read instead.
5. Add new error code NC_ERCFILE for errors in reading RC file.
6. Complete documentation cleanup as indicated in this comment
   https://github.com/Unidata/netcdf-c/pull/472#issuecomment-325926426
7. Convert some occurrences of #ifdef _WIN32 to #ifdef _MSC_VER
2017-09-02 18:09:36 -06:00