diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2005-09-27 23:04:38 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2005-09-27 23:04:38 +0400 |
| commit | f1cdab8563361648a8585f0f43fe070d6b440fc9 (patch) | |
| tree | 1aef8b05d34d6d9693e1d3e924b4b85f85398915 /winsup/cygwin/shared.cc | |
| parent | e0be0a1d50bc7d10601d44c98d95b2132aca5033 (diff) | |
* cygheap.cc (cygheap_init): Add GLOBAL_PRIV to hProcToken explicitely
since hProcImpToken isn't initialized here.
* shared.cc (open_shared): Always print mapname instead of name in
debug output.
Diffstat (limited to 'winsup/cygwin/shared.cc')
| -rw-r--r-- | winsup/cygwin/shared.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 02c512f17..c491708e3 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -89,15 +89,14 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size, VirtualFree (addr, 0, MEM_RELEASE); } + char map_buf[CYG_MAX_PATH]; + char *mapname = NULL; + if (shared_h) m = SH_JUSTOPEN; else { - char *mapname; - char map_buf[CYG_MAX_PATH]; - if (!name) - mapname = NULL; - else + if (name) mapname = shared_name (map_buf, name, n); if (m == SH_JUSTOPEN) shared_h = OpenFileMapping (access, FALSE, mapname); @@ -133,7 +132,7 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size, } if (!shared) - api_fatal ("MapViewOfFileEx '%s'(%p), %E. Terminating.", name, shared_h); + api_fatal ("MapViewOfFileEx '%s'(%p), %E. Terminating.", mapname, shared_h); if (m == SH_CYGWIN_SHARED && offsets[0] && wincap.needs_memory_protection ()) { @@ -155,7 +154,7 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size, #endif } - debug_printf ("name %s, n %d, shared %p (wanted %p), h %p", name, n, shared, addr, shared_h); + debug_printf ("name %s, n %d, shared %p (wanted %p), h %p", mapname, n, shared, addr, shared_h); return shared; } |