emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

turn off new SE Linux code for now

Browse Source
This commit is contained in:
albert 2005-10-30 03:44:26 +00:00
parent f505219ae1
commit 3ced977cf2
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -69,6 +69,17 @@ _TARFILES := Makefile
CURSES := -lncurses CURSES := -lncurses
# This seems about right for the dynamic library stuff.
# Something like this is probably needed to make the SE Linux
# library loading not conflict with embedded systems stuff.
#
#ifeq ($(SHARED),1)
#ldl := -ldl
#LIBTYPE := -DSHAREDLIB
#else
#LIBTYPE := -DSTATICLIB
#endif
# Preprocessor flags. # Preprocessor flags.
PKG_CPPFLAGS := -D_GNU_SOURCE -I proc PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
CPPFLAGS := -I/usr/include/ncurses CPPFLAGS := -I/usr/include/ncurses

4
ps/module.mk
View File

@ -20,11 +20,11 @@ PS_X := COPYING HACKING TRANSLATION common.h module.mk it p ps.1 regression
TARFILES += $(PSSRC) $(addprefix ps/,$(PS_X)) TARFILES += $(PSSRC) $(addprefix ps/,$(PS_X))
ps/ps: $(PSOBJ) $(LIBPROC) ps/ps: $(PSOBJ) $(LIBPROC)
$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -ldl $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ $(ldl)
# This just adds the stacktrace code # This just adds the stacktrace code
ps/debug: $(PSOBJ) stacktrace.o $(LIBPROC) ps/debug: $(PSOBJ) stacktrace.o $(LIBPROC)
$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -lefence $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -lefence $(ldl)
$(PSOBJ): %.o: %.c ps/common.h $(LIBPROC) $(PSOBJ): %.o: %.c ps/common.h $(LIBPROC)
$(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $< -o $@ $(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $< -o $@

9
ps/output.c
View File

@ -1122,8 +1122,11 @@ fail:
return 1; return 1;
} }
#if 0
// move the bulk of this to libproc sometime // This needs more study, considering:
// 1. the static linking option (maybe disable this in that case)
// 2. the -z and -Z option issue
// 3. width of output
static int pr_context(char *restrict const outbuf, const proc_t *restrict const pp){ static int pr_context(char *restrict const outbuf, const proc_t *restrict const pp){
static int (*ps_getpidcon)(pid_t pid, char **context) = 0; static int (*ps_getpidcon)(pid_t pid, char **context) = 0;
static int tried_load = 0; static int tried_load = 0;
@ -1154,7 +1157,7 @@ static int pr_context(char *restrict const outbuf, const proc_t *restrict const
} }
return len; return len;
} }
#endif
////////////////////////////// Test code ///////////////////////////////// ////////////////////////////// Test code /////////////////////////////////