JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ps.cc: Include limits.h. 

(main): Set file name buffer size to PATH_MAX.  Use progname or
	progname_long member of struct external_pinfo dependent of the value of
	the struct's version member.
This commit is contained in:
Corinna Vinschen 2007-12-06 18:26:18 +00:00
parent 36093cfbbf
commit 9408cf38dd
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/utils/ChangeLog
View File

@ -1,3 +1,10 @@
2007-12-06 Corinna Vinschen <corinna@vinschen.de>
* ps.cc: Include limits.h.
(main): Set file name buffer size to PATH_MAX. Use progname or
progname_long member of struct external_pinfo dependent of the value of
the struct's version member.
2007-08-31 Dave Korn <dave.korn@artimi.com> 2007-08-31 Dave Korn <dave.korn@artimi.com>
* mkgroup.c (enum_groups): Use MAX_PREFERRED_LENGTH in netgroupenum * mkgroup.c (enum_groups): Use MAX_PREFERRED_LENGTH in netgroupenum

8
winsup/utils/ps.cc
View File

@ -15,6 +15,7 @@ details. */
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <pwd.h> #include <pwd.h>
#include <limits.h>
#include <sys/cygwin.h> #include <sys/cygwin.h>
#include <tlhelp32.h> #include <tlhelp32.h>
#include <psapi.h> #include <psapi.h>
@ -354,13 +355,16 @@ main (int argc, char *argv[])
else if (p->process_state & PID_TTYOU) else if (p->process_state & PID_TTYOU)
status = 'O'; status = 'O';
char pname[MAX_PATH]; char pname[PATH_MAX];
if (p->process_state & PID_EXITED || (p->exitcode & ~0xffff)) if (p->process_state & PID_EXITED || (p->exitcode & ~0xffff))
strcpy (pname, "<defunct>"); strcpy (pname, "<defunct>");
else if (p->ppid) else if (p->ppid)
{ {
char *s; char *s;
pname[0] = '\0'; pname[0] = '\0';
if (p->version >= EXTERNAL_PINFO_VERSION_32_LP)
cygwin_conv_to_posix_path (p->progname_long, pname);
else
cygwin_conv_to_posix_path (p->progname, pname); cygwin_conv_to_posix_path (p->progname, pname);
s = strchr (pname, '\0') - 4; s = strchr (pname, '\0') - 4;
if (s > pname && strcasecmp (s, ".exe") == 0) if (s > pname && strcasecmp (s, ".exe") == 0)
@ -376,7 +380,7 @@ main (int argc, char *argv[])
DWORD n = p->dwProcessId; DWORD n = p->dwProcessId;
if (!myEnumProcessModules (h, hm, sizeof (hm), &n)) if (!myEnumProcessModules (h, hm, sizeof (hm), &n))
n = 0; n = 0;
if (!n || !myGetModuleFileNameEx (h, hm[0], pname, MAX_PATH)) if (!n || !myGetModuleFileNameEx (h, hm[0], pname, PATH_MAX))
strcpy (pname, "*** unknown ***"); strcpy (pname, "*** unknown ***");
FILETIME ct, et, kt, ut; FILETIME ct, et, kt, ut;
if (GetProcessTimes (h, &ct, &et, &kt, &ut)) if (GetProcessTimes (h, &ct, &et, &kt, &ut))