Update.

	* libio/fileops.c (_IO_file_xsgetn_mmap): Always set EOF flag is
	not enough content is available.
	* libio/tst-eof.c: New file.
	* libio/Makefile (tests): Add tst-eof.

	* libio/fileops.c (_IO_file_underflow_mmap): Read a single byte to
	update atime.
	* libio/tst-atime.c: New file.
	* libio/Makefile (tests): Add tst-atime.

1 files changed, 97 insertions, 0 deletions

diff --git a/libio/tst-atime.c b/libio/tst-atime.c
new file mode 100644
index 0000000000..2df64c3382
--- /dev/null
+++ b/libio/tst-atime.c
@@ -0,0 +1,97 @@
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+
+static int do_test (void);
+#define TEST_FUNCTION do_test ()
+#define TIMEOUT 5
+#include <test-skeleton.c>
+
+
+static int
+do_test (void)
+{
+  char *buf;
+  int fd;
+  FILE *fp;
+  int ch;
+  struct stat st1;
+  struct stat st2;
+
+  buf = (char *) malloc (strlen (test_dir) + sizeof "/tst-atime.XXXXXX");
+  if (buf == NULL)
+    {
+      printf ("cannot allocate memory: %m\n");
+      return 1;
+    }
+  stpcpy (stpcpy (buf, test_dir), "/tst-atime.XXXXXX");
+
+  fd = mkstemp (buf);
+  if (fd == -1)
+    {
+      printf ("cannot open temporary file: %m\n");
+      return 1;
+    }
+
+  /* Make sure it gets removed.  */
+  add_temp_file (buf);
+
+  if (write (fd, "some string\n", 12) != 12)
+    {
+      printf ("cannot write temporary file: %m\n");
+      return 1;
+    }
+
+  if (lseek (fd, 0, SEEK_SET) == (off_t) -1)
+    {
+      printf ("cannot reposition temporary file: %m\n");
+      return 1;
+    }
+
+  fp = fdopen (fd, "r");
+  if (fp == NULL)
+    {
+      printf ("cannot create stream: %m\n");
+      return 1;
+    }
+
+  if (fstat (fd, &st1) == -1)
+    {
+      printf ("first stat failed: %m\n");
+      return 1;
+    }
+
+  sleep (2);
+
+  ch = fgetc (fp);
+  if (ch != 's')
+    {
+      printf ("did not read correct character: got '%c', expected 's'\n", ch);
+      return 1;
+    }
+
+  if (fstat (fd, &st2) == -1)
+    {
+      printf ("second stat failed: %m\n");
+      return 1;
+    }
+
+  if (st1.st_atime > st2.st_atime)
+    {
+      puts ("second atime smaller");
+      return 1;
+    }
+  else if (st1.st_atime == st2.st_atime)
+    {
+      puts ("atime has not changed");
+      return 1;
+    }
+
+  fclose (fp);
+
+  return 0;
+}