summary refs log tree commit diff
path: root/dirent
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-08 02:52:43 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-08 02:52:43 +0000
commitd1a5466da874386f7de99d381513e6779a331c7e (patch)
tree5fdd8cf728bce263e588b070cc0f8ae360f9e3ed /dirent
parent48ddeb0b4c82cd33bea3e77e254e36cac52338ed (diff)
downloadglibc-d1a5466da874386f7de99d381513e6779a331c7e.tar.gz
glibc-d1a5466da874386f7de99d381513e6779a331c7e.tar.xz
glibc-d1a5466da874386f7de99d381513e6779a331c7e.zip
Update.
2001-08-07  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/seekdir.c (seekdir): Set dirp->filepos.

	* dirent/tst-seekdir.c (main): Check whether telldir right after
	seekdir returns 2nd argument given to seekdir.

2001-08-07  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>

	* dlfcn/Makefile (tststatic-ENV): Add $(common-objpfx) to
	LD_LIBRARY_PATH.
Diffstat (limited to 'dirent')
-rw-r--r--dirent/tst-seekdir.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/dirent/tst-seekdir.c b/dirent/tst-seekdir.c
index f4d99ae632..b833c30705 100644
--- a/dirent/tst-seekdir.c
+++ b/dirent/tst-seekdir.c
@@ -5,20 +5,21 @@
 int
 main (int argc, char *argv[])
 {
-
   DIR * dirp;
   long int save3 = 0;
+  long int cur;
   int i = 0;
+  int result = 0;
   struct dirent *dp;
 
-  dirp = opendir(".");
-  for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp))
+  dirp = opendir (".");
+  for (dp = readdir (dirp); dp != NULL; dp = readdir (dirp))
     {
       /* save position 3 (after fourth entry) */
       if (i++ == 3)
-	save3 = telldir(dirp);
+	save3 = telldir (dirp);
 
-      printf("%s\n", dp->d_name);
+      printf ("%s\n", dp->d_name);
 
       /* stop at 400 (just to make sure dirp->__offset and dirp->__size are
 	 scrambled */
@@ -26,17 +27,24 @@ main (int argc, char *argv[])
 	break;
     }
 
-  printf("going back past 4-th entry...\n");
+  printf ("going back past 4-th entry...\n");
 
   /* go back to saved entry */
   seekdir (dirp, save3);
 
+  /* Check whether telldir equals to save3 now.  */
+  cur = telldir (dirp);
+  if (cur != save3)
+    {
+      printf ("seekdir (d, %ld); telldir (d) == %ld\n", save3, cur);
+      result = 1;
+    }
 
   /* print remaining files (3-last) */
-  for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp))
-    printf("%s\n", dp->d_name);
+  for (dp = readdir (dirp); dp != NULL; dp = readdir (dirp))
+    printf ("%s\n", dp->d_name);
 
 
   closedir (dirp);
-  return 0;
+  return result;
 }