diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2012-03-16 12:02:22 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-03-16 12:02:22 +0100 |
| commit | a6d91ded3f2d5401e09a9c2fa442aabfbfe593a8 (patch) | |
| tree | 95e456ad2b1c7677c3aaadc3d97ba73f3ee22c67 | |
| parent | 27aeaa2aaad9fb642040be903d6fe6c0fc59c6e2 (diff) | |
| download | strace-a6d91ded3f2d5401e09a9c2fa442aabfbfe593a8.tar.gz strace-a6d91ded3f2d5401e09a9c2fa442aabfbfe593a8.tar.bz2 strace-a6d91ded3f2d5401e09a9c2fa442aabfbfe593a8.tar.xz | |
Tidy up includes and copyright notices, fix indentation
The files not mentioned in changelog below had only
copyright notices fixes and indentation fixes.
* defs.h: Include <stdint.h> and <inttypes.h>.
* file.c: Do not include <inttypes.h>.
Move struct kernel_dirent declaration below top include block.
* block.c: Do not include <stdint.h> and <inttypes.h>.
* quota.c: Likewise.
* desc.c: Likewise.
* signal.c: Likewise.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
55 files changed, 121 insertions, 293 deletions
@@ -27,5 +27,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$Id$ @@ -26,11 +26,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ -#include "defs.h" +#include "defs.h" #include <fcntl.h> #include <sys/stat.h> #include <sys/wait.h> @@ -26,8 +26,6 @@ */ #include "defs.h" -#include <stdint.h> -#include <inttypes.h> #include <linux/blkpg.h> #include <linux/fs.h> #include <linux/hdreg.h> @@ -31,8 +31,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" diff --git a/debian/copyright b/debian/copyright index 59e7b1b..fd35507 100644 --- a/debian/copyright +++ b/debian/copyright @@ -37,5 +37,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$Id$ @@ -25,8 +25,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #ifdef HAVE_CONFIG_H @@ -42,23 +40,25 @@ # include <sgidefs.h> #endif #include <features.h> +#ifdef HAVE_STDBOOL_H +# include <stdbool.h> +#endif +#include <stdint.h> +#include <inttypes.h> #include <sys/types.h> +#ifdef STDC_HEADERS +# include <stddef.h> +#endif #include <unistd.h> #include <stdlib.h> #include <stdio.h> #include <ctype.h> #include <string.h> +#include <errno.h> +#include <signal.h> #include <time.h> #include <sys/time.h> -#include <errno.h> #include <sys/syscall.h> -#ifdef HAVE_STDBOOL_H -# include <stdbool.h> -#endif -#ifdef STDC_HEADERS -# include <stddef.h> -#endif -#include <signal.h> #ifndef HAVE_STRERROR const char *strerror(int); @@ -26,28 +26,24 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <fcntl.h> #include <sys/file.h> -#include <inttypes.h> #ifdef HAVE_SYS_EPOLL_H -#include <sys/epoll.h> +# include <sys/epoll.h> #endif #ifdef HAVE_LIBAIO_H -#include <libaio.h> +# include <libaio.h> #endif #if HAVE_LONG_LONG_OFF_T /* * Hacks for systems that have a long long off_t */ -#define flock64 flock /* Horrid hack */ -#define printflock printflock64 /* Horrider hack */ +# define flock64 flock /* Horrid hack */ +# define printflock printflock64 /* Horrider hack */ #endif static const struct xlat fcntlcmds[] = { diff --git a/errnoent.sh b/errnoent.sh index 3a709ae..a82fc04 100755 --- a/errnoent.sh +++ b/errnoent.sh @@ -23,8 +23,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# $Id$ awk ' /^#define[ ]+E[A-Z0-9_]+[ ]+[0-9]+/ { @@ -26,22 +26,12 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <dirent.h> #include <sys/swap.h> -struct kernel_dirent { - unsigned long d_ino; - unsigned long d_off; - unsigned short d_reclen; - char d_name[1]; -}; - #ifdef LINUXSPARC struct stat { unsigned short st_dev; @@ -92,7 +82,6 @@ struct stat_sparc64 { # undef gid_t # undef off_t # undef loff_t - # define dev_t __kernel_dev_t # define ino_t __kernel_ino_t # define mode_t __kernel_mode_t @@ -112,7 +101,6 @@ struct stat_sparc64 { # undef gid_t # undef off_t # undef loff_t - # define dev_t dev_t # define ino_t ino_t # define mode_t mode_t @@ -131,7 +119,7 @@ struct stat_sparc64 { #include <sys/stat.h> #undef stat #undef stat64 - /* These might be macros. */ +/* These might be macros. */ #undef st_atime #undef st_mtime #undef st_ctime @@ -140,11 +128,9 @@ struct stat_sparc64 { #endif #include <fcntl.h> - #ifdef HAVE_SYS_VFS_H # include <sys/vfs.h> #endif - #ifdef HAVE_LINUX_XATTR_H # include <linux/xattr.h> #else @@ -152,23 +138,12 @@ struct stat_sparc64 { # define XATTR_REPLACE 2 #endif -#if _LFS64_LARGEFILE -# ifdef HAVE_INTTYPES_H -# include <inttypes.h> -# else -# define PRId64 "lld" -# define PRIu64 "llu" -# endif -#endif - #if HAVE_LONG_LONG_OFF_T /* * Ugly hacks for systems that have typedef long long off_t */ - # define stat64 stat # define HAVE_STAT64 1 /* Ugly hack */ - # define sys_stat64 sys_stat # define sys_fstat64 sys_fstat # define sys_lstat64 sys_lstat @@ -189,6 +164,13 @@ struct stat_sparc64 { # include <sys/asynch.h> #endif +struct kernel_dirent { + unsigned long d_ino; + unsigned long d_off; + unsigned short d_reclen; + char d_name[1]; +}; + const struct xlat open_access_modes[] = { { O_RDONLY, "O_RDONLY" }, { O_WRONLY, "O_WRONLY" }, @@ -26,15 +26,12 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <fcntl.h> #if HAVE_SYS_UIO_H -#include <sys/uio.h> +# include <sys/uio.h> #endif int @@ -26,12 +26,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <asm/ioctl.h> static int diff --git a/ioctlsort.c b/ioctlsort.c index 50f4760..0e6608e 100644 --- a/ioctlsort.c +++ b/ioctlsort.c @@ -24,14 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include <stdio.h> - #ifdef STDC_HEADERS -#include <stdlib.h> +# include <stdlib.h> #endif struct ioctlent { @@ -45,9 +42,7 @@ struct ioctlent { int nioctlents = sizeof ioctlent / sizeof ioctlent[0]; int -compare(a, b) -const void *a; -const void *b; +compare(const void *a, const void *b) { unsigned long code1 = ((struct ioctlent *) a)->code; unsigned long code2 = ((struct ioctlent *) b)->code; @@ -26,16 +26,12 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - -# ifdef HAVE_MQUEUE_H -# include <mqueue.h> -# endif - +#ifdef HAVE_MQUEUE_H +# include <mqueue.h> +#endif #include <fcntl.h> #include <sys/ipc.h> #include <sys/sem.h> diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h index 85c341a..b50a48c 100644 --- a/linux/alpha/syscallent.h +++ b/linux/alpha/syscallent.h @@ -24,8 +24,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ { 6, 0, printargs, "osf_syscall" }, /* 0, not implemented */ diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h index 6f16a80..a72c2ab 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -24,8 +24,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ { 0, 0, sys_restart_syscall, "restart_syscall"}, /* 0 */ diff --git a/linux/avr32/syscallent.h b/linux/avr32/syscallent.h index baba008..8320f9a 100644 --- a/linux/avr32/syscallent.h +++ b/linux/avr32/syscallent.h @@ -23,8 +23,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ { 0, 0, sys_setup, "setup" }, /* 0 */ diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h index 24f57c4..2ea529e 100644 --- a/linux/bfin/syscallent.h +++ b/linux/bfin/syscallent.h @@ -24,8 +24,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ { 0, 0, sys_restart_syscall, "restart_syscall" }, /* 0 */ diff --git a/linux/dummy.h b/linux/dummy.h index 3c5f901..d373cad 100644 --- a/linux/dummy.h +++ b/linux/dummy.h @@ -24,8 +24,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ /* still unfinished */ diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h index 851898a..61febc6 100644 --- a/linux/hppa/syscallent.h +++ b/linux/hppa/syscallent.h @@ -1,8 +1,5 @@ /* * Copyright (c) 2001 Hewlett-Packard, Matthew Wilcox - * - * $Id$ - * */ { 0, 0, sys_restart_syscall, "restart_syscall" }, /* 0 */ diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h index 7700447..8e797bd 100644 --- a/linux/i386/syscallent.h +++ b/linux/i386/syscallent.h @@ -24,8 +24,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ { 0, 0, sys_restart_syscall, "restart_syscall" }, /* 0 */ diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h index 2cee60f..a6b47fe 100644 --- a/linux/ia64/syscallent.h +++ b/linux/ia64/syscallent.h @@ -24,8 +24,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ /* diff --git a/linux/ioctlent.sh b/linux/ioctlent.sh index 985deff..9bcff5f 100755 --- a/linux/ioctlent.sh +++ b/linux/ioctlent.sh @@ -1,5 +1,4 @@ #! /bin/sh -# # Copyright (c) 2001 Wichert Akkerman <wichert@cistron.nl> # All rights reserved. # @@ -24,9 +23,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# $Id$ -# # Validate arg count. case $# in diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h index 947937a..5853eff 100644 --- a/linux/m68k/syscallent.h +++ b/linux/m68k/syscallent.h @@ -24,8 +24,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ { 0, 0, sys_restart_syscall, "restart_syscall" }, /* 0 */ diff --git a/linux/mips/ioctlent.sh b/linux/mips/ioctlent.sh index dd5fd9d..52d8df5 100755 --- a/linux/mips/ioctlent.sh +++ b/linux/mips/ioctlent.sh @@ -26,8 +26,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# $Id$ # Files to find. file_find='asm/*.h linux/*.h scsi/*.h' diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h index b859cc3..e485b3a 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -24,8 +24,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ { 0, 0, sys_restart_syscall, "restart_syscall" }, /* 0 */ diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h index 9b068aa..62234f9 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -26,8 +26,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ { 0, 0, sys_restart_syscall, "restart_syscall"}, /* 0 */ diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h index 4e50771..69b9972 100644 --- a/linux/sh64/syscallent.h +++ b/linux/sh64/syscallent.h @@ -24,8 +24,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ { 0, 0, sys_setup, "setup" }, /* 0 */ diff --git a/linux/sparc/dummy2.h b/linux/sparc/dummy2.h index 4527585..39552a2 100644 --- a/linux/sparc/dummy2.h +++ b/linux/sparc/dummy2.h @@ -23,8 +23,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ /* still unfinished */ diff --git a/linux/sparc/syscall1.h b/linux/sparc/syscall1.h index a4d7af3..6f30b74 100644 --- a/linux/sparc/syscall1.h +++ b/linux/sparc/syscall1.h @@ -23,8 +23,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #define SOLARIS_syscall 0 diff --git a/linux/sparc/syscallent1.h b/linux/sparc/syscallent1.h index ff3c4c4..3f11dd8 100644 --- a/linux/sparc/syscallent1.h +++ b/linux/sparc/syscallent1.h @@ -23,8 +23,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ { 6, 0, solaris_syscall, "syscall" }, /* 0 */ diff --git a/linux/sparc64/dummy2.h b/linux/sparc64/dummy2.h index 4527585..39552a2 100644 --- a/linux/sparc64/dummy2.h +++ b/linux/sparc64/dummy2.h @@ -23,8 +23,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ /* still unfinished */ diff --git a/linux/sparc64/syscall1.h b/linux/sparc64/syscall1.h index a4d7af3..6f30b74 100644 --- a/linux/sparc64/syscall1.h +++ b/linux/sparc64/syscall1.h @@ -23,8 +23,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #define SOLARIS_syscall 0 diff --git a/linux/syscall.h b/linux/syscall.h index fb13566..5b47d8d 100644 --- a/linux/syscall.h +++ b/linux/syscall.h @@ -24,8 +24,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "dummy.h" @@ -28,15 +28,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <asm/mman.h> #include <sys/mman.h> - #if defined(I386) # include <asm/ldt.h> # ifdef HAVE_STRUCT_USER_DESC @@ -51,7 +47,7 @@ /* * Ugly hacks for systems that have a long long off_t */ -#define sys_mmap64 sys_mmap +# define sys_mmap64 sys_mmap #endif int @@ -26,81 +26,72 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <sys/stat.h> #include <sys/socket.h> #include <sys/un.h> - #if defined(HAVE_SIN6_SCOPE_ID_LINUX) -#define in6_addr in6_addr_libc -#define ipv6_mreq ipv6_mreq_libc -#define sockaddr_in6 sockaddr_in6_libc +# define in6_addr in6_addr_libc +# define ipv6_mreq ipv6_mreq_libc +# define sockaddr_in6 sockaddr_in6_libc #endif - #include <netinet/in.h> #ifdef HAVE_NETINET_TCP_H -#include <netinet/tcp.h> +# include <netinet/tcp.h> #endif #ifdef HAVE_NETINET_UDP_H -#include <netinet/udp.h> +# include <netinet/udp.h> #endif #ifdef HAVE_NETINET_SCTP_H -#include <netinet/sctp.h> +# include <netinet/sctp.h> #endif #include <arpa/inet.h> #include <net/if.h> #include <asm/types.h> #if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC__ + __GLIBC_MINOR__ >= 3) -# include <netipx/ipx.h> +# include <netipx/ipx.h> #else -# include <linux/ipx.h> +# include <linux/ipx.h> #endif #if defined(__GLIBC__) && (((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)) || defined(HAVE_SIN6_SCOPE_ID_LINUX)) -#if defined(HAVE_LINUX_IN6_H) -#if defined(HAVE_SIN6_SCOPE_ID_LINUX) -#undef in6_addr -#undef ipv6_mreq -#undef sockaddr_in6 -#define in6_addr in6_addr_kernel -#define ipv6_mreq ipv6_mreq_kernel -#define sockaddr_in6 sockaddr_in6_kernel -#endif -#include <linux/in6.h> -#if defined(HAVE_SIN6_SCOPE_ID_LINUX) -#undef in6_addr -#undef ipv6_mreq -#undef sockaddr_in6 -#define in6_addr in6_addr_libc -#define ipv6_mreq ipv6_mreq_libc -#define sockaddr_in6 sockaddr_in6_kernel -#endif -#endif +# if defined(HAVE_LINUX_IN6_H) +# if defined(HAVE_SIN6_SCOPE_ID_LINUX) +# undef in6_addr +# undef ipv6_mreq +# undef sockaddr_in6 +# define in6_addr in6_addr_kernel +# define ipv6_mreq ipv6_mreq_kernel +# define sockaddr_in6 sockaddr_in6_kernel +# endif +# include <linux/in6.h> +# if defined(HAVE_SIN6_SCOPE_ID_LINUX) +# undef in6_addr +# undef ipv6_mreq +# undef sockaddr_in6 +# define in6_addr in6_addr_libc +# define ipv6_mreq ipv6_mreq_libc +# define sockaddr_in6 sockaddr_in6_kernel +# endif +# endif #endif #if defined(HAVE_SYS_UIO_H) -#include <sys/uio.h> +# include <sys/uio.h> #endif - #if defined(HAVE_LINUX_NETLINK_H) -#include <linux/netlink.h> +# include <linux/netlink.h> #endif - #if defined(HAVE_LINUX_IF_PACKET_H) -#include <linux/if_packet.h> +# include <linux/if_packet.h> #endif - #if defined(HAVE_LINUX_ICMP_H) -#include <linux/icmp.h> +# include <linux/icmp.h> #endif - #ifndef PF_UNSPEC -#define PF_UNSPEC AF_UNSPEC +# define PF_UNSPEC AF_UNSPEC #endif /* Under Linux these are enums so we can't test for them with ifdef. */ diff --git a/pathtrace.c b/pathtrace.c index d50b268..87d9827 100644 --- a/pathtrace.c +++ b/pathtrace.c @@ -27,14 +27,12 @@ */ #include "defs.h" - #include <sys/param.h> - #ifdef HAVE_POLL_H -#include <poll.h> +# include <poll.h> #endif #ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> +# include <sys/poll.h> #endif #include "syscall.h" @@ -8,7 +8,6 @@ * <barrow_dj@mail.yahoo.com,djbarrow@de.ibm.com> * Copyright (c) 2000 PocketPenguins Inc. Linux for Hitachi SuperH * port by Greg Banks <gbanks@pocketpenguins.com> - * * All rights reserved. * @@ -33,12 +32,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <fcntl.h> #include <sys/stat.h> #include <sys/wait.h> @@ -448,40 +444,40 @@ static const struct xlat clone_flags[] = { { 0, NULL }, }; -# ifdef I386 -# include <asm/ldt.h> -# ifdef HAVE_STRUCT_USER_DESC -# define modify_ldt_ldt_s user_desc -# endif +#ifdef I386 +# include <asm/ldt.h> +# ifdef HAVE_STRUCT_USER_DESC +# define modify_ldt_ldt_s user_desc +# endif extern void print_ldt_entry(); -# endif +#endif -# if defined IA64 -# define ARG_FLAGS 0 -# define ARG_STACK 1 -# define ARG_STACKSIZE (tcp->scno == SYS_clone2 ? 2 : -1) -# define ARG_PTID (tcp->scno == SYS_clone2 ? 3 : 2) -# define ARG_CTID (tcp->scno == SYS_clone2 ? 4 : 3) -# define ARG_TLS (tcp->scno == SYS_clone2 ? 5 : 4) -# elif defined S390 || defined S390X || defined CRISV10 || defined CRISV32 -# define ARG_STACK 0 -# define ARG_FLAGS 1 -# define ARG_PTID 2 -# define ARG_CTID 3 -# define ARG_TLS 4 -# elif defined X86_64 || defined ALPHA -# define ARG_FLAGS 0 -# define ARG_STACK 1 -# define ARG_PTID 2 -# define ARG_CTID 3 -# define ARG_TLS 4 -# else -# define ARG_FLAGS 0 -# define ARG_STACK 1 -# define ARG_PTID 2 -# define ARG_TLS 3 -# define ARG_CTID 4 -# endif +#if defined IA64 +# define ARG_FLAGS 0 +# define ARG_STACK 1 +# define ARG_STACKSIZE (tcp->scno == SYS_clone2 ? 2 : -1) +# define ARG_PTID (tcp->scno == SYS_clone2 ? 3 : 2) +# define ARG_CTID (tcp->scno == SYS_clone2 ? 4 : 3) +# define ARG_TLS (tcp->scno == SYS_clone2 ? 5 : 4) +#elif defined S390 || defined S390X || defined CRISV10 || defined CRISV32 +# define ARG_STACK 0 +# define ARG_FLAGS 1 +# define ARG_PTID 2 +# define ARG_CTID 3 +# define ARG_TLS 4 +#elif defined X86_64 || defined ALPHA +# define ARG_FLAGS 0 +# define ARG_STACK 1 +# define ARG_PTID 2 +# define ARG_CTID 3 +# define ARG_TLS 4 +#else +# define ARG_FLAGS 0 +# define ARG_STACK 1 +# define ARG_PTID 2 +# define ARG_TLS 3 +# define ARG_CTID 4 +#endif int sys_clone(struct tcb *tcp) @@ -490,11 +486,11 @@ sys_clone(struct tcb *tcp) const char *sep = "|"; unsigned long flags = tcp->u_arg[ARG_FLAGS]; tprintf("child_stack=%#lx, ", tcp->u_arg[ARG_STACK]); -# ifdef ARG_STACKSIZE +#ifdef ARG_STACKSIZE if (ARG_STACKSIZE != -1) tprintf("stack_size=%#lx, ", tcp->u_arg[ARG_STACKSIZE]); -# endif +#endif tprints("flags="); if (!printflags(clone_flags, flags &~ CSIGNAL, NULL)) sep = ""; @@ -506,7 +502,7 @@ sys_clone(struct tcb *tcp) if (flags & CLONE_PARENT_SETTID) tprintf(", parent_tidptr=%#lx", tcp->u_arg[ARG_PTID]); if (flags & CLONE_SETTLS) { -# ifdef I386 +#ifdef I386 struct modify_ldt_ldt_s copy; if (umove(tcp, tcp->u_arg[ARG_TLS], ©) != -1) { tprintf(", {entry_number:%d, ", @@ -517,7 +513,7 @@ sys_clone(struct tcb *tcp) print_ldt_entry(©); } else -# endif +#endif tprintf(", tls=%#lx", tcp->u_arg[ARG_TLS]); } if (flags & (CLONE_CHILD_SETTID|CLONE_CHILD_CLEARTID)) @@ -2729,7 +2725,7 @@ sys_sched_rr_get_interval(struct tcb *tcp) } # ifdef X86_64 -# include <asm/prctl.h> +# include <asm/prctl.h> static const struct xlat archvals[] = { { ARCH_SET_GS, "ARCH_SET_GS" }, @@ -27,14 +27,10 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" -#include <inttypes.h> - #define SUBCMDMASK 0x00ff #define SUBCMDSHIFT 8 #define QCMD_CMD(cmd) ((u_int32_t)(cmd) >> SUBCMDSHIFT) @@ -26,12 +26,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <sys/resource.h> #include <sys/times.h> #include <linux/kernel.h> @@ -40,15 +37,13 @@ /* * Hacks for systems that have a long long rlim_t */ - -#define rlimit64 rlimit /* Ugly hack */ -#define rlim64_t rlim_t /* Ugly hack */ -#ifndef RLIM64_INFINITY -#define RLIM64_INFINITY RLIM_INFINITY /* You guessed it */ -#endif - -#define sys_getrlimit64 sys_getrlimit -#define sys_setrlimit64 sys_setrlimit +# define rlimit64 rlimit /* Ugly hack */ +# define rlim64_t rlim_t /* Ugly hack */ +# ifndef RLIM64_INFINITY +# define RLIM64_INFINITY RLIM_INFINITY /* You guessed it */ +# endif +# define sys_getrlimit64 sys_getrlimit +# define sys_setrlimit64 sys_setrlimit #endif static const struct xlat resources[] = { @@ -27,7 +27,6 @@ */ #include "defs.h" - #include <sys/ioctl.h> #include <scsi/sg.h> @@ -29,13 +29,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - -#include <stdint.h> #include <sys/user.h> #include <fcntl.h> @@ -79,7 +75,7 @@ typedef struct { #elif defined HAVE_ASM_SIGCONTEXT_H # if !defined(IA64) && !defined(X86_64) # include <asm/sigcontext.h> -# endif /* !IA64 && !X86_64 */ +# endif #else /* !HAVE_ASM_SIGCONTEXT_H */ # if defined I386 && !defined HAVE_STRUCT_SIGCONTEXT_STRUCT struct sigcontext_struct { @@ -417,7 +413,6 @@ print_sigset(struct tcb *tcp, long addr, int rt) #define SI_SIGIO -5 /* sent by SIGIO */ #define SI_TKILL -6 /* sent by tkill */ #define SI_ASYNCNL -60 /* sent by asynch name lookup completion */ - #endif #ifndef SI_FROMUSER diff --git a/signalent.sh b/signalent.sh index 9a346dd..62ae786 100755 --- a/signalent.sh +++ b/signalent.sh @@ -23,8 +23,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# $Id$ cat $* | sed -n -e 's/\/\*.*\*\// /' -e 's/^#[ ]*define[ ][ ]*SIG\([^_ ]*\)[ ][ ]*\([0-9][0-9]*\)[ ]*$/\1 \2/p' | @@ -23,18 +23,14 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <sys/socket.h> #include <linux/sockios.h> #include <arpa/inet.h> - #if defined(ALPHA) || defined(SH) || defined(SH64) -# ifdef HAVE_SYS_IOCTL_H +# if defined(HAVE_SYS_IOCTL_H) # include <sys/ioctl.h> # elif defined(HAVE_IOCTLS_H) # include <ioctls.h> diff --git a/strace-graph b/strace-graph index 6a04ac2..d57e768 100755 --- a/strace-graph +++ b/strace-graph @@ -32,8 +32,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# $Id$ my %unfinished; @@ -24,9 +24,6 @@ .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.\" $Id$ -.\" .de CW .sp .nf @@ -26,12 +26,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <stdarg.h> #include <sys/param.h> #include <fcntl.h> @@ -163,7 +160,7 @@ static volatile int interrupted; #if !HAVE_DECL_SYS_ERRLIST extern int sys_nerr; extern char *sys_errlist[]; -#endif /* HAVE_DECL_SYS_ERRLIST */ +#endif const char * strerror(int err_no) @@ -24,23 +24,20 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #ifdef HAVE_POLL_H -#include <poll.h> +# include <poll.h> #endif #ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> +# include <sys/poll.h> #endif #ifdef HAVE_STROPTS_H -#include <stropts.h> +# include <stropts.h> #endif #ifdef HAVE_SYS_CONF_H -#include <sys/conf.h> +# include <sys/conf.h> #endif #ifndef HAVE_STROPTS_H @@ -29,12 +29,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <sys/user.h> #include <sys/param.h> diff --git a/syscallent.sh b/syscallent.sh index 58107d5..16dd77f 100755 --- a/syscallent.sh +++ b/syscallent.sh @@ -23,8 +23,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# $Id$ cat ${1+"$@"} | sed -n 's/^#[ ]*define[ ][ ]*SYS_\([^ ]*\)[ ]*[^0-9]*\([0-9]*\).*$/\1 \2/p @@ -26,8 +26,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" @@ -67,24 +65,18 @@ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> - - #ifdef HAVE_LINUX_CAPABILITY_H -#include <linux/capability.h> +# include <linux/capability.h> #endif - #ifdef HAVE_ASM_CACHECTL_H -#include <asm/cachectl.h> +# include <asm/cachectl.h> #endif - #ifdef HAVE_LINUX_USTNAME_H -#include <linux/utsname.h> +# include <linux/utsname.h> #endif - #ifdef HAVE_ASM_SYSMIPS_H -#include <asm/sysmips.h> +# include <asm/sysmips.h> #endif - #include <linux/sysctl.h> static const struct xlat mount_flags[] = { @@ -23,20 +23,16 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - /* * The C library's definition of struct termios might differ from * the kernel one, and we need to use the kernel layout. */ #include <linux/termios.h> - #ifdef HAVE_SYS_FILIO_H -#include <sys/filio.h> +# include <sys/filio.h> #endif static const struct xlat tcxonc_options[] = { diff --git a/test/Makefile b/test/Makefile index 8d2400c..c6ce99c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,7 +1,3 @@ -# -# $Id$ -# - all: \ vfork fork sig skodic clone leaderkill childthread \ sigkill_rain wait_must_be_interruptible threaded_execve @@ -25,12 +25,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <linux/version.h> #include <sys/timex.h> #include <linux/ioctl.h> @@ -29,12 +29,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ */ #include "defs.h" - #include <sys/user.h> #include <sys/param.h> #include <fcntl.h> @@ -43,7 +40,7 @@ #endif #if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1) -#include <linux/ptrace.h> +# include <linux/ptrace.h> #endif #if defined(IA64) @@ -22,8 +22,6 @@ ;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ;; THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -;; -;; $Id$ ;; Description: Automate the construction of strace xlat tables. |