Let it probably compile again

This commit is contained in:
Pierre Pronchery 2009-10-23 23:52:23 +00:00
parent ed41cec932
commit 6dc80d5fd5
5 changed files with 11 additions and 5 deletions

View File

@ -21,7 +21,9 @@ dist:
$(RM) -r $(PACKAGE)-$(VERSION) $(RM) -r $(PACKAGE)-$(VERSION)
$(LN) -s . $(PACKAGE)-$(VERSION) $(LN) -s . $(PACKAGE)-$(VERSION)
@$(TAR) $(PACKAGE)-$(VERSION).tar.gz \ @$(TAR) $(PACKAGE)-$(VERSION).tar.gz \
$(PACKAGE)-$(VERSION)/src/linux.c \
$(PACKAGE)-$(VERSION)/src/strace.c \ $(PACKAGE)-$(VERSION)/src/strace.c \
$(PACKAGE)-$(VERSION)/src/Makefile \
$(PACKAGE)-$(VERSION)/src/project.conf \ $(PACKAGE)-$(VERSION)/src/project.conf \
$(PACKAGE)-$(VERSION)/Makefile \ $(PACKAGE)-$(VERSION)/Makefile \
$(PACKAGE)-$(VERSION)/COPYING \ $(PACKAGE)-$(VERSION)/COPYING \

View File

@ -15,13 +15,16 @@ INSTALL = install
all: $(TARGETS) all: $(TARGETS)
strace_OBJS = strace.o strace_OBJS = linux.o strace.o
strace_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) strace_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
strace_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) strace_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
strace: $(strace_OBJS) strace: $(strace_OBJS)
$(CC) -o strace $(strace_OBJS) $(strace_LDFLAGS) $(CC) -o strace $(strace_OBJS) $(strace_LDFLAGS)
linux.o: linux.c
$(CC) $(strace_CFLAGS) -c linux.c
strace.o: strace.c strace.o: strace.c
$(CC) $(strace_CFLAGS) -c strace.c $(CC) $(strace_CFLAGS) -c strace.c

View File

@ -20,7 +20,7 @@
#include "linux.h" #include "linux.h"
char * syscall[] = char const * _syscall[] =
{ {
"exit", "exit",
"fork", "fork",

View File

@ -1,8 +1,9 @@
targets=strace targets=strace
cflags_force=-W cflags_force=-W
cflags=-Wall -g -O2 -pedantic cflags=-Wall -g -O2 -pedantic
dist=Makefile
[strace] [strace]
type=binary type=binary
sources=strace.c sources=linux.c,strace.c
install=$(BINDIR) install=$(BINDIR)

View File

@ -64,7 +64,7 @@ static int _strace_parent(pid_t pid)
static int _handle(pid_t pid, int status) static int _handle(pid_t pid, int status)
{ {
struct user context; struct user context;
int size = sizeof(syscall) / 4; int size = sizeof(_syscall) / 4;
if(!WIFSTOPPED(status)) if(!WIFSTOPPED(status))
return -1; return -1;
@ -74,7 +74,7 @@ static int _handle(pid_t pid, int status)
ptrace(PTRACE_GETREGS, pid, NULL, &context); ptrace(PTRACE_GETREGS, pid, NULL, &context);
if(size >= context.regs.orig_eax) if(size >= context.regs.orig_eax)
fprintf(stderr, "%s();\n", fprintf(stderr, "%s();\n",
syscall[context.regs.orig_eax - 1]); _syscall[context.regs.orig_eax - 1]);
else else
fprintf(stderr, "%ld\n", context.regs.orig_eax); fprintf(stderr, "%ld\n", context.regs.orig_eax);
ptrace(PTRACE_SYSCALL, pid, NULL, NULL); ptrace(PTRACE_SYSCALL, pid, NULL, NULL);