diff options
author | Christopher Faylor <me@cgf.cx> | 2001-10-02 05:58:06 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2001-10-02 05:58:06 +0400 |
commit | 4ab6034f50e5783151699f2c0b146f090980e183 (patch) | |
tree | 2c566fbf592daaff83e02ad049cad474442d0995 /winsup/cygwin/dcrt0.cc | |
parent | 47af76d8c8e9979c5ddd42f17573b22b75a03117 (diff) |
* dtable.h (dtable::build_fhandler): Make path_conv parameter non-optional.
(dtable::init_std_file_from_handle): Eliminate name parameter.
* dtable.cc (stdio_init): Don't pass bogus name to init_std_file_from_handle.
The function will figure out the name itself.
(dtable::init_std_file_from_handle): Eliminate name parameter. Assume that
we're always called with an appropriate fd. Pass name as NULL if we can't
simply figure it out from context.
(cygwin_attach_handle_to_fd): Pass path_conv argument to build_fhandler.
(dtable::build_fhandler): Make path_conv argument mandatory. Eliminate
specific call to get_device_number. With unknown device names, set name from
handle context for parsing by path_conv.
(dtable::build_fhandler): Pass path_conv argument to build_fhandler.
* path.h (path_conv::set_isdisk): Set disk device type.
(path_conv::is_device): Don't consider FH_DISK a "device".
* syscalls.cc (_open): Pass path_conv argument by reference.
(stat_worker): Ditto.
(_rename): Use path_conv operators. Add bounds to DeleteFile/MoveFile for
loop.
Diffstat (limited to 'winsup/cygwin/dcrt0.cc')
-rw-r--r-- | winsup/cygwin/dcrt0.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 73c1b7245..656b3cefb 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -833,7 +833,12 @@ _dll_crt0 () if (_cygwin_testing) fork_info = NULL; else if ((fork_info->type & PROC_MAGIC_MASK) == PROC_MAGIC_GENERIC) - api_fatal ("conflicting versions of cygwin1.dll detected. Use only the most recent version.\n"); + api_fatal ("\ +You have multiple copies of cygwin1.dll on your system.\n\ +Search for cygwin1.dll using the Windows Start->Find/Search facility\n\ +and delete all but the most recent version. This will probably be\n\ +the one that resides in x:\\cygwin\\bin, where 'x' is the drive on which\n\ +you have installed the cygwin distribution.\n"); break; } } |