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

plenty -- see NEWS file and a diff

Browse Source
This commit is contained in:
albert
2004-07-15 01:17:15 +00:00
parent d8921adf71
commit 8300609ba9
8 changed files with 119 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proc/escape.c
View File

@@ -131,7 +131,7 @@ int escape_strlist(char *restrict dst, const char *restrict const *restrict src,
///////////////////////////////////////////////////
int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int glyphs, unsigned flags){
int overhead = 1; // the trailing NUL
int overhead = 0;
int end = 0;
if(bytes > glyphs+1) bytes=glyphs+1; // FIXME: assumes 8-bit locale
@@ -147,7 +147,7 @@ int escape_command(char *restrict const outbuf, const proc_t *restrict const pp,
if(pp->state=='Z') overhead += 10; // chars in " <defunct>"
else flags &= ~ESC_DEFUNCT;
}
if(overhead >= bytes){ // if no room for even one byte of the command name
if(overhead + 1 >= bytes){ // if no room for even one byte of the command name
// you'd damn well better have _some_ space
outbuf[0] = '-';
outbuf[1] = '\0';
@@ -156,7 +156,7 @@ int escape_command(char *restrict const outbuf, const proc_t *restrict const pp,
if(flags & ESC_BRACKETS){
outbuf[end++] = '[';
}
end += escape_str(outbuf+end, pp->cmd, bytes-overhead, glyphs-overhead+1);
end += escape_str(outbuf+end, pp->cmd, bytes-overhead, glyphs-overhead);
// Hmmm, do we want "[foo] <defunct>" or "[foo <defunct>]"?
if(flags & ESC_BRACKETS){

4
proc/module.mk
View File

@@ -64,12 +64,12 @@ endif
$(lib)/$(SONAME) : proc/$(SONAME)
$(install) --mode a=rx --strip $< $@
$(install) --mode a=rx $< $@
cd $(lib) && $(ln_sf) $(SONAME) lib$(NAME).so
$(ldconfig)
#$(usr/lib)/lib$(NAME).a : proc/lib$(NAME).a
# $(install) --mode a=r --strip $< $@
# $(install) --mode a=r $< $@
# Junk anyway... supposed to go in /usr/include/$(NAME)
#$(HDRFILES) ??? : $(addprefix proc/,$(HDRFILES)) ???