Re: [PATCH 1/2] fseeko: fix bug on glibc

[Bruno Haible]

Eric Blake wrote:
> if you fopen()/ftell()/fseek(,0,SEEK_END)/ftell(),
> then the stream should be positioned at the same place as the
> underlying fd, even though no I/O occurred, and without requiring
> an fflush() in the middle.

I'm adding your test program in the test suite. I verified that before
your patch [1/2], a testdir for the modules  fseeko fflush  fails:

  test-fseeko3.c:45: assertion failed
  FAIL: test-fseeko3.sh

and with the patch, it passes.


2011-08-09  Bruno Haible  <address@hidden>

        More tests for 'fseeko'.
        * tests/test-fseeko3.c: New file, from Eric Blake.
        * tests/test-fseeko3.sh: New file.
        * modules/fseeko-tests (Files): Add them.
        (TESTS): Add test-fseeko3.sh.
        (check_PROGRAMS): Add test-fseeko3.

--- modules/fseeko-tests.orig   Wed Aug 10 00:09:48 2011
+++ modules/fseeko-tests        Tue Aug  9 23:48:21 2011
@@ -2,6 +2,8 @@
 tests/test-fseeko.c
 tests/test-fseeko.sh
 tests/test-fseeko2.sh
+tests/test-fseeko3.c
+tests/test-fseeko3.sh
 tests/signature.h
 tests/macros.h
 m4/ungetc.m4
@@ -12,5 +14,5 @@
 gl_FUNC_UNGETC_WORKS
 
 Makefile.am:
-TESTS += test-fseeko.sh test-fseeko2.sh
-check_PROGRAMS += test-fseeko
+TESTS += test-fseeko.sh test-fseeko2.sh test-fseeko3.sh
+check_PROGRAMS += test-fseeko test-fseeko3
============================ tests/test-fseeko3.sh ============================
#!/bin/sh

./test-fseeko3${EXEEXT} 0 "$srcdir/test-fseeko3.sh" || exit 1

./test-fseeko3${EXEEXT} 1 "$srcdir/test-fseeko3.sh" || exit 1

exit 0
============================ tests/test-fseeko3.c =============================
/* Test of fseeko() function.
   Copyright (C) 2011 Free Software Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 3 of the License, or
   (at your option) any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

/* Written by Eric Blake <address@hidden>, 2011.  */

#include <config.h>

#include <stdio.h>

#include <stdlib.h>

#include "macros.h"

int
main (int argc, char **argv)
{
  int do_initial_ftell = atoi (argv[1]);
  const char *filename = argv[2];
  FILE *fp = fopen (filename, "r");
  ASSERT (fp != NULL);

  if (do_initial_ftell)
    {
      off_t pos = ftell (fp);
      ASSERT (pos == 0);
    }

  ASSERT (fseeko (fp, 0, SEEK_END) == 0);

  {
    off_t pos = ftell (fp);
    ASSERT (pos > 0);
  }

  ASSERT (fclose (fp) == 0);

  return 0;
}
===============================================================================

-- 
In memoriam Franz Jägerstätter <http://en.wikipedia.org/wiki/Franz_Jägerstätter>