[Pspp-cvs] pspp src/data/ChangeLog src/data/sys-file-reade...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Branch:         
Changes by:     John Darrington <address@hidden>        06/03/04 05:01:06

Modified files:
        src/data       : ChangeLog sys-file-reader.c 
        tests          : automake.mk test_template 
Added files:
        tests/bugs     : compression.sh 

Log message:
        Fixed bug reading compressed system files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/ChangeLog.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/sys-file-reader.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/test_template.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/compression.sh?rev=1.1

Patches:
Index: pspp/src/data/ChangeLog
diff -u pspp/src/data/ChangeLog:1.1 pspp/src/data/ChangeLog:1.2
--- pspp/src/data/ChangeLog:1.1 Sat Mar  4 01:11:57 2006
+++ pspp/src/data/ChangeLog     Sat Mar  4 05:01:06 2006
@@ -1,3 +1,7 @@
+Sat Mar  4 12:50:48 WST 2006 John Darrington <address@hidden>
+
+       * sys-file-reader.c: Fixed bug reading compressed files.
+
 Thu Mar  2 08:40:33 WST 2006 John Darrington <address@hidden>
 
        * Numerous renames.  See src/ChangeLog for details.
Index: pspp/src/data/sys-file-reader.c
diff -u pspp/src/data/sys-file-reader.c:1.1 pspp/src/data/sys-file-reader.c:1.2
--- pspp/src/data/sys-file-reader.c:1.1 Sat Mar  4 01:11:57 2006
+++ pspp/src/data/sys-file-reader.c     Sat Mar  4 05:01:06 2006
@@ -1399,9 +1399,13 @@
       if (r->ptr == NULL || r->ptr >= r->end) 
         {
           if (!buffer_input (r))
-            if (buf_beg != buf)
-              lose ((ME, _("%s: Unexpected end of file."),
-                     fh_get_filename (r->fh))); 
+           {
+             if (buf_beg != buf)
+               lose ((ME, _("%s: Unexpected end of file."),
+                      fh_get_filename (r->fh))); 
+             else
+               return 0;
+           }
         }
       memcpy (r->x, r->ptr++, sizeof *buf);
       p = r->x;
Index: pspp/tests/automake.mk
diff -u pspp/tests/automake.mk:1.1 pspp/tests/automake.mk:1.2
--- pspp/tests/automake.mk:1.1  Sat Mar  4 00:53:48 2006
+++ pspp/tests/automake.mk      Sat Mar  4 05:01:06 2006
@@ -59,6 +59,7 @@
        tests/bugs/big-input-2.sh \
        tests/bugs/comment-at-eof.sh \
        tests/bugs/compute-fmt.sh \
+       tests/bugs/compression.sh \
        tests/bugs/crosstabs.sh \
        tests/bugs/crosstabs-crash.sh \
        tests/bugs/curtailed.sh \
Index: pspp/tests/test_template
diff -u pspp/tests/test_template:1.3 pspp/tests/test_template:1.4
--- pspp/tests/test_template:1.3        Sat Mar  4 00:28:15 2006
+++ pspp/tests/test_template    Sat Mar  4 05:01:06 2006
@@ -9,7 +9,7 @@
 if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
 top_srcdir=`cd $top_srcdir; pwd`
-top_buiddir=`cd $top_builddir; pwd`
+top_builddir=`cd $top_builddir; pwd`
 
 export STAT_CONFIG_PATH=$top_srcdir/config