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

* autoload.cc (GetModuleFileNameExW): Replace definition of

Browse Source 
GetModuleFileNameExA.
	* fhandler_process.cc (format_process_maps): Change modname type to
	WCHAR.  Set buffer sizes to PATH_MAX.  Call GetModuleFileNameExW
	instead of GetModuleFileNameExA.  Call mount_info::conv_to_posix_path
	instead of cygwin_conv_to_full_posix_path.  Set posix_modname to
	modname if that call fails.
	(format_process_stat): Set cmd buffer size to NAME_MAX + 1.  Simplify
	setting cmd to process name.
	(format_process_status): Ditto.
	* path.cc (mount_info::conv_to_posix_path): Call sys_wcstombs
	correctly.
This commit is contained in:
Corinna Vinschen 2007-12-03 14:13:03 +00:00
parent 268e8d00e9
commit 814066b912
4 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,18 @@
2007-12-03 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (GetModuleFileNameExW): Replace definition of
GetModuleFileNameExA.
* fhandler_process.cc (format_process_maps): Change modname type to
WCHAR. Set buffer sizes to PATH_MAX. Call GetModuleFileNameExW
instead of GetModuleFileNameExA. Call mount_info::conv_to_posix_path
instead of cygwin_conv_to_full_posix_path. Set posix_modname to
modname if that call fails.
(format_process_stat): Set cmd buffer size to NAME_MAX + 1. Simplify
setting cmd to process name.
(format_process_status): Ditto.
* path.cc (mount_info::conv_to_posix_path): Call sys_wcstombs
correctly.
2007-12-03 Corinna Vinschen <corinna@vinschen.de> 2007-12-03 Corinna Vinschen <corinna@vinschen.de>
* include/cygwin/time.h: Remove redundant #endif. * include/cygwin/time.h: Remove redundant #endif.

2
winsup/cygwin/autoload.cc
View File

@ -309,7 +309,7 @@ LoadDLLfunc (NetUserGetGroups, 28, netapi32)
LoadDLLfunc (NetUserGetInfo, 16, netapi32) LoadDLLfunc (NetUserGetInfo, 16, netapi32)
LoadDLLfuncEx (EnumProcessModules, 16, psapi, 1) LoadDLLfuncEx (EnumProcessModules, 16, psapi, 1)
LoadDLLfuncEx (GetModuleFileNameExA, 16, psapi, 1) LoadDLLfuncEx (GetModuleFileNameExW, 16, psapi, 1)
LoadDLLfuncEx (GetModuleInformation, 16, psapi, 1) LoadDLLfuncEx (GetModuleInformation, 16, psapi, 1)
LoadDLLfuncEx (GetProcessMemoryInfo, 12, psapi, 1) LoadDLLfuncEx (GetProcessMemoryInfo, 12, psapi, 1)
LoadDLLfuncEx (QueryWorkingSet, 12, psapi, 1) LoadDLLfuncEx (QueryWorkingSet, 12, psapi, 1)

25
winsup/cygwin/fhandler_process.cc
View File

@ -524,8 +524,8 @@ format_process_maps (_pinfo *p, char *&destbuf, size_t maxsize)
DWORD_PTR wset_size; DWORD_PTR wset_size;
DWORD_PTR *workingset = NULL; DWORD_PTR *workingset = NULL;
MODULEINFO info; MODULEINFO info;
char modname[CYG_MAX_PATH]; WCHAR modname[PATH_MAX];
char posix_modname[CYG_MAX_PATH]; char posix_modname[PATH_MAX];
if (!EnumProcessModules (proc, NULL, 0, &needed)) if (!EnumProcessModules (proc, NULL, 0, &needed))
{ {
@ -551,12 +551,13 @@ format_process_maps (_pinfo *p, char *&destbuf, size_t maxsize)
} }
for (i = 0; i < needed / sizeof (HMODULE); i++) for (i = 0; i < needed / sizeof (HMODULE); i++)
if (GetModuleInformation (proc, modules[i], &info, sizeof info) if (GetModuleInformation (proc, modules[i], &info, sizeof info)
&& GetModuleFileNameEx (proc, modules[i], modname, sizeof modname)) && GetModuleFileNameExW (proc, modules[i], modname, sizeof modname))
{ {
char access[5]; char access[5];
strcpy (access, "r--p"); strcpy (access, "r--p");
struct __stat64 st; struct __stat64 st;
cygwin_conv_to_full_posix_path (modname, posix_modname); if (mount_table->conv_to_posix_path (modname, posix_modname, 0))
sys_wcstombs (posix_modname, PATH_MAX, modname);
if (stat64 (posix_modname, &st)) if (stat64 (posix_modname, &st))
{ {
st.st_dev = 0; st.st_dev = 0;
@ -600,7 +601,7 @@ out:
static _off64_t static _off64_t
format_process_stat (_pinfo *p, char *destbuf, size_t maxsize) format_process_stat (_pinfo *p, char *destbuf, size_t maxsize)
{ {
char cmd[CYG_MAX_PATH]; char cmd[NAME_MAX + 1];
int state = 'R'; int state = 'R';
unsigned long fault_count = 0UL, unsigned long fault_count = 0UL,
utime = 0UL, stime = 0UL, utime = 0UL, stime = 0UL,
@ -611,10 +612,8 @@ format_process_stat (_pinfo *p, char *destbuf, size_t maxsize)
strcpy (cmd, "<defunct>"); strcpy (cmd, "<defunct>");
else else
{ {
strcpy (cmd, p->progname); char *last_slash = strrchr (p->progname, '\\');
char *last_slash = strrchr (cmd, '\\'); strcpy (cmd, last_slash ? last_slash + 1 : p->progname);
if (last_slash != NULL)
strcpy (cmd, last_slash + 1);
int len = strlen (cmd); int len = strlen (cmd);
if (len > 4) if (len > 4)
{ {
@ -730,7 +729,7 @@ format_process_stat (_pinfo *p, char *destbuf, size_t maxsize)
static _off64_t static _off64_t
format_process_status (_pinfo *p, char *destbuf, size_t maxsize) format_process_status (_pinfo *p, char *destbuf, size_t maxsize)
{ {
char cmd[CYG_MAX_PATH]; char cmd[NAME_MAX + 1];
int state = 'R'; int state = 'R';
const char *state_str = "unknown"; const char *state_str = "unknown";
unsigned long vmsize = 0UL, vmrss = 0UL, vmdata = 0UL, vmlib = 0UL, vmtext = 0UL, unsigned long vmsize = 0UL, vmrss = 0UL, vmdata = 0UL, vmlib = 0UL, vmtext = 0UL,
@ -739,10 +738,8 @@ format_process_status (_pinfo *p, char *destbuf, size_t maxsize)
strcpy (cmd, "<defunct>"); strcpy (cmd, "<defunct>");
else else
{ {
strcpy (cmd, p->progname); char *last_slash = strrchr (p->progname, '\\');
char *last_slash = strrchr (cmd, '\\'); strcpy (cmd, last_slash ? last_slash + 1 : p->progname);
if (last_slash != NULL)
strcpy (cmd, last_slash + 1);
int len = strlen (cmd); int len = strlen (cmd);
if (len > 4) if (len > 4)
{ {

2
winsup/cygwin/path.cc
View File

@ -1966,7 +1966,7 @@ mount_info::conv_to_posix_path (PWCHAR src_path, char *posix_path,
} }
} }
char buf[PATH_MAX]; char buf[PATH_MAX];
sys_wcstombs (buf, PATH_MAX, src_path, 0); sys_wcstombs (buf, PATH_MAX, src_path);
int ret = conv_to_posix_path (buf, posix_path, keep_rel_p); int ret = conv_to_posix_path (buf, posix_path, keep_rel_p);
if (changed) if (changed)
src_path[0] = L'C'; src_path[0] = L'C';