Deltime: replace strlcpy() ny strncpy()

cdo.spec

@@ -4,7 +4,7 @@
 
 Name:           cdo
 #BuildRequires:  
-Version:        1.7.0
+Version:        1.6.5.2
 Release:        1
 Summary:        Climate Data Operators
 License:        GNU GENERAL PUBLIC LICENSE Version 2, June 1991

configure

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for cdo 1.7.0rc1.
+# Generated by GNU Autoconf 2.68 for cdo 1.6.5.2.
 #
 # Report bugs to <http://code.zmaw.de/projects/cdo>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cdo'
 PACKAGE_TARNAME='cdo'
-PACKAGE_VERSION='1.7.0rc1'
-PACKAGE_STRING='cdo 1.7.0rc1'
+PACKAGE_VERSION='1.6.5.2'
+PACKAGE_STRING='cdo 1.6.5.2'
 PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdo'
 PACKAGE_URL=''
@@ -1391,7 +1391,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cdo 1.7.0rc1 to adapt to many kinds of systems.
+\`configure' configures cdo 1.6.5.2 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1461,7 +1461,7 @@ fi
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cdo 1.7.0rc1:";;
+     short | recursive ) echo "Configuration of cdo 1.6.5.2:";;
    esac
   cat <<\_ACEOF
@@ -1615,7 +1615,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cdo configure 1.7.0rc1
+cdo configure 1.6.5.2
 generated by GNU Autoconf 2.68
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2208,7 +2208,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by cdo $as_me 1.7.0rc1, which was
+It was created by cdo $as_me 1.6.5.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
   $ $0 $@
@@ -3151,7 +3151,7 @@ fi
 # Define the identity of the package.
  PACKAGE='cdo'
- VERSION='1.7.0rc1'
+ VERSION='1.6.5.2'
 cat >>confdefs.h <<_ACEOF
@@ -21349,7 +21349,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cdo $as_me 1.7.0rc1, which was
+This file was extended by cdo $as_me 1.6.5.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
@@ -21415,7 +21415,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cdo config.status 1.7.0rc1
+cdo config.status 1.6.5.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"

configure.ac

@@ -4,7 +4,7 @@
 #  autoconf 2.68
 #  libtool  2.4.2
 
-AC_INIT([cdo], [1.7.0rc1], [http://code.zmaw.de/projects/cdo])
+AC_INIT([cdo], [1.6.5.2], [http://code.zmaw.de/projects/cdo])
 
 CONFIG_ABORT=yes
 AC_CONFIG_AUX_DIR(config)

src/Deltime.c

@@ -72,7 +72,8 @@ void *Deltime(void *argument)
       if ( isalpha(*sarg) )
 	{
 	  char smon[32];
-	  strlcpy(smon, sarg, sizeof(smon));
+	  strncpy(smon, sarg, sizeof(smon)-1);
+	  smon[sizeof(smon)-1] = 0;
 	  strtolower(smon);
 	  for ( im = 0; im < 12; ++im )
 	    if ( memcmp(smon, cmons[im+1], 3) == 0 ) break;

test/data/Makefile.in

@@ -282,7 +282,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INPUTDATA = ts_mm_5years hl_l19.grb t21_geosp_tsurf.grb bathy4.grb pl_data.grb detrend_data \
-            grib_testfile01.grb grib_testfile02.grb netcdf_testfile01.nc netcdf_testfile02.nc
+            grib_testfile01.grb grib_testfile02.grb netcdf_testfile01.nc netcdf_testfile02.nc testfile01c.nc
 
 GRIB_REF = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile02_sinfo_ref grib_testfile02_info_ref
 NETCDF_REF = netcdf_testfile01_sinfon_ref netcdf_testfile01_infon_ref netcdf_testfile02_sinfon_ref netcdf_testfile02_infon_ref