diff options
Diffstat (limited to 'winsup/cygwin/fhandler_process.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_process.cc | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc index 7cbfaa3cd..a9e8d2f0c 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -42,6 +42,7 @@ static const int PROCESS_SID = 10; static const int PROCESS_CTTY = 11; static const int PROCESS_STAT = 12; static const int PROCESS_STATM = 13; +static const int PROCESS_CMDLINE = 14; static const char * const process_listing[] = { @@ -59,6 +60,7 @@ static const char * const process_listing[] = "ctty", "stat", "statm", + "cmdline", NULL }; @@ -264,8 +266,7 @@ fhandler_process::fill_filebuf () case PROCESS_CTTY: case PROCESS_PPID: { - if (!filebuf) - filebuf = (char *) cmalloc (HEAP_BUF, bufalloc = 40); + filebuf = (char *) realloc (filebuf, bufalloc = 40); int num; switch (fileid) { @@ -295,10 +296,18 @@ fhandler_process::fill_filebuf () filesize = strlen (filebuf); break; } + case PROCESS_CMDLINE: + { + if (filebuf) + free (filebuf); + filebuf = p->cmdline (filesize); + if (!*filebuf) + filebuf = strdup ("<defunct>"); + break; + } case PROCESS_EXENAME: { - if (!filebuf) - filebuf = (char *) cmalloc (HEAP_BUF, bufalloc = MAX_PATH); + filebuf = (char *) realloc (filebuf, bufalloc = MAX_PATH); if (p->process_state & (PID_ZOMBIE | PID_EXITED)) strcpy (filebuf, "<defunct>"); else @@ -317,8 +326,7 @@ fhandler_process::fill_filebuf () } case PROCESS_WINPID: { - if (!filebuf) - filebuf = (char *) cmalloc (HEAP_BUF, bufalloc = 40); + filebuf = (char *) realloc (filebuf, bufalloc = 40); __small_sprintf (filebuf, "%d\n", p->dwProcessId); filesize = strlen (filebuf); break; @@ -326,8 +334,7 @@ fhandler_process::fill_filebuf () case PROCESS_WINEXENAME: { int len = strlen (p->progname); - if (!filebuf) - filebuf = (char *) cmalloc (HEAP_BUF, bufalloc = (len + 2)); + filebuf = (char *) realloc (filebuf, bufalloc = (len + 2)); strcpy (filebuf, p->progname); filebuf[len] = '\n'; filesize = len + 1; @@ -335,22 +342,19 @@ fhandler_process::fill_filebuf () } case PROCESS_STATUS: { - if (!filebuf) - filebuf = (char *) cmalloc (HEAP_BUF, bufalloc = 2048); + filebuf = (char *) realloc (filebuf, bufalloc = 2048); filesize = format_process_status (*p, filebuf, bufalloc); break; } case PROCESS_STAT: { - if (!filebuf) - filebuf = (char *) cmalloc (HEAP_BUF, bufalloc = 2048); + filebuf = (char *) realloc (filebuf, bufalloc = 2048); filesize = format_process_stat (*p, filebuf, bufalloc); break; } case PROCESS_STATM: { - if (!filebuf) - filebuf = (char *) cmalloc (HEAP_BUF, bufalloc = 2048); + filebuf = (char *) realloc (filebuf, bufalloc = 2048); filesize = format_process_statm (*p, filebuf, bufalloc); break; } |