lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Update.

Browse Source 
2000-01-25  Andreas Schwab  <schwab@suse.de>

	* posix/testfnm.c: Add new test case.  Use FNM_PATHNAME instead of
	FNM_FILE_NAME consistently.

	* posix/fnmatch.c: Define STRCOLL appropriately for the loop
	definition.
	* posix/fnmatch_loop.c: Undefine STRCOLL.

	* sysdeps/unix/sysv/linux/i386/fxstat.c: Correct code to handle
	kernels with stat64 support.
	* sysdeps/unix/sysv/linux/i386/lxstat.c: Likewise
	* sysdeps/unix/sysv/linux/i386/xstat.c: Likewise.
	Patch by SL Baur <steve@xemacs.org>.
This commit is contained in:
Ulrich Drepper
2000-01-26 03:22:20 +00:00
parent d6f7f7bdf0
commit 1827fc4c98
6 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,5 +1,20 @@
2000-01-25 Andreas Schwab <schwab@suse.de>
* posix/testfnm.c: Add new test case. Use FNM_PATHNAME instead of
FNM_FILE_NAME consistently.
2000-01-25 Ulrich Drepper <drepper@cygnus.com> 2000-01-25 Ulrich Drepper <drepper@cygnus.com>
* posix/fnmatch.c: Define STRCOLL appropriately for the loop
definition.
* posix/fnmatch_loop.c: Undefine STRCOLL.
* sysdeps/unix/sysv/linux/i386/fxstat.c: Correct code to handle
kernels with stat64 support.
* sysdeps/unix/sysv/linux/i386/lxstat.c: Likewise
* sysdeps/unix/sysv/linux/i386/xstat.c: Likewise.
Patch by SL Baur <steve@xemacs.org>.
* string/strxfrm.c: Don't count in the terminating NUL byte/word. * string/strxfrm.c: Don't count in the terminating NUL byte/word.
2000-01-24 Paul Eggert <eggert@twinsun.com> 2000-01-24 Paul Eggert <eggert@twinsun.com>

2
posix/fnmatch.c
View File

@ -191,6 +191,7 @@ __wcschrnul (s, c)
# endif # endif
# define STRCHR(S, C) strchr (S, C) # define STRCHR(S, C) strchr (S, C)
# define STRCHRNUL(S, C) __strchrnul (S, C) # define STRCHRNUL(S, C) __strchrnul (S, C)
# define STRCOLL(S1, S2) strcoll (S1, S2)
# include "fnmatch_loop.c" # include "fnmatch_loop.c"
@ -208,6 +209,7 @@ __wcschrnul (s, c)
# define BTOWC(C) (C) # define BTOWC(C) (C)
# define STRCHR(S, C) wcschr (S, C) # define STRCHR(S, C) wcschr (S, C)
# define STRCHRNUL(S, C) __wcschrnul (S, C) # define STRCHRNUL(S, C) __wcschrnul (S, C)
# define STRCOLL(S1, S2) wcscoll (S1, S2)
# undef IS_CHAR_CLASS # undef IS_CHAR_CLASS
# ifdef _LIBC # ifdef _LIBC

1
posix/fnmatch_loop.c
View File

@ -346,5 +346,6 @@ FCT (pattern, string, no_leading_period, flags)
#undef FCT #undef FCT
#undef STRCHR #undef STRCHR
#undef STRCHRNUL #undef STRCHRNUL
#undef STRCOLL
#undef L #undef L
#undef BTOWC #undef BTOWC

5
sysdeps/unix/sysv/linux/i386/fxstat.c
View File

@ -28,6 +28,7 @@
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include "kernel-features.h"
#include <xstatconv.c> #include <xstatconv.c>
@ -53,10 +54,14 @@ __fxstat (int vers, int fd, struct stat *buf)
return INLINE_SYSCALL (fstat, 2, fd, (struct kernel_stat *) buf); return INLINE_SYSCALL (fstat, 2, fd, (struct kernel_stat *) buf);
} }
#if __ASSUME_STAT64_SYSCALL > 0 #if __ASSUME_STAT64_SYSCALL > 0
{
struct stat64 buf64;
result = INLINE_SYSCALL (fstat64, 2, fd, &buf64); result = INLINE_SYSCALL (fstat64, 2, fd, &buf64);
if (result == 0) if (result == 0)
result = xstat32_conv (vers, &buf64, buf); result = xstat32_conv (vers, &buf64, buf);
return result; return result;
}
#else #else
# if defined __NR_stat64 # if defined __NR_stat64

5
sysdeps/unix/sysv/linux/i386/lxstat.c
View File

@ -28,6 +28,7 @@
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include "kernel-features.h"
#include <xstatconv.c> #include <xstatconv.c>
@ -55,10 +56,14 @@ __lxstat (int vers, const char *name, struct stat *buf)
} }
#if __ASSUME_STAT64_SYSCALL > 0 #if __ASSUME_STAT64_SYSCALL > 0
{
struct stat64 buf64;
result = INLINE_SYSCALL (lstat64, 2, name, &buf64); result = INLINE_SYSCALL (lstat64, 2, name, &buf64);
if (result == 0) if (result == 0)
result = xstat32_conv (vers, &buf64, buf); result = xstat32_conv (vers, &buf64, buf);
return result; return result;
}
#else #else
# if defined __NR_stat64 # if defined __NR_stat64

5
sysdeps/unix/sysv/linux/i386/xstat.c
View File

@ -28,6 +28,7 @@
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include "kernel-features.h"
#include <xstatconv.c> #include <xstatconv.c>
@ -54,10 +55,14 @@ __xstat (int vers, const char *name, struct stat *buf)
return INLINE_SYSCALL (stat, 2, name, (struct kernel_stat *) buf); return INLINE_SYSCALL (stat, 2, name, (struct kernel_stat *) buf);
} }
#if __ASSUME_STAT64_SYSCALL > 0 #if __ASSUME_STAT64_SYSCALL > 0
{
struct stat64 buf64;
result = INLINE_SYSCALL (stat64, 2, name, &buf64); result = INLINE_SYSCALL (stat64, 2, name, &buf64);
if (result == 0) if (result == 0)
result = xstat32_conv (vers, &buf64, buf); result = xstat32_conv (vers, &buf64, buf);
return result; return result;
}
#else #else
# if defined __NR_stat64 # if defined __NR_stat64
/* To support 32 bit UIDs, we have to use stat64. The normal stat call only returns /* To support 32 bit UIDs, we have to use stat64. The normal stat call only returns