diff options
author | Christopher Faylor <me@cgf.cx> | 2002-07-03 07:20:50 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2002-07-03 07:20:50 +0400 |
commit | 4558638014de7cf18593510922a1339a03c4cda0 (patch) | |
tree | e2ea92fbb7f85d425dea842834799286be1432ee /winsup/cygwin/dtable.cc | |
parent | 66eee32b8fec65cab4a0fb21895fdd39030b2afe (diff) |
* cygheap.cc (init_cheap): Rearrange error message.
(cygheap_fixup_in_child): Ditto.
* dtable.cc: Remove if 0'ed code.
* fhandler_dsp.cc (fhandler_dev_dsp::open): Force binmode.
* sec_helper.cc (cygsid::get_id): Use system_printf for error message.
* tty.cc (tty::common_init): Ditto.
Diffstat (limited to 'winsup/cygwin/dtable.cc')
-rw-r--r-- | winsup/cygwin/dtable.cc | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index bc7a86ee0..bb9db8a4a 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -197,8 +197,7 @@ dtable::release (int fd) } } -extern "C" -int +extern "C" int cygwin_attach_handle_to_fd (char *name, int fd, HANDLE handle, mode_t bin, DWORD myaccess) { @@ -691,31 +690,6 @@ dtable::vfork_child_fixup () return; } -#if 0 -static char * -handle_to_fn (HANDLE h, char *posix_fn) -{ - IO_STATUS_BLOCK io; - FILE_NAME_INFORMATION ntfn; - - io.Status = 0; - io.Information = 0; - - SetLastError (0); - DWORD res = NtQueryInformationFile (h, &io, &ntfn, sizeof (ntfn), 9); - if (res || GetLastError () == ERROR_PROC_NOT_FOUND) - { - strcpy (posix_fn, "some disk file"); - return posix_fn; - } - ntfn.FileName[ntfn.FileNameLength / sizeof (WCHAR)] = 0; - - char win32_fn[MAX_PATH + 100]; - sys_wcstombs (win32_fn, ntfn.FileName, ntfn.FileNameLength); - cygwin_conv_to_full_posix_path (win32_fn, posix_fn); - return posix_fn; -} -#else #define DEVICE_PREFIX "\\device\\" #define DEVICE_PREFIX_LEN sizeof(DEVICE_PREFIX) - 1 #define REMOTE "\\Device\\LanmanRedirector\\" @@ -814,4 +788,3 @@ handle_to_fn (HANDLE h, char *posix_fn) cygwin_conv_to_full_posix_path (w32, posix_fn); return posix_fn; } -#endif |