glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes from Ulrich

Browse Source
This commit is contained in:
Wichert Akkerman 2000-06-27 17:33:32 +00:00
parent bd4125c6bc
commit 43a7482edb
5 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -2,6 +2,13 @@
* strace.c: close outf before we exec a child process
2000-06-09 Ulrich Drepper <drepper@redhat.com>
* configure.in: Don't link against libnsl on Linux, it's unnecessary.
* defs.h (struct tcb): Make auxstr member const.
* file.c (fsmagic): And many more magic numbers.
* util.c: Don't include <linux/ptrace.h> for glibc 2.1 and up.
2000-04-26 Wichert Akkerman <wakkerma@debian.org>
* defs.h: balance #if/#endif again

2
configure.in
View File

@ -143,7 +143,9 @@ AC_TYPE_GETGROUPS
AC_HEADER_MAJOR
AC_SIG_ATOMIC_T
AC_STAT64
if test x$OPSYS != xLINUX; then
AC_CHECK_LIB(nsl, main)
fi
AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl putpmsg prctl sendmsg inet_ntop)
AC_CHECK_HEADERS(sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h sys/stream.h sys/tiuser.h sys/sysconfig.h asm/sigcontext.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h linux/in6.h sys/uio.h linux/netlink.h linux/if_packet.h sys/poll.h)
AC_DECL_SYS_ERRLIST

2
defs.h
View File

@ -195,7 +195,7 @@ struct tcb {
int u_error; /* Error code */
long u_rval; /* (first) return value */
FILE *outf; /* Output file for this process */
char *auxstr; /* Auxiliary info from syscall (see RVAL_STR) */
const char *auxstr; /* Auxiliary info from syscall (see RVAL_STR) */
struct timeval stime; /* System time usage as of last process wait */
struct timeval dtime; /* Delta for system time usage */
struct timeval etime; /* Syscall entry time */

16
file.c
View File

@ -1067,17 +1067,33 @@ struct tcb *tcp;
#ifdef linux
static struct xlat fsmagic[] = {
{ 0x73757245, "CODA_SUPER_MAGIC" },
{ 0x012ff7b7, "COH_SUPER_MAGIC" },
{ 0x1373, "DEVFS_SUPER_MAGIC" },
{ 0x1cd1, "DEVPTS_SUPER_MAGIC" },
{ 0x414A53, "EFS_SUPER_MAGIC" },
{ 0xef51, "EXT2_OLD_SUPER_MAGIC" },
{ 0xef53, "EXT2_SUPER_MAGIC" },
{ 0x137d, "EXT_SUPER_MAGIC" },
{ 0xf995e849, "HPFS_SUPER_MAGIC" },
{ 0x9660, "ISOFS_SUPER_MAGIC" },
{ 0x137f, "MINIX_SUPER_MAGIC" },
{ 0x138f, "MINIX_SUPER_MAGIC2" },
{ 0x2468, "MINIX2_SUPER_MAGIC" },
{ 0x2478, "MINIX2_SUPER_MAGIC2" },
{ 0x4d44, "MSDOS_SUPER_MAGIC" },
{ 0x564c, "NCP_SUPER_MAGIC" },
{ 0x6969, "NFS_SUPER_MAGIC" },
{ 0x9fa0, "PROC_SUPER_MAGIC" },
{ 0x002f, "QNX4_SUPER_MAGIC" },
{ 0x52654973, "REISERFS_SUPER_MAGIC" },
{ 0x02011994, "SHMFS_SUPER_MAGIC" },
{ 0x517b, "SMB_SUPER_MAGIC" },
{ 0x012ff7b6, "SYSV2_SUPER_MAGIC" },
{ 0x012ff7b5, "SYSV4_SUPER_MAGIC" },
{ 0x00011954, "UFS_MAGIC" },
{ 0x54190100, "UFS_CIGAM" },
{ 0x012ff7b4, "XENIX_SUPER_MAGIC" },
{ 0x012fd16d, "XIAFS_SUPER_MAGIC" },
{ 0, NULL },
};

2
util.c
View File

@ -44,7 +44,7 @@
#include <link.h>
#endif /* SUNOS4 */
#if defined(linux)
#if defined(linux) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1))
#include <linux/ptrace.h>
#endif