Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update.
	* posix/TESTS: Fix expected result for test cases with * with no
	leading expression.
  • Loading branch information
Ulrich Drepper committed Jan 18, 2000
1 parent 6e9b72d commit c7e85d0
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 14 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
@@ -1,5 +1,8 @@
2000-01-18 Ulrich Drepper <drepper@cygnus.com>

* posix/TESTS: Fix expected result for test cases with * with no
leading expression.

* sysdeps/unix/sysv/linux/fstatvfs.c: Move actual code in...
* sysdeps/unix/sysv/linux/internal_statvfs.c: ...here. New file.
* sysdeps/unix/sysv/linux/statvfs.c: Don't use fstatvfs since the
Expand Down
8 changes: 4 additions & 4 deletions posix/TESTS
Expand Up @@ -54,10 +54,10 @@
0:ab|cd:abcd
0:()ef:def
0:()*:-
1:*a:-
0:^*:-
0:$*:-
1:(*)b:-
2:*a:-
2:^*:-
2:$*:-
2:(*)b:-
1:$b:b
2:a\:-
0:a\(b:a(b
Expand Down
8 changes: 4 additions & 4 deletions posix/testcases.h
Expand Up @@ -54,10 +54,10 @@
{0, "ab|cd", "abcd"},
{0, "()ef", "def"},
{0, "()*", "-"},
{1, "*a", "-"},
{0, "^*", "-"},
{0, "$*", "-"},
{1, "(*)b", "-"},
{2, "*a", "-"},
{2, "^*", "-"},
{2, "$*", "-"},
{2, "(*)b", "-"},
{1, "$b", "b"},
{2, "a\\", "-"},
{0, "a\\(b", "a(b"},
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/unix/sysv/linux/fstatvfs.c
Expand Up @@ -37,8 +37,9 @@ fstatvfs (int fd, struct statvfs *buf)
if (__fstatfs (fd, &fsbuf) < 0)
return -1;

#define STAT(st) fstat (fd, st)
#include "internal_statvfs.c"

/* We signal success if the statfs call succeeded. */
return 0;
}
2 changes: 1 addition & 1 deletion sysdeps/unix/sysv/linux/internal_statvfs.c
Expand Up @@ -40,7 +40,7 @@
file. The way we can test for matching filesystem is using the
device number. */
buf->f_flag = 0;
if (fstat (fd, &st) >= 0)
if (STAT (&st) >= 0)
{
int save_errno = errno;
struct mntent mntbuf;
Expand Down
13 changes: 9 additions & 4 deletions sysdeps/unix/sysv/linux/statvfs.c
Expand Up @@ -18,8 +18,12 @@
Boston, MA 02111-1307, USA. */

#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <mntent.h>
#include <paths.h>
#include <string.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/statfs.h>
#include <sys/statvfs.h>


Expand All @@ -30,11 +34,12 @@ statvfs (const char *file, struct statvfs *buf)
struct stat st;

/* Get as much information as possible from the system. */
if (__statfs (fd, &fsbuf) < 0)
if (__statfs (file, &fsbuf) < 0)
return -1;

#define STAT(st) stat (file, st)
#include "internal_statvfs.c"

/* We signal success if the statfs call succeeded. */
return 0;
}

0 comments on commit c7e85d0

Please sign in to comment.