7b0fc19e9d
Library Changes . added PROC_EDITCMDLCVT flag . added an internal (static) fill_cmdline_cvt function: - reads and "escapes" /proc/#/cmdline - returns result as a single string in a single vector - callers are guaranteed a cmdline (no more NULL) . added vectorize_this_str function, exploited by fill_cgroup_cvt, fill_cmdline_cvt . generalized read_cmdline function as read_unvectored, now exploited by fill_cgroup_cvt, fill_cmdline_cvt, read_cmdline ( cgroup and cmdline no longer need be converted to string ) ( vectors before being transformed to final representation ) . fixed bug regarding skipped group numbers (when enabled) . escape_str made responsible for all single byte translation with distinction between control chars + other unprintable . added escaped_copy function for already escaped strings . reorganized parts of proc_t to restore formatting standards ( displacement changes shouldn't matter with new version # ) . former ZAP_SUSEONLY #define now OOMEM_ENABLE . added to library.map: escaped_copy; read_cmdline Top Program Changes . exploited the new PROC_EDITCMDLCVT provision . eliminated now obsolete #include "proc/escape.h" . changed the P_WCH display format if no kernel symbol table . fixed very old bug in lflgs for out-of-view sort fields . former ZAP_SUSEONLY #define now OOMEM_ENABLE Ps Program Changes . exploited the new PROC_EDITCMDLCVT provision . exploited the new escaped_copy function . consolidated pr_args and pr_comm into pr_argcom Signed-off-by: Jan Görig <jgorig@redhat.com>
24 lines
901 B
C
24 lines
901 B
C
#ifndef PROCPS_PROC_ESCAPE_H
|
|
#define PROCPS_PROC_ESCAPE_H
|
|
|
|
//#include <stdio.h>
|
|
#include <sys/types.h>
|
|
#include "procps.h"
|
|
#include "readproc.h"
|
|
|
|
EXTERN_C_BEGIN
|
|
|
|
#define ESC_STRETCH 1 // since we mangle to '?' this is 1 (would be 4 for octal escapes)
|
|
|
|
#define ESC_ARGS 0x1 // try to use cmdline instead of cmd
|
|
#define ESC_BRACKETS 0x2 // if using cmd, put '[' and ']' around it
|
|
#define ESC_DEFUNCT 0x4 // mark zombies with " <defunct>"
|
|
|
|
extern int escape_strlist(char *restrict dst, const char *restrict const *restrict src, size_t n, int *cells);
|
|
extern int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *maxcells);
|
|
extern int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int *cells, unsigned flags);
|
|
extern int escaped_copy(char *restrict dst, const char *restrict src, int bufsize, int *maxroom);
|
|
|
|
EXTERN_C_END
|
|
#endif
|