diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-12-04 16:29:44 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-12-04 16:29:44 +0300 |
| commit | 86a1bb43f57dee2ed5d3273624475852bb0bf8dd (patch) | |
| tree | 6b723e7e0c9a0a05afabb9663e7a63e0ea2e8ba8 /winsup/cygwin/fhandler_proc.cc | |
| parent | 41d46fe86f66a763ca737508ef7123e47a7dce1e (diff) | |
* fhandler_fifo.cc (fhandler_fifo::open): Use MAX_NAME for pipe name
buffer size.
(fhandler_fifo::fstatvfs): Use same technique as in fhandler_socket.
* fhandler_proc.cc (format_proc_partitions): Use NAME_MAX+1 for
device name buffer size. Use MAX_PATH for device path buffer size.
Diffstat (limited to 'winsup/cygwin/fhandler_proc.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_proc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index 608faf5b9..482d77849 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -1030,14 +1030,14 @@ format_proc_partitions (char *destbuf, size_t maxsize) char *bufptr = destbuf; print ("major minor #blocks name\n\n"); - char devname[CYG_MAX_PATH]; + char devname[NAME_MAX + 1]; OBJECT_ATTRIBUTES attr; HANDLE dirhdl, devhdl; IO_STATUS_BLOCK io; NTSTATUS status; /* Open \Device object directory. */ - wchar_t wpath[CYG_MAX_PATH] = L"\\Device"; + wchar_t wpath[MAX_PATH] = L"\\Device"; UNICODE_STRING upath = {14, 16, wpath}; InitializeObjectAttributes (&attr, &upath, OBJ_CASE_INSENSITIVE, NULL, NULL); status = NtOpenDirectoryObject (&dirhdl, DIRECTORY_QUERY, &attr); @@ -1056,7 +1056,7 @@ format_proc_partitions (char *destbuf, size_t maxsize) &context, NULL))) { restart = FALSE; - sys_wcstombs (devname, CYG_MAX_PATH - 1, dbi->ObjectName.Buffer, + sys_wcstombs (devname, NAME_MAX + 1, dbi->ObjectName.Buffer, dbi->ObjectName.Length / 2); /* ... and check for a "Harddisk[0-9]*" entry. */ if (!strncasematch (devname, "Harddisk", 8) |