]>
Commit | Line | Data |
---|---|---|
247879cf | 1 | diff -Nur procps-3.1.9/Makefile procps-3.1.9.new/Makefile |
2 | --- procps-3.1.9/Makefile 2003-06-06 03:39:56.000000000 +0200 | |
3 | +++ procps-3.1.9.new/Makefile 2003-06-06 03:41:49.000000000 +0200 | |
4 | @@ -156,13 +156,13 @@ | |
649623d2 | 5 | ############ prog.o --> prog |
6 | ||
7 | pmap w uptime tload free sysctl vmstat utmp pgrep skill: % : %.o $(LIBPROC) | |
8 | - $(CC) $(LDFLAGS) -o $@ $^ | |
9 | + $(CC) $(LDFLAGS) -o $@ $^ $(SELIB) | |
10 | ||
11 | top: % : %.o $(LIBPROC) | |
12 | - $(CC) $(LDFLAGS) -o $@ $^ $(CURSESLIB) | |
13 | + $(CC) $(LDFLAGS) -o $@ $^ $(CURSESLIB) $(SELIB) | |
14 | ||
15 | watch: % : %.o | |
16 | - $(CC) $(LDFLAGS) -o $@ $^ $(CURSESLIB) | |
17 | + $(CC) $(LDFLAGS) -o $@ $^ $(CURSESLIB) $(SELIB) | |
18 | ||
19 | ############ progX --> progY | |
20 | ||
247879cf | 21 | diff -Nur procps-3.1.9/proc/readproc.c procps-3.1.9.new/proc/readproc.c |
22 | --- procps-3.1.9/proc/readproc.c 2003-05-31 17:09:13.000000000 +0200 | |
23 | +++ procps-3.1.9.new/proc/readproc.c 2003-06-06 03:41:49.000000000 +0200 | |
24 | @@ -758,6 +758,8 @@ | |
25 | else | |
26 | PT = openproc(flags); | |
27 | va_end(ap); | |
28 | + if (!PT) | |
29 | + return 0; | |
30 | do { /* read table: */ | |
31 | tab = xrealloc(tab, (n+1)*sizeof(proc_t*));/* realloc as we go, using */ | |
32 | tab[n] = readproc_direct(PT, NULL); /* final null to terminate */ | |
33 | diff -Nur procps-3.1.9/ps/module.mk procps-3.1.9.new/ps/module.mk | |
34 | --- procps-3.1.9/ps/module.mk 2003-03-30 22:04:07.000000000 +0200 | |
35 | +++ procps-3.1.9.new/ps/module.mk 2003-06-06 03:41:49.000000000 +0200 | |
36 | @@ -20,7 +20,7 @@ | |
37 | TARFILES += $(PSSRC) $(addprefix ps/,$(PS_X)) | |
649623d2 | 38 | |
247879cf | 39 | ps/ps: $(PSOBJ) $(LIBPROC) |
40 | - $(CC) $(LDFLAGS) -o $@ $^ | |
41 | + $(CC) $(LDFLAGS) -o $@ $^ $(SELIB) | |
649623d2 | 42 | |
247879cf | 43 | # This just adds the stacktrace code |
44 | ps/debug: $(PSOBJ) stacktrace.o $(LIBPROC) |