* posix/bits/unistd.h (pread) [__USE_FILE_OFFSET64]: Use __off64_t

instead of __off_t for last argument.
	* debug/Makefile (tests): Add tst-lfschk{1,2,3}.
	* debug/tst-lfschk1.c: New test.
	* debug/tst-lfschk2.c: New test.
	* debug/tst-lfschk3.c: New test.

2005-02-09  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/bits/termios.h (CMSPAR): Define.
	* sysdeps/unix/sysv/linux/sparc/bits/termios.h: Add __USE_MISC
	and __USE_XOPEN guards to match linux/bits/termios.h.
	* sysdeps/unix/sysv/linux/alpha/bits/termios.h: Likewise.
	(CMSPAR): Define.
	* sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Likewise.
This commit is contained in:
Ulrich Drepper 2005-03-20 16:51:05 +00:00
parent 1aa4e40a31
commit 65fb0d2189
10 changed files with 182 additions and 106 deletions

View File

@ -1,3 +1,21 @@
2005-03-20 Jakub Jelinek <jakub@redhat.com>
* posix/bits/unistd.h (pread) [__USE_FILE_OFFSET64]: Use __off64_t
instead of __off_t for last argument.
* debug/Makefile (tests): Add tst-lfschk{1,2,3}.
* debug/tst-lfschk1.c: New test.
* debug/tst-lfschk2.c: New test.
* debug/tst-lfschk3.c: New test.
2005-02-09 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/bits/termios.h (CMSPAR): Define.
* sysdeps/unix/sysv/linux/sparc/bits/termios.h: Add __USE_MISC
and __USE_XOPEN guards to match linux/bits/termios.h.
* sysdeps/unix/sysv/linux/alpha/bits/termios.h: Likewise.
(CMSPAR): Define.
* sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Likewise.
2005-02-10 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/ia64/elf/initfini.c: Add local _init and _fini labels.

View File

@ -54,7 +54,7 @@ CFLAGS-recv_chk.c = -fexceptions -fasynchronous-unwind-tables
CFLAGS-recvfrom_chk.c = -fexceptions -fasynchronous-unwind-tables
tests = backtrace-tst tst-chk1 tst-chk2 tst-chk3 \
test-strcpy_chk test-stpcpy_chk
tst-lfschk1 tst-lfschk2 tst-lfschk3 test-strcpy_chk test-stpcpy_chk
extra-libs = libSegFault libpcprofile
extra-libs-others = $(extra-libs)

2
debug/tst-lfschk1.c Normal file
View File

@ -0,0 +1,2 @@
#define _FILE_OFFSET_BITS 64
#include "tst-chk1.c"

2
debug/tst-lfschk2.c Normal file
View File

@ -0,0 +1,2 @@
#define _FILE_OFFSET_BITS 64
#include "tst-chk2.c"

2
debug/tst-lfschk3.c Normal file
View File

@ -0,0 +1,2 @@
#define _FILE_OFFSET_BITS 64
#include "tst-chk3.c"

View File

@ -58,7 +58,7 @@ pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset)
}
# else
extern __always_inline __wur ssize_t
pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset)
pread (int __fd, void *__buf, size_t __nbytes, __off64_t __offset)
{
if (__bos0 (__buf) != (size_t) -1
&& (!__builtin_constant_p (__nbytes) || __nbytes > __bos0 (__buf)))

View File

@ -1,5 +1,5 @@
/* termios type and macro definitions. Linux version.
Copyright (C) 1993,1994,1995,1996,1997,1999,2003
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2003, 2005
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -91,34 +91,42 @@ struct termios
#define OFILL 00000100
#define OFDEL 00000200
#define NLDLY 00001400
#define NL0 00000000
#define NL1 00000400
#define NL2 00001000
#define NL3 00001400
#define TABDLY 00006000
#define TAB0 00000000
#define TAB1 00002000
#define TAB2 00004000
#define TAB3 00006000
#define CRDLY 00030000
#define CR0 00000000
#define CR1 00010000
#define CR2 00020000
#define CR3 00030000
#define FFDLY 00040000
#define FF0 00000000
#define FF1 00040000
#define BSDLY 00100000
#define BS0 00000000
#define BS1 00100000
#if defined __USE_MISC || defined __USE_XOPEN
# define NLDLY 00001400
# define NL0 00000000
# define NL1 00000400
# define NL2 00001000
# define NL3 00001400
# define TABDLY 00006000
# define TAB0 00000000
# define TAB1 00002000
# define TAB2 00004000
# define TAB3 00006000
# define CRDLY 00030000
# define CR0 00000000
# define CR1 00010000
# define CR2 00020000
# define CR3 00030000
# define FFDLY 00040000
# define FF0 00000000
# define FF1 00040000
# define BSDLY 00100000
# define BS0 00000000
# define BS1 00100000
#endif
#define VTDLY 00200000
#define VT0 00000000
#define VT1 00200000
#define XTABS 01000000 /* Hmm.. Linux/i386 considers this part of TABDLY.. */
#ifdef __USE_MISC
# define XTABS 01000000 /* Hmm.. Linux/i386 considers this part of TABDLY.. */
#endif
/* c_cflag bit meaning */
#define CBAUD 0000037
#ifdef __USE_MISC
# define CBAUD 0000037
#endif
#define B0 0000000 /* hang up */
#define B50 0000001
#define B75 0000002
@ -135,9 +143,11 @@ struct termios
#define B9600 0000015
#define B19200 0000016
#define B38400 0000017
#define EXTA B19200
#define EXTB B38400
#define CBAUDEX 0000000
#ifdef __USE_MISC
# define EXTA B19200
# define EXTB B38400
# define CBAUDEX 0000000
#endif
#define B57600 00020
#define B115200 00021
#define B230400 00022
@ -169,23 +179,30 @@ struct termios
#define HUPCL 00040000
#define CLOCAL 00100000
#define CRTSCTS 020000000000 /* flow control */
#ifdef __USE_MISC
# define CMSPAR 010000000000 /* mark or space (stick) parity */
# define CRTSCTS 020000000000 /* flow control */
#endif
/* c_lflag bits */
#define ISIG 0x00000080
#define ICANON 0x00000100
#define XCASE 0x00004000
#if defined __USE_MISC || defined __USE_XOPEN
# define XCASE 0x00004000
#endif
#define ECHO 0x00000008
#define ECHOE 0x00000002
#define ECHOK 0x00000004
#define ECHONL 0x00000010
#define NOFLSH 0x80000000
#define TOSTOP 0x00400000
#define ECHOCTL 0x00000040
#define ECHOPRT 0x00000020
#define ECHOKE 0x00000001
#define FLUSHO 0x00800000
#define PENDIN 0x20000000
#ifdef __USE_MISC
# define ECHOCTL 0x00000040
# define ECHOPRT 0x00000020
# define ECHOKE 0x00000001
# define FLUSHO 0x00800000
# define PENDIN 0x20000000
#endif
#define IEXTEN 0x00000400
/* Values for the ACTION argument to `tcflow'. */

View File

@ -1,5 +1,5 @@
/* termios type and macro definitions. Linux version.
Copyright (C) 1993,1994,1995,1996,1997,1998,1999,2003
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2005
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -172,6 +172,7 @@ struct termios
#define __MAX_BAUD B4000000
#ifdef __USE_MISC
# define CIBAUD 002003600000 /* input baud rate (not used) */
# define CMSPAR 010000000000 /* mark or space (stick) parity */
# define CRTSCTS 020000000000 /* flow control */
#endif

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1997,1999,2001,2003,2004 Free Software Foundation, Inc.
/* Copyright (C) 1997,1999,2001,2003,2004,2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -92,34 +92,41 @@ struct termios {
#define OFILL 00000100
#define OFDEL 00000200
#define NLDLY 00001400
#define NL0 00000000
#define NL1 00000400
#define NL2 00001000
#define NL3 00001400
#define TABDLY 00006000
#define TAB0 00000000
#define TAB1 00002000
#define TAB2 00004000
#define TAB3 00006000
#define XTABS 00006000 /* Required by POSIX to be == TAB3. */
#define CRDLY 00030000
#define CR0 00000000
#define CR1 00010000
#define CR2 00020000
#define CR3 00030000
#define FFDLY 00040000
#define FF0 00000000
#define FF1 00040000
#define BSDLY 00100000
#define BS0 00000000
#define BS1 00100000
#if defined __USE_MISC || defined __USE_XOPEN
# define NLDLY 00001400
# define NL0 00000000
# define NL1 00000400
# define NL2 00001000
# define NL3 00001400
# define TABDLY 00006000
# define TAB0 00000000
# define TAB1 00002000
# define TAB2 00004000
# define TAB3 00006000
# define CRDLY 00030000
# define CR0 00000000
# define CR1 00010000
# define CR2 00020000
# define CR3 00030000
# define FFDLY 00040000
# define FF0 00000000
# define FF1 00040000
# define BSDLY 00100000
# define BS0 00000000
# define BS1 00100000
#endif
#define VTDLY 00200000
#define VT0 00000000
#define VT1 00200000
#ifdef __USE_MISC
# define XTABS 00006000
#endif
/* c_cflag bit meaning */
#define CBAUD 0000377
#ifdef __USE_MISC
# define CBAUD 0000377
#endif
#define B0 0000000 /* hang up */
#define B50 0000001
#define B75 0000002
@ -136,9 +143,11 @@ struct termios {
#define B9600 0000015
#define B19200 0000016
#define B38400 0000017
#define EXTA B19200
#define EXTB B38400
#define CBAUDEX 0000020
#ifdef __USE_MISC
# define EXTA B19200
# define EXTB B38400
# define CBAUDEX 0000020
#endif
#define B57600 00020
#define B115200 00021
#define B230400 00022
@ -169,23 +178,30 @@ struct termios {
#define HUPCL 00040000
#define CLOCAL 00100000
#define CRTSCTS 020000000000 /* flow control */
#ifdef __USE_MISC
# define CMSPAR 010000000000 /* mark or space (stick) parity */
# define CRTSCTS 020000000000 /* flow control */
#endif
/* c_lflag bits */
#define ISIG 0x00000080
#define ICANON 0x00000100
#define XCASE 0x00004000
#if defined __USE_MISC || defined __USE_XOPEN
# define XCASE 0x00004000
#endif
#define ECHO 0x00000008
#define ECHOE 0x00000002
#define ECHOK 0x00000004
#define ECHONL 0x00000010
#define NOFLSH 0x80000000
#define TOSTOP 0x00400000
#define ECHOCTL 0x00000040
#define ECHOPRT 0x00000020
#define ECHOKE 0x00000001
#define FLUSHO 0x00800000
#define PENDIN 0x20000000
#ifdef __USE_MISC
# define ECHOCTL 0x00000040
# define ECHOPRT 0x00000020
# define ECHOKE 0x00000001
# define FLUSHO 0x00800000
# define PENDIN 0x20000000
#endif
#define IEXTEN 0x00000400
/* Values for the ACTION argument to `tcflow'. */

View File

@ -1,5 +1,6 @@
/* termios type and macro definitions. Linux/SPARC version.
Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2005
Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -84,34 +85,41 @@ struct termios
#define ONLRET 0x00000020
#define OFILL 0x00000040
#define OFDEL 0x00000080
#define NLDLY 0x00000100
#define NL0 0x00000000
#define NL1 0x00000100
#define CRDLY 0x00000600
#define CR0 0x00000000
#define CR1 0x00000200
#define CR2 0x00000400
#define CR3 0x00000600
#define TABDLY 0x00001800
#define TAB0 0x00000000
#define TAB1 0x00000800
#define TAB2 0x00001000
#define TAB3 0x00001800
#define XTABS 0x00001800
#define BSDLY 0x00002000
#define BS0 0x00000000
#define BS1 0x00002000
#define VTDLY 0x00004000
#define VT0 0x00000000
#define VT1 0x00004000
#if defined __USE_MISC || defined __USE_XOPEN
# define NLDLY 0x00000100
# define NL0 0x00000000
# define NL1 0x00000100
# define CRDLY 0x00000600
# define CR0 0x00000000
# define CR1 0x00000200
# define CR2 0x00000400
# define CR3 0x00000600
# define TABDLY 0x00001800
# define TAB0 0x00000000
# define TAB1 0x00000800
# define TAB2 0x00001000
# define TAB3 0x00001800
# define BSDLY 0x00002000
# define BS0 0x00000000
# define BS1 0x00002000
#define FFDLY 0x00008000
#define FF0 0x00000000
#define FF1 0x00008000
#endif
#define VTDLY 0x00004000
#define VT0 0x00000000
#define VT1 0x00004000
#define PAGEOUT 0x00010000 /* SUNOS specific */
#define WRAP 0x00020000 /* SUNOS specific */
#ifdef __USE_MISC
# define XTABS 0x00001800
#endif
/* c_cflag bit meaning */
#define CBAUD 0x0000100f
#ifdef __USE_MISC
# define CBAUD 0x0000100f
#endif
#define B0 0x00000000 /* hang up */
#define B50 0x00000001
#define B75 0x00000002
@ -128,8 +136,10 @@ struct termios
#define B9600 0x0000000d
#define B19200 0x0000000e
#define B38400 0x0000000f
#define EXTA B19200
#define EXTB B38400
#ifdef __USE_MISC
# define EXTA B19200
# define EXTB B38400
#endif
#define CSIZE 0x00000030
#define CS5 0x00000000
#define CS6 0x00000010
@ -141,7 +151,9 @@ struct termios
#define PARODD 0x00000200
#define HUPCL 0x00000400
#define CLOCAL 0x00000800
#define CBAUDEX 0x00001000
#ifdef __USE_MISC
# define CBAUDEX 0x00001000
#endif
#define B57600 0x00001001
#define B115200 0x00001002
#define B230400 0x00001003
@ -159,26 +171,32 @@ struct termios
#define B2000000 0x0000100f
#define __MAX_BAUD B2000000
#define CIBAUD 0x100f0000 /* input baud rate (not used) */
#define CMSPAR 0x40000000 /* mark or space (stick) parity */
#define CRTSCTS 0x80000000 /* flow control */
#ifdef __USE_MISC
# define CIBAUD 0x100f0000 /* input baud rate (not used) */
# define CMSPAR 0x40000000 /* mark or space (stick) parity */
# define CRTSCTS 0x80000000 /* flow control */
#endif
/* c_lflag bits */
#define ISIG 0x00000001
#define ICANON 0x00000002
#define XCASE 0x00000004
#if defined __USE_MISC || defined __USE_XOPEN
# define XCASE 0x00000004
#endif
#define ECHO 0x00000008
#define ECHOE 0x00000010
#define ECHOK 0x00000020
#define ECHONL 0x00000040
#define NOFLSH 0x00000080
#define TOSTOP 0x00000100
#define ECHOCTL 0x00000200
#define ECHOPRT 0x00000400
#define ECHOKE 0x00000800
#define DEFECHO 0x00001000 /* SUNOS thing, what is it? */
#define FLUSHO 0x00002000
#define PENDIN 0x00004000
#ifdef __USE_MISC
# define ECHOCTL 0x00000200
# define ECHOPRT 0x00000400
# define ECHOKE 0x00000800
# define DEFECHO 0x00001000 /* SUNOS thing, what is it? */
# define FLUSHO 0x00002000
# define PENDIN 0x00004000
#endif
#define IEXTEN 0x00008000
/* modem lines */