[spatialite-tools] 02/06: Imported Upstream version 4.4.0~rc0
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Dec 17 03:15:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository spatialite-tools.
commit edb111c9056914bedabe844b1991da3686d82812
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Dec 17 01:55:18 2015 +0100
Imported Upstream version 4.4.0~rc0
---
configure | 20 ++++++++++----------
configure.ac | 2 +-
shell.c | 16 +++++++++++++---
spatialite_gml.c | 5 +++++
4 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/configure b/configure
index d408815..a8835b2 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for spatialite-tools 4.3.0.
+# Generated by GNU Autoconf 2.69 for spatialite-tools 4.4.0-RC0.
#
# Report bugs to <a.furieri at lqt.it>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='spatialite-tools'
PACKAGE_TARNAME='spatialite-tools'
-PACKAGE_VERSION='4.3.0'
-PACKAGE_STRING='spatialite-tools 4.3.0'
+PACKAGE_VERSION='4.4.0-RC0'
+PACKAGE_STRING='spatialite-tools 4.4.0-RC0'
PACKAGE_BUGREPORT='a.furieri at lqt.it'
PACKAGE_URL=''
@@ -1358,7 +1358,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 spatialite-tools 4.3.0 to adapt to many kinds of systems.
+\`configure' configures spatialite-tools 4.4.0-RC0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1429,7 +1429,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of spatialite-tools 4.3.0:";;
+ short | recursive ) echo "Configuration of spatialite-tools 4.4.0-RC0:";;
esac
cat <<\_ACEOF
@@ -1566,7 +1566,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-spatialite-tools configure 4.3.0
+spatialite-tools configure 4.4.0-RC0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2156,7 +2156,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 spatialite-tools $as_me 4.3.0, which was
+It was created by spatialite-tools $as_me 4.4.0-RC0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3027,7 +3027,7 @@ fi
# Define the identity of the package.
PACKAGE='spatialite-tools'
- VERSION='4.3.0'
+ VERSION='4.4.0-RC0'
cat >>confdefs.h <<_ACEOF
@@ -18871,7 +18871,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 spatialite-tools $as_me 4.3.0, which was
+This file was extended by spatialite-tools $as_me 4.4.0-RC0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18937,7 +18937,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="\\
-spatialite-tools config.status 4.3.0
+spatialite-tools config.status 4.4.0-RC0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 2481e41..7fff3ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT(spatialite-tools, 4.3.0, a.furieri at lqt.it)
+AC_INIT(spatialite-tools, 4.4.0-RC0, a.furieri at lqt.it)
AC_LANG(C)
AC_CONFIG_MACRO_DIR([m4])
diff --git a/shell.c b/shell.c
index 5f09052..d5c0db8 100644
--- a/shell.c
+++ b/shell.c
@@ -2748,7 +2748,12 @@ stop_dxf:
else if (c == 'r' && strncmp (azArg[0], "read", n) == 0)
{
FILE *alt;
- if (nArg != 3)
+ char *arg2 = NULL;
+ if (nArg == 2)
+ ;
+ else if (nArg == 3)
+ arg2 = azArg[2];
+ else
{
fprintf (stderr,
"invalid arguments: .read script_path charset\n");
@@ -2761,7 +2766,7 @@ stop_dxf:
}
else
{
- process_input (p, alt, azArg[2]);
+ process_input (p, alt, arg2);
fclose (alt);
}
}
@@ -3333,7 +3338,7 @@ stop_dxf:
rc = 2;
}else
- if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 && nArg==2 ){
+ if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 && nArg > 0 ){
FILE *alt = fopen(azArg[1], "rb");
if( alt==0 ){
fprintf(stderr,"Error: cannot open \"%s\"\n", azArg[1]);
@@ -4509,6 +4514,11 @@ registering the SpatiaLite extension
/* Sandro Furieri 2008-11-20 */
auto_fdo_stop (data.db);
/* end Sandro Furieri 2008-11-20 */
+
+/* Sandro Furieri 2015-09-14 */
+ spatialite_finalize_topologies (splite_cache);
+/* end Sandro Furieri 2015-09-14 */
+
if (sqlite3_close (data.db) != SQLITE_OK)
{
fprintf (stderr, "error closing database: %s\n",
diff --git a/spatialite_gml.c b/spatialite_gml.c
index 9f4ad24..3a4c4dc 100644
--- a/spatialite_gml.c
+++ b/spatialite_gml.c
@@ -591,6 +591,8 @@ end1_tag (void *data, const char *el)
*(params->CharData + params->CharDataLen) = '\0';
column_name (params, el);
}
+ *(params->CharData) = '\0';
+ params->CharDataLen = 0;
}
static void
@@ -1259,6 +1261,8 @@ end2_tag (void *data, const char *el)
parse_coords_1 (params);
if (strcasecmp (el, "gml:posList") == 0 || strcasecmp (el, "gml:pos") == 0)
parse_coords_2 (params);
+ *(params->CharData) = '\0';
+ params->CharDataLen = 0;
}
static void
@@ -1640,6 +1644,7 @@ main (int argc, char *argv[])
params.CharDataStep = 65536;
params.CharDataMax = params.CharDataStep;
params.CharData = malloc (params.CharDataStep);
+ params.CharDataLen = 0;
for (i = 1; i < argc; i++)
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite-tools.git
More information about the Pkg-grass-devel
mailing list