2000-02-17 20:38:33 +01:00
|
|
|
/* path.cc: path support.
|
|
|
|
|
2006-01-04 17:20:30 +01:00
|
|
|
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
This file is part of Cygwin.
|
|
|
|
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
|
|
details. */
|
|
|
|
|
|
|
|
/* This module's job is to
|
|
|
|
- convert between POSIX and Win32 style filenames,
|
|
|
|
- support the `mount' functionality,
|
|
|
|
- support symlinks for files and directories
|
|
|
|
|
|
|
|
Pathnames are handled as follows:
|
|
|
|
|
2000-09-05 05:16:28 +02:00
|
|
|
- A \ or : in a path denotes a pure windows spec.
|
2000-02-17 20:38:33 +01:00
|
|
|
- Paths beginning with // (or \\) are not translated (i.e. looked
|
|
|
|
up in the mount table) and are assumed to be UNC path names.
|
|
|
|
|
|
|
|
The goal in the above set of rules is to allow both POSIX and Win32
|
|
|
|
flavors of pathnames without either interfering. The rules are
|
|
|
|
intended to be as close to a superset of both as possible.
|
|
|
|
|
|
|
|
Note that you can have more than one path to a file. The mount
|
|
|
|
table is always prefered when translating Win32 paths to POSIX
|
|
|
|
paths. Win32 paths in mount table entries may be UNC paths or
|
|
|
|
standard Win32 paths starting with <drive-letter>:
|
|
|
|
|
|
|
|
Text vs Binary issues are not considered here in path style
|
2000-09-05 05:16:28 +02:00
|
|
|
decisions, although the appropriate flags are retrieved and
|
|
|
|
stored in various structures.
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
Removing mounted filesystem support would simplify things greatly,
|
|
|
|
but having it gives us a mechanism of treating disk that lives on a
|
|
|
|
UNIX machine as having UNIX semantics [it allows one to edit a text
|
|
|
|
file on that disk and not have cr's magically appear and perhaps
|
|
|
|
break apps running on UNIX boxes]. It also useful to be able to
|
|
|
|
layout a hierarchy without changing the underlying directories.
|
|
|
|
|
|
|
|
The semantics of mounting file systems is not intended to precisely
|
|
|
|
follow normal UNIX systems.
|
|
|
|
|
|
|
|
Each DOS drive is defined to have a current directory. Supporting
|
|
|
|
this would complicate things so for now things are defined so that
|
2004-04-20 20:46:15 +02:00
|
|
|
c: means c:\.
|
2000-02-17 20:38:33 +01:00
|
|
|
*/
|
|
|
|
|
2000-08-02 18:28:18 +02:00
|
|
|
#include "winsup.h"
|
2000-02-17 20:38:33 +01:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <sys/mount.h>
|
|
|
|
#include <mntent.h>
|
|
|
|
#include <unistd.h>
|
2005-02-22 20:45:41 +01:00
|
|
|
#include <libgen.h>
|
2000-02-17 20:38:33 +01:00
|
|
|
#include <ctype.h>
|
2000-06-08 15:24:52 +02:00
|
|
|
#include <winioctl.h>
|
2001-02-21 22:49:37 +01:00
|
|
|
#include <wingdi.h>
|
|
|
|
#include <winuser.h>
|
|
|
|
#include <winnls.h>
|
|
|
|
#include <winnetwk.h>
|
2005-01-18 14:00:18 +01:00
|
|
|
#include <shlobj.h>
|
2000-09-08 04:56:55 +02:00
|
|
|
#include <sys/cygwin.h>
|
|
|
|
#include <cygwin/version.h>
|
2000-08-22 05:58:47 +02:00
|
|
|
#include "cygerrno.h"
|
2001-07-26 21:22:24 +02:00
|
|
|
#include "security.h"
|
2000-08-22 07:10:20 +02:00
|
|
|
#include "path.h"
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
#include "fhandler.h"
|
2000-08-22 07:10:20 +02:00
|
|
|
#include "sync.h"
|
|
|
|
#include "sigproc.h"
|
|
|
|
#include "pinfo.h"
|
2001-04-18 23:10:15 +02:00
|
|
|
#include "dtable.h"
|
2000-09-03 06:16:35 +02:00
|
|
|
#include "cygheap.h"
|
2000-09-07 18:23:51 +02:00
|
|
|
#include "shared_info.h"
|
2000-09-08 04:56:55 +02:00
|
|
|
#include "registry.h"
|
2003-12-23 17:26:31 +01:00
|
|
|
#include "cygtls.h"
|
2006-08-02 17:11:48 +02:00
|
|
|
#include "environ.h"
|
2000-10-13 00:15:47 +02:00
|
|
|
#include <assert.h>
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2006-08-01 20:00:44 +02:00
|
|
|
bool dos_file_warning = true;
|
2004-12-19 04:27:09 +01:00
|
|
|
static int normalize_win32_path (const char *, char *, char *&);
|
|
|
|
static void slashify (const char *, char *, int);
|
|
|
|
static void backslashify (const char *, char *, int);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-04-14 00:43:48 +02:00
|
|
|
struct symlink_info
|
|
|
|
{
|
2003-11-15 00:40:06 +01:00
|
|
|
char contents[CYG_MAX_PATH + 4];
|
2000-04-14 00:43:48 +02:00
|
|
|
char *ext_here;
|
2001-04-11 21:09:53 +02:00
|
|
|
int extn;
|
2000-04-14 00:43:48 +02:00
|
|
|
unsigned pflags;
|
|
|
|
DWORD fileattr;
|
2005-12-01 18:33:59 +01:00
|
|
|
int issymlink;
|
2001-04-11 21:09:53 +02:00
|
|
|
bool ext_tacked_on;
|
2000-08-22 05:58:47 +02:00
|
|
|
int error;
|
2001-12-07 06:03:32 +01:00
|
|
|
bool case_clash;
|
2005-12-01 18:33:59 +01:00
|
|
|
bool isdevice;
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
_major_t major;
|
|
|
|
_minor_t minor;
|
|
|
|
_mode_t mode;
|
2001-04-30 03:46:31 +02:00
|
|
|
int check (char *path, const suffix_info *suffixes, unsigned opt);
|
2005-02-01 16:11:47 +01:00
|
|
|
int set (char *path);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
bool parse_device (const char *);
|
2003-12-07 23:37:12 +01:00
|
|
|
bool case_check (char *path);
|
2005-03-12 03:33:00 +01:00
|
|
|
int check_sysfile (const char *path, HANDLE h);
|
|
|
|
int check_shortcut (const char *path, HANDLE h);
|
2006-10-31 12:40:47 +01:00
|
|
|
int check_reparse_point (const char *path, HANDLE h);
|
2006-11-02 12:45:03 +01:00
|
|
|
int posixify (char *srcbuf);
|
2005-10-11 18:06:10 +02:00
|
|
|
bool set_error (int);
|
2000-04-14 00:43:48 +02:00
|
|
|
};
|
|
|
|
|
2005-04-05 06:31:00 +02:00
|
|
|
muto NO_COPY cwdstuff::cwd_lock;
|
|
|
|
|
2001-04-12 23:21:37 +02:00
|
|
|
int pcheck_case = PCHECK_RELAXED; /* Determines the case check behaviour. */
|
|
|
|
|
2005-01-18 14:00:18 +01:00
|
|
|
static const GUID GUID_shortcut
|
|
|
|
= { 0x00021401L, 0, 0, 0xc0, 0, 0, 0, 0, 0, 0, 0x46 };
|
|
|
|
|
|
|
|
enum {
|
|
|
|
WSH_FLAG_IDLIST = 0x01, /* Contains an ITEMIDLIST. */
|
|
|
|
WSH_FLAG_FILE = 0x02, /* Contains a file locator element. */
|
|
|
|
WSH_FLAG_DESC = 0x04, /* Contains a description. */
|
|
|
|
WSH_FLAG_RELPATH = 0x08, /* Contains a relative path. */
|
|
|
|
WSH_FLAG_WD = 0x10, /* Contains a working dir. */
|
|
|
|
WSH_FLAG_CMDLINE = 0x20, /* Contains command line args. */
|
|
|
|
WSH_FLAG_ICON = 0x40 /* Contains a custom icon. */
|
|
|
|
};
|
2002-09-04 15:11:29 +02:00
|
|
|
|
2005-01-18 14:00:18 +01:00
|
|
|
struct win_shortcut_hdr
|
|
|
|
{
|
|
|
|
DWORD size; /* Header size in bytes. Must contain 0x4c. */
|
|
|
|
GUID magic; /* GUID of shortcut files. */
|
|
|
|
DWORD flags; /* Content flags. See above. */
|
|
|
|
|
|
|
|
/* The next fields from attr to icon_no are always set to 0 in Cygwin
|
|
|
|
and U/Win shortcuts. */
|
|
|
|
DWORD attr; /* Target file attributes. */
|
|
|
|
FILETIME ctime; /* These filetime items are never touched by the */
|
|
|
|
FILETIME mtime; /* system, apparently. Values don't matter. */
|
|
|
|
FILETIME atime;
|
|
|
|
DWORD filesize; /* Target filesize. */
|
|
|
|
DWORD icon_no; /* Icon number. */
|
|
|
|
|
|
|
|
DWORD run; /* Values defined in winuser.h. Use SW_NORMAL. */
|
|
|
|
DWORD hotkey; /* Hotkey value. Set to 0. */
|
|
|
|
DWORD dummy[2]; /* Future extension probably. Always 0. */
|
|
|
|
};
|
2002-09-04 15:11:29 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Determine if path prefix matches current cygdrive */
|
|
|
|
#define iscygdrive(path) \
|
2001-01-28 06:51:15 +01:00
|
|
|
(path_prefix_p (mount_table->cygdrive, (path), mount_table->cygdrive_len))
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
#define iscygdrive_device(path) \
|
2002-09-22 05:38:57 +02:00
|
|
|
(isalpha (path[mount_table->cygdrive_len]) && \
|
2003-01-09 09:22:05 +01:00
|
|
|
(path[mount_table->cygdrive_len + 1] == '/' || \
|
2001-01-28 06:51:15 +01:00
|
|
|
!path[mount_table->cygdrive_len + 1]))
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-05-02 06:13:48 +02:00
|
|
|
#define isproc(path) \
|
|
|
|
(path_prefix_p (proc, (path), proc_len))
|
|
|
|
|
|
|
|
#define isvirtual_dev(devn) \
|
2005-05-09 04:39:34 +02:00
|
|
|
(devn == FH_CYGDRIVE || devn == FH_PROC || devn == FH_REGISTRY \
|
|
|
|
|| devn == FH_PROCESS || devn == FH_NETDRIVE )
|
2002-05-02 06:13:48 +02:00
|
|
|
|
2000-09-05 05:16:28 +02:00
|
|
|
/* Return non-zero if PATH1 is a prefix of PATH2.
|
|
|
|
Both are assumed to be of the same path style and / vs \ usage.
|
|
|
|
Neither may be "".
|
|
|
|
LEN1 = strlen (PATH1). It's passed because often it's already known.
|
|
|
|
|
|
|
|
Examples:
|
|
|
|
/foo/ is a prefix of /foo <-- may seem odd, but desired
|
|
|
|
/foo is a prefix of /foo/
|
|
|
|
/ is a prefix of /foo/bar
|
|
|
|
/ is not a prefix of foo/bar
|
|
|
|
foo/ is a prefix foo/bar
|
|
|
|
/foo is not a prefix of /foobar
|
|
|
|
*/
|
|
|
|
|
2001-06-03 04:31:16 +02:00
|
|
|
int
|
|
|
|
path_prefix_p (const char *path1, const char *path2, int len1)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
/* Handle case where PATH1 has trailing '/' and when it doesn't. */
|
2003-01-09 09:22:05 +01:00
|
|
|
if (len1 > 0 && isdirsep (path1[len1 - 1]))
|
2000-02-17 20:38:33 +01:00
|
|
|
len1--;
|
|
|
|
|
|
|
|
if (len1 == 0)
|
2003-01-09 09:22:05 +01:00
|
|
|
return isdirsep (path2[0]) && !isdirsep (path2[1]);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-04-08 03:33:00 +02:00
|
|
|
if (isdirsep (path2[len1]) || path2[len1] == 0 || path1[len1 - 1] == ':')
|
|
|
|
return pathnmatch (path1, path2, len1);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-04-08 03:33:00 +02:00
|
|
|
return 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-04-12 23:21:37 +02:00
|
|
|
/* Return non-zero if paths match in first len chars.
|
|
|
|
Check is dependent of the case sensitivity setting. */
|
|
|
|
int
|
|
|
|
pathnmatch (const char *path1, const char *path2, int len)
|
|
|
|
{
|
|
|
|
return pcheck_case == PCHECK_STRICT ? !strncmp (path1, path2, len)
|
2001-06-11 05:38:32 +02:00
|
|
|
: strncasematch (path1, path2, len);
|
2001-04-12 23:21:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Return non-zero if paths match. Check is dependent of the case
|
|
|
|
sensitivity setting. */
|
|
|
|
int
|
|
|
|
pathmatch (const char *path1, const char *path2)
|
|
|
|
{
|
|
|
|
return pcheck_case == PCHECK_STRICT ? !strcmp (path1, path2)
|
2001-06-11 05:38:32 +02:00
|
|
|
: strcasematch (path1, path2);
|
2001-04-12 23:21:37 +02:00
|
|
|
}
|
|
|
|
|
2005-09-29 18:23:22 +02:00
|
|
|
/* TODO: This function is used in mkdir and rmdir to generate correct
|
|
|
|
error messages in case of paths ending in /. or /.. components.
|
2006-08-01 20:00:44 +02:00
|
|
|
Right now, normalize_posix_path will just normalize
|
2005-09-29 18:23:22 +02:00
|
|
|
those components away, which changes the semantics. */
|
|
|
|
bool
|
2006-11-30 11:17:24 +01:00
|
|
|
has_dot_last_component (const char *dir, bool test_dot_dot)
|
2005-09-29 18:23:22 +02:00
|
|
|
{
|
|
|
|
/* SUSv3: . and .. are not allowed as last components in various system
|
|
|
|
calls. Don't test for backslash path separator since that's a Win32
|
|
|
|
path following Win32 rules. */
|
|
|
|
const char *last_comp = strrchr (dir, '/');
|
2006-11-30 11:17:24 +01:00
|
|
|
if (!last_comp)
|
|
|
|
last_comp = dir;
|
|
|
|
else {
|
|
|
|
/* Check for trailing slash. If so, hop back to the previous slash. */
|
|
|
|
if (!last_comp[1])
|
|
|
|
while (last_comp > dir)
|
|
|
|
if (*--last_comp == '/')
|
|
|
|
break;
|
|
|
|
if (*last_comp == '/')
|
|
|
|
++last_comp;
|
|
|
|
}
|
|
|
|
return last_comp[0] == '.'
|
|
|
|
&& ((last_comp[1] == '\0' || last_comp[1] == '/')
|
|
|
|
|| (test_dot_dot
|
|
|
|
&& last_comp[1] == '.'
|
|
|
|
&& (last_comp[2] == '\0' || last_comp[2] == '/')));
|
2005-09-29 18:23:22 +02:00
|
|
|
}
|
|
|
|
|
2004-03-24 22:46:09 +01:00
|
|
|
#define isslash(c) ((c) == '/')
|
|
|
|
|
2001-04-29 01:48:28 +02:00
|
|
|
/* Normalize a POSIX path.
|
|
|
|
All duplicate /'s, except for 2 leading /'s, are deleted.
|
|
|
|
The result is 0 for success, or an errno error value. */
|
|
|
|
|
2002-05-02 06:13:48 +02:00
|
|
|
static int
|
2004-12-19 04:27:09 +01:00
|
|
|
normalize_posix_path (const char *src, char *dst, char *&tail)
|
2001-04-29 01:48:28 +02:00
|
|
|
{
|
2004-03-25 16:15:27 +01:00
|
|
|
const char *in_src = src;
|
2005-08-26 17:11:06 +02:00
|
|
|
char *dst_start = dst;
|
2004-12-19 04:27:09 +01:00
|
|
|
syscall_printf ("src %s", src);
|
2004-03-25 16:15:27 +01:00
|
|
|
|
2004-04-20 20:45:16 +02:00
|
|
|
if (isdrive (src) || *src == '\\')
|
2004-03-25 16:15:27 +01:00
|
|
|
goto win32_path;
|
2003-01-09 09:22:05 +01:00
|
|
|
|
2004-12-19 04:27:09 +01:00
|
|
|
tail = dst;
|
2001-04-29 01:48:28 +02:00
|
|
|
if (!isslash (src[0]))
|
|
|
|
{
|
|
|
|
if (!cygheap->cwd.get (dst))
|
|
|
|
return get_errno ();
|
2004-12-19 04:27:09 +01:00
|
|
|
tail = strchr (tail, '\0');
|
2005-08-26 17:11:06 +02:00
|
|
|
if (isslash (dst[0]) && isslash (dst[1]))
|
2005-12-22 06:57:54 +01:00
|
|
|
++dst_start;
|
2001-04-29 01:48:28 +02:00
|
|
|
if (*src == '.')
|
|
|
|
{
|
2005-08-26 17:11:06 +02:00
|
|
|
if (tail == dst_start + 1 && *dst_start == '/')
|
2004-12-19 04:27:09 +01:00
|
|
|
tail--;
|
2001-04-29 01:48:28 +02:00
|
|
|
goto sawdot;
|
|
|
|
}
|
2004-12-19 04:27:09 +01:00
|
|
|
if (tail > dst && !isslash (tail[-1]))
|
|
|
|
*tail++ = '/';
|
2001-04-29 01:48:28 +02:00
|
|
|
}
|
|
|
|
/* Two leading /'s? If so, preserve them. */
|
2005-05-07 23:06:08 +02:00
|
|
|
else if (isslash (src[1]) && !isslash (src[2]))
|
2005-08-26 17:11:06 +02:00
|
|
|
{
|
|
|
|
*tail++ = *src++;
|
|
|
|
++dst_start;
|
|
|
|
}
|
2001-04-29 01:48:28 +02:00
|
|
|
|
|
|
|
while (*src)
|
|
|
|
{
|
2004-03-25 16:15:27 +01:00
|
|
|
if (*src == '\\')
|
|
|
|
goto win32_path;
|
2001-04-29 01:48:28 +02:00
|
|
|
/* Strip runs of /'s. */
|
|
|
|
if (!isslash (*src))
|
2004-12-19 04:27:09 +01:00
|
|
|
*tail++ = *src++;
|
2001-04-29 01:48:28 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
while (*++src)
|
|
|
|
{
|
|
|
|
if (isslash (*src))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (*src != '.')
|
|
|
|
break;
|
|
|
|
|
|
|
|
sawdot:
|
|
|
|
if (src[1] != '.')
|
|
|
|
{
|
|
|
|
if (!src[1])
|
|
|
|
{
|
2004-12-19 04:27:09 +01:00
|
|
|
*tail++ = '/';
|
2001-04-29 01:48:28 +02:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
if (!isslash (src[1]))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (src[2] && !isslash (src[2]))
|
2004-12-20 17:31:18 +01:00
|
|
|
break;
|
2001-06-11 05:38:32 +02:00
|
|
|
else
|
2001-06-04 03:28:09 +02:00
|
|
|
{
|
2005-08-26 17:11:06 +02:00
|
|
|
while (tail > dst_start && !isslash (*--tail))
|
2001-06-04 03:28:09 +02:00
|
|
|
continue;
|
|
|
|
src++;
|
|
|
|
}
|
2001-04-29 01:48:28 +02:00
|
|
|
}
|
|
|
|
|
2004-12-19 04:27:09 +01:00
|
|
|
*tail++ = '/';
|
2001-04-29 01:48:28 +02:00
|
|
|
}
|
2004-12-19 04:27:09 +01:00
|
|
|
if ((tail - dst) >= CYG_MAX_PATH)
|
2001-04-29 01:48:28 +02:00
|
|
|
{
|
|
|
|
debug_printf ("ENAMETOOLONG = normalize_posix_path (%s)", src);
|
|
|
|
return ENAMETOOLONG;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
2004-12-19 04:27:09 +01:00
|
|
|
*tail = '\0';
|
2001-04-29 01:48:28 +02:00
|
|
|
|
2004-12-19 04:27:09 +01:00
|
|
|
debug_printf ("%s = normalize_posix_path (%s)", dst, in_src);
|
2001-04-29 01:48:28 +02:00
|
|
|
return 0;
|
2004-03-25 16:15:27 +01:00
|
|
|
|
|
|
|
win32_path:
|
2004-12-19 04:27:09 +01:00
|
|
|
int err = normalize_win32_path (in_src, dst, tail);
|
2004-03-25 16:15:27 +01:00
|
|
|
if (!err)
|
2004-12-19 04:27:09 +01:00
|
|
|
for (char *p = dst; (p = strchr (p, '\\')); p++)
|
2004-03-25 16:15:27 +01:00
|
|
|
*p = '/';
|
2006-08-01 20:00:44 +02:00
|
|
|
return err ?: -1;
|
2001-04-29 01:48:28 +02:00
|
|
|
}
|
|
|
|
|
2001-04-15 16:00:45 +02:00
|
|
|
inline void
|
2001-04-18 01:12:11 +02:00
|
|
|
path_conv::add_ext_from_sym (symlink_info &sym)
|
2001-04-15 16:00:45 +02:00
|
|
|
{
|
|
|
|
if (sym.ext_here && *sym.ext_here)
|
|
|
|
{
|
|
|
|
known_suffix = path + sym.extn;
|
|
|
|
if (sym.ext_tacked_on)
|
2001-06-04 03:28:09 +02:00
|
|
|
strcpy (known_suffix, sym.ext_here);
|
2001-04-15 16:00:45 +02:00
|
|
|
}
|
|
|
|
}
|
2001-04-13 09:54:20 +02:00
|
|
|
|
2001-05-01 04:03:10 +02:00
|
|
|
static void __stdcall mkrelpath (char *dst) __attribute__ ((regparm (2)));
|
|
|
|
static void __stdcall
|
|
|
|
mkrelpath (char *path)
|
|
|
|
{
|
2003-11-15 00:40:06 +01:00
|
|
|
char cwd_win32[CYG_MAX_PATH];
|
2001-05-01 04:03:10 +02:00
|
|
|
if (!cygheap->cwd.get (cwd_win32, 0))
|
|
|
|
return;
|
|
|
|
|
|
|
|
unsigned cwdlen = strlen (cwd_win32);
|
|
|
|
if (!path_prefix_p (cwd_win32, path, cwdlen))
|
|
|
|
return;
|
|
|
|
|
|
|
|
size_t n = strlen (path);
|
|
|
|
if (n < cwdlen)
|
|
|
|
return;
|
|
|
|
|
|
|
|
char *tail = path;
|
|
|
|
if (n == cwdlen)
|
|
|
|
tail += cwdlen;
|
|
|
|
else
|
|
|
|
tail += isdirsep (cwd_win32[cwdlen - 1]) ? cwdlen : cwdlen + 1;
|
|
|
|
|
|
|
|
memmove (path, tail, strlen (tail) + 1);
|
|
|
|
if (!*path)
|
|
|
|
strcpy (path, ".");
|
|
|
|
}
|
|
|
|
|
2004-04-09 21:33:07 +02:00
|
|
|
#define MAX_FS_INFO_CNT 25
|
|
|
|
fs_info fsinfo[MAX_FS_INFO_CNT];
|
2004-04-10 15:45:10 +02:00
|
|
|
LONG fsinfo_cnt;
|
2004-04-09 21:33:07 +02:00
|
|
|
|
2002-05-12 05:08:59 +02:00
|
|
|
bool
|
|
|
|
fs_info::update (const char *win32_path)
|
2001-06-05 12:45:52 +02:00
|
|
|
{
|
2004-04-10 15:45:10 +02:00
|
|
|
char fsname [CYG_MAX_PATH];
|
|
|
|
char root_dir [CYG_MAX_PATH];
|
2005-04-03 15:06:43 +02:00
|
|
|
bool ret;
|
2001-06-05 12:45:52 +02:00
|
|
|
|
2004-04-10 21:24:55 +02:00
|
|
|
if (!rootdir (win32_path, root_dir))
|
2001-06-05 12:45:52 +02:00
|
|
|
{
|
|
|
|
debug_printf ("Cannot get root component of path %s", win32_path);
|
2004-04-10 15:45:10 +02:00
|
|
|
clear ();
|
2002-05-12 05:08:59 +02:00
|
|
|
return false;
|
2001-06-05 12:45:52 +02:00
|
|
|
}
|
|
|
|
|
2004-04-10 15:45:10 +02:00
|
|
|
__ino64_t tmp_name_hash = hash_path_name (1, root_dir);
|
2004-04-09 21:33:07 +02:00
|
|
|
if (tmp_name_hash == name_hash)
|
|
|
|
return true;
|
|
|
|
int idx = 0;
|
2004-04-10 15:45:10 +02:00
|
|
|
LONG cur_fsinfo_cnt = fsinfo_cnt;
|
|
|
|
while (idx < cur_fsinfo_cnt && fsinfo[idx].name_hash)
|
2004-04-09 21:33:07 +02:00
|
|
|
{
|
|
|
|
if (tmp_name_hash == fsinfo[idx].name_hash)
|
2004-04-10 02:50:16 +02:00
|
|
|
{
|
2004-04-09 21:33:07 +02:00
|
|
|
*this = fsinfo[idx];
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
++idx;
|
|
|
|
}
|
|
|
|
name_hash = tmp_name_hash;
|
2001-06-05 12:45:52 +02:00
|
|
|
|
2005-04-03 15:06:43 +02:00
|
|
|
/* I have no idea why, but some machines require SeChangeNotifyPrivilege
|
|
|
|
to access volume information. */
|
|
|
|
push_thread_privilege (SE_CHANGE_NOTIFY_PRIV, true);
|
|
|
|
|
2004-04-10 15:45:10 +02:00
|
|
|
drive_type (GetDriveType (root_dir));
|
|
|
|
if (drive_type () == DRIVE_REMOTE
|
|
|
|
|| (drive_type () == DRIVE_UNKNOWN
|
|
|
|
&& (root_dir[0] == '\\' && root_dir[1] == '\\')))
|
|
|
|
is_remote_drive (true);
|
2002-05-12 05:08:59 +02:00
|
|
|
else
|
2004-04-10 15:45:10 +02:00
|
|
|
is_remote_drive (false);
|
2002-05-12 05:08:59 +02:00
|
|
|
|
2005-04-03 15:06:43 +02:00
|
|
|
ret = GetVolumeInformation (root_dir, NULL, 0, &status.serial, NULL,
|
|
|
|
&status.flags, fsname, sizeof (fsname));
|
|
|
|
|
|
|
|
pop_thread_privilege ();
|
|
|
|
|
|
|
|
if (!ret && !is_remote_drive ())
|
2002-05-12 05:08:59 +02:00
|
|
|
{
|
2004-04-10 15:45:10 +02:00
|
|
|
debug_printf ("Cannot get volume information (%s), %E", root_dir);
|
|
|
|
has_buggy_open (false);
|
|
|
|
has_ea (false);
|
|
|
|
flags () = serial () = 0;
|
2002-05-12 05:08:59 +02:00
|
|
|
return false;
|
2001-06-05 12:45:52 +02:00
|
|
|
}
|
2005-04-03 15:06:43 +02:00
|
|
|
|
2006-11-23 12:28:52 +01:00
|
|
|
/* Should be reevaluated for each new OS. Right now this mask is valid up
|
|
|
|
to Vista. The important point here is to test only flags indicating
|
|
|
|
capabilities and to ignore flags indicating a specific state of this
|
|
|
|
volume. At present these flags to ignore are FILE_VOLUME_IS_COMPRESSED
|
|
|
|
and FILE_READ_ONLY_VOLUME. */
|
|
|
|
#define GETVOLINFO_VALID_MASK (0x003701ffUL)
|
|
|
|
#define TEST_GVI(f,m) (((f) & GETVOLINFO_VALID_MASK) == (m))
|
|
|
|
|
|
|
|
#define FS_IS_SAMBA TEST_GVI(flags (), \
|
|
|
|
FILE_CASE_SENSITIVE_SEARCH \
|
|
|
|
| FILE_CASE_PRESERVED_NAMES \
|
|
|
|
| FILE_PERSISTENT_ACLS)
|
|
|
|
#define FS_IS_SAMBA_WITH_QUOTA TEST_GVI(flags (), \
|
|
|
|
FILE_CASE_SENSITIVE_SEARCH \
|
|
|
|
| FILE_CASE_PRESERVED_NAMES \
|
|
|
|
| FILE_PERSISTENT_ACLS \
|
|
|
|
| FILE_VOLUME_QUOTAS)
|
|
|
|
#define FS_IS_NETAPP_DATAONTAP TEST_GVI(flags (), \
|
|
|
|
FILE_CASE_SENSITIVE_SEARCH \
|
|
|
|
| FILE_CASE_PRESERVED_NAMES \
|
|
|
|
| FILE_UNICODE_ON_DISK \
|
|
|
|
| FILE_PERSISTENT_ACLS \
|
|
|
|
| FILE_NAMED_STREAMS)
|
2006-04-26 18:51:09 +02:00
|
|
|
is_fat (strncasematch (fsname, "FAT", 3));
|
|
|
|
is_samba (strcmp (fsname, "NTFS") == 0 && is_remote_drive ()
|
2006-11-23 12:28:52 +01:00
|
|
|
&& (FS_IS_SAMBA || FS_IS_SAMBA_WITH_QUOTA));
|
|
|
|
is_netapp (strcmp (fsname, "NTFS") == 0 && is_remote_drive ()
|
|
|
|
&& FS_IS_NETAPP_DATAONTAP);
|
|
|
|
is_ntfs (strcmp (fsname, "NTFS") == 0 && !is_samba () && !is_netapp ());
|
2006-04-26 18:51:09 +02:00
|
|
|
is_nfs (strcmp (fsname, "NFS") == 0);
|
|
|
|
|
|
|
|
has_ea (is_ntfs ());
|
2004-04-10 15:45:10 +02:00
|
|
|
has_acls ((flags () & FS_PERSISTENT_ACLS)
|
|
|
|
&& (allow_smbntsec || !is_remote_drive ()));
|
2006-04-26 18:51:09 +02:00
|
|
|
hasgood_inode (((flags () & FILE_PERSISTENT_ACLS)
|
2006-11-23 12:28:52 +01:00
|
|
|
&& drive_type () != DRIVE_UNKNOWN
|
|
|
|
&& !is_netapp ())
|
2006-04-26 18:51:09 +02:00
|
|
|
|| is_nfs ());
|
2004-04-10 15:45:10 +02:00
|
|
|
/* Known file systems with buggy open calls. Further explanation
|
|
|
|
in fhandler.cc (fhandler_disk_file::open). */
|
|
|
|
has_buggy_open (!strcmp (fsname, "SUNWNFS"));
|
|
|
|
|
|
|
|
/* Only append non-removable drives to the global fsinfo storage */
|
|
|
|
if (drive_type () != DRIVE_REMOVABLE && drive_type () != DRIVE_CDROM
|
|
|
|
&& idx < MAX_FS_INFO_CNT)
|
|
|
|
{
|
|
|
|
LONG exc_cnt;
|
|
|
|
while ((exc_cnt = InterlockedExchange (&fsinfo_cnt, -1)) == -1)
|
|
|
|
low_priority_sleep (0);
|
|
|
|
if (exc_cnt < MAX_FS_INFO_CNT)
|
|
|
|
{
|
|
|
|
/* Check if another thread has already appended that very drive */
|
|
|
|
while (idx < exc_cnt)
|
|
|
|
{
|
|
|
|
if (fsinfo[idx++].name_hash == name_hash)
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
fsinfo[exc_cnt++] = *this;
|
|
|
|
}
|
|
|
|
done:
|
|
|
|
InterlockedExchange (&fsinfo_cnt, exc_cnt);
|
|
|
|
}
|
2002-05-12 05:08:59 +02:00
|
|
|
return true;
|
2001-06-05 12:45:52 +02:00
|
|
|
}
|
|
|
|
|
2002-05-28 03:55:40 +02:00
|
|
|
void
|
|
|
|
path_conv::fillin (HANDLE h)
|
|
|
|
{
|
|
|
|
BY_HANDLE_FILE_INFORMATION local;
|
|
|
|
if (!GetFileInformationByHandle (h, &local))
|
|
|
|
{
|
|
|
|
fileattr = INVALID_FILE_ATTRIBUTES;
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
fs.serial () = 0;
|
2002-05-28 03:55:40 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fileattr = local.dwFileAttributes;
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
fs.serial () = local.dwVolumeSerialNumber;
|
|
|
|
}
|
2004-04-10 15:45:10 +02:00
|
|
|
fs.drive_type (DRIVE_UNKNOWN);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2004-12-23 22:37:44 +01:00
|
|
|
path_conv::set_normalized_path (const char *path_copy, bool strip_tail)
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
{
|
2004-12-23 22:37:44 +01:00
|
|
|
char *p = strchr (path_copy, '\0');
|
2004-12-20 17:31:18 +01:00
|
|
|
|
2004-12-23 22:37:44 +01:00
|
|
|
if (strip_tail)
|
2004-12-20 17:31:18 +01:00
|
|
|
{
|
|
|
|
while (*--p == '.' || *p == ' ')
|
|
|
|
continue;
|
2004-12-23 22:37:44 +01:00
|
|
|
*++p = '\0';
|
2004-12-20 17:31:18 +01:00
|
|
|
}
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
|
2004-12-23 22:37:44 +01:00
|
|
|
size_t n = 1 + p - path_copy;
|
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
normalized_path = path + sizeof (path) - n;
|
2004-12-23 22:37:44 +01:00
|
|
|
|
|
|
|
char *eopath = strchr (path, '\0');
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
if (normalized_path > eopath)
|
|
|
|
normalized_path_size = n;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
normalized_path = (char *) cmalloc (HEAP_STR, n);
|
|
|
|
normalized_path_size = 0;
|
2002-05-28 03:55:40 +02:00
|
|
|
}
|
2004-12-20 17:31:18 +01:00
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
memcpy (normalized_path, path_copy, n);
|
2002-09-06 06:39:49 +02:00
|
|
|
}
|
2002-05-28 03:55:40 +02:00
|
|
|
|
2004-04-30 19:36:36 +02:00
|
|
|
PUNICODE_STRING
|
2004-06-17 15:34:26 +02:00
|
|
|
path_conv::get_nt_native_path (UNICODE_STRING &upath)
|
2004-04-30 19:36:36 +02:00
|
|
|
{
|
2005-09-28 21:22:25 +02:00
|
|
|
if (path[0] != '\\') /* X:\... or NUL, etc. */
|
2004-04-30 19:36:36 +02:00
|
|
|
{
|
2005-09-28 21:22:25 +02:00
|
|
|
str2uni_cat (upath, "\\??\\");
|
|
|
|
str2uni_cat (upath, path);
|
2004-04-30 19:36:36 +02:00
|
|
|
}
|
2005-09-28 21:22:25 +02:00
|
|
|
else if (path[1] != '\\') /* \Device\... */
|
|
|
|
str2uni_cat (upath, path);
|
2006-10-09 16:01:52 +02:00
|
|
|
else if ((path[2] != '.' && path[2] != '?')
|
2005-09-28 21:22:25 +02:00
|
|
|
|| path[3] != '\\') /* \\server\share\... */
|
2004-04-30 19:36:36 +02:00
|
|
|
{
|
2005-09-28 21:22:25 +02:00
|
|
|
str2uni_cat (upath, "\\??\\UNC\\");
|
|
|
|
str2uni_cat (upath, path + 2);
|
|
|
|
}
|
2006-10-09 16:01:52 +02:00
|
|
|
else /* \\.\device or \\?\foo */
|
2005-09-28 21:22:25 +02:00
|
|
|
{
|
|
|
|
str2uni_cat (upath, "\\??\\");
|
|
|
|
str2uni_cat (upath, path + 4);
|
2004-04-30 19:36:36 +02:00
|
|
|
}
|
2005-09-28 21:22:25 +02:00
|
|
|
return &upath;
|
2004-04-30 19:36:36 +02:00
|
|
|
}
|
|
|
|
|
2006-08-01 20:00:44 +02:00
|
|
|
void
|
|
|
|
warn_msdos (const char *src)
|
|
|
|
{
|
|
|
|
if (user_shared->warned_msdos || !dos_file_warning)
|
|
|
|
return;
|
|
|
|
char posix_path[CYG_MAX_PATH];
|
|
|
|
small_printf ("cygwin warning:\n");
|
|
|
|
if (cygwin_conv_to_full_posix_path (src, posix_path))
|
|
|
|
small_printf (" MS-DOS style path detected: %s\n POSIX equivalent preferred.\n",
|
|
|
|
src);
|
|
|
|
else
|
|
|
|
small_printf (" MS-DOS style path detected: %s\n Preferred POSIX equivalent is: %s\n",
|
|
|
|
src, posix_path);
|
|
|
|
small_printf (" CYGWIN environment variable option \"nodosfilewarning\" turns off this warning.\n"
|
|
|
|
" Consult the user's guide for more details about POSIX paths:\n"
|
|
|
|
" http://cygwin.com/cygwin-ug-net/using.html#using-pathnames\n");
|
|
|
|
|
|
|
|
user_shared->warned_msdos = true;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Convert an arbitrary path SRC to a pure Win32 path, suitable for
|
|
|
|
passing to Win32 API routines.
|
|
|
|
|
|
|
|
If an error occurs, `error' is set to the errno value.
|
|
|
|
Otherwise it is set to 0.
|
|
|
|
|
|
|
|
follow_mode values:
|
|
|
|
SYMLINK_FOLLOW - convert to PATH symlink points to
|
|
|
|
SYMLINK_NOFOLLOW - convert to PATH of symlink itself
|
|
|
|
SYMLINK_IGNORE - do not check PATH for symlinks
|
|
|
|
SYMLINK_CONTENTS - just return symlink contents
|
|
|
|
*/
|
|
|
|
|
2000-04-26 07:13:32 +02:00
|
|
|
void
|
2000-07-17 21:18:21 +02:00
|
|
|
path_conv::check (const char *src, unsigned opt,
|
|
|
|
const suffix_info *suffixes)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-11-15 00:40:06 +01:00
|
|
|
/* This array is used when expanding symlinks. It is CYG_MAX_PATH * 2
|
2000-02-17 20:38:33 +01:00
|
|
|
in length so that we can hold the expanded symlink plus a
|
|
|
|
trailer. */
|
2004-12-18 17:41:27 +01:00
|
|
|
char path_copy[CYG_MAX_PATH + 3];
|
2003-11-15 00:40:06 +01:00
|
|
|
char tmp_buf[2 * CYG_MAX_PATH + 3];
|
2000-04-14 00:43:48 +02:00
|
|
|
symlink_info sym;
|
2000-10-06 21:11:14 +02:00
|
|
|
bool need_directory = 0;
|
2001-01-27 16:34:38 +01:00
|
|
|
bool saw_symlinks = 0;
|
2005-04-20 20:25:14 +02:00
|
|
|
bool is_relpath;
|
2004-12-18 17:41:27 +01:00
|
|
|
char *tail, *path_end;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-10-23 05:35:50 +02:00
|
|
|
#if 0
|
|
|
|
static path_conv last_path_conv;
|
2005-04-03 10:45:21 +02:00
|
|
|
static char last_src[CYG_MAX_PATH];
|
2000-10-23 05:35:50 +02:00
|
|
|
|
|
|
|
if (*last_src && strcmp (last_src, src) == 0)
|
|
|
|
{
|
|
|
|
*this = last_path_conv;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted ())
|
|
|
|
{
|
|
|
|
error = EFAULT;
|
|
|
|
return;
|
|
|
|
}
|
2001-04-20 18:40:04 +02:00
|
|
|
int loop = 0;
|
|
|
|
path_flags = 0;
|
|
|
|
known_suffix = NULL;
|
2002-01-14 21:39:59 +01:00
|
|
|
fileattr = INVALID_FILE_ATTRIBUTES;
|
2001-12-07 06:03:32 +01:00
|
|
|
case_clash = false;
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
memset (&dev, 0, sizeof (dev));
|
2004-04-10 15:45:10 +02:00
|
|
|
fs.clear ();
|
2002-05-02 06:13:48 +02:00
|
|
|
normalized_path = NULL;
|
2005-05-29 13:04:02 +02:00
|
|
|
int component = 0; // Number of translated components
|
2001-04-20 18:40:04 +02:00
|
|
|
|
2000-07-17 21:18:21 +02:00
|
|
|
if (!(opt & PC_NULLEMPTY))
|
|
|
|
error = 0;
|
2005-07-03 04:40:30 +02:00
|
|
|
else if (!*src)
|
|
|
|
{
|
|
|
|
error = ENOENT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-08-01 20:00:44 +02:00
|
|
|
bool is_msdos = false;
|
2000-02-17 20:38:33 +01:00
|
|
|
/* This loop handles symlink expansion. */
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
MALLOC_CHECK;
|
2000-10-13 00:15:47 +02:00
|
|
|
assert (src);
|
2004-12-18 17:41:27 +01:00
|
|
|
|
2001-05-01 04:03:10 +02:00
|
|
|
is_relpath = !isabspath (src);
|
2004-12-19 04:27:09 +01:00
|
|
|
error = normalize_posix_path (src, path_copy, tail);
|
2006-08-01 20:00:44 +02:00
|
|
|
if (error > 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
return;
|
2006-08-01 20:00:44 +02:00
|
|
|
if (error < 0)
|
|
|
|
{
|
|
|
|
if (component == 0)
|
|
|
|
is_msdos = true;
|
|
|
|
error = 0;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-04-10 02:50:16 +02:00
|
|
|
/* Detect if the user was looking for a directory. We have to strip the
|
|
|
|
trailing slash initially while trying to add extensions but take it
|
|
|
|
into account during processing */
|
2004-12-23 16:26:38 +01:00
|
|
|
if (tail > path_copy + 2 && isslash (tail[-1]))
|
2004-04-10 02:50:16 +02:00
|
|
|
{
|
2004-12-19 03:40:40 +01:00
|
|
|
need_directory = 1;
|
|
|
|
*--tail = '\0';
|
2004-05-28 21:50:07 +02:00
|
|
|
}
|
2004-12-18 17:41:27 +01:00
|
|
|
path_end = tail;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* Scan path_copy from right to left looking either for a symlink
|
|
|
|
or an actual existing file. If an existing file is found, just
|
2003-07-04 05:07:01 +02:00
|
|
|
return. If a symlink is found, exit the for loop.
|
2000-02-17 20:38:33 +01:00
|
|
|
Also: be careful to preserve the errno returned from
|
2000-04-14 00:43:48 +02:00
|
|
|
symlink.check as the caller may need it. */
|
2000-02-17 20:38:33 +01:00
|
|
|
/* FIXME: Do we have to worry about multiple \'s here? */
|
2005-05-29 13:04:02 +02:00
|
|
|
component = 0; // Number of translated components
|
2000-04-14 00:43:48 +02:00
|
|
|
sym.contents[0] = '\0';
|
|
|
|
|
2005-02-01 17:49:13 +01:00
|
|
|
int symlen = 0;
|
2005-05-02 05:50:11 +02:00
|
|
|
|
2005-04-04 18:07:36 +02:00
|
|
|
for (unsigned pflags_or = opt & PC_NO_ACCESS_CHECK; ; pflags_or = 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
const suffix_info *suff;
|
2003-11-15 00:40:06 +01:00
|
|
|
char pathbuf[CYG_MAX_PATH];
|
2001-05-01 04:03:10 +02:00
|
|
|
char *full_path;
|
2000-08-22 05:58:47 +02:00
|
|
|
|
2000-04-14 00:43:48 +02:00
|
|
|
/* Don't allow symlink.check to set anything in the path_conv
|
2000-02-17 20:38:33 +01:00
|
|
|
class if we're working on an inner component of the path */
|
|
|
|
if (component)
|
|
|
|
{
|
2001-02-22 15:51:16 +01:00
|
|
|
suff = NULL;
|
2000-04-14 00:43:48 +02:00
|
|
|
sym.pflags = 0;
|
2001-05-01 04:03:10 +02:00
|
|
|
full_path = pathbuf;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
suff = suffixes;
|
2000-10-09 04:53:44 +02:00
|
|
|
sym.pflags = path_flags;
|
2001-05-01 04:03:10 +02:00
|
|
|
full_path = this->path;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-05-08 17:16:49 +02:00
|
|
|
/* Convert to native path spec sans symbolic link info. */
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
error = mount_table->conv_to_win32_path (path_copy, full_path, dev,
|
2004-04-10 02:50:16 +02:00
|
|
|
&sym.pflags);
|
2001-06-03 04:31:16 +02:00
|
|
|
|
|
|
|
if (error)
|
|
|
|
return;
|
2001-04-30 03:46:31 +02:00
|
|
|
|
2005-03-12 03:33:00 +01:00
|
|
|
sym.pflags |= pflags_or;
|
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
if (dev.major == DEV_CYGDRIVE_MAJOR)
|
2001-12-07 06:03:32 +01:00
|
|
|
{
|
2001-12-08 02:27:10 +01:00
|
|
|
if (!component)
|
2003-12-15 05:16:42 +01:00
|
|
|
fileattr = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_READONLY;
|
2001-12-08 02:27:10 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
fileattr = GetFileAttributes (this->path);
|
2005-08-24 06:38:39 +02:00
|
|
|
dev.devn = FH_FS;
|
2001-12-08 02:27:10 +01:00
|
|
|
}
|
2001-12-07 06:03:32 +01:00
|
|
|
goto out;
|
|
|
|
}
|
2005-08-24 06:38:39 +02:00
|
|
|
else if (dev == FH_DEV)
|
|
|
|
{
|
|
|
|
dev.devn = FH_FS;
|
2005-09-12 23:19:07 +02:00
|
|
|
#if 0
|
2005-08-24 16:17:56 +02:00
|
|
|
fileattr = GetFileAttributes (this->path);
|
|
|
|
if (!component && fileattr == INVALID_FILE_ATTRIBUTES)
|
|
|
|
{
|
|
|
|
fileattr = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_READONLY;
|
|
|
|
goto out;
|
|
|
|
}
|
2005-09-12 23:19:07 +02:00
|
|
|
#endif
|
2005-08-24 06:38:39 +02:00
|
|
|
}
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
else if (isvirtual_dev (dev.devn))
|
2002-05-28 03:55:40 +02:00
|
|
|
{
|
2002-05-12 03:41:17 +02:00
|
|
|
/* FIXME: Calling build_fhandler here is not the right way to handle this. */
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
fhandler_virtual *fh = (fhandler_virtual *) build_fh_dev (dev, path_copy);
|
2002-05-28 03:55:40 +02:00
|
|
|
int file_type = fh->exists ();
|
2005-02-01 16:11:47 +01:00
|
|
|
if (file_type == -2)
|
2005-05-02 05:50:11 +02:00
|
|
|
{
|
2005-01-29 12:23:07 +01:00
|
|
|
fh->fill_filebuf ();
|
2005-02-01 16:11:47 +01:00
|
|
|
symlen = sym.set (fh->get_filebuf ());
|
2005-01-29 12:23:07 +01:00
|
|
|
}
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
delete fh;
|
2002-05-28 03:55:40 +02:00
|
|
|
switch (file_type)
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
case 2:
|
2005-04-20 20:25:14 +02:00
|
|
|
if (component == 0)
|
|
|
|
fileattr = FILE_ATTRIBUTE_DIRECTORY;
|
2002-05-02 06:13:48 +02:00
|
|
|
break;
|
2002-05-28 03:55:40 +02:00
|
|
|
case -1:
|
2005-04-20 20:25:14 +02:00
|
|
|
if (component == 0)
|
|
|
|
fileattr = 0;
|
2002-05-31 05:11:21 +02:00
|
|
|
break;
|
2005-02-01 16:11:47 +01:00
|
|
|
case -2: /* /proc/self or /proc/<pid>/symlinks */
|
2005-01-29 12:23:07 +01:00
|
|
|
goto is_virtual_symlink;
|
2005-02-01 16:11:47 +01:00
|
|
|
case -3: /* /proc/<pid>/fd/pipe:[] */
|
2005-04-20 20:25:14 +02:00
|
|
|
if (component == 0)
|
|
|
|
{
|
|
|
|
fileattr = 0;
|
|
|
|
dev.parse (FH_PIPE);
|
|
|
|
}
|
2005-02-01 16:11:47 +01:00
|
|
|
break;
|
|
|
|
case -4: /* /proc/<pid>/fd/socket:[] */
|
2005-04-20 20:25:14 +02:00
|
|
|
if (component == 0)
|
|
|
|
{
|
|
|
|
fileattr = 0;
|
|
|
|
dev.parse (FH_TCP);
|
|
|
|
}
|
2005-02-01 16:11:47 +01:00
|
|
|
break;
|
2002-05-31 05:11:21 +02:00
|
|
|
default:
|
2005-04-20 20:25:14 +02:00
|
|
|
if (component == 0)
|
|
|
|
fileattr = INVALID_FILE_ATTRIBUTES;
|
|
|
|
goto virtual_component_retry;
|
2002-05-28 03:55:40 +02:00
|
|
|
}
|
2005-05-29 13:04:02 +02:00
|
|
|
if (component == 0 || dev.devn != FH_NETDRIVE)
|
|
|
|
path_flags |= PATH_RO;
|
2002-05-02 06:13:48 +02:00
|
|
|
goto out;
|
2002-05-28 03:55:40 +02:00
|
|
|
}
|
2001-05-08 17:16:49 +02:00
|
|
|
/* devn should not be a device. If it is, then stop parsing now. */
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
else if (dev.devn != FH_FS)
|
2001-04-30 03:46:31 +02:00
|
|
|
{
|
2001-12-07 06:03:32 +01:00
|
|
|
fileattr = 0;
|
2002-07-03 20:02:54 +02:00
|
|
|
path_flags = sym.pflags;
|
2001-12-07 06:03:32 +01:00
|
|
|
if (component)
|
2001-10-05 02:52:41 +02:00
|
|
|
{
|
2001-12-07 06:03:32 +01:00
|
|
|
error = ENOTDIR;
|
|
|
|
return;
|
2001-10-05 02:52:41 +02:00
|
|
|
}
|
2001-04-30 03:46:31 +02:00
|
|
|
goto out; /* Found a device. Stop parsing. */
|
|
|
|
}
|
|
|
|
|
2001-12-07 06:03:32 +01:00
|
|
|
/* If path is only a drivename, Windows interprets it as the
|
|
|
|
current working directory on this drive instead of the root
|
|
|
|
dir which is what we want. So we need the trailing backslash
|
|
|
|
in this case. */
|
2001-05-01 04:03:10 +02:00
|
|
|
if (full_path[0] && full_path[1] == ':' && full_path[2] == '\0')
|
2001-05-08 17:16:49 +02:00
|
|
|
{
|
|
|
|
full_path[2] = '\\';
|
|
|
|
full_path[3] = '\0';
|
|
|
|
}
|
2001-04-30 03:46:31 +02:00
|
|
|
|
2006-07-05 10:35:51 +02:00
|
|
|
symlen = sym.check (full_path, suff, opt);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
|
2005-01-29 12:23:07 +01:00
|
|
|
is_virtual_symlink:
|
|
|
|
|
2005-12-01 18:33:59 +01:00
|
|
|
if (sym.isdevice)
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
{
|
|
|
|
dev.parse (sym.major, sym.minor);
|
|
|
|
dev.setfs (1);
|
|
|
|
dev.mode = sym.mode;
|
|
|
|
fileattr = sym.fileattr;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sym.pflags & PATH_SOCKET)
|
2005-02-01 16:11:47 +01:00
|
|
|
{
|
|
|
|
if (component)
|
|
|
|
{
|
|
|
|
error = ENOTDIR;
|
|
|
|
return;
|
|
|
|
}
|
2005-05-10 11:08:20 +02:00
|
|
|
fileattr = sym.fileattr;
|
2005-02-01 16:11:47 +01:00
|
|
|
dev.parse (FH_UNIX);
|
2005-02-17 18:21:11 +01:00
|
|
|
dev.setfs (1);
|
2005-02-01 16:11:47 +01:00
|
|
|
goto out;
|
|
|
|
}
|
2000-04-14 00:43:48 +02:00
|
|
|
|
2001-04-12 23:21:37 +02:00
|
|
|
if (sym.case_clash)
|
|
|
|
{
|
2001-04-17 13:47:37 +02:00
|
|
|
if (pcheck_case == PCHECK_STRICT)
|
2001-06-04 03:28:09 +02:00
|
|
|
{
|
2003-12-07 23:37:12 +01:00
|
|
|
case_clash = true;
|
2001-04-17 13:47:37 +02:00
|
|
|
error = ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* If pcheck_case==PCHECK_ADJUST the case_clash is remembered
|
2001-06-04 03:28:09 +02:00
|
|
|
if the last component is concerned. This allows functions
|
2001-04-17 13:47:37 +02:00
|
|
|
which shall create files to avoid overriding already existing
|
|
|
|
files with another case. */
|
|
|
|
if (!component)
|
2003-12-07 23:37:12 +01:00
|
|
|
case_clash = true;
|
2001-04-12 23:21:37 +02:00
|
|
|
}
|
|
|
|
if (!(opt & PC_SYM_IGNORE))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-04-12 23:21:37 +02:00
|
|
|
if (!component)
|
2002-07-24 07:37:47 +02:00
|
|
|
{
|
|
|
|
fileattr = sym.fileattr;
|
|
|
|
path_flags = sym.pflags;
|
|
|
|
}
|
2001-04-12 23:21:37 +02:00
|
|
|
|
|
|
|
/* If symlink.check found an existing non-symlink file, then
|
|
|
|
it sets the appropriate flag. It also sets any suffix found
|
|
|
|
into `ext_here'. */
|
2005-12-01 18:33:59 +01:00
|
|
|
if (!sym.issymlink && sym.fileattr != INVALID_FILE_ATTRIBUTES)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-04-12 23:21:37 +02:00
|
|
|
error = sym.error;
|
|
|
|
if (component == 0)
|
2002-07-24 07:37:47 +02:00
|
|
|
add_ext_from_sym (sym);
|
2005-05-02 05:50:11 +02:00
|
|
|
else if (!(sym.fileattr & FILE_ATTRIBUTE_DIRECTORY))
|
|
|
|
{
|
|
|
|
error = ENOTDIR;
|
2005-01-26 05:34:19 +01:00
|
|
|
goto out;
|
2005-05-02 05:50:11 +02:00
|
|
|
}
|
2001-04-12 23:21:37 +02:00
|
|
|
if (pcheck_case == PCHECK_RELAXED)
|
|
|
|
goto out; // file found
|
|
|
|
/* Avoid further symlink evaluation. Only case checks are
|
|
|
|
done now. */
|
|
|
|
opt |= PC_SYM_IGNORE;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2004-04-10 02:50:16 +02:00
|
|
|
/* Found a symlink if symlen > 0. If component == 0, then the
|
2001-04-12 23:21:37 +02:00
|
|
|
src path itself was a symlink. If !follow_mode then
|
|
|
|
we're done. Otherwise we have to insert the path found
|
|
|
|
into the full path that we are building and perform all of
|
|
|
|
these operations again on the newly derived path. */
|
2004-04-10 02:50:16 +02:00
|
|
|
else if (symlen > 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-04-12 23:21:37 +02:00
|
|
|
saw_symlinks = 1;
|
|
|
|
if (component == 0 && !need_directory && !(opt & PC_SYM_FOLLOW))
|
|
|
|
{
|
2004-04-14 05:08:00 +02:00
|
|
|
set_symlink (symlen); // last component of path is a symlink.
|
2001-04-12 23:21:37 +02:00
|
|
|
if (opt & PC_SYM_CONTENTS)
|
2001-06-04 03:28:09 +02:00
|
|
|
{
|
2001-04-12 23:21:37 +02:00
|
|
|
strcpy (path, sym.contents);
|
|
|
|
goto out;
|
|
|
|
}
|
2001-04-13 09:54:20 +02:00
|
|
|
add_ext_from_sym (sym);
|
2001-04-12 23:21:37 +02:00
|
|
|
if (pcheck_case == PCHECK_RELAXED)
|
2001-06-04 03:28:09 +02:00
|
|
|
goto out;
|
2001-04-12 23:21:37 +02:00
|
|
|
/* Avoid further symlink evaluation. Only case checks are
|
2001-06-04 03:28:09 +02:00
|
|
|
done now. */
|
2001-04-12 23:21:37 +02:00
|
|
|
opt |= PC_SYM_IGNORE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2005-04-04 18:07:36 +02:00
|
|
|
else if (sym.error && sym.error != ENOENT && sym.error != ENOSHARE)
|
2005-02-06 12:15:29 +01:00
|
|
|
{
|
|
|
|
error = sym.error;
|
|
|
|
goto out;
|
|
|
|
}
|
2001-04-12 23:21:37 +02:00
|
|
|
/* No existing file found. */
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-01-29 12:23:07 +01:00
|
|
|
virtual_component_retry:
|
2004-04-10 02:50:16 +02:00
|
|
|
/* Find the new "tail" of the path, e.g. in '/for/bar/baz',
|
2001-05-08 17:16:49 +02:00
|
|
|
/baz is the tail. */
|
2004-12-18 17:41:27 +01:00
|
|
|
if (tail != path_end)
|
|
|
|
*tail = '/';
|
|
|
|
while (--tail > path_copy + 1 && *tail != '/') {}
|
2001-05-08 17:16:49 +02:00
|
|
|
/* Exit loop if there is no tail or we are at the
|
|
|
|
beginning of a UNC path */
|
2004-12-18 17:41:27 +01:00
|
|
|
if (tail <= path_copy + 1)
|
2000-08-22 05:58:47 +02:00
|
|
|
goto out; // all done
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-01-27 16:34:38 +01:00
|
|
|
/* Haven't found an existing pathname component yet.
|
2000-02-17 20:38:33 +01:00
|
|
|
Pinch off the tail and try again. */
|
2004-12-18 17:41:27 +01:00
|
|
|
*tail = '\0';
|
2000-02-17 20:38:33 +01:00
|
|
|
component++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Arrive here if above loop detected a symlink. */
|
2006-11-07 18:59:54 +01:00
|
|
|
if (++loop > SYMLOOP_MAX)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
error = ELOOP; // Eep.
|
|
|
|
return;
|
|
|
|
}
|
2001-04-29 01:48:28 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
MALLOC_CHECK;
|
|
|
|
|
|
|
|
|
2004-04-10 02:50:16 +02:00
|
|
|
/* Place the link content, possibly with head and/or tail, in tmp_buf */
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-04-29 01:48:28 +02:00
|
|
|
char *headptr;
|
2000-04-14 00:43:48 +02:00
|
|
|
if (isabspath (sym.contents))
|
2001-05-08 17:16:49 +02:00
|
|
|
headptr = tmp_buf; /* absolute path */
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
|
|
|
{
|
2004-04-10 02:50:16 +02:00
|
|
|
/* Copy the first part of the path (with ending /) and point to the end. */
|
2004-12-18 17:41:27 +01:00
|
|
|
char *prevtail = tail;
|
2004-04-10 02:50:16 +02:00
|
|
|
while (--prevtail > path_copy && *prevtail != '/') {}
|
|
|
|
int headlen = prevtail - path_copy + 1;;
|
|
|
|
memcpy (tmp_buf, path_copy, headlen);
|
|
|
|
headptr = &tmp_buf[headlen];
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2001-04-29 01:48:28 +02:00
|
|
|
|
2004-04-10 02:50:16 +02:00
|
|
|
/* Make sure there is enough space */
|
|
|
|
if (headptr + symlen >= tmp_buf + sizeof (tmp_buf))
|
|
|
|
{
|
|
|
|
too_long:
|
|
|
|
error = ENAMETOOLONG;
|
|
|
|
strcpy (path, "::ENAMETOOLONG::");
|
|
|
|
return;
|
|
|
|
}
|
2001-06-11 05:38:32 +02:00
|
|
|
|
2004-04-10 02:50:16 +02:00
|
|
|
/* Copy the symlink contents to the end of tmp_buf.
|
2004-05-04 17:14:48 +02:00
|
|
|
Convert slashes. */
|
2004-04-10 02:50:16 +02:00
|
|
|
for (char *p = sym.contents; *p; p++)
|
2001-04-29 01:48:28 +02:00
|
|
|
*headptr++ = *p == '\\' ? '/' : *p;
|
2004-04-10 02:50:16 +02:00
|
|
|
*headptr = '\0';
|
2001-05-08 17:16:49 +02:00
|
|
|
|
2004-04-10 02:50:16 +02:00
|
|
|
/* Copy any tail component (with the 0) */
|
2004-12-18 17:41:27 +01:00
|
|
|
if (tail++ < path_end)
|
2001-04-29 01:48:28 +02:00
|
|
|
{
|
2004-04-10 02:50:16 +02:00
|
|
|
/* Add a slash if needed. There is space. */
|
|
|
|
if (*(headptr - 1) != '/')
|
|
|
|
*headptr++ = '/';
|
2004-12-18 17:41:27 +01:00
|
|
|
int taillen = path_end - tail + 1;
|
2004-04-10 02:50:16 +02:00
|
|
|
if (headptr + taillen > tmp_buf + sizeof (tmp_buf))
|
|
|
|
goto too_long;
|
2004-12-18 17:41:27 +01:00
|
|
|
memcpy (headptr, tail, taillen);
|
2001-04-29 01:48:28 +02:00
|
|
|
}
|
|
|
|
|
2004-04-10 02:50:16 +02:00
|
|
|
/* Evaluate everything all over again. */
|
2001-04-29 01:48:28 +02:00
|
|
|
src = tmp_buf;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2000-04-13 00:50:08 +02:00
|
|
|
|
2001-04-13 09:54:20 +02:00
|
|
|
if (!(opt & PC_SYM_CONTENTS))
|
|
|
|
add_ext_from_sym (sym);
|
2000-04-13 00:50:08 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
out:
|
2004-12-23 22:37:44 +01:00
|
|
|
bool strip_tail = false;
|
2005-10-12 22:38:38 +02:00
|
|
|
if (dev.devn == FH_NETDRIVE && component)
|
2005-06-15 01:52:53 +02:00
|
|
|
{
|
|
|
|
/* This case indicates a non-existant resp. a non-retrievable
|
|
|
|
share. This happens for instance if the share is a printer.
|
|
|
|
In this case the path must not be treated like a FH_NETDRIVE,
|
|
|
|
but like a FH_FS instead, so the usual open call for files
|
|
|
|
is used on it. */
|
|
|
|
dev.parse (FH_FS);
|
|
|
|
}
|
2005-04-20 20:25:14 +02:00
|
|
|
else if (isvirtual_dev (dev.devn) && fileattr == INVALID_FILE_ATTRIBUTES)
|
|
|
|
{
|
2005-06-15 01:52:53 +02:00
|
|
|
error = dev.devn == FH_NETDRIVE ? ENOSHARE : ENOENT;
|
|
|
|
return;
|
2005-04-20 20:25:14 +02:00
|
|
|
}
|
2005-05-13 05:21:39 +02:00
|
|
|
else if (!need_directory || error)
|
|
|
|
/* nothing to do */;
|
|
|
|
else if (fileattr & FILE_ATTRIBUTE_DIRECTORY)
|
|
|
|
path_flags &= ~PATH_SYMLINK;
|
2000-10-06 21:11:14 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
debug_printf ("%s is a non-directory", path);
|
|
|
|
error = ENOTDIR;
|
|
|
|
return;
|
|
|
|
}
|
2001-04-12 23:21:37 +02:00
|
|
|
|
2004-12-26 03:10:30 +01:00
|
|
|
if (dev.isfs ())
|
2000-03-16 20:35:18 +01:00
|
|
|
{
|
2004-12-19 03:40:40 +01:00
|
|
|
if (strncmp (path, "\\\\.\\", 4))
|
|
|
|
{
|
2005-12-27 19:10:49 +01:00
|
|
|
/* Windows ignores trailing dots and spaces in the last path
|
|
|
|
component, and ignores exactly one trailing dot in inner
|
|
|
|
path components. */
|
2004-12-19 03:40:40 +01:00
|
|
|
char *tail = NULL;
|
|
|
|
for (char *p = path; *p; p++)
|
2005-12-27 19:10:49 +01:00
|
|
|
{
|
|
|
|
if (*p != '.' && *p != ' ')
|
2005-05-17 03:08:58 +02:00
|
|
|
tail = NULL;
|
2005-12-27 19:10:49 +01:00
|
|
|
else if (!tail)
|
|
|
|
tail = p;
|
|
|
|
if (tail && p[1] == '\\')
|
2006-05-28 17:50:14 +02:00
|
|
|
{
|
2005-12-27 19:10:49 +01:00
|
|
|
if (p > tail || *tail != '.')
|
|
|
|
{
|
|
|
|
error = ENOENT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
tail = NULL;
|
2006-05-28 17:50:14 +02:00
|
|
|
}
|
2005-12-27 19:10:49 +01:00
|
|
|
}
|
2004-12-19 03:40:40 +01:00
|
|
|
|
2005-06-24 11:15:05 +02:00
|
|
|
if (!tail || tail == path)
|
2004-12-19 03:40:40 +01:00
|
|
|
/* nothing */;
|
|
|
|
else if (tail[-1] != '\\')
|
2004-12-23 22:37:44 +01:00
|
|
|
{
|
|
|
|
*tail = '\0';
|
|
|
|
strip_tail = true;
|
|
|
|
}
|
2004-12-19 03:40:40 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
error = ENOENT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-04-10 15:45:10 +02:00
|
|
|
if (fs.update (path))
|
2001-10-05 02:17:57 +02:00
|
|
|
{
|
2004-04-10 15:45:10 +02:00
|
|
|
debug_printf ("this->path(%s), has_acls(%d)", path, fs.has_acls ());
|
2004-10-06 03:33:39 +02:00
|
|
|
if (fs.has_acls () && allow_ntsec)
|
2004-04-10 15:45:10 +02:00
|
|
|
set_exec (0); /* We really don't know if this is executable or not here
|
|
|
|
but set it to not executable since it will be figured out
|
|
|
|
later by anything which cares about this. */
|
2001-10-05 02:17:57 +02:00
|
|
|
}
|
2003-05-30 17:01:33 +02:00
|
|
|
if (exec_state () != dont_know_if_executable)
|
|
|
|
/* ok */;
|
|
|
|
else if (isdir ())
|
|
|
|
set_exec (1);
|
|
|
|
else if (issymlink () || issocket ())
|
|
|
|
set_exec (0);
|
2000-03-16 20:35:18 +01:00
|
|
|
}
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
|
|
|
|
#if 0
|
2001-10-13 19:23:35 +02:00
|
|
|
if (issocket ())
|
|
|
|
devn = FH_SOCKET;
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
#endif
|
2000-10-23 05:35:50 +02:00
|
|
|
|
2005-05-13 17:46:07 +02:00
|
|
|
if (opt & PC_NOFULL)
|
2001-05-01 04:03:10 +02:00
|
|
|
{
|
|
|
|
if (is_relpath)
|
|
|
|
mkrelpath (this->path);
|
|
|
|
if (need_directory)
|
|
|
|
{
|
2002-09-30 04:51:22 +02:00
|
|
|
size_t n = strlen (this->path);
|
2001-05-01 04:03:10 +02:00
|
|
|
/* Do not add trailing \ to UNC device names like \\.\a: */
|
|
|
|
if (this->path[n - 1] != '\\' &&
|
2004-12-19 04:27:09 +01:00
|
|
|
(strncmp (this->path, "\\\\.\\", 4) != 0))
|
2001-05-01 04:03:10 +02:00
|
|
|
{
|
|
|
|
this->path[n] = '\\';
|
|
|
|
this->path[n + 1] = '\0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-27 16:34:38 +01:00
|
|
|
if (saw_symlinks)
|
|
|
|
set_has_symlinks ();
|
|
|
|
|
2002-06-05 03:42:28 +02:00
|
|
|
if (!error && !isdir () && !(path_flags & PATH_ALL_EXEC))
|
2001-03-05 07:28:25 +01:00
|
|
|
{
|
|
|
|
const char *p = strchr (path, '\0') - 4;
|
|
|
|
if (p >= path &&
|
|
|
|
(strcasematch (".exe", p) ||
|
|
|
|
strcasematch (".bat", p) ||
|
|
|
|
strcasematch (".com", p)))
|
|
|
|
path_flags |= PATH_EXEC;
|
|
|
|
}
|
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
if (!(opt & PC_POSIX))
|
|
|
|
normalized_path_size = 0;
|
|
|
|
else
|
|
|
|
{
|
2004-12-18 17:41:27 +01:00
|
|
|
if (tail < path_end && tail > path_copy + 1)
|
|
|
|
*tail = '/';
|
2004-12-23 22:37:44 +01:00
|
|
|
set_normalized_path (path_copy, strip_tail);
|
2006-08-01 20:00:44 +02:00
|
|
|
if (is_msdos && !(opt & PC_NOWARN))
|
|
|
|
warn_msdos (src);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
}
|
|
|
|
|
2000-10-23 05:35:50 +02:00
|
|
|
#if 0
|
|
|
|
if (!error)
|
|
|
|
{
|
|
|
|
last_path_conv = *this;
|
|
|
|
strcpy (last_src, src);
|
|
|
|
}
|
|
|
|
#endif
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2005-01-31 22:29:59 +01:00
|
|
|
void
|
|
|
|
path_conv::set_name (const char *win32, const char *posix)
|
|
|
|
{
|
|
|
|
if (!normalized_path_size && normalized_path)
|
|
|
|
cfree (normalized_path);
|
|
|
|
strcpy (path, win32);
|
|
|
|
set_normalized_path (posix, false);
|
|
|
|
}
|
|
|
|
|
2004-02-17 21:03:01 +01:00
|
|
|
path_conv::~path_conv ()
|
|
|
|
{
|
|
|
|
if (!normalized_path_size && normalized_path)
|
|
|
|
{
|
|
|
|
cfree (normalized_path);
|
|
|
|
normalized_path = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-12-07 23:37:12 +01:00
|
|
|
/* Return true if src_path is a valid, internally supported device name.
|
2003-10-24 10:13:15 +02:00
|
|
|
In that case, win32_path gets the corresponding NT device name and
|
|
|
|
dev is appropriately filled with device information. */
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-10-02 05:50:10 +02:00
|
|
|
static bool
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
win32_device_name (const char *src_path, char *win32_path, device& dev)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
dev.parse (src_path);
|
2005-08-24 16:17:56 +02:00
|
|
|
if (dev == FH_FS || dev == FH_DEV)
|
2003-10-02 05:50:10 +02:00
|
|
|
return false;
|
2003-10-01 14:36:39 +02:00
|
|
|
strcpy (win32_path, dev.native);
|
2003-10-02 05:50:10 +02:00
|
|
|
return true;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2004-04-20 20:45:16 +02:00
|
|
|
/* is_unc_share: Return non-zero if PATH begins with //UNC/SHARE */
|
|
|
|
|
|
|
|
static bool __stdcall
|
|
|
|
is_unc_share (const char *path)
|
|
|
|
{
|
2004-05-04 17:09:58 +02:00
|
|
|
const char *p;
|
|
|
|
return (isdirsep (path[0])
|
|
|
|
&& isdirsep (path[1])
|
|
|
|
&& (isalnum (path[2]) || path[2] == '.')
|
|
|
|
&& ((p = strpbrk (path + 3, "\\/")) != NULL)
|
|
|
|
&& isalnum (p[1]));
|
2004-04-20 20:45:16 +02:00
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Normalize a Win32 path.
|
|
|
|
/'s are converted to \'s in the process.
|
|
|
|
All duplicate \'s, except for 2 leading \'s, are deleted.
|
|
|
|
|
|
|
|
The result is 0 for success, or an errno error value.
|
|
|
|
FIXME: A lot of this should be mergeable with the POSIX critter. */
|
|
|
|
static int
|
2004-12-19 04:27:09 +01:00
|
|
|
normalize_win32_path (const char *src, char *dst, char *&tail)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
const char *src_start = src;
|
2000-12-09 22:31:49 +01:00
|
|
|
bool beg_src_slash = isdirsep (src[0]);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-12-19 04:27:09 +01:00
|
|
|
tail = dst;
|
2005-08-25 22:35:25 +02:00
|
|
|
if (beg_src_slash && isdirsep (src[1]))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-08-25 22:35:25 +02:00
|
|
|
if (isdirsep (src[2]))
|
2005-12-22 06:57:54 +01:00
|
|
|
{
|
2005-08-25 22:35:25 +02:00
|
|
|
/* More than two slashes are just folded into one. */
|
2001-10-07 23:16:36 +02:00
|
|
|
src += 2;
|
2005-08-25 22:35:25 +02:00
|
|
|
while (isdirsep (src[1]))
|
|
|
|
++src;
|
|
|
|
}
|
|
|
|
else
|
2005-12-22 06:57:54 +01:00
|
|
|
{
|
2005-08-25 22:35:25 +02:00
|
|
|
/* Two slashes start a network or device path. */
|
|
|
|
*tail++ = '\\';
|
|
|
|
src++;
|
|
|
|
if (src[1] == '.' && isdirsep (src[2]))
|
|
|
|
{
|
|
|
|
*tail++ = '\\';
|
|
|
|
*tail++ = '.';
|
|
|
|
src += 2;
|
|
|
|
}
|
2001-10-07 23:16:36 +02:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2005-08-26 17:11:06 +02:00
|
|
|
if (tail == dst && !isdrive (src) && *src != '/')
|
2000-12-09 04:29:33 +01:00
|
|
|
{
|
|
|
|
if (beg_src_slash)
|
2004-12-19 04:27:09 +01:00
|
|
|
tail += cygheap->cwd.get_drive (dst);
|
2004-09-08 01:26:28 +02:00
|
|
|
else if (!cygheap->cwd.get (dst, 0))
|
|
|
|
return get_errno ();
|
|
|
|
else
|
2004-09-12 05:47:57 +02:00
|
|
|
{
|
2004-12-19 04:27:09 +01:00
|
|
|
tail = strchr (tail, '\0');
|
|
|
|
*tail++ = '\\';
|
2004-09-12 05:47:57 +02:00
|
|
|
}
|
2000-12-09 04:29:33 +01:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
while (*src)
|
|
|
|
{
|
|
|
|
/* Strip duplicate /'s. */
|
2003-01-09 09:22:05 +01:00
|
|
|
if (isdirsep (src[0]) && isdirsep (src[1]))
|
2000-02-17 20:38:33 +01:00
|
|
|
src++;
|
|
|
|
/* Ignore "./". */
|
2003-01-09 09:22:05 +01:00
|
|
|
else if (src[0] == '.' && isdirsep (src[1])
|
|
|
|
&& (src == src_start || isdirsep (src[-1])))
|
2000-12-15 23:25:51 +01:00
|
|
|
src += 2;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* Backup if "..". */
|
|
|
|
else if (src[0] == '.' && src[1] == '.'
|
|
|
|
/* dst must be greater than dst_start */
|
2004-12-19 04:27:09 +01:00
|
|
|
&& tail[-1] == '\\')
|
2004-05-28 21:50:07 +02:00
|
|
|
{
|
2004-12-20 18:55:22 +01:00
|
|
|
if (!isdirsep (src[2]) && src[2] != '\0')
|
|
|
|
*tail++ = *src++;
|
|
|
|
else
|
2004-05-04 17:14:48 +02:00
|
|
|
{
|
|
|
|
/* Back up over /, but not if it's the first one. */
|
2004-12-19 04:27:09 +01:00
|
|
|
if (tail > dst + 1)
|
|
|
|
tail--;
|
2004-05-04 17:14:48 +02:00
|
|
|
/* Now back up to the next /. */
|
2004-12-19 04:27:09 +01:00
|
|
|
while (tail > dst + 1 && tail[-1] != '\\' && tail[-2] != ':')
|
|
|
|
tail--;
|
2004-05-04 17:14:48 +02:00
|
|
|
src += 2;
|
|
|
|
if (isdirsep (*src))
|
|
|
|
src++;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
/* Otherwise, add char to result. */
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (*src == '/')
|
2004-12-19 04:27:09 +01:00
|
|
|
*tail++ = '\\';
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
2004-12-19 04:27:09 +01:00
|
|
|
*tail++ = *src;
|
|
|
|
src++;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2004-12-19 04:27:09 +01:00
|
|
|
if ((tail - dst) >= CYG_MAX_PATH)
|
2000-12-15 23:25:51 +01:00
|
|
|
return ENAMETOOLONG;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2004-12-19 04:27:09 +01:00
|
|
|
if (tail > dst + 1 && tail[-1] == '.' && tail[-2] == '\\')
|
|
|
|
tail--;
|
|
|
|
*tail = '\0';
|
|
|
|
debug_printf ("%s = normalize_win32_path (%s)", dst, src_start);
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Various utilities. */
|
|
|
|
|
|
|
|
/* slashify: Convert all back slashes in src path to forward slashes
|
|
|
|
in dst path. Add a trailing slash to dst when trailing_slash_p arg
|
|
|
|
is set to 1. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
slashify (const char *src, char *dst, int trailing_slash_p)
|
|
|
|
{
|
|
|
|
const char *start = src;
|
|
|
|
|
|
|
|
while (*src)
|
|
|
|
{
|
|
|
|
if (*src == '\\')
|
|
|
|
*dst++ = '/';
|
|
|
|
else
|
|
|
|
*dst++ = *src;
|
|
|
|
++src;
|
|
|
|
}
|
|
|
|
if (trailing_slash_p
|
|
|
|
&& src > start
|
|
|
|
&& !isdirsep (src[-1]))
|
|
|
|
*dst++ = '/';
|
|
|
|
*dst++ = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* backslashify: Convert all forward slashes in src path to back slashes
|
|
|
|
in dst path. Add a trailing slash to dst when trailing_slash_p arg
|
|
|
|
is set to 1. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
backslashify (const char *src, char *dst, int trailing_slash_p)
|
|
|
|
{
|
|
|
|
const char *start = src;
|
|
|
|
|
|
|
|
while (*src)
|
|
|
|
{
|
|
|
|
if (*src == '/')
|
|
|
|
*dst++ = '\\';
|
|
|
|
else
|
|
|
|
*dst++ = *src;
|
|
|
|
++src;
|
|
|
|
}
|
|
|
|
if (trailing_slash_p
|
|
|
|
&& src > start
|
|
|
|
&& !isdirsep (src[-1]))
|
|
|
|
*dst++ = '\\';
|
|
|
|
*dst++ = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* nofinalslash: Remove trailing / and \ from SRC (except for the
|
|
|
|
first one). It is ok for src == dst. */
|
|
|
|
|
|
|
|
void __stdcall
|
|
|
|
nofinalslash (const char *src, char *dst)
|
|
|
|
{
|
|
|
|
int len = strlen (src);
|
|
|
|
if (src != dst)
|
|
|
|
memcpy (dst, src, len + 1);
|
2003-01-09 09:22:05 +01:00
|
|
|
while (len > 1 && isdirsep (dst[--len]))
|
2000-02-17 20:38:33 +01:00
|
|
|
dst[len] = '\0';
|
|
|
|
}
|
|
|
|
|
2002-06-12 01:30:48 +02:00
|
|
|
/* conv_path_list: Convert a list of path names to/from Win32/POSIX. */
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-02-21 05:46:00 +01:00
|
|
|
static int
|
2003-02-05 22:12:58 +01:00
|
|
|
conv_path_list (const char *src, char *dst, int to_posix)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2006-02-17 21:12:11 +01:00
|
|
|
char src_delim, dst_delim;
|
|
|
|
int (*conv_fn) (const char *, char *);
|
|
|
|
|
|
|
|
if (to_posix)
|
|
|
|
{
|
|
|
|
src_delim = ';';
|
|
|
|
dst_delim = ':';
|
|
|
|
conv_fn = cygwin_conv_to_posix_path;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
src_delim = ':';
|
|
|
|
dst_delim = ';';
|
|
|
|
conv_fn = cygwin_conv_to_win32_path;
|
|
|
|
}
|
2001-11-21 07:47:57 +01:00
|
|
|
|
|
|
|
char *srcbuf = (char *) alloca (strlen (src) + 1);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2006-02-17 21:12:11 +01:00
|
|
|
int err = 0;
|
|
|
|
char *d = dst - 1;
|
2006-08-02 17:11:48 +02:00
|
|
|
bool saw_empty = false;
|
2006-02-17 21:12:11 +01:00
|
|
|
do
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2006-02-17 21:12:11 +01:00
|
|
|
char *s = strccpy (srcbuf, &src, src_delim);
|
2001-11-21 07:47:57 +01:00
|
|
|
int len = s - srcbuf;
|
2003-11-15 00:40:06 +01:00
|
|
|
if (len >= CYG_MAX_PATH)
|
2006-02-17 21:12:11 +01:00
|
|
|
{
|
|
|
|
err = ENAMETOOLONG;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (len)
|
|
|
|
err = conv_fn (srcbuf, ++d);
|
|
|
|
else if (!to_posix)
|
|
|
|
err = conv_fn (".", ++d);
|
|
|
|
else
|
2006-08-02 17:11:48 +02:00
|
|
|
{
|
|
|
|
if (to_posix == ENV_CVT)
|
|
|
|
saw_empty = true;
|
|
|
|
continue;
|
|
|
|
}
|
2004-02-21 05:46:00 +01:00
|
|
|
if (err)
|
2001-11-22 06:59:07 +01:00
|
|
|
break;
|
|
|
|
d = strchr (d, '\0');
|
2006-02-17 21:12:11 +01:00
|
|
|
*d = dst_delim;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2006-02-17 21:12:11 +01:00
|
|
|
while (*src++);
|
|
|
|
|
2006-08-02 17:11:48 +02:00
|
|
|
if (saw_empty)
|
|
|
|
err = EIDRM;
|
|
|
|
|
2006-02-17 21:12:11 +01:00
|
|
|
if (d < dst)
|
|
|
|
d++;
|
|
|
|
*d = '\0';
|
|
|
|
return err;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* init: Initialize the mount table. */
|
|
|
|
|
|
|
|
void
|
|
|
|
mount_info::init ()
|
|
|
|
{
|
|
|
|
nmounts = 0;
|
|
|
|
|
|
|
|
/* Fetch the mount table and cygdrive-related information from
|
|
|
|
the registry. */
|
|
|
|
from_registry ();
|
|
|
|
}
|
|
|
|
|
2002-06-05 03:42:28 +02:00
|
|
|
static void
|
|
|
|
set_flags (unsigned *flags, unsigned val)
|
|
|
|
{
|
|
|
|
*flags = val;
|
|
|
|
if (!(*flags & PATH_BINARY))
|
2002-07-01 21:03:26 +02:00
|
|
|
{
|
|
|
|
*flags |= PATH_TEXT;
|
|
|
|
debug_printf ("flags: text (%p)", *flags & (PATH_TEXT | PATH_BINARY));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*flags |= PATH_BINARY;
|
|
|
|
debug_printf ("flags: binary (%p)", *flags & (PATH_TEXT | PATH_BINARY));
|
|
|
|
}
|
2002-06-05 03:42:28 +02:00
|
|
|
}
|
|
|
|
|
2003-10-29 02:15:12 +01:00
|
|
|
static char dot_special_chars[] =
|
|
|
|
"."
|
2003-07-04 05:07:01 +02:00
|
|
|
"\001" "\002" "\003" "\004" "\005" "\006" "\007" "\010"
|
|
|
|
"\011" "\012" "\013" "\014" "\015" "\016" "\017" "\020"
|
|
|
|
"\021" "\022" "\023" "\024" "\025" "\026" "\027" "\030"
|
2006-01-04 17:20:30 +01:00
|
|
|
"\031" "\032" "\033" "\034" "\035" "\036" "\037" ":"
|
|
|
|
"\\" "*" "?" "%" "\"" "<" ">" "|"
|
2003-07-04 05:07:01 +02:00
|
|
|
"A" "B" "C" "D" "E" "F" "G" "H"
|
|
|
|
"I" "J" "K" "L" "M" "N" "O" "P"
|
|
|
|
"Q" "R" "S" "T" "U" "V" "W" "X"
|
|
|
|
"Y" "Z";
|
2003-10-29 02:15:12 +01:00
|
|
|
static char *special_chars = dot_special_chars + 1;
|
2003-07-26 06:53:59 +02:00
|
|
|
static char special_introducers[] =
|
2003-07-11 02:54:46 +02:00
|
|
|
"anpcl";
|
2003-07-04 05:07:01 +02:00
|
|
|
|
2003-07-11 02:54:46 +02:00
|
|
|
static char
|
|
|
|
special_char (const char *s, const char *valid_chars = special_chars)
|
2003-07-04 05:07:01 +02:00
|
|
|
{
|
2003-07-11 02:54:46 +02:00
|
|
|
if (*s != '%' || strlen (s) < 3)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
char *p;
|
|
|
|
char hex[] = {s[1], s[2], '\0'};
|
|
|
|
unsigned char c = strtoul (hex, &p, 16);
|
|
|
|
p = strechr (valid_chars, c);
|
2003-07-04 05:07:01 +02:00
|
|
|
return *p;
|
|
|
|
}
|
|
|
|
|
2003-07-11 02:54:46 +02:00
|
|
|
/* Determines if name is "special". Assumes that name is empty or "absolute" */
|
|
|
|
static int
|
|
|
|
special_name (const char *s, int inc = 1)
|
|
|
|
{
|
|
|
|
if (!*s)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
s += inc;
|
|
|
|
|
2005-03-06 21:15:07 +01:00
|
|
|
if (strcmp (s, ".") == 0 || strcmp (s, "..") == 0)
|
2003-10-29 02:15:12 +01:00
|
|
|
return false;
|
2003-08-17 18:33:15 +02:00
|
|
|
|
2005-03-06 21:15:07 +01:00
|
|
|
int n;
|
|
|
|
const char *p = NULL;
|
|
|
|
if (strncasematch (s, "conin$", n = 5)
|
|
|
|
|| strncasematch (s, "conout$", n = 7)
|
|
|
|
|| strncasematch (s, "nul", n = 3)
|
2003-08-17 18:33:15 +02:00
|
|
|
|| strncasematch (s, "aux", 3)
|
|
|
|
|| strncasematch (s, "prn", 3)
|
|
|
|
|| strncasematch (s, "con", 3))
|
2005-03-06 21:15:07 +01:00
|
|
|
p = s + n;
|
2003-08-17 18:33:15 +02:00
|
|
|
else if (strncasematch (s, "com", 3) || strncasematch (s, "lpt", 3))
|
2005-07-06 22:05:03 +02:00
|
|
|
strtoul (s + 3, (char **) &p, 10);
|
2005-03-06 21:15:07 +01:00
|
|
|
if (p && (*p == '\0' || *p == '.'))
|
|
|
|
return -1;
|
2003-08-17 18:33:15 +02:00
|
|
|
|
2005-03-06 21:15:07 +01:00
|
|
|
return (strchr (s, '\0')[-1] == '.')
|
|
|
|
|| (strpbrk (s, special_chars) && !strncasematch (s, "%2f", 3));
|
2003-07-11 02:54:46 +02:00
|
|
|
}
|
|
|
|
|
2003-07-04 05:07:01 +02:00
|
|
|
bool
|
2003-07-26 06:53:59 +02:00
|
|
|
fnunmunge (char *dst, const char *src)
|
2003-07-04 05:07:01 +02:00
|
|
|
{
|
|
|
|
bool converted = false;
|
|
|
|
char c;
|
|
|
|
|
2003-07-11 02:54:46 +02:00
|
|
|
if ((c = special_char (src, special_introducers)))
|
|
|
|
{
|
|
|
|
__small_sprintf (dst, "%c%s", c, src + 3);
|
|
|
|
if (special_name (dst, 0))
|
|
|
|
{
|
|
|
|
*dst++ = c;
|
|
|
|
src += 3;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-07-04 05:07:01 +02:00
|
|
|
while (*src)
|
2003-10-29 02:15:12 +01:00
|
|
|
if (!(c = special_char (src, dot_special_chars)))
|
2003-07-04 05:07:01 +02:00
|
|
|
*dst++ = *src++;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
converted = true;
|
|
|
|
*dst++ = c;
|
|
|
|
src += 3;
|
|
|
|
}
|
|
|
|
|
|
|
|
*dst = *src;
|
|
|
|
return converted;
|
|
|
|
}
|
|
|
|
|
2004-02-21 05:46:00 +01:00
|
|
|
static bool
|
|
|
|
copy1 (char *&d, const char *&src, int& left)
|
|
|
|
{
|
|
|
|
left--;
|
|
|
|
if (left || !*src)
|
|
|
|
*d++ = *src++;
|
|
|
|
else
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
copyenc (char *&d, const char *&src, int& left)
|
|
|
|
{
|
|
|
|
char buf[16];
|
|
|
|
int n = __small_sprintf (buf, "%%%02x", (unsigned char) *src++);
|
|
|
|
left -= n;
|
|
|
|
if (left <= 0)
|
|
|
|
return true;
|
|
|
|
strcpy (d, buf);
|
|
|
|
d += n;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
mount_item::fnmunge (char *dst, const char *src, int& left)
|
2003-05-29 05:50:15 +02:00
|
|
|
{
|
2003-07-04 05:07:01 +02:00
|
|
|
int name_type;
|
2003-12-23 17:26:31 +01:00
|
|
|
if (!(name_type = special_name (src)))
|
2004-02-21 05:46:00 +01:00
|
|
|
{
|
|
|
|
if ((int) strlen (src) >= left)
|
|
|
|
return ENAMETOOLONG;
|
|
|
|
else
|
|
|
|
strcpy (dst, src);
|
|
|
|
}
|
2003-07-04 05:07:01 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
char *d = dst;
|
2004-02-21 05:46:00 +01:00
|
|
|
if (copy1 (d, src, left))
|
|
|
|
return ENAMETOOLONG;
|
|
|
|
if (name_type < 0 && copyenc (d, src, left))
|
|
|
|
return ENAMETOOLONG;
|
2003-07-04 05:07:01 +02:00
|
|
|
|
|
|
|
while (*src)
|
2003-07-11 02:54:46 +02:00
|
|
|
if (!strchr (special_chars, *src) || (*src == '%' && !special_char (src)))
|
2004-02-21 05:46:00 +01:00
|
|
|
{
|
|
|
|
if (copy1 (d, src, left))
|
|
|
|
return ENAMETOOLONG;
|
|
|
|
}
|
|
|
|
else if (copyenc (d, src, left))
|
|
|
|
return ENAMETOOLONG;
|
2003-10-29 02:15:12 +01:00
|
|
|
|
2004-02-21 05:46:00 +01:00
|
|
|
char dot[] = ".";
|
|
|
|
const char *p = dot;
|
2003-10-29 02:15:12 +01:00
|
|
|
if (*--d != '.')
|
|
|
|
d++;
|
2004-02-21 05:46:00 +01:00
|
|
|
else if (copyenc (d, p, left))
|
|
|
|
return ENAMETOOLONG;
|
2003-10-29 02:15:12 +01:00
|
|
|
|
2003-07-04 05:07:01 +02:00
|
|
|
*d = *src;
|
|
|
|
}
|
|
|
|
|
2003-05-29 05:50:15 +02:00
|
|
|
backslashify (dst, dst, 0);
|
2004-02-21 05:46:00 +01:00
|
|
|
return 0;
|
2003-05-29 05:50:15 +02:00
|
|
|
}
|
|
|
|
|
2004-02-21 05:46:00 +01:00
|
|
|
int
|
2004-12-18 17:41:27 +01:00
|
|
|
mount_item::build_win32 (char *dst, const char *src, unsigned *outflags, unsigned chroot_pathlen)
|
2003-05-29 05:50:15 +02:00
|
|
|
{
|
2004-02-21 05:46:00 +01:00
|
|
|
int n, err = 0;
|
2003-05-29 05:50:15 +02:00
|
|
|
const char *real_native_path;
|
|
|
|
int real_posix_pathlen;
|
|
|
|
set_flags (outflags, (unsigned) flags);
|
|
|
|
if (!cygheap->root.exists () || posix_pathlen != 1 || posix_path[0] != '/')
|
|
|
|
{
|
|
|
|
n = native_pathlen;
|
|
|
|
real_native_path = native_path;
|
|
|
|
real_posix_pathlen = chroot_pathlen ?: posix_pathlen;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
n = cygheap->root.native_length ();
|
|
|
|
real_native_path = cygheap->root.native_path ();
|
|
|
|
real_posix_pathlen = posix_pathlen;
|
|
|
|
}
|
|
|
|
memcpy (dst, real_native_path, n + 1);
|
|
|
|
const char *p = src + real_posix_pathlen;
|
|
|
|
if (*p == '/')
|
|
|
|
/* nothing */;
|
2003-07-04 05:07:01 +02:00
|
|
|
else if ((!(flags & MOUNT_ENC) && isdrive (dst) && !dst[2]) || *p)
|
2003-05-29 05:50:15 +02:00
|
|
|
dst[n++] = '\\';
|
2003-12-23 17:26:31 +01:00
|
|
|
if (!*p || !(flags & MOUNT_ENC))
|
2003-12-26 19:26:17 +01:00
|
|
|
{
|
2005-04-03 10:45:21 +02:00
|
|
|
if ((n + strlen (p)) >= CYG_MAX_PATH)
|
2004-02-21 05:46:00 +01:00
|
|
|
err = ENAMETOOLONG;
|
|
|
|
else
|
2004-04-10 02:50:16 +02:00
|
|
|
backslashify (p, dst + n, 0);
|
2003-12-26 19:26:17 +01:00
|
|
|
}
|
2003-12-23 17:26:31 +01:00
|
|
|
else
|
2004-02-21 05:46:00 +01:00
|
|
|
{
|
|
|
|
int left = CYG_MAX_PATH - n;
|
|
|
|
while (*p)
|
|
|
|
{
|
|
|
|
char slash = 0;
|
|
|
|
char *s = strchr (p + 1, '/');
|
|
|
|
if (s)
|
|
|
|
{
|
|
|
|
slash = *s;
|
|
|
|
*s = '\0';
|
|
|
|
}
|
|
|
|
err = fnmunge (dst += n, p, left);
|
|
|
|
if (!s || err)
|
|
|
|
break;
|
|
|
|
n = strlen (dst);
|
|
|
|
*s = slash;
|
|
|
|
p = s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return err;
|
2003-05-29 05:50:15 +02:00
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* conv_to_win32_path: Ensure src_path is a pure Win32 path and store
|
|
|
|
the result in win32_path.
|
|
|
|
|
|
|
|
If win32_path != NULL, the relative path, if possible to keep, is
|
|
|
|
stored in win32_path. If the relative path isn't possible to keep,
|
|
|
|
the full path is stored.
|
|
|
|
|
|
|
|
If full_win32_path != NULL, the full path is stored there.
|
|
|
|
|
|
|
|
The result is zero for success, or an errno value.
|
|
|
|
|
2003-11-15 00:40:06 +01:00
|
|
|
{,full_}win32_path must have sufficient space (i.e. CYG_MAX_PATH bytes). */
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
int
|
2004-12-18 17:41:27 +01:00
|
|
|
mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
|
|
|
|
unsigned *flags)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-05-31 01:43:24 +02:00
|
|
|
bool chroot_ok = !cygheap->root.exists ();
|
2001-01-28 07:23:42 +01:00
|
|
|
while (sys_mount_table_counter < cygwin_shared->sys_mount_table_counter)
|
|
|
|
{
|
2004-12-03 03:00:37 +01:00
|
|
|
int current = cygwin_shared->sys_mount_table_counter;
|
2001-01-28 07:23:42 +01:00
|
|
|
init ();
|
2004-12-03 03:00:37 +01:00
|
|
|
sys_mount_table_counter = current;
|
2001-01-28 07:23:42 +01:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
MALLOC_CHECK;
|
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
dev.devn = FH_FS;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
*flags = 0;
|
2004-12-18 17:41:27 +01:00
|
|
|
debug_printf ("conv_to_win32_path (%s)", src_path);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
int i, rc;
|
|
|
|
mount_item *mi = NULL; /* initialized to avoid compiler warning */
|
2000-04-27 05:26:23 +02:00
|
|
|
|
2004-04-10 02:50:16 +02:00
|
|
|
/* The path is already normalized, without ../../ stuff, we need to have this
|
2000-02-17 20:38:33 +01:00
|
|
|
so that we can move from one mounted directory to another with relative
|
|
|
|
stuff.
|
|
|
|
|
|
|
|
eg mounting c:/foo /foo
|
|
|
|
d:/bar /bar
|
|
|
|
|
|
|
|
cd /bar
|
|
|
|
ls ../foo
|
|
|
|
|
|
|
|
should look in c:/foo, not d:/foo.
|
|
|
|
|
2004-04-10 02:50:16 +02:00
|
|
|
converting normalizex UNIX path to a DOS-style path, looking up the
|
|
|
|
appropriate drive in the mount table. */
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* See if this is a cygwin "device" */
|
2004-04-10 02:50:16 +02:00
|
|
|
if (win32_device_name (src_path, dst, dev))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
*flags = MOUNT_BINARY; /* FIXME: Is this a sensible default for devices? */
|
2001-06-03 04:31:16 +02:00
|
|
|
rc = 0;
|
|
|
|
goto out_no_chroot_check;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
MALLOC_CHECK;
|
2006-10-09 16:01:52 +02:00
|
|
|
/* If the path is on a network drive or a //./ resp.//?/ path prefix,
|
|
|
|
bypass the mount table. If it's // or //MACHINE, use the netdrive
|
|
|
|
device. */
|
2005-05-17 03:29:27 +02:00
|
|
|
if (src_path[1] == '/')
|
2005-05-09 04:39:34 +02:00
|
|
|
{
|
|
|
|
if (!strchr (src_path + 2, '/'))
|
|
|
|
{
|
|
|
|
dev = *netdrive_dev;
|
|
|
|
set_flags (flags, PATH_BINARY);
|
|
|
|
}
|
|
|
|
backslashify (src_path, dst, 0);
|
|
|
|
/* Go through chroot check */
|
|
|
|
goto out;
|
|
|
|
}
|
2004-04-10 02:50:16 +02:00
|
|
|
if (isproc (src_path))
|
2002-05-03 04:43:45 +02:00
|
|
|
{
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
dev = *proc_dev;
|
2004-04-10 02:50:16 +02:00
|
|
|
dev.devn = fhandler_proc::get_proc_fhandler (src_path);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
if (dev.devn == FH_BAD)
|
2002-05-28 03:55:40 +02:00
|
|
|
return ENOENT;
|
2004-04-10 02:50:16 +02:00
|
|
|
set_flags (flags, PATH_BINARY);
|
|
|
|
strcpy (dst, src_path);
|
|
|
|
goto out;
|
2002-05-03 04:43:45 +02:00
|
|
|
}
|
2005-05-06 23:09:58 +02:00
|
|
|
/* Check if the cygdrive prefix was specified. If so, just strip
|
|
|
|
off the prefix and transform it into an MS-DOS path. */
|
2004-04-10 02:50:16 +02:00
|
|
|
else if (iscygdrive (src_path))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-11-22 06:59:07 +01:00
|
|
|
int n = mount_table->cygdrive_len - 1;
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
int unit;
|
|
|
|
|
2004-09-23 02:32:08 +02:00
|
|
|
if (!src_path[n])
|
2001-11-22 06:59:07 +01:00
|
|
|
{
|
|
|
|
unit = 0;
|
|
|
|
dst[0] = '\0';
|
2001-11-24 21:57:19 +01:00
|
|
|
if (mount_table->cygdrive_len > 1)
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
dev = *cygdrive_dev;
|
2001-11-22 06:59:07 +01:00
|
|
|
}
|
2004-04-10 02:50:16 +02:00
|
|
|
else if (cygdrive_win32_path (src_path, dst, unit))
|
2001-12-03 17:47:18 +01:00
|
|
|
{
|
2002-06-05 03:42:28 +02:00
|
|
|
set_flags (flags, (unsigned) cygdrive_flags);
|
2001-12-03 17:47:18 +01:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
else if (mount_table->cygdrive_len > 1)
|
2000-02-17 20:38:33 +01:00
|
|
|
return ENOENT;
|
|
|
|
}
|
|
|
|
|
2003-05-29 05:50:15 +02:00
|
|
|
int chroot_pathlen;
|
|
|
|
chroot_pathlen = 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Check the mount table for prefix matches. */
|
|
|
|
for (i = 0; i < nmounts; i++)
|
|
|
|
{
|
2001-06-03 04:31:16 +02:00
|
|
|
const char *path;
|
|
|
|
int len;
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
mi = mount + posix_sorted[i];
|
2001-06-03 04:31:16 +02:00
|
|
|
if (!cygheap->root.exists ()
|
|
|
|
|| (mi->posix_pathlen == 1 && mi->posix_path[0] == '/'))
|
|
|
|
{
|
|
|
|
path = mi->posix_path;
|
|
|
|
len = mi->posix_pathlen;
|
|
|
|
}
|
|
|
|
else if (cygheap->root.posix_ok (mi->posix_path))
|
|
|
|
{
|
|
|
|
path = cygheap->root.unchroot (mi->posix_path);
|
2003-05-29 05:50:15 +02:00
|
|
|
chroot_pathlen = len = strlen (path);
|
2001-06-03 04:31:16 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-05-29 05:50:15 +02:00
|
|
|
chroot_pathlen = 0;
|
2001-06-03 04:31:16 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2004-04-10 02:50:16 +02:00
|
|
|
if (path_prefix_p (path, src_path, len))
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2003-07-04 05:07:01 +02:00
|
|
|
if (i < nmounts)
|
2002-06-05 06:01:43 +02:00
|
|
|
{
|
2004-04-10 02:50:16 +02:00
|
|
|
int err = mi->build_win32 (dst, src_path, flags, chroot_pathlen);
|
2004-02-21 05:46:00 +01:00
|
|
|
if (err)
|
|
|
|
return err;
|
2003-07-04 05:07:01 +02:00
|
|
|
chroot_ok = true;
|
2002-06-05 06:01:43 +02:00
|
|
|
}
|
2004-09-12 05:47:57 +02:00
|
|
|
else
|
2004-09-08 01:26:28 +02:00
|
|
|
{
|
|
|
|
int offset = 0;
|
|
|
|
if (src_path[1] != '/' && src_path[1] != ':')
|
2004-09-12 05:47:57 +02:00
|
|
|
offset = cygheap->cwd.get_drive (dst);
|
2004-09-08 01:26:28 +02:00
|
|
|
backslashify (src_path, dst + offset, 0);
|
|
|
|
}
|
2001-06-03 04:31:16 +02:00
|
|
|
out:
|
2000-02-17 20:38:33 +01:00
|
|
|
MALLOC_CHECK;
|
2001-06-03 04:31:16 +02:00
|
|
|
if (chroot_ok || cygheap->root.ischroot_native (dst))
|
|
|
|
rc = 0;
|
|
|
|
else
|
|
|
|
{
|
2004-09-03 03:53:12 +02:00
|
|
|
debug_printf ("attempt to access outside of chroot '%s - %s'",
|
2001-06-03 04:31:16 +02:00
|
|
|
cygheap->root.posix_path (), cygheap->root.native_path ());
|
|
|
|
rc = ENOENT;
|
|
|
|
}
|
|
|
|
|
|
|
|
out_no_chroot_check:
|
2004-12-18 17:41:27 +01:00
|
|
|
debug_printf ("src_path %s, dst %s, flags %p, rc %d", src_path, dst, *flags, rc);
|
2001-06-03 04:31:16 +02:00
|
|
|
return rc;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2006-03-01 14:47:49 +01:00
|
|
|
int
|
|
|
|
mount_info::get_mounts_here (const char *parent_dir, int parent_dir_len,
|
|
|
|
char **mount_points)
|
|
|
|
{
|
|
|
|
int n_mounts = 0;
|
|
|
|
|
|
|
|
for (int i = 0; i < nmounts; i++)
|
|
|
|
{
|
|
|
|
mount_item *mi = mount + posix_sorted[i];
|
|
|
|
char *last_slash = strrchr (mi->posix_path, '/');
|
|
|
|
if (!last_slash)
|
2006-05-28 17:50:14 +02:00
|
|
|
continue;
|
2006-03-01 14:47:49 +01:00
|
|
|
if (last_slash == mi->posix_path)
|
2006-05-28 17:50:14 +02:00
|
|
|
{
|
2006-03-01 14:47:49 +01:00
|
|
|
if (parent_dir_len == 1 && mi->posix_pathlen > 1)
|
|
|
|
mount_points[n_mounts++] = last_slash + 1;
|
|
|
|
}
|
|
|
|
else if (parent_dir_len == last_slash - mi->posix_path
|
|
|
|
&& strncasematch (parent_dir, mi->posix_path, parent_dir_len))
|
|
|
|
mount_points[n_mounts++] = last_slash + 1;
|
|
|
|
}
|
|
|
|
return n_mounts;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* cygdrive_posix_path: Build POSIX path used as the
|
|
|
|
mount point for cygdrives created when there is no other way to
|
|
|
|
obtain a POSIX path from a Win32 one. */
|
|
|
|
|
|
|
|
void
|
|
|
|
mount_info::cygdrive_posix_path (const char *src, char *dst, int trailing_slash_p)
|
|
|
|
{
|
|
|
|
int len = cygdrive_len;
|
|
|
|
|
|
|
|
memcpy (dst, cygdrive, len + 1);
|
|
|
|
|
|
|
|
/* Now finish the path off with the drive letter to be used.
|
|
|
|
The cygdrive prefix always ends with a trailing slash so
|
|
|
|
the drive letter is added after the path. */
|
2000-10-19 05:12:44 +02:00
|
|
|
dst[len++] = cyg_tolower (src[0]);
|
2003-01-09 09:22:05 +01:00
|
|
|
if (!src[2] || (isdirsep (src[2]) && !src[3]))
|
2000-02-17 20:38:33 +01:00
|
|
|
dst[len++] = '\000';
|
|
|
|
else
|
|
|
|
{
|
2000-10-09 20:10:53 +02:00
|
|
|
int n;
|
2000-02-17 20:38:33 +01:00
|
|
|
dst[len++] = '/';
|
2003-01-09 09:22:05 +01:00
|
|
|
if (isdirsep (src[2]))
|
2000-10-09 20:10:53 +02:00
|
|
|
n = 3;
|
|
|
|
else
|
|
|
|
n = 2;
|
|
|
|
strcpy (dst + len, src + n);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
slashify (dst, dst, trailing_slash_p);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2001-11-22 06:59:07 +01:00
|
|
|
mount_info::cygdrive_win32_path (const char *src, char *dst, int& unit)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-11-22 06:59:07 +01:00
|
|
|
int res;
|
2000-02-17 20:38:33 +01:00
|
|
|
const char *p = src + cygdrive_len;
|
|
|
|
if (!isalpha (*p) || (!isdirsep (p[1]) && p[1]))
|
2001-11-22 06:59:07 +01:00
|
|
|
{
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
unit = -1; /* FIXME: should be zero, maybe? */
|
2001-11-22 06:59:07 +01:00
|
|
|
dst[0] = '\0';
|
2001-12-03 17:47:18 +01:00
|
|
|
res = 0;
|
2001-11-22 06:59:07 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
dst[0] = cyg_tolower (*p);
|
|
|
|
dst[1] = ':';
|
|
|
|
strcpy (dst + 2, p + 1);
|
|
|
|
backslashify (dst, dst, !dst[2]);
|
|
|
|
unit = dst[0];
|
2001-12-03 17:47:18 +01:00
|
|
|
res = 1;
|
2001-11-22 06:59:07 +01:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
debug_printf ("src '%s', dst '%s'", src, dst);
|
2001-12-03 17:47:18 +01:00
|
|
|
return res;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* conv_to_posix_path: Ensure src_path is a POSIX path.
|
|
|
|
|
|
|
|
The result is zero for success, or an errno value.
|
2003-11-15 00:40:06 +01:00
|
|
|
posix_path must have sufficient space (i.e. CYG_MAX_PATH bytes).
|
2000-02-17 20:38:33 +01:00
|
|
|
If keep_rel_p is non-zero, relative paths stay that way. */
|
|
|
|
|
|
|
|
int
|
2004-12-18 17:41:27 +01:00
|
|
|
mount_info::conv_to_posix_path (const char *src_path, char *posix_path,
|
2000-02-17 20:38:33 +01:00
|
|
|
int keep_rel_p)
|
|
|
|
{
|
|
|
|
int src_path_len = strlen (src_path);
|
2000-05-17 07:49:51 +02:00
|
|
|
int relative_path_p = !isabspath (src_path);
|
|
|
|
int trailing_slash_p;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-05-17 07:49:51 +02:00
|
|
|
if (src_path_len <= 1)
|
|
|
|
trailing_slash_p = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const char *lastchar = src_path + src_path_len - 1;
|
2003-01-09 09:22:05 +01:00
|
|
|
trailing_slash_p = isdirsep (*lastchar) && lastchar[-1] != ':';
|
2000-05-17 07:49:51 +02:00
|
|
|
}
|
2000-08-22 05:58:47 +02:00
|
|
|
|
2004-12-18 17:41:27 +01:00
|
|
|
debug_printf ("conv_to_posix_path (%s, %s, %s)", src_path,
|
2000-05-23 16:08:52 +02:00
|
|
|
keep_rel_p ? "keep-rel" : "no-keep-rel",
|
|
|
|
trailing_slash_p ? "add-slash" : "no-add-slash");
|
2000-02-17 20:38:33 +01:00
|
|
|
MALLOC_CHECK;
|
|
|
|
|
2003-11-15 00:40:06 +01:00
|
|
|
if (src_path_len >= CYG_MAX_PATH)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
debug_printf ("ENAMETOOLONG");
|
|
|
|
return ENAMETOOLONG;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: For now, if the path is relative and it's supposed to stay
|
|
|
|
that way, skip mount table processing. */
|
2000-04-21 07:32:19 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
if (keep_rel_p && relative_path_p)
|
|
|
|
{
|
|
|
|
slashify (src_path, posix_path, 0);
|
2004-12-18 17:41:27 +01:00
|
|
|
debug_printf ("%s = conv_to_posix_path (%s)", posix_path, src_path);
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-12-18 17:41:27 +01:00
|
|
|
char pathbuf[CYG_MAX_PATH];
|
2004-12-19 04:27:09 +01:00
|
|
|
char *tail;
|
|
|
|
int rc = normalize_win32_path (src_path, pathbuf, tail);
|
2000-02-17 20:38:33 +01:00
|
|
|
if (rc != 0)
|
|
|
|
{
|
2004-12-18 17:41:27 +01:00
|
|
|
debug_printf ("%d = conv_to_posix_path (%s)", rc, src_path);
|
2000-02-17 20:38:33 +01:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2004-12-18 17:41:27 +01:00
|
|
|
int pathbuflen = tail - pathbuf;
|
2000-02-17 20:38:33 +01:00
|
|
|
for (int i = 0; i < nmounts; ++i)
|
|
|
|
{
|
|
|
|
mount_item &mi = mount[native_sorted[i]];
|
2001-03-05 07:28:25 +01:00
|
|
|
if (!path_prefix_p (mi.native_path, pathbuf, mi.native_pathlen))
|
2000-02-17 20:38:33 +01:00
|
|
|
continue;
|
|
|
|
|
2001-06-03 04:31:16 +02:00
|
|
|
if (cygheap->root.exists () && !cygheap->root.posix_ok (mi.posix_path))
|
|
|
|
continue;
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* SRC_PATH is in the mount table. */
|
|
|
|
int nextchar;
|
2000-05-23 16:08:52 +02:00
|
|
|
const char *p = pathbuf + mi.native_pathlen;
|
|
|
|
|
|
|
|
if (!*p || !p[1])
|
2000-02-17 20:38:33 +01:00
|
|
|
nextchar = 0;
|
2003-01-10 21:25:47 +01:00
|
|
|
else if (isdirsep (*p))
|
2000-02-17 20:38:33 +01:00
|
|
|
nextchar = -1;
|
|
|
|
else
|
|
|
|
nextchar = 1;
|
|
|
|
|
|
|
|
int addslash = nextchar > 0 ? 1 : 0;
|
2003-11-15 00:40:06 +01:00
|
|
|
if ((mi.posix_pathlen + (pathbuflen - mi.native_pathlen) + addslash) >= CYG_MAX_PATH)
|
2000-02-17 20:38:33 +01:00
|
|
|
return ENAMETOOLONG;
|
|
|
|
strcpy (posix_path, mi.posix_path);
|
|
|
|
if (addslash)
|
|
|
|
strcat (posix_path, "/");
|
|
|
|
if (nextchar)
|
2000-05-23 16:08:52 +02:00
|
|
|
slashify (p,
|
2000-02-17 20:38:33 +01:00
|
|
|
posix_path + addslash + (mi.posix_pathlen == 1 ? 0 : mi.posix_pathlen),
|
2000-05-23 16:08:52 +02:00
|
|
|
trailing_slash_p);
|
2001-06-03 04:31:16 +02:00
|
|
|
|
|
|
|
if (cygheap->root.exists ())
|
|
|
|
{
|
|
|
|
const char *p = cygheap->root.unchroot (posix_path);
|
|
|
|
memmove (posix_path, p, strlen (p) + 1);
|
|
|
|
}
|
2003-07-04 05:07:01 +02:00
|
|
|
if (mi.flags & MOUNT_ENC)
|
|
|
|
{
|
2005-04-03 10:45:21 +02:00
|
|
|
char tmpbuf[CYG_MAX_PATH];
|
2003-07-04 05:07:01 +02:00
|
|
|
if (fnunmunge (tmpbuf, posix_path))
|
|
|
|
strcpy (posix_path, tmpbuf);
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2001-06-03 04:31:16 +02:00
|
|
|
if (!cygheap->root.exists ())
|
|
|
|
/* nothing */;
|
2004-05-07 05:27:37 +02:00
|
|
|
else if (!cygheap->root.ischroot_native (pathbuf))
|
|
|
|
return ENOENT;
|
|
|
|
else
|
2001-06-03 04:31:16 +02:00
|
|
|
{
|
|
|
|
const char *p = pathbuf + cygheap->root.native_length ();
|
|
|
|
if (*p)
|
|
|
|
slashify (p, posix_path, trailing_slash_p);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
posix_path[0] = '/';
|
|
|
|
posix_path[1] = '\0';
|
|
|
|
}
|
2004-05-07 05:27:37 +02:00
|
|
|
goto out;
|
2001-06-03 04:31:16 +02:00
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Not in the database. This should [theoretically] only happen if either
|
|
|
|
the path begins with //, or / isn't mounted, or the path has a drive
|
|
|
|
letter not covered by the mount table. If it's a relative path then the
|
|
|
|
caller must want an absolute path (otherwise we would have returned
|
|
|
|
above). So we always return an absolute path at this point. */
|
2000-05-30 02:38:51 +02:00
|
|
|
if (isdrive (pathbuf))
|
2000-05-17 07:49:51 +02:00
|
|
|
cygdrive_posix_path (pathbuf, posix_path, trailing_slash_p);
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* The use of src_path and not pathbuf here is intentional.
|
|
|
|
We couldn't translate the path, so just ensure no \'s are present. */
|
2003-01-10 21:25:47 +01:00
|
|
|
slashify (src_path, posix_path, trailing_slash_p);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2004-12-18 17:41:27 +01:00
|
|
|
debug_printf ("%s = conv_to_posix_path (%s)", posix_path, src_path);
|
2000-02-17 20:38:33 +01:00
|
|
|
MALLOC_CHECK;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return flags associated with a mount point given the win32 path. */
|
|
|
|
|
|
|
|
unsigned
|
|
|
|
mount_info::set_flags_from_win32_path (const char *p)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < nmounts; i++)
|
|
|
|
{
|
|
|
|
mount_item &mi = mount[native_sorted[i]];
|
|
|
|
if (path_prefix_p (mi.native_path, p, mi.native_pathlen))
|
|
|
|
return mi.flags;
|
|
|
|
}
|
2002-06-05 06:01:43 +02:00
|
|
|
return PATH_BINARY;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* read_mounts: Given a specific regkey, read mounts from under its
|
|
|
|
key. */
|
|
|
|
|
|
|
|
void
|
|
|
|
mount_info::read_mounts (reg_key& r)
|
|
|
|
{
|
2003-11-15 00:40:06 +01:00
|
|
|
char posix_path[CYG_MAX_PATH];
|
2000-02-17 20:38:33 +01:00
|
|
|
HKEY key = r.get_key ();
|
|
|
|
DWORD i, posix_path_size;
|
2000-09-18 18:42:28 +02:00
|
|
|
int res;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* Loop through subkeys */
|
|
|
|
/* FIXME: we would like to not check MAX_MOUNTS but the heap in the
|
|
|
|
shared area is currently statically allocated so we can't have an
|
|
|
|
arbitrarily large number of mounts. */
|
2000-09-18 18:42:28 +02:00
|
|
|
for (i = 0; ; i++)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-11-15 00:40:06 +01:00
|
|
|
char native_path[CYG_MAX_PATH];
|
2000-02-17 20:38:33 +01:00
|
|
|
int mount_flags;
|
|
|
|
|
2004-12-03 03:00:37 +01:00
|
|
|
posix_path_size = sizeof (posix_path);
|
2000-02-17 20:38:33 +01:00
|
|
|
/* FIXME: if maximum posix_path_size is 256, we're going to
|
|
|
|
run into problems if we ever try to store a mount point that's
|
2003-11-15 00:40:06 +01:00
|
|
|
over 256 but is under CYG_MAX_PATH. */
|
2000-09-18 18:42:28 +02:00
|
|
|
res = RegEnumKeyEx (key, i, posix_path, &posix_path_size, NULL,
|
2000-02-17 20:38:33 +01:00
|
|
|
NULL, NULL, NULL);
|
|
|
|
|
2000-09-18 18:42:28 +02:00
|
|
|
if (res == ERROR_NO_MORE_ITEMS)
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
2000-09-18 18:42:28 +02:00
|
|
|
else if (res != ERROR_SUCCESS)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2002-09-30 06:35:18 +02:00
|
|
|
debug_printf ("RegEnumKeyEx failed, error %d!", res);
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get a reg_key based on i. */
|
|
|
|
reg_key subkey = reg_key (key, KEY_READ, posix_path, NULL);
|
|
|
|
|
|
|
|
/* Fetch info from the subkey. */
|
|
|
|
subkey.get_string ("native", native_path, sizeof (native_path), "");
|
|
|
|
mount_flags = subkey.get_int ("flags", 0);
|
|
|
|
|
|
|
|
/* Add mount_item corresponding to registry mount point. */
|
2001-12-07 06:03:32 +01:00
|
|
|
res = mount_table->add_item (native_path, posix_path, mount_flags, false);
|
2000-06-08 15:24:52 +02:00
|
|
|
if (res && get_errno () == EMFILE)
|
|
|
|
break; /* The number of entries exceeds MAX_MOUNTS */
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* from_registry: Build the entire mount table from the registry. Also,
|
|
|
|
read in cygdrive-related information from its registry location. */
|
|
|
|
|
|
|
|
void
|
|
|
|
mount_info::from_registry ()
|
|
|
|
{
|
|
|
|
|
|
|
|
/* Retrieve cygdrive-related information. */
|
|
|
|
read_cygdrive_info_from_registry ();
|
|
|
|
|
|
|
|
nmounts = 0;
|
|
|
|
|
2004-12-03 03:00:37 +01:00
|
|
|
/* First read mounts from user's table.
|
|
|
|
Then read mounts from system-wide mount table while deimpersonated . */
|
|
|
|
for (int i = 0; i < 2; i++)
|
|
|
|
{
|
|
|
|
if (i)
|
|
|
|
cygheap->user.deimpersonate ();
|
|
|
|
reg_key r (i, KEY_READ, CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME, NULL);
|
|
|
|
read_mounts (r);
|
|
|
|
if (i)
|
|
|
|
cygheap->user.reimpersonate ();
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* add_reg_mount: Add mount item to registry. Return zero on success,
|
|
|
|
non-zero on failure. */
|
|
|
|
/* FIXME: Need a mutex to avoid collisions with other tasks. */
|
|
|
|
|
|
|
|
int
|
2003-06-17 18:52:18 +02:00
|
|
|
mount_info::add_reg_mount (const char *native_path, const char *posix_path, unsigned mountflags)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2004-12-03 03:00:37 +01:00
|
|
|
int res;
|
|
|
|
|
|
|
|
/* Add the mount to the right registry location, depending on
|
|
|
|
whether MOUNT_SYSTEM is set in the mount flags. */
|
2000-09-18 18:42:28 +02:00
|
|
|
|
2004-12-03 03:00:37 +01:00
|
|
|
reg_key reg (mountflags & MOUNT_SYSTEM, KEY_ALL_ACCESS,
|
|
|
|
CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME, NULL);
|
|
|
|
|
|
|
|
/* Start by deleting existing mount if one exists. */
|
|
|
|
res = reg.kill (posix_path);
|
|
|
|
if (res != ERROR_SUCCESS && res != ERROR_FILE_NOT_FOUND)
|
2003-06-17 18:52:18 +02:00
|
|
|
{
|
2004-12-03 03:00:37 +01:00
|
|
|
err:
|
|
|
|
__seterrno_from_win_error (res);
|
|
|
|
return -1;
|
2003-06-17 18:52:18 +02:00
|
|
|
}
|
|
|
|
|
2004-12-03 03:00:37 +01:00
|
|
|
/* Create the new mount. */
|
|
|
|
reg_key subkey (reg.get_key (), KEY_ALL_ACCESS, posix_path, NULL);
|
2001-01-28 07:23:42 +01:00
|
|
|
|
2004-12-03 03:00:37 +01:00
|
|
|
res = subkey.set_string ("native", native_path);
|
|
|
|
if (res != ERROR_SUCCESS)
|
|
|
|
goto err;
|
|
|
|
res = subkey.set_int ("flags", mountflags);
|
2004-12-23 22:37:44 +01:00
|
|
|
|
2004-12-03 03:00:37 +01:00
|
|
|
if (mountflags & MOUNT_SYSTEM)
|
|
|
|
{
|
2001-01-28 07:23:42 +01:00
|
|
|
sys_mount_table_counter++;
|
|
|
|
cygwin_shared->sys_mount_table_counter++;
|
2004-12-23 22:37:44 +01:00
|
|
|
}
|
2001-03-05 07:28:25 +01:00
|
|
|
return 0; /* Success */
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* del_reg_mount: delete mount item from registry indicated in flags.
|
|
|
|
Return zero on success, non-zero on failure.*/
|
|
|
|
/* FIXME: Need a mutex to avoid collisions with other tasks. */
|
|
|
|
|
|
|
|
int
|
|
|
|
mount_info::del_reg_mount (const char * posix_path, unsigned flags)
|
|
|
|
{
|
2000-09-18 18:42:28 +02:00
|
|
|
int res;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-12-03 03:00:37 +01:00
|
|
|
reg_key reg (flags & MOUNT_SYSTEM, KEY_ALL_ACCESS,
|
|
|
|
CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME, NULL);
|
|
|
|
res = reg.kill (posix_path);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-09-18 18:42:28 +02:00
|
|
|
if (res != ERROR_SUCCESS)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-09-18 18:42:28 +02:00
|
|
|
__seterrno_from_win_error (res);
|
2000-02-17 20:38:33 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-12-03 03:00:37 +01:00
|
|
|
if (flags & MOUNT_SYSTEM)
|
|
|
|
{
|
|
|
|
sys_mount_table_counter++;
|
|
|
|
cygwin_shared->sys_mount_table_counter++;
|
|
|
|
}
|
|
|
|
|
2001-03-05 07:28:25 +01:00
|
|
|
return 0; /* Success */
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* read_cygdrive_info_from_registry: Read the default prefix and flags
|
|
|
|
to use when creating cygdrives from the special user registry
|
|
|
|
location used to store cygdrive information. */
|
|
|
|
|
|
|
|
void
|
|
|
|
mount_info::read_cygdrive_info_from_registry ()
|
|
|
|
{
|
2004-12-03 03:00:37 +01:00
|
|
|
/* First read cygdrive from user's registry.
|
|
|
|
If failed, then read cygdrive from system-wide registry
|
|
|
|
while deimpersonated. */
|
|
|
|
for (int i = 0; i < 2; i++)
|
|
|
|
{
|
|
|
|
if (i)
|
2005-02-13 19:17:29 +01:00
|
|
|
cygheap->user.deimpersonate ();
|
2004-12-03 03:00:37 +01:00
|
|
|
reg_key r (i, KEY_READ, CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME, NULL);
|
|
|
|
if (i)
|
|
|
|
cygheap->user.reimpersonate ();
|
|
|
|
|
2004-12-23 22:37:44 +01:00
|
|
|
if (r.get_string (CYGWIN_INFO_CYGDRIVE_PREFIX, cygdrive, sizeof (cygdrive),
|
2004-12-03 03:00:37 +01:00
|
|
|
CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX) != ERROR_SUCCESS && i == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Fetch user cygdrive_flags from registry; returns MOUNT_CYGDRIVE on error. */
|
2004-12-23 22:37:44 +01:00
|
|
|
cygdrive_flags = r.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS,
|
2004-12-03 03:00:37 +01:00
|
|
|
MOUNT_CYGDRIVE | MOUNT_BINARY);
|
|
|
|
/* Sanitize */
|
|
|
|
if (i == 0)
|
2004-12-19 04:27:09 +01:00
|
|
|
cygdrive_flags &= ~MOUNT_SYSTEM;
|
2004-12-03 03:00:37 +01:00
|
|
|
else
|
2005-02-13 19:17:29 +01:00
|
|
|
cygdrive_flags |= MOUNT_SYSTEM;
|
2000-02-17 20:38:33 +01:00
|
|
|
slashify (cygdrive, cygdrive, 1);
|
2002-09-22 05:38:57 +02:00
|
|
|
cygdrive_len = strlen (cygdrive);
|
2005-03-06 22:28:28 +01:00
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* write_cygdrive_info_to_registry: Write the default prefix and flags
|
|
|
|
to use when creating cygdrives to the special user registry
|
|
|
|
location used to store cygdrive information. */
|
|
|
|
|
|
|
|
int
|
|
|
|
mount_info::write_cygdrive_info_to_registry (const char *cygdrive_prefix, unsigned flags)
|
|
|
|
{
|
|
|
|
/* Verify cygdrive prefix starts with a forward slash and if there's
|
|
|
|
another character, it's not a slash. */
|
|
|
|
if ((cygdrive_prefix == NULL) || (*cygdrive_prefix == 0) ||
|
2000-04-21 07:32:19 +02:00
|
|
|
(!isslash (cygdrive_prefix[0])) ||
|
|
|
|
((cygdrive_prefix[1] != '\0') && (isslash (cygdrive_prefix[1]))))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
char hold_cygdrive_prefix[strlen (cygdrive_prefix) + 1];
|
|
|
|
/* Ensure that there is never a final slash */
|
|
|
|
nofinalslash (cygdrive_prefix, hold_cygdrive_prefix);
|
|
|
|
|
2004-12-23 22:37:44 +01:00
|
|
|
reg_key r (flags & MOUNT_SYSTEM, KEY_ALL_ACCESS,
|
2004-12-03 03:00:37 +01:00
|
|
|
CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME, NULL);
|
2000-09-18 18:42:28 +02:00
|
|
|
int res;
|
2000-11-06 17:40:29 +01:00
|
|
|
res = r.set_string (CYGWIN_INFO_CYGDRIVE_PREFIX, hold_cygdrive_prefix);
|
2000-09-18 18:42:28 +02:00
|
|
|
if (res != ERROR_SUCCESS)
|
|
|
|
{
|
|
|
|
__seterrno_from_win_error (res);
|
|
|
|
return -1;
|
|
|
|
}
|
2000-11-06 17:40:29 +01:00
|
|
|
r.set_int (CYGWIN_INFO_CYGDRIVE_FLAGS, flags);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-12-03 03:00:37 +01:00
|
|
|
if (flags & MOUNT_SYSTEM)
|
|
|
|
sys_mount_table_counter = ++cygwin_shared->sys_mount_table_counter;
|
|
|
|
|
2000-07-29 00:33:43 +02:00
|
|
|
/* This also needs to go in the in-memory copy of "cygdrive", but only if
|
|
|
|
appropriate:
|
|
|
|
1. setting user path prefix, or
|
|
|
|
2. overwriting (a previous) system path prefix */
|
2001-01-28 07:23:42 +01:00
|
|
|
if (!(flags & MOUNT_SYSTEM) || (mount_table->cygdrive_flags & MOUNT_SYSTEM))
|
2000-07-29 00:33:43 +02:00
|
|
|
{
|
2004-12-03 03:00:37 +01:00
|
|
|
slashify (cygdrive_prefix, cygdrive, 1);
|
|
|
|
cygdrive_flags = flags;
|
|
|
|
cygdrive_len = strlen (cygdrive);
|
2000-07-29 00:33:43 +02:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-07-29 00:33:43 +02:00
|
|
|
int
|
|
|
|
mount_info::remove_cygdrive_info_from_registry (const char *cygdrive_prefix, unsigned flags)
|
|
|
|
{
|
2004-12-23 22:37:44 +01:00
|
|
|
reg_key r (flags & MOUNT_SYSTEM, KEY_ALL_ACCESS,
|
2000-07-29 00:33:43 +02:00
|
|
|
CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
/* Delete cygdrive prefix and flags. */
|
2000-11-06 17:40:29 +01:00
|
|
|
int res = r.killvalue (CYGWIN_INFO_CYGDRIVE_PREFIX);
|
|
|
|
int res2 = r.killvalue (CYGWIN_INFO_CYGDRIVE_FLAGS);
|
2000-07-29 00:33:43 +02:00
|
|
|
|
2004-12-03 03:00:37 +01:00
|
|
|
if (flags & MOUNT_SYSTEM)
|
|
|
|
sys_mount_table_counter = ++cygwin_shared->sys_mount_table_counter;
|
|
|
|
|
2000-07-29 00:33:43 +02:00
|
|
|
/* Reinitialize the cygdrive path prefix to reflect to removal from the
|
|
|
|
registry. */
|
|
|
|
read_cygdrive_info_from_registry ();
|
|
|
|
|
2004-12-03 03:00:37 +01:00
|
|
|
if (res == ERROR_SUCCESS)
|
|
|
|
res = res2;
|
|
|
|
if (res == ERROR_SUCCESS)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
__seterrno_from_win_error (res);
|
|
|
|
return -1;
|
2000-07-29 00:33:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-11-08 21:36:37 +01:00
|
|
|
mount_info::get_cygdrive_info (char *user, char *system, char* user_flags,
|
|
|
|
char* system_flags)
|
2000-07-29 00:33:43 +02:00
|
|
|
{
|
|
|
|
/* Get the user path prefix from HKEY_CURRENT_USER. */
|
2004-12-03 03:00:37 +01:00
|
|
|
reg_key r (false, KEY_READ, CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME, NULL);
|
2003-11-15 00:40:06 +01:00
|
|
|
int res = r.get_string (CYGWIN_INFO_CYGDRIVE_PREFIX, user, CYG_MAX_PATH, "");
|
2000-07-29 00:33:43 +02:00
|
|
|
|
2000-11-08 21:36:37 +01:00
|
|
|
/* Get the user flags, if appropriate */
|
|
|
|
if (res == ERROR_SUCCESS)
|
|
|
|
{
|
2004-09-24 21:41:19 +02:00
|
|
|
int flags = r.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE | MOUNT_BINARY);
|
2000-11-08 21:36:37 +01:00
|
|
|
strcpy (user_flags, (flags & MOUNT_BINARY) ? "binmode" : "textmode");
|
|
|
|
}
|
|
|
|
|
2000-07-29 00:33:43 +02:00
|
|
|
/* Get the system path prefix from HKEY_LOCAL_MACHINE. */
|
2004-12-03 03:00:37 +01:00
|
|
|
reg_key r2 (true, KEY_READ, CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME, NULL);
|
2003-11-15 00:40:06 +01:00
|
|
|
int res2 = r2.get_string (CYGWIN_INFO_CYGDRIVE_PREFIX, system, CYG_MAX_PATH, "");
|
2000-07-29 00:33:43 +02:00
|
|
|
|
2000-11-08 21:36:37 +01:00
|
|
|
/* Get the system flags, if appropriate */
|
|
|
|
if (res2 == ERROR_SUCCESS)
|
|
|
|
{
|
2004-09-24 21:41:19 +02:00
|
|
|
int flags = r2.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE | MOUNT_BINARY);
|
2000-11-08 21:36:37 +01:00
|
|
|
strcpy (system_flags, (flags & MOUNT_BINARY) ? "binmode" : "textmode");
|
|
|
|
}
|
|
|
|
|
2000-07-29 00:33:43 +02:00
|
|
|
return (res != ERROR_SUCCESS) ? res : res2;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
static mount_item *mounts_for_sort;
|
|
|
|
|
|
|
|
/* sort_by_posix_name: qsort callback to sort the mount entries. Sort
|
|
|
|
user mounts ahead of system mounts to the same POSIX path. */
|
|
|
|
/* FIXME: should the user should be able to choose whether to
|
|
|
|
prefer user or system mounts??? */
|
|
|
|
static int
|
|
|
|
sort_by_posix_name (const void *a, const void *b)
|
|
|
|
{
|
|
|
|
mount_item *ap = mounts_for_sort + (*((int*) a));
|
|
|
|
mount_item *bp = mounts_for_sort + (*((int*) b));
|
|
|
|
|
|
|
|
/* Base weighting on longest posix path first so that the most
|
|
|
|
obvious path will be chosen. */
|
|
|
|
size_t alen = strlen (ap->posix_path);
|
|
|
|
size_t blen = strlen (bp->posix_path);
|
|
|
|
|
|
|
|
int res = blen - alen;
|
|
|
|
|
|
|
|
if (res)
|
|
|
|
return res; /* Path lengths differed */
|
|
|
|
|
|
|
|
/* The two paths were the same length, so just determine normal
|
|
|
|
lexical sorted order. */
|
|
|
|
res = strcmp (ap->posix_path, bp->posix_path);
|
|
|
|
|
|
|
|
if (res == 0)
|
|
|
|
{
|
|
|
|
/* need to select between user and system mount to same POSIX path */
|
2001-01-28 07:23:42 +01:00
|
|
|
if (!(bp->flags & MOUNT_SYSTEM)) /* user mount */
|
2000-02-17 20:38:33 +01:00
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* sort_by_native_name: qsort callback to sort the mount entries. Sort
|
|
|
|
user mounts ahead of system mounts to the same POSIX path. */
|
|
|
|
/* FIXME: should the user should be able to choose whether to
|
|
|
|
prefer user or system mounts??? */
|
|
|
|
static int
|
|
|
|
sort_by_native_name (const void *a, const void *b)
|
|
|
|
{
|
|
|
|
mount_item *ap = mounts_for_sort + (*((int*) a));
|
|
|
|
mount_item *bp = mounts_for_sort + (*((int*) b));
|
|
|
|
|
|
|
|
/* Base weighting on longest win32 path first so that the most
|
|
|
|
obvious path will be chosen. */
|
|
|
|
size_t alen = strlen (ap->native_path);
|
|
|
|
size_t blen = strlen (bp->native_path);
|
|
|
|
|
|
|
|
int res = blen - alen;
|
|
|
|
|
|
|
|
if (res)
|
|
|
|
return res; /* Path lengths differed */
|
|
|
|
|
|
|
|
/* The two paths were the same length, so just determine normal
|
|
|
|
lexical sorted order. */
|
2000-07-01 19:30:35 +02:00
|
|
|
res = strcmp (ap->native_path, bp->native_path);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
if (res == 0)
|
|
|
|
{
|
|
|
|
/* need to select between user and system mount to same POSIX path */
|
2001-01-28 07:23:42 +01:00
|
|
|
if (!(bp->flags & MOUNT_SYSTEM)) /* user mount */
|
2000-02-17 20:38:33 +01:00
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
mount_info::sort ()
|
|
|
|
{
|
|
|
|
for (int i = 0; i < nmounts; i++)
|
|
|
|
native_sorted[i] = posix_sorted[i] = i;
|
|
|
|
/* Sort them into reverse length order, otherwise we won't
|
|
|
|
be able to look for /foo in /. */
|
|
|
|
mounts_for_sort = mount; /* ouch. */
|
|
|
|
qsort (posix_sorted, nmounts, sizeof (posix_sorted[0]), sort_by_posix_name);
|
|
|
|
qsort (native_sorted, nmounts, sizeof (native_sorted[0]), sort_by_native_name);
|
|
|
|
}
|
|
|
|
|
2000-06-08 15:24:52 +02:00
|
|
|
/* Add an entry to the mount table.
|
2000-02-17 20:38:33 +01:00
|
|
|
Returns 0 on success, -1 on failure and errno is set.
|
|
|
|
|
|
|
|
This is where all argument validation is done. It may not make sense to
|
|
|
|
do this when called internally, but it's cleaner to keep it all here. */
|
|
|
|
|
|
|
|
int
|
2000-06-08 15:24:52 +02:00
|
|
|
mount_info::add_item (const char *native, const char *posix, unsigned mountflags, int reg_p)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2004-12-18 17:41:27 +01:00
|
|
|
char nativetmp[CYG_MAX_PATH];
|
|
|
|
char posixtmp[CYG_MAX_PATH];
|
|
|
|
char *nativetail, *posixtail, error[] = "error";
|
2004-05-31 04:20:39 +02:00
|
|
|
int nativeerr, posixerr;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-05-31 04:20:39 +02:00
|
|
|
/* Something's wrong if either path is NULL or empty, or if it's
|
|
|
|
not a UNC or absolute path. */
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-05-31 04:20:39 +02:00
|
|
|
if (native == NULL || !isabspath (native) ||
|
|
|
|
!(is_unc_share (native) || isdrive (native)))
|
|
|
|
nativeerr = EINVAL;
|
|
|
|
else
|
2004-12-19 04:27:09 +01:00
|
|
|
nativeerr = normalize_win32_path (native, nativetmp, nativetail);
|
2004-05-31 04:20:39 +02:00
|
|
|
|
|
|
|
if (posix == NULL || !isabspath (posix) ||
|
|
|
|
is_unc_share (posix) || isdrive (posix))
|
|
|
|
posixerr = EINVAL;
|
|
|
|
else
|
2004-12-19 04:27:09 +01:00
|
|
|
posixerr = normalize_posix_path (posix, posixtmp, posixtail);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
debug_printf ("%s[%s], %s[%s], %p",
|
2004-12-18 17:41:27 +01:00
|
|
|
native, nativeerr ? error : nativetmp,
|
|
|
|
posix, posixerr ? error : posixtmp, mountflags);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-06-02 23:20:54 +02:00
|
|
|
if (nativeerr || posixerr)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2004-05-31 04:20:39 +02:00
|
|
|
set_errno (nativeerr?:posixerr);
|
2004-06-02 23:20:54 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-05-31 04:20:39 +02:00
|
|
|
|
|
|
|
/* Make sure both paths do not end in /. */
|
2004-12-18 17:41:27 +01:00
|
|
|
if (nativetail > nativetmp + 1 && nativetail[-1] == '\\')
|
|
|
|
nativetail[-1] = '\0';
|
|
|
|
if (posixtail > posixtmp + 1 && posixtail[-1] == '/')
|
|
|
|
posixtail[-1] = '\0';
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* Write over an existing mount item with the same POSIX path if
|
|
|
|
it exists and is from the same registry area. */
|
2000-06-08 15:24:52 +02:00
|
|
|
int i;
|
|
|
|
for (i = 0; i < nmounts; i++)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-06-08 15:24:52 +02:00
|
|
|
if (strcasematch (mount[i].posix_path, posixtmp) &&
|
|
|
|
(mount[i].flags & MOUNT_SYSTEM) == (mountflags & MOUNT_SYSTEM))
|
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2000-09-18 18:42:28 +02:00
|
|
|
if (i == nmounts && nmounts == MAX_MOUNTS)
|
2000-06-08 15:24:52 +02:00
|
|
|
{
|
2000-09-18 18:42:28 +02:00
|
|
|
set_errno (EMFILE);
|
|
|
|
return -1;
|
2000-06-08 15:24:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (reg_p && add_reg_mount (nativetmp, posixtmp, mountflags))
|
|
|
|
return -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-09-18 18:42:28 +02:00
|
|
|
if (i == nmounts)
|
|
|
|
nmounts++;
|
2000-06-08 15:24:52 +02:00
|
|
|
mount[i].init (nativetmp, posixtmp, mountflags);
|
2000-02-17 20:38:33 +01:00
|
|
|
sort ();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Delete a mount table entry where path is either a Win32 or POSIX
|
|
|
|
path. Since the mount table is really just a table of aliases,
|
|
|
|
deleting / is ok (although running without a slash mount is
|
|
|
|
strongly discouraged because some programs may run erratically
|
|
|
|
without one). If MOUNT_SYSTEM is set in flags, remove from system
|
|
|
|
registry, otherwise remove the user registry mount.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2000-06-08 15:24:52 +02:00
|
|
|
mount_info::del_item (const char *path, unsigned flags, int reg_p)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-11-15 00:40:06 +01:00
|
|
|
char pathtmp[CYG_MAX_PATH];
|
2001-12-07 06:03:32 +01:00
|
|
|
int posix_path_p = false;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* Something's wrong if path is NULL or empty. */
|
2000-06-15 21:44:50 +02:00
|
|
|
if (path == NULL || *path == 0 || !isabspath (path))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-04-20 20:45:16 +02:00
|
|
|
if (is_unc_share (path) || strpbrk (path, ":\\"))
|
2001-05-25 05:13:14 +02:00
|
|
|
backslashify (path, pathtmp, 0);
|
2000-06-15 21:44:50 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
slashify (path, pathtmp, 0);
|
2003-12-07 23:37:12 +01:00
|
|
|
posix_path_p = true;
|
2000-06-15 21:44:50 +02:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
nofinalslash (pathtmp, pathtmp);
|
|
|
|
|
2000-06-15 21:44:50 +02:00
|
|
|
if (reg_p && posix_path_p &&
|
|
|
|
del_reg_mount (pathtmp, flags) &&
|
|
|
|
del_reg_mount (path, flags)) /* for old irregular entries */
|
2000-06-08 15:24:52 +02:00
|
|
|
return -1;
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
for (int i = 0; i < nmounts; i++)
|
|
|
|
{
|
2000-06-15 21:44:50 +02:00
|
|
|
int ent = native_sorted[i]; /* in the same order as getmntent() */
|
|
|
|
if (((posix_path_p)
|
|
|
|
? strcasematch (mount[ent].posix_path, pathtmp)
|
|
|
|
: strcasematch (mount[ent].native_path, pathtmp)) &&
|
|
|
|
(mount[ent].flags & MOUNT_SYSTEM) == (flags & MOUNT_SYSTEM))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-06-15 21:44:50 +02:00
|
|
|
if (!posix_path_p &&
|
|
|
|
reg_p && del_reg_mount (mount[ent].posix_path, flags))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
nmounts--; /* One less mount table entry */
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Fill in the hole if not at the end of the table */
|
2000-06-15 21:44:50 +02:00
|
|
|
if (ent < nmounts)
|
|
|
|
memmove (mount + ent, mount + ent + 1,
|
|
|
|
sizeof (mount[ent]) * (nmounts - ent));
|
|
|
|
sort (); /* Resort the table */
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/************************* mount_item class ****************************/
|
|
|
|
|
2001-04-01 05:06:02 +02:00
|
|
|
static mntent *
|
|
|
|
fillout_mntent (const char *native_path, const char *posix_path, unsigned flags)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-12-23 17:26:31 +01:00
|
|
|
struct mntent& ret=_my_tls.locals.mntbuf;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-04-01 07:09:57 +02:00
|
|
|
/* Remove drivenum from list if we see a x: style path */
|
|
|
|
if (strlen (native_path) == 2 && native_path[1] == ':')
|
|
|
|
{
|
2001-11-22 06:59:07 +01:00
|
|
|
int drivenum = cyg_tolower (native_path[0]) - 'a';
|
2001-04-01 07:09:57 +02:00
|
|
|
if (drivenum >= 0 && drivenum <= 31)
|
2003-12-23 17:26:31 +01:00
|
|
|
_my_tls.locals.available_drives &= ~(1 << drivenum);
|
2001-04-01 07:09:57 +02:00
|
|
|
}
|
|
|
|
|
2001-01-28 06:51:15 +01:00
|
|
|
/* Pass back pointers to mount_table strings reserved for use by
|
2000-02-17 20:38:33 +01:00
|
|
|
getmntent rather than pointers to strings in the internal mount
|
|
|
|
table because the mount table might change, causing weird effects
|
|
|
|
from the getmntent user's point of view. */
|
|
|
|
|
2003-12-23 17:26:31 +01:00
|
|
|
strcpy (_my_tls.locals.mnt_fsname, native_path);
|
|
|
|
ret.mnt_fsname = _my_tls.locals.mnt_fsname;
|
|
|
|
strcpy (_my_tls.locals.mnt_dir, posix_path);
|
|
|
|
ret.mnt_dir = _my_tls.locals.mnt_dir;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-08-22 05:58:47 +02:00
|
|
|
if (!(flags & MOUNT_SYSTEM)) /* user mount */
|
2003-12-23 17:26:31 +01:00
|
|
|
strcpy (_my_tls.locals.mnt_type, (char *) "user");
|
2000-08-22 05:58:47 +02:00
|
|
|
else /* system mount */
|
2003-12-23 17:26:31 +01:00
|
|
|
strcpy (_my_tls.locals.mnt_type, (char *) "system");
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-12-23 17:26:31 +01:00
|
|
|
ret.mnt_type = _my_tls.locals.mnt_type;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* mnt_opts is a string that details mount params such as
|
|
|
|
binary or textmode, or exec. We don't print
|
|
|
|
`silent' here; it's a magic internal thing. */
|
|
|
|
|
2001-03-05 07:28:25 +01:00
|
|
|
if (!(flags & MOUNT_BINARY))
|
2003-12-23 17:26:31 +01:00
|
|
|
strcpy (_my_tls.locals.mnt_opts, (char *) "textmode");
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
2003-12-23 17:26:31 +01:00
|
|
|
strcpy (_my_tls.locals.mnt_opts, (char *) "binmode");
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-04-26 07:13:32 +02:00
|
|
|
if (flags & MOUNT_CYGWIN_EXEC)
|
2003-12-23 17:26:31 +01:00
|
|
|
strcat (_my_tls.locals.mnt_opts, (char *) ",cygexec");
|
2000-04-26 07:13:32 +02:00
|
|
|
else if (flags & MOUNT_EXEC)
|
2003-12-23 17:26:31 +01:00
|
|
|
strcat (_my_tls.locals.mnt_opts, (char *) ",exec");
|
2002-05-12 05:08:59 +02:00
|
|
|
else if (flags & MOUNT_NOTEXEC)
|
2003-12-23 17:26:31 +01:00
|
|
|
strcat (_my_tls.locals.mnt_opts, (char *) ",noexec");
|
2003-07-04 05:07:01 +02:00
|
|
|
if (flags & MOUNT_ENC)
|
2003-12-23 17:26:31 +01:00
|
|
|
strcat (_my_tls.locals.mnt_opts, ",managed");
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-06-09 02:48:38 +02:00
|
|
|
if ((flags & MOUNT_CYGDRIVE)) /* cygdrive */
|
2003-12-23 17:26:31 +01:00
|
|
|
strcat (_my_tls.locals.mnt_opts, (char *) ",noumount");
|
|
|
|
ret.mnt_opts = _my_tls.locals.mnt_opts;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
ret.mnt_freq = 1;
|
|
|
|
ret.mnt_passno = 1;
|
|
|
|
return &ret;
|
|
|
|
}
|
|
|
|
|
2001-04-01 05:06:02 +02:00
|
|
|
struct mntent *
|
|
|
|
mount_item::getmntent ()
|
|
|
|
{
|
|
|
|
return fillout_mntent (native_path, posix_path, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct mntent *
|
|
|
|
cygdrive_getmntent ()
|
|
|
|
{
|
2001-04-01 07:09:57 +02:00
|
|
|
char native_path[4];
|
2003-11-15 00:40:06 +01:00
|
|
|
char posix_path[CYG_MAX_PATH];
|
2001-04-01 07:09:57 +02:00
|
|
|
DWORD mask = 1, drive = 'a';
|
|
|
|
struct mntent *ret = NULL;
|
2001-04-01 05:06:02 +02:00
|
|
|
|
2003-12-23 17:26:31 +01:00
|
|
|
while (_my_tls.locals.available_drives)
|
2001-04-01 07:09:57 +02:00
|
|
|
{
|
|
|
|
for (/* nothing */; drive <= 'z'; mask <<= 1, drive++)
|
2003-12-23 17:26:31 +01:00
|
|
|
if (_my_tls.locals.available_drives & mask)
|
2001-04-01 07:09:57 +02:00
|
|
|
break;
|
2001-04-01 05:06:02 +02:00
|
|
|
|
2001-04-01 07:09:57 +02:00
|
|
|
__small_sprintf (native_path, "%c:\\", drive);
|
2003-08-05 06:49:44 +02:00
|
|
|
if (GetFileAttributes (native_path) == INVALID_FILE_ATTRIBUTES)
|
2001-06-04 03:28:09 +02:00
|
|
|
{
|
2003-12-23 17:26:31 +01:00
|
|
|
_my_tls.locals.available_drives &= ~mask;
|
2001-04-01 07:09:57 +02:00
|
|
|
continue;
|
2001-06-04 03:28:09 +02:00
|
|
|
}
|
2001-04-01 07:09:57 +02:00
|
|
|
native_path[2] = '\0';
|
|
|
|
__small_sprintf (posix_path, "%s%c", mount_table->cygdrive, drive);
|
|
|
|
ret = fillout_mntent (native_path, posix_path, mount_table->cygdrive_flags);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
2001-04-01 05:06:02 +02:00
|
|
|
}
|
2001-06-11 05:38:32 +02:00
|
|
|
|
2001-04-01 05:06:02 +02:00
|
|
|
struct mntent *
|
|
|
|
mount_info::getmntent (int x)
|
|
|
|
{
|
|
|
|
if (x < 0 || x >= nmounts)
|
|
|
|
return cygdrive_getmntent ();
|
|
|
|
|
|
|
|
return mount[native_sorted[x]].getmntent ();
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Fill in the fields of a mount table entry. */
|
|
|
|
|
|
|
|
void
|
|
|
|
mount_item::init (const char *native, const char *posix, unsigned mountflags)
|
|
|
|
{
|
|
|
|
strcpy ((char *) native_path, native);
|
|
|
|
strcpy ((char *) posix_path, posix);
|
|
|
|
|
|
|
|
native_pathlen = strlen (native_path);
|
|
|
|
posix_pathlen = strlen (posix_path);
|
|
|
|
|
|
|
|
flags = mountflags;
|
|
|
|
}
|
|
|
|
|
|
|
|
/********************** Mount System Calls **************************/
|
|
|
|
|
|
|
|
/* Mount table system calls.
|
|
|
|
Note that these are exported to the application. */
|
|
|
|
|
|
|
|
/* mount: Add a mount to the mount table in memory and to the registry
|
|
|
|
that will cause paths under win32_path to be translated to paths
|
|
|
|
under posix_path. */
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
mount (const char *win32_path, const char *posix_path, unsigned flags)
|
|
|
|
{
|
|
|
|
int res = -1;
|
|
|
|
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2003-08-19 02:18:48 +02:00
|
|
|
/* errno set */;
|
2005-07-09 19:15:38 +02:00
|
|
|
else if (!*posix_path)
|
2005-07-03 04:40:30 +02:00
|
|
|
set_errno (EINVAL);
|
2003-08-19 02:18:48 +02:00
|
|
|
else if (strpbrk (posix_path, "\\:"))
|
2003-06-17 18:52:18 +02:00
|
|
|
set_errno (EINVAL);
|
|
|
|
else if (flags & MOUNT_CYGDRIVE) /* normal mount */
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2002-06-09 02:48:38 +02:00
|
|
|
/* When flags include MOUNT_CYGDRIVE, take this to mean that
|
2000-02-17 20:38:33 +01:00
|
|
|
we actually want to change the cygdrive prefix and flags
|
|
|
|
without actually mounting anything. */
|
2001-01-28 06:51:15 +01:00
|
|
|
res = mount_table->write_cygdrive_info_to_registry (posix_path, flags);
|
2000-02-17 20:38:33 +01:00
|
|
|
win32_path = NULL;
|
|
|
|
}
|
2005-07-09 19:15:38 +02:00
|
|
|
else if (!*win32_path)
|
|
|
|
set_errno (EINVAL);
|
2005-07-03 04:40:30 +02:00
|
|
|
else
|
2003-12-07 23:37:12 +01:00
|
|
|
res = mount_table->add_item (win32_path, posix_path, flags, true);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
syscall_printf ("%d = mount (%s, %s, %p)", res, win32_path, posix_path, flags);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* umount: The standard umount call only has a path parameter. Since
|
|
|
|
it is not possible for this call to specify whether to remove the
|
|
|
|
mount from the user or global mount registry table, assume the user
|
|
|
|
table. */
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
umount (const char *path)
|
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2003-08-19 02:18:48 +02:00
|
|
|
return -1;
|
2005-07-03 04:40:30 +02:00
|
|
|
if (!*path)
|
|
|
|
{
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
return cygwin_umount (path, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* cygwin_umount: This is like umount but takes an additional flags
|
|
|
|
parameter that specifies whether to umount from the user or system-wide
|
|
|
|
registry area. */
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
cygwin_umount (const char *path, unsigned flags)
|
|
|
|
{
|
2000-07-29 00:33:43 +02:00
|
|
|
int res = -1;
|
|
|
|
|
2002-06-09 02:48:38 +02:00
|
|
|
if (flags & MOUNT_CYGDRIVE)
|
2000-07-29 00:33:43 +02:00
|
|
|
{
|
2002-06-09 02:48:38 +02:00
|
|
|
/* When flags include MOUNT_CYGDRIVE, take this to mean that we actually want
|
2000-08-22 05:58:47 +02:00
|
|
|
to remove the cygdrive prefix and flags without actually unmounting
|
2000-07-29 00:33:43 +02:00
|
|
|
anything. */
|
2001-01-28 06:51:15 +01:00
|
|
|
res = mount_table->remove_cygdrive_info_from_registry (path, flags);
|
2000-07-29 00:33:43 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-12-07 23:37:12 +01:00
|
|
|
res = mount_table->del_item (path, flags, true);
|
2000-07-29 00:33:43 +02:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
syscall_printf ("%d = cygwin_umount (%s, %d)", res, path, flags);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2005-03-29 19:42:50 +02:00
|
|
|
bool
|
2005-03-10 18:02:52 +01:00
|
|
|
is_floppy (const char *dos)
|
|
|
|
{
|
|
|
|
char dev[256];
|
|
|
|
if (!QueryDosDevice (dos, dev, 256))
|
|
|
|
return false;
|
|
|
|
return strncasematch (dev, "\\Device\\Floppy", 14)
|
2005-05-02 05:50:11 +02:00
|
|
|
|| strcasematch (dev, "A:");
|
2005-03-10 18:02:52 +01:00
|
|
|
}
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" FILE *
|
2000-02-17 20:38:33 +01:00
|
|
|
setmntent (const char *filep, const char *)
|
|
|
|
{
|
2003-12-23 17:26:31 +01:00
|
|
|
_my_tls.locals.iteration = 0;
|
|
|
|
_my_tls.locals.available_drives = GetLogicalDrives ();
|
2005-03-10 18:02:52 +01:00
|
|
|
/* Filter floppy drives on A: and B: */
|
|
|
|
if ((_my_tls.locals.available_drives & 1) && is_floppy ("A:"))
|
|
|
|
_my_tls.locals.available_drives &= ~1;
|
|
|
|
if ((_my_tls.locals.available_drives & 2) && is_floppy ("B:"))
|
|
|
|
_my_tls.locals.available_drives &= ~2;
|
2000-02-17 20:38:33 +01:00
|
|
|
return (FILE *) filep;
|
|
|
|
}
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" struct mntent *
|
2000-02-17 20:38:33 +01:00
|
|
|
getmntent (FILE *)
|
|
|
|
{
|
2003-12-23 17:26:31 +01:00
|
|
|
return mount_table->getmntent (_my_tls.locals.iteration++);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
endmntent (FILE *)
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/********************** Symbolic Link Support **************************/
|
|
|
|
|
|
|
|
/* Create a symlink from FROMPATH to TOPATH. */
|
|
|
|
|
2001-12-07 06:03:32 +01:00
|
|
|
/* If TRUE create symlinks as Windows shortcuts, if false create symlinks
|
2001-03-02 12:41:09 +01:00
|
|
|
as normal files with magic number and system bit set. */
|
2003-12-07 23:37:12 +01:00
|
|
|
bool allow_winsymlinks = true;
|
2001-03-02 12:41:09 +01:00
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2005-07-05 04:05:07 +02:00
|
|
|
symlink (const char *oldpath, const char *newpath)
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
{
|
2005-07-05 04:05:07 +02:00
|
|
|
return symlink_worker (oldpath, newpath, allow_winsymlinks, false);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2005-07-05 04:05:07 +02:00
|
|
|
symlink_worker (const char *oldpath, const char *newpath, bool use_winsym,
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
bool isdevice)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2006-02-05 19:18:02 +01:00
|
|
|
extern suffix_info stat_suffixes[];
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
HANDLE h;
|
|
|
|
int res = -1;
|
2005-07-05 04:05:07 +02:00
|
|
|
path_conv win32_path, win32_oldpath;
|
2003-11-15 00:40:06 +01:00
|
|
|
char from[CYG_MAX_PATH + 5];
|
2005-04-03 10:45:21 +02:00
|
|
|
char cwd[CYG_MAX_PATH], *cp = NULL, c = 0;
|
2005-07-05 04:05:07 +02:00
|
|
|
char w32oldpath[CYG_MAX_PATH];
|
|
|
|
char reloldpath[CYG_MAX_PATH] = { 0 };
|
2001-03-02 12:41:09 +01:00
|
|
|
DWORD written;
|
2001-08-07 17:09:54 +02:00
|
|
|
SECURITY_ATTRIBUTES sa = sec_none_nih;
|
2003-11-26 14:23:27 +01:00
|
|
|
security_descriptor sd;
|
2001-03-02 12:41:09 +01:00
|
|
|
|
2005-07-05 04:05:07 +02:00
|
|
|
/* POSIX says that empty 'newpath' is invalid input while empty
|
|
|
|
'oldpath' is valid -- it's symlink resolver job to verify if
|
2001-11-05 07:09:15 +01:00
|
|
|
symlink contents point to existing filesystem object */
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2001-09-16 16:26:11 +02:00
|
|
|
goto done;
|
2005-07-05 04:05:07 +02:00
|
|
|
if (!*oldpath || !*newpath)
|
2005-07-03 04:40:30 +02:00
|
|
|
{
|
2005-07-05 04:05:07 +02:00
|
|
|
set_errno (ENOENT);
|
2005-07-03 04:40:30 +02:00
|
|
|
goto done;
|
|
|
|
}
|
2001-09-16 16:26:11 +02:00
|
|
|
|
2005-07-05 04:05:07 +02:00
|
|
|
if (strlen (oldpath) >= CYG_MAX_PATH)
|
2001-09-16 16:26:11 +02:00
|
|
|
{
|
|
|
|
set_errno (ENAMETOOLONG);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2006-02-05 19:18:02 +01:00
|
|
|
win32_path.check (newpath, PC_SYM_NOFOLLOW,
|
|
|
|
transparent_exe ? stat_suffixes : NULL);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
if (use_winsym && !win32_path.exists ())
|
2001-03-02 12:41:09 +01:00
|
|
|
{
|
2005-07-05 04:05:07 +02:00
|
|
|
strcpy (from, newpath);
|
2001-03-02 12:41:09 +01:00
|
|
|
strcat (from, ".lnk");
|
|
|
|
win32_path.check (from, PC_SYM_NOFOLLOW);
|
|
|
|
}
|
2001-02-21 22:49:37 +01:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
if (win32_path.error)
|
|
|
|
{
|
2001-04-12 23:21:37 +02:00
|
|
|
set_errno (win32_path.case_clash ? ECASECLASH : win32_path.error);
|
2000-02-17 20:38:33 +01:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2005-07-05 04:05:07 +02:00
|
|
|
syscall_printf ("symlink (%s, %s)", oldpath, win32_path.get_win32 ());
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2006-07-19 10:20:26 +02:00
|
|
|
if ((!isdevice && win32_path.exists ())
|
|
|
|
|| win32_path.is_auto_device ())
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
set_errno (EEXIST);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
DWORD create_how;
|
|
|
|
if (!use_winsym)
|
|
|
|
create_how = CREATE_NEW;
|
|
|
|
else if (isdevice)
|
|
|
|
{
|
2005-07-05 04:05:07 +02:00
|
|
|
strcpy (w32oldpath, oldpath);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
create_how = CREATE_ALWAYS;
|
2005-07-06 22:05:03 +02:00
|
|
|
SetFileAttributes (win32_path, FILE_ATTRIBUTE_NORMAL);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
}
|
|
|
|
else
|
2001-03-02 12:41:09 +01:00
|
|
|
{
|
2005-07-05 04:05:07 +02:00
|
|
|
if (!isabspath (oldpath))
|
2001-03-02 12:41:09 +01:00
|
|
|
{
|
2005-04-03 10:45:21 +02:00
|
|
|
getcwd (cwd, CYG_MAX_PATH);
|
2001-03-02 12:41:09 +01:00
|
|
|
if ((cp = strrchr (from, '/')) || (cp = strrchr (from, '\\')))
|
|
|
|
{
|
|
|
|
c = *cp;
|
|
|
|
*cp = '\0';
|
|
|
|
chdir (from);
|
|
|
|
}
|
2005-07-05 04:05:07 +02:00
|
|
|
backslashify (oldpath, reloldpath, 0);
|
2005-01-18 14:00:18 +01:00
|
|
|
/* Creating an ITEMIDLIST requires an absolute path. So if we
|
|
|
|
create a shortcut file, we create relative and absolute Win32
|
|
|
|
paths, the first for the relpath field and the latter for the
|
|
|
|
ITEMIDLIST field. */
|
2005-07-05 04:05:07 +02:00
|
|
|
if (GetFileAttributes (reloldpath) == INVALID_FILE_ATTRIBUTES)
|
2005-01-18 14:00:18 +01:00
|
|
|
{
|
2006-02-05 19:18:02 +01:00
|
|
|
win32_oldpath.check (oldpath, PC_SYM_NOFOLLOW,
|
2006-05-28 17:50:14 +02:00
|
|
|
transparent_exe ? stat_suffixes : NULL);
|
2005-07-05 04:05:07 +02:00
|
|
|
if (win32_oldpath.error != ENOENT)
|
|
|
|
strcpy (use_winsym ? reloldpath : w32oldpath, win32_oldpath);
|
2005-01-18 14:00:18 +01:00
|
|
|
}
|
|
|
|
else if (!use_winsym)
|
2005-07-05 04:05:07 +02:00
|
|
|
strcpy (w32oldpath, reloldpath);
|
2005-01-18 14:00:18 +01:00
|
|
|
if (use_winsym)
|
|
|
|
{
|
2006-02-05 19:18:02 +01:00
|
|
|
win32_oldpath.check (oldpath, PC_SYM_NOFOLLOW,
|
2006-05-28 17:50:14 +02:00
|
|
|
transparent_exe ? stat_suffixes : NULL);
|
2005-07-05 04:05:07 +02:00
|
|
|
strcpy (w32oldpath, win32_oldpath);
|
2005-01-18 14:00:18 +01:00
|
|
|
}
|
|
|
|
if (cp)
|
|
|
|
{
|
|
|
|
*cp = c;
|
|
|
|
chdir (cwd);
|
|
|
|
}
|
2001-03-02 12:41:09 +01:00
|
|
|
}
|
2005-01-18 14:00:18 +01:00
|
|
|
else
|
2005-05-02 05:50:11 +02:00
|
|
|
{
|
2006-02-05 19:18:02 +01:00
|
|
|
win32_oldpath.check (oldpath, PC_SYM_NOFOLLOW,
|
|
|
|
transparent_exe ? stat_suffixes : NULL);
|
2005-07-05 04:05:07 +02:00
|
|
|
strcpy (w32oldpath, win32_oldpath);
|
2001-03-02 12:41:09 +01:00
|
|
|
}
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
create_how = CREATE_NEW;
|
2001-03-02 12:41:09 +01:00
|
|
|
}
|
|
|
|
|
2001-08-07 17:09:54 +02:00
|
|
|
if (allow_ntsec && win32_path.has_acls ())
|
2003-02-04 20:26:01 +01:00
|
|
|
set_security_attribute (S_IFLNK | STD_RBITS | STD_WBITS,
|
2003-11-26 14:23:27 +01:00
|
|
|
&sa, sd);
|
2001-08-07 17:09:54 +02:00
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
h = CreateFile (win32_path, GENERIC_WRITE, 0, &sa, create_how,
|
|
|
|
FILE_ATTRIBUTE_NORMAL, 0);
|
2000-02-17 20:38:33 +01:00
|
|
|
if (h == INVALID_HANDLE_VALUE)
|
2001-11-13 22:49:06 +01:00
|
|
|
__seterrno ();
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
|
|
|
{
|
2005-01-18 14:00:18 +01:00
|
|
|
bool success = false;
|
2001-03-02 12:41:09 +01:00
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
if (use_winsym)
|
2001-03-02 12:41:09 +01:00
|
|
|
{
|
2005-01-18 14:00:18 +01:00
|
|
|
/* A path of 240 chars with 120 one character directories in it
|
|
|
|
can result in a 6K shortcut. */
|
|
|
|
char *buf = (char *) alloca (8192);
|
|
|
|
win_shortcut_hdr *shortcut_header = (win_shortcut_hdr *) buf;
|
|
|
|
HRESULT hres;
|
|
|
|
IShellFolder *psl;
|
2005-04-03 10:45:21 +02:00
|
|
|
WCHAR wc_path[CYG_MAX_PATH];
|
2005-01-18 14:00:18 +01:00
|
|
|
ITEMIDLIST *pidl = NULL, *p;
|
|
|
|
unsigned short len;
|
|
|
|
|
|
|
|
memset (shortcut_header, 0, sizeof *shortcut_header);
|
|
|
|
shortcut_header->size = sizeof *shortcut_header;
|
|
|
|
shortcut_header->magic = GUID_shortcut;
|
|
|
|
shortcut_header->flags = (WSH_FLAG_DESC | WSH_FLAG_RELPATH);
|
|
|
|
shortcut_header->run = SW_NORMAL;
|
|
|
|
cp = buf + sizeof (win_shortcut_hdr);
|
|
|
|
/* Creating an IDLIST */
|
|
|
|
hres = SHGetDesktopFolder (&psl);
|
|
|
|
if (SUCCEEDED (hres))
|
|
|
|
{
|
2005-07-05 04:05:07 +02:00
|
|
|
MultiByteToWideChar (CP_ACP, 0, w32oldpath, -1, wc_path,
|
2005-04-03 10:45:21 +02:00
|
|
|
CYG_MAX_PATH);
|
2005-01-18 14:00:18 +01:00
|
|
|
hres = psl->ParseDisplayName (NULL, NULL, wc_path, NULL,
|
|
|
|
&pidl, NULL);
|
|
|
|
if (SUCCEEDED (hres))
|
|
|
|
{
|
|
|
|
shortcut_header->flags |= WSH_FLAG_IDLIST;
|
|
|
|
for (p = pidl; p->mkid.cb > 0;
|
|
|
|
p = (ITEMIDLIST *)((char *) p + p->mkid.cb))
|
|
|
|
;
|
|
|
|
len = (char *) p - (char *) pidl + 2;
|
|
|
|
*(unsigned short *)cp = len;
|
|
|
|
memcpy (cp += 2, pidl, len);
|
|
|
|
cp += len;
|
|
|
|
CoTaskMemFree (pidl);
|
|
|
|
}
|
|
|
|
psl->Release ();
|
|
|
|
}
|
|
|
|
/* Creating a description */
|
2005-07-05 04:05:07 +02:00
|
|
|
*(unsigned short *)cp = len = strlen (oldpath);
|
|
|
|
memcpy (cp += 2, oldpath, len);
|
2005-01-18 14:00:18 +01:00
|
|
|
cp += len;
|
|
|
|
/* Creating a relpath */
|
2005-07-05 04:05:07 +02:00
|
|
|
if (reloldpath[0])
|
2005-01-18 14:00:18 +01:00
|
|
|
{
|
2005-07-05 04:05:07 +02:00
|
|
|
*(unsigned short *)cp = len = strlen (reloldpath);
|
|
|
|
memcpy (cp += 2, reloldpath, len);
|
2005-01-18 14:00:18 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2005-07-05 04:05:07 +02:00
|
|
|
*(unsigned short *)cp = len = strlen (w32oldpath);
|
|
|
|
memcpy (cp += 2, w32oldpath, len);
|
2005-01-18 14:00:18 +01:00
|
|
|
}
|
|
|
|
cp += len;
|
|
|
|
success = WriteFile (h, buf, cp - buf, &written, NULL)
|
|
|
|
&& written == (DWORD) (cp - buf);
|
2001-03-02 12:41:09 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* This is the old technique creating a symlink. */
|
2003-11-15 00:40:06 +01:00
|
|
|
char buf[sizeof (SYMLINK_COOKIE) + CYG_MAX_PATH + 10];
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-07-05 04:05:07 +02:00
|
|
|
__small_sprintf (buf, "%s%s", SYMLINK_COOKIE, oldpath);
|
2001-03-02 12:41:09 +01:00
|
|
|
DWORD len = strlen (buf) + 1;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-03-02 12:41:09 +01:00
|
|
|
/* Note that the terminating nul is written. */
|
|
|
|
success = WriteFile (h, buf, len, &written, NULL)
|
2001-06-04 03:28:09 +02:00
|
|
|
|| written != len;
|
2001-03-02 12:41:09 +01:00
|
|
|
|
|
|
|
}
|
|
|
|
if (success)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
CloseHandle (h);
|
2001-08-07 17:09:54 +02:00
|
|
|
if (!allow_ntsec && allow_ntea)
|
2004-04-16 23:22:13 +02:00
|
|
|
set_file_attribute (false, NULL, win32_path.get_win32 (),
|
2001-08-07 17:09:54 +02:00
|
|
|
S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO);
|
2001-11-13 22:49:06 +01:00
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
DWORD attr = use_winsym ? FILE_ATTRIBUTE_READONLY
|
2004-04-10 02:50:16 +02:00
|
|
|
: FILE_ATTRIBUTE_SYSTEM;
|
2001-11-13 22:49:06 +01:00
|
|
|
#ifdef HIDDEN_DOT_FILES
|
|
|
|
cp = strrchr (win32_path, '\\');
|
|
|
|
if ((cp && cp[1] == '.') || *win32_path == '.')
|
|
|
|
attr |= FILE_ATTRIBUTE_HIDDEN;
|
|
|
|
#endif
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
SetFileAttributes (win32_path, attr);
|
2001-11-13 22:49:06 +01:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
res = 0;
|
|
|
|
}
|
2001-02-21 22:49:37 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
CloseHandle (h);
|
|
|
|
DeleteFileA (win32_path.get_win32 ());
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
2005-07-05 04:05:07 +02:00
|
|
|
syscall_printf ("%d = symlink_worker (%s, %s, %d, %d)", res, oldpath,
|
|
|
|
newpath, use_winsym, isdevice);
|
2000-02-17 20:38:33 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2003-12-07 23:37:12 +01:00
|
|
|
static bool
|
2005-01-18 14:00:18 +01:00
|
|
|
cmp_shortcut_header (win_shortcut_hdr *file_header)
|
2002-09-04 15:11:29 +02:00
|
|
|
{
|
2005-01-18 14:00:18 +01:00
|
|
|
/* A Cygwin or U/Win shortcut only contains a description and a relpath.
|
|
|
|
Cygwin shortcuts also might contain an ITEMIDLIST. The run type is
|
|
|
|
always set to SW_NORMAL. */
|
|
|
|
return file_header->size == sizeof (win_shortcut_hdr)
|
|
|
|
&& !memcmp (&file_header->magic, &GUID_shortcut, sizeof GUID_shortcut)
|
|
|
|
&& (file_header->flags & ~WSH_FLAG_IDLIST)
|
2005-05-02 05:50:11 +02:00
|
|
|
== (WSH_FLAG_DESC | WSH_FLAG_RELPATH)
|
2005-01-18 14:00:18 +01:00
|
|
|
&& file_header->run == SW_NORMAL;
|
2002-09-04 15:11:29 +02:00
|
|
|
}
|
|
|
|
|
2005-03-12 03:33:00 +01:00
|
|
|
int
|
|
|
|
symlink_info::check_shortcut (const char *path, HANDLE h)
|
2002-09-04 15:11:29 +02:00
|
|
|
{
|
2005-01-18 14:00:18 +01:00
|
|
|
win_shortcut_hdr *file_header;
|
|
|
|
char *buf, *cp;
|
2002-09-04 15:11:29 +02:00
|
|
|
unsigned short len;
|
|
|
|
int res = 0;
|
2005-01-18 14:00:18 +01:00
|
|
|
DWORD size, got = 0;
|
2002-09-04 15:11:29 +02:00
|
|
|
|
2005-01-18 14:00:18 +01:00
|
|
|
if ((size = GetFileSize (h, NULL)) > 8192) /* Not a Cygwin symlink. */
|
2002-09-04 15:11:29 +02:00
|
|
|
goto file_not_symlink;
|
2006-11-02 12:45:03 +01:00
|
|
|
buf = (char *) alloca (size + 1);
|
2005-01-18 14:00:18 +01:00
|
|
|
if (!ReadFile (h, buf, size, &got, 0))
|
2002-09-04 15:11:29 +02:00
|
|
|
{
|
2005-03-12 03:33:00 +01:00
|
|
|
set_error (EIO);
|
2002-09-04 15:11:29 +02:00
|
|
|
goto close_it;
|
|
|
|
}
|
2005-01-18 14:00:18 +01:00
|
|
|
file_header = (win_shortcut_hdr *) buf;
|
|
|
|
if (got != size || !cmp_shortcut_header (file_header))
|
2002-09-04 15:11:29 +02:00
|
|
|
goto file_not_symlink;
|
2005-01-18 14:00:18 +01:00
|
|
|
cp = buf + sizeof (win_shortcut_hdr);
|
|
|
|
if (file_header->flags & WSH_FLAG_IDLIST) /* Skip ITEMIDLIST */
|
|
|
|
cp += *(unsigned short *) cp + 2;
|
2005-04-03 10:45:21 +02:00
|
|
|
if ((len = *(unsigned short *) cp) == 0 || len >= CYG_MAX_PATH)
|
2002-09-04 15:11:29 +02:00
|
|
|
goto file_not_symlink;
|
2006-11-02 12:45:03 +01:00
|
|
|
cp += 2;
|
|
|
|
cp[len] = '\0';
|
|
|
|
res = posixify (cp);
|
2002-09-04 15:11:29 +02:00
|
|
|
if (res) /* It's a symlink. */
|
2005-03-12 03:33:00 +01:00
|
|
|
pflags = PATH_SYMLINK | PATH_LNK;
|
2002-09-04 15:11:29 +02:00
|
|
|
goto close_it;
|
|
|
|
|
|
|
|
file_not_symlink:
|
|
|
|
/* Not a symlink, see if executable. */
|
2005-03-12 03:33:00 +01:00
|
|
|
if (!(pflags & PATH_ALL_EXEC) && has_exec_chars ((const char *) &file_header, got))
|
|
|
|
pflags |= PATH_EXEC;
|
2002-09-04 15:11:29 +02:00
|
|
|
|
|
|
|
close_it:
|
|
|
|
CloseHandle (h);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2005-03-12 03:33:00 +01:00
|
|
|
int
|
|
|
|
symlink_info::check_sysfile (const char *path, HANDLE h)
|
2001-02-21 22:49:37 +01:00
|
|
|
{
|
|
|
|
char cookie_buf[sizeof (SYMLINK_COOKIE) - 1];
|
2006-11-02 12:45:03 +01:00
|
|
|
char srcbuf[CYG_MAX_PATH];
|
2001-02-21 22:49:37 +01:00
|
|
|
DWORD got;
|
|
|
|
int res = 0;
|
|
|
|
|
2001-03-05 07:28:25 +01:00
|
|
|
if (!ReadFile (h, cookie_buf, sizeof (cookie_buf), &got, 0))
|
2001-02-21 22:49:37 +01:00
|
|
|
{
|
|
|
|
debug_printf ("ReadFile1 failed");
|
2005-03-12 03:33:00 +01:00
|
|
|
set_error (EIO);
|
2001-02-21 22:49:37 +01:00
|
|
|
}
|
|
|
|
else if (got == sizeof (cookie_buf)
|
|
|
|
&& memcmp (cookie_buf, SYMLINK_COOKIE, sizeof (cookie_buf)) == 0)
|
|
|
|
{
|
|
|
|
/* It's a symlink. */
|
2005-03-12 03:33:00 +01:00
|
|
|
pflags = PATH_SYMLINK;
|
2001-02-21 22:49:37 +01:00
|
|
|
|
2006-11-02 12:45:03 +01:00
|
|
|
res = ReadFile (h, srcbuf, CYG_MAX_PATH, &got, 0);
|
2001-02-21 22:49:37 +01:00
|
|
|
if (!res)
|
|
|
|
{
|
|
|
|
debug_printf ("ReadFile2 failed");
|
2005-03-12 03:33:00 +01:00
|
|
|
set_error (EIO);
|
2001-02-21 22:49:37 +01:00
|
|
|
}
|
|
|
|
else
|
2006-11-02 12:45:03 +01:00
|
|
|
res = posixify (srcbuf);
|
2001-02-21 22:49:37 +01:00
|
|
|
}
|
|
|
|
else if (got == sizeof (cookie_buf)
|
|
|
|
&& memcmp (cookie_buf, SOCKET_COOKIE, sizeof (cookie_buf)) == 0)
|
2005-03-12 03:33:00 +01:00
|
|
|
pflags |= PATH_SOCKET;
|
2001-02-21 22:49:37 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Not a symlink, see if executable. */
|
2005-03-12 03:33:00 +01:00
|
|
|
if (pflags & PATH_ALL_EXEC)
|
2001-03-05 07:28:25 +01:00
|
|
|
/* Nothing to do */;
|
|
|
|
else if (has_exec_chars (cookie_buf, got))
|
2005-03-12 03:33:00 +01:00
|
|
|
pflags |= PATH_EXEC;
|
2001-03-05 07:28:25 +01:00
|
|
|
else
|
2005-03-12 03:33:00 +01:00
|
|
|
pflags |= PATH_NOTEXEC;
|
2001-03-05 07:28:25 +01:00
|
|
|
}
|
|
|
|
syscall_printf ("%d = symlink.check_sysfile (%s, %s) (%p)",
|
2005-03-12 03:33:00 +01:00
|
|
|
res, path, contents, pflags);
|
2001-04-22 18:19:27 +02:00
|
|
|
|
|
|
|
CloseHandle (h);
|
2001-02-21 22:49:37 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2006-10-31 12:40:47 +01:00
|
|
|
int
|
|
|
|
symlink_info::check_reparse_point (const char *path, HANDLE h)
|
|
|
|
{
|
|
|
|
int res = 0;
|
|
|
|
PREPARSE_DATA_BUFFER rp = (PREPARSE_DATA_BUFFER)
|
|
|
|
alloca (MAXIMUM_REPARSE_DATA_BUFFER_SIZE);
|
|
|
|
DWORD size;
|
2006-11-02 12:45:03 +01:00
|
|
|
char srcbuf[CYG_MAX_PATH + 6];
|
2006-10-31 12:40:47 +01:00
|
|
|
|
|
|
|
if (!DeviceIoControl (h, FSCTL_GET_REPARSE_POINT, NULL, 0, (LPVOID) rp,
|
|
|
|
MAXIMUM_REPARSE_DATA_BUFFER_SIZE, &size, NULL))
|
|
|
|
{
|
|
|
|
debug_printf ("DeviceIoControl(FSCTL_GET_REPARSE_POINT) failed, %E");
|
|
|
|
set_error (EIO);
|
|
|
|
goto close_it;
|
|
|
|
}
|
|
|
|
if (rp->ReparseTag == IO_REPARSE_TAG_SYMLINK)
|
|
|
|
{
|
2006-11-02 12:45:03 +01:00
|
|
|
if (rp->SymbolicLinkReparseBuffer.SubstituteNameLength
|
|
|
|
> 2 * (CYG_MAX_PATH + 6))
|
2006-10-31 12:40:47 +01:00
|
|
|
{
|
|
|
|
debug_printf ("Symlink name too long");
|
|
|
|
set_error (EIO);
|
|
|
|
goto close_it;
|
|
|
|
}
|
2006-11-02 12:45:03 +01:00
|
|
|
sys_wcstombs (srcbuf, CYG_MAX_PATH,
|
2006-10-31 12:40:47 +01:00
|
|
|
(WCHAR *)((char *)rp->SymbolicLinkReparseBuffer.PathBuffer
|
2006-11-02 12:45:03 +01:00
|
|
|
+ rp->SymbolicLinkReparseBuffer.SubstituteNameOffset),
|
|
|
|
rp->SymbolicLinkReparseBuffer.SubstituteNameLength / 2);
|
2006-10-31 12:40:47 +01:00
|
|
|
pflags = PATH_SYMLINK | PATH_REP;
|
|
|
|
fileattr &= ~FILE_ATTRIBUTE_DIRECTORY;
|
|
|
|
}
|
|
|
|
else if (rp->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT)
|
|
|
|
{
|
|
|
|
if (rp->SymbolicLinkReparseBuffer.PrintNameLength == 0)
|
|
|
|
{
|
|
|
|
/* Likely a volume mount point. Not treated as symlink. */
|
|
|
|
goto close_it;
|
|
|
|
}
|
2006-11-02 12:45:03 +01:00
|
|
|
if (rp->MountPointReparseBuffer.SubstituteNameLength
|
|
|
|
> 2 * (CYG_MAX_PATH + 6))
|
2006-10-31 12:40:47 +01:00
|
|
|
{
|
|
|
|
debug_printf ("Symlink name too long");
|
|
|
|
set_error (EIO);
|
|
|
|
goto close_it;
|
|
|
|
}
|
2006-11-02 12:45:03 +01:00
|
|
|
sys_wcstombs (srcbuf, CYG_MAX_PATH,
|
|
|
|
(WCHAR *)((char *)rp->MountPointReparseBuffer.PathBuffer
|
|
|
|
+ rp->MountPointReparseBuffer.SubstituteNameOffset),
|
|
|
|
rp->MountPointReparseBuffer.SubstituteNameLength / 2);
|
2006-10-31 12:40:47 +01:00
|
|
|
pflags = PATH_SYMLINK | PATH_REP;
|
|
|
|
fileattr &= ~FILE_ATTRIBUTE_DIRECTORY;
|
|
|
|
}
|
2006-11-02 12:45:03 +01:00
|
|
|
res = posixify (srcbuf);
|
2006-10-31 12:40:47 +01:00
|
|
|
close_it:
|
|
|
|
CloseHandle (h);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2006-11-02 12:45:03 +01:00
|
|
|
int
|
|
|
|
symlink_info::posixify (char *srcbuf)
|
|
|
|
{
|
|
|
|
/* The definition for a path in a native symlink is a bit weird. The Flags
|
|
|
|
value seem to contain 0 for absolute paths (stored as NT native path)
|
|
|
|
and 1 for relative paths. Relative paths are paths not starting with a
|
|
|
|
drive letter. These are not converted to NT native, but stored as
|
|
|
|
given. A path starting with a single backslash is relative to the
|
|
|
|
current drive thus a "relative" value (Flags == 1).
|
|
|
|
Funny enough it's possible to store paths with slashes instead of
|
|
|
|
backslashes, but they are evaluated incorrectly by subsequent Windows
|
|
|
|
calls like CreateFile (ERROR_INVALID_NAME). So, what we do here is to
|
|
|
|
take paths starting with slashes at face value, evaluating them as
|
|
|
|
Cygwin specific POSIX paths.
|
|
|
|
A path starting with two slashes(!) or backslashes is converted into an
|
|
|
|
NT UNC path. Unfortunately, in contrast to POSIX rules, paths starting
|
|
|
|
with three or more (back)slashes are also converted into UNC paths,
|
2006-11-02 14:39:44 +01:00
|
|
|
just incorrectly sticking to one redundant leading backslashe. We go
|
|
|
|
along with this behaviour to avoid scenarios in which native tools access
|
2006-11-02 12:45:03 +01:00
|
|
|
other files than Cygwin.
|
|
|
|
The above rules are used exactly the same way on Cygwin specific symlinks
|
|
|
|
(sysfiles and shortcuts) to eliminate non-POSIX paths in the output. */
|
|
|
|
|
|
|
|
/* Eliminate native NT prefixes. */
|
|
|
|
if (srcbuf[0] == '\\' && !strncmp (srcbuf + 1, "??\\", 3))
|
|
|
|
{
|
|
|
|
srcbuf += 4;
|
|
|
|
if (!strncmp (srcbuf, "UNC\\", 4))
|
|
|
|
{
|
|
|
|
srcbuf += 2;
|
|
|
|
*srcbuf = '\\';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (isdrive (srcbuf))
|
|
|
|
mount_table->conv_to_posix_path (srcbuf, contents, 0);
|
|
|
|
else if (srcbuf[0] == '\\')
|
|
|
|
{
|
|
|
|
if (srcbuf[1] == '\\') /* UNC path */
|
|
|
|
slashify (srcbuf, contents, 0);
|
|
|
|
else /* Paths starting with \ are current drive relative. */
|
|
|
|
{
|
|
|
|
char cvtbuf[CYG_MAX_PATH + 6];
|
|
|
|
|
2006-11-30 11:17:24 +01:00
|
|
|
strncpy (cvtbuf, cygheap->cwd.win32, 2);
|
2006-11-02 12:45:03 +01:00
|
|
|
strcpy (cvtbuf + 2, srcbuf);
|
|
|
|
mount_table->conv_to_posix_path (cvtbuf, contents, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else /* Everything else is taken as is. */
|
|
|
|
slashify (srcbuf, contents, 0);
|
|
|
|
return strlen (contents);
|
|
|
|
}
|
|
|
|
|
2001-03-17 02:29:14 +01:00
|
|
|
enum
|
|
|
|
{
|
|
|
|
SCAN_BEG,
|
|
|
|
SCAN_LNK,
|
|
|
|
SCAN_HASLNK,
|
|
|
|
SCAN_JUSTCHECK,
|
|
|
|
SCAN_APPENDLNK,
|
2001-03-17 08:09:41 +01:00
|
|
|
SCAN_EXTRALNK,
|
|
|
|
SCAN_DONE,
|
2001-03-17 02:29:14 +01:00
|
|
|
};
|
2001-03-05 07:28:25 +01:00
|
|
|
|
|
|
|
class suffix_scan
|
|
|
|
{
|
2001-03-17 08:09:41 +01:00
|
|
|
const suffix_info *suffixes, *suffixes_start;
|
2001-03-17 02:29:14 +01:00
|
|
|
int nextstate;
|
2001-03-17 08:09:41 +01:00
|
|
|
char *eopath;
|
2001-03-05 07:28:25 +01:00
|
|
|
public:
|
|
|
|
const char *path;
|
2001-03-17 08:09:41 +01:00
|
|
|
char *has (const char *, const suffix_info *);
|
2001-03-05 07:28:25 +01:00
|
|
|
int next ();
|
2006-02-03 22:33:09 +01:00
|
|
|
int lnk_match () {return nextstate >= SCAN_APPENDLNK;}
|
2001-03-05 07:28:25 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
char *
|
2001-03-17 08:09:41 +01:00
|
|
|
suffix_scan::has (const char *in_path, const suffix_info *in_suffixes)
|
2001-03-05 07:28:25 +01:00
|
|
|
{
|
2001-03-17 02:29:14 +01:00
|
|
|
nextstate = SCAN_BEG;
|
2001-03-17 08:09:41 +01:00
|
|
|
suffixes = suffixes_start = in_suffixes;
|
|
|
|
|
|
|
|
char *ext_here = strrchr (in_path, '.');
|
2001-04-11 21:09:53 +02:00
|
|
|
path = in_path;
|
|
|
|
eopath = strchr (path, '\0');
|
|
|
|
|
2001-03-17 08:09:41 +01:00
|
|
|
if (!ext_here)
|
2001-04-11 21:09:53 +02:00
|
|
|
goto noext;
|
2001-03-17 08:09:41 +01:00
|
|
|
|
|
|
|
if (suffixes)
|
2001-03-05 07:28:25 +01:00
|
|
|
{
|
2001-03-17 08:09:41 +01:00
|
|
|
/* Check if the extension matches a known extension */
|
|
|
|
for (const suffix_info *ex = in_suffixes; ex->name != NULL; ex++)
|
|
|
|
if (strcasematch (ext_here, ex->name))
|
|
|
|
{
|
|
|
|
nextstate = SCAN_JUSTCHECK;
|
|
|
|
suffixes = NULL; /* Has an extension so don't scan for one. */
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Didn't match. Use last resort -- .lnk. */
|
|
|
|
if (strcasematch (ext_here, ".lnk"))
|
|
|
|
{
|
|
|
|
nextstate = SCAN_HASLNK;
|
|
|
|
suffixes = NULL;
|
2001-03-05 07:28:25 +01:00
|
|
|
}
|
|
|
|
|
2001-04-11 21:09:53 +02:00
|
|
|
noext:
|
|
|
|
ext_here = eopath;
|
|
|
|
|
2001-03-17 08:09:41 +01:00
|
|
|
done:
|
2001-04-11 21:09:53 +02:00
|
|
|
return ext_here;
|
2001-03-05 07:28:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
suffix_scan::next ()
|
|
|
|
{
|
2002-07-05 23:58:49 +02:00
|
|
|
for (;;)
|
2001-03-05 07:28:25 +01:00
|
|
|
{
|
2002-07-05 23:58:49 +02:00
|
|
|
if (!suffixes)
|
|
|
|
switch (nextstate)
|
|
|
|
{
|
|
|
|
case SCAN_BEG:
|
|
|
|
suffixes = suffixes_start;
|
|
|
|
if (!suffixes)
|
|
|
|
{
|
|
|
|
nextstate = SCAN_LNK;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
nextstate = SCAN_EXTRALNK;
|
|
|
|
/* fall through to suffix checking below */
|
|
|
|
break;
|
|
|
|
case SCAN_HASLNK:
|
2006-02-03 22:33:09 +01:00
|
|
|
nextstate = SCAN_APPENDLNK; /* Skip SCAN_BEG */
|
2002-07-05 23:58:49 +02:00
|
|
|
return 1;
|
|
|
|
case SCAN_EXTRALNK:
|
|
|
|
nextstate = SCAN_DONE;
|
2006-02-03 22:33:09 +01:00
|
|
|
*eopath = '\0';
|
|
|
|
return 0;
|
2002-07-05 23:58:49 +02:00
|
|
|
case SCAN_JUSTCHECK:
|
2006-02-03 22:33:09 +01:00
|
|
|
nextstate = SCAN_LNK;
|
2002-07-05 23:58:49 +02:00
|
|
|
return 1;
|
2006-02-03 22:33:09 +01:00
|
|
|
case SCAN_LNK:
|
2002-07-05 23:58:49 +02:00
|
|
|
case SCAN_APPENDLNK:
|
|
|
|
strcat (eopath, ".lnk");
|
|
|
|
nextstate = SCAN_DONE;
|
|
|
|
return 1;
|
|
|
|
default:
|
|
|
|
*eopath = '\0';
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-03-05 07:28:25 +01:00
|
|
|
while (suffixes && suffixes->name)
|
2006-01-31 22:09:43 +01:00
|
|
|
if (nextstate == SCAN_EXTRALNK && !suffixes->addon)
|
2001-03-05 07:28:25 +01:00
|
|
|
suffixes++;
|
|
|
|
else
|
|
|
|
{
|
2001-03-17 08:09:41 +01:00
|
|
|
strcpy (eopath, suffixes->name);
|
|
|
|
if (nextstate == SCAN_EXTRALNK)
|
|
|
|
strcat (eopath, ".lnk");
|
2001-03-05 07:28:25 +01:00
|
|
|
suffixes++;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
suffixes = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-10-11 18:06:10 +02:00
|
|
|
bool
|
2005-03-12 03:33:00 +01:00
|
|
|
symlink_info::set_error (int in_errno)
|
|
|
|
{
|
2005-10-11 18:06:10 +02:00
|
|
|
bool res;
|
|
|
|
if (!(pflags & PATH_NO_ACCESS_CHECK) || in_errno == ENAMETOOLONG || in_errno == EIO)
|
|
|
|
{
|
|
|
|
error = in_errno;
|
|
|
|
res = true;
|
|
|
|
}
|
|
|
|
else if (in_errno == ENOENT)
|
|
|
|
res = true;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fileattr = FILE_ATTRIBUTE_NORMAL;
|
|
|
|
res = false;
|
|
|
|
}
|
|
|
|
return res;
|
2005-03-12 03:33:00 +01:00
|
|
|
}
|
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
bool
|
|
|
|
symlink_info::parse_device (const char *contents)
|
|
|
|
{
|
|
|
|
char *endptr;
|
|
|
|
_major_t mymajor;
|
|
|
|
_major_t myminor;
|
|
|
|
_mode_t mymode;
|
|
|
|
|
2003-09-27 07:44:58 +02:00
|
|
|
mymajor = strtol (contents += 2, &endptr, 16);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
if (endptr == contents)
|
2005-12-01 18:33:59 +01:00
|
|
|
return isdevice = false;
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
|
|
|
|
contents = endptr;
|
|
|
|
myminor = strtol (++contents, &endptr, 16);
|
|
|
|
if (endptr == contents)
|
2005-12-01 18:33:59 +01:00
|
|
|
return isdevice = false;
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
|
|
|
|
contents = endptr;
|
|
|
|
mymode = strtol (++contents, &endptr, 16);
|
|
|
|
if (endptr == contents)
|
2005-12-01 18:33:59 +01:00
|
|
|
return isdevice = false;
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
|
2005-12-01 18:33:59 +01:00
|
|
|
if ((mymode & S_IFMT) == S_IFIFO)
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
{
|
|
|
|
mymajor = _major (FH_FIFO);
|
|
|
|
myminor = _minor (FH_FIFO);
|
|
|
|
}
|
|
|
|
|
|
|
|
major = mymajor;
|
|
|
|
minor = myminor;
|
|
|
|
mode = mymode;
|
2005-12-01 18:33:59 +01:00
|
|
|
return isdevice = true;
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Check if PATH is a symlink. PATH must be a valid Win32 path name.
|
|
|
|
|
|
|
|
If PATH is a symlink, put the value of the symlink--the file to
|
|
|
|
which it points--into BUF. The value stored in BUF is not
|
|
|
|
necessarily null terminated. BUFLEN is the length of BUF; only up
|
|
|
|
to BUFLEN characters will be stored in BUF. BUF may be NULL, in
|
|
|
|
which case nothing will be stored.
|
|
|
|
|
|
|
|
Set *SYML if PATH is a symlink.
|
|
|
|
|
|
|
|
Set *EXEC if PATH appears to be executable. This is an efficiency
|
|
|
|
hack because we sometimes have to open the file anyhow. *EXEC will
|
|
|
|
not be set for every executable file.
|
|
|
|
|
|
|
|
Return -1 on error, 0 if PATH is not a symlink, or the length
|
|
|
|
stored into BUF if PATH is a symlink. */
|
|
|
|
|
2000-04-14 00:43:48 +02:00
|
|
|
int
|
2001-04-30 03:46:31 +02:00
|
|
|
symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
HANDLE h;
|
|
|
|
int res = 0;
|
2001-03-05 07:28:25 +01:00
|
|
|
suffix_scan suffix;
|
2001-04-29 01:48:28 +02:00
|
|
|
contents[0] = '\0';
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-12-01 18:33:59 +01:00
|
|
|
issymlink = true;
|
|
|
|
isdevice = false;
|
2001-04-30 03:46:31 +02:00
|
|
|
ext_here = suffix.has (path, suffixes);
|
|
|
|
extn = ext_here - path;
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
major = 0;
|
|
|
|
minor = 0;
|
2005-12-01 18:33:59 +01:00
|
|
|
mode = 0;
|
2006-11-02 13:19:16 +01:00
|
|
|
pflags &= ~(PATH_SYMLINK | PATH_LNK | PATH_REP);
|
2001-12-07 06:03:32 +01:00
|
|
|
case_clash = false;
|
2001-04-12 23:21:37 +02:00
|
|
|
|
2001-03-05 07:28:25 +01:00
|
|
|
while (suffix.next ())
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-08-22 19:59:53 +02:00
|
|
|
error = 0;
|
2001-11-22 06:59:07 +01:00
|
|
|
fileattr = GetFileAttributes (suffix.path);
|
2002-01-14 21:39:59 +01:00
|
|
|
if (fileattr == INVALID_FILE_ATTRIBUTES)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-11-22 06:59:07 +01:00
|
|
|
/* The GetFileAttributes call can fail for reasons that don't
|
2000-02-17 20:38:33 +01:00
|
|
|
matter, so we just return 0. For example, getting the
|
|
|
|
attributes of \\HOST will typically fail. */
|
2001-11-22 06:59:07 +01:00
|
|
|
debug_printf ("GetFileAttributes (%s) failed", suffix.path);
|
2005-04-16 19:17:33 +02:00
|
|
|
|
|
|
|
/* The above comment is not *quite* right. When calling
|
|
|
|
GetFileAttributes for a non-existant file an a Win9x share,
|
2005-06-06 18:58:39 +02:00
|
|
|
GetLastError returns ERROR_INVALID_FUNCTION. Go figure!
|
|
|
|
Also, GetFileAttributes fails with ERROR_SHARING_VIOLATION
|
|
|
|
if the file is locked exclusively by another process.
|
|
|
|
If we don't special handle this here, the file is accidentally
|
|
|
|
treated as non-existant. */
|
2005-04-16 19:17:33 +02:00
|
|
|
DWORD win_error = GetLastError ();
|
|
|
|
if (win_error == ERROR_INVALID_FUNCTION)
|
|
|
|
win_error = ERROR_FILE_NOT_FOUND;
|
2005-06-06 18:58:39 +02:00
|
|
|
else if (win_error == ERROR_SHARING_VIOLATION)
|
|
|
|
{
|
|
|
|
ext_tacked_on = !!*ext_here;
|
|
|
|
fileattr = 0;
|
|
|
|
goto file_not_symlink;
|
|
|
|
}
|
2005-10-11 18:06:10 +02:00
|
|
|
if (set_error (geterrno_from_win_error (win_error, EACCES)))
|
|
|
|
continue;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-05-25 17:07:46 +02:00
|
|
|
ext_tacked_on = !!*ext_here;
|
|
|
|
|
2001-04-30 03:46:31 +02:00
|
|
|
if (pcheck_case != PCHECK_RELAXED && !case_check (path)
|
2001-06-04 03:28:09 +02:00
|
|
|
|| (opt & PC_SYM_IGNORE))
|
|
|
|
goto file_not_symlink;
|
2001-04-12 23:21:37 +02:00
|
|
|
|
2001-05-25 17:07:46 +02:00
|
|
|
int sym_check;
|
|
|
|
|
|
|
|
sym_check = 0;
|
2001-02-21 22:49:37 +01:00
|
|
|
|
2006-10-31 12:40:47 +01:00
|
|
|
if ((fileattr & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_REPARSE_POINT))
|
|
|
|
== FILE_ATTRIBUTE_DIRECTORY)
|
2001-06-04 03:28:09 +02:00
|
|
|
goto file_not_symlink;
|
2001-02-21 22:49:37 +01:00
|
|
|
|
2006-10-31 12:40:47 +01:00
|
|
|
/* Reparse points are potentially symlinks. */
|
|
|
|
if (fileattr & FILE_ATTRIBUTE_REPARSE_POINT)
|
|
|
|
sym_check = 3;
|
2001-02-21 22:49:37 +01:00
|
|
|
|
2001-04-29 01:48:28 +02:00
|
|
|
/* This is the old Cygwin method creating symlinks: */
|
2000-02-17 20:38:33 +01:00
|
|
|
/* A symlink will have the `system' file attribute. */
|
|
|
|
/* Only files can be symlinks (which can be symlinks to directories). */
|
2006-10-31 12:40:47 +01:00
|
|
|
else if (fileattr & FILE_ATTRIBUTE_SYSTEM)
|
2001-02-21 22:49:37 +01:00
|
|
|
sym_check = 2;
|
|
|
|
|
2006-10-31 12:40:47 +01:00
|
|
|
/* Windows shortcuts are potentially treated as symlinks. */
|
|
|
|
/* Valid Cygwin & U/WIN shortcuts are R/O. */
|
|
|
|
else if ((fileattr & FILE_ATTRIBUTE_READONLY) && suffix.lnk_match ())
|
|
|
|
sym_check = 1;
|
|
|
|
|
2001-04-29 01:48:28 +02:00
|
|
|
if (!sym_check)
|
2000-02-17 20:38:33 +01:00
|
|
|
goto file_not_symlink;
|
|
|
|
|
|
|
|
/* Open the file. */
|
|
|
|
|
2002-09-06 06:39:49 +02:00
|
|
|
h = CreateFile (suffix.path, GENERIC_READ, FILE_SHARE_READ,
|
2006-10-31 12:40:47 +01:00
|
|
|
&sec_none_nih, OPEN_EXISTING,
|
|
|
|
sym_check == 3 ? FILE_FLAG_OPEN_REPARSE_POINT
|
|
|
|
| FILE_FLAG_BACKUP_SEMANTICS
|
|
|
|
: FILE_ATTRIBUTE_NORMAL, 0);
|
2000-02-17 20:38:33 +01:00
|
|
|
res = -1;
|
|
|
|
if (h == INVALID_HANDLE_VALUE)
|
2000-05-09 00:50:19 +02:00
|
|
|
goto file_not_symlink;
|
2001-04-22 18:19:27 +02:00
|
|
|
|
|
|
|
switch (sym_check)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-04-22 18:19:27 +02:00
|
|
|
case 1:
|
2005-03-12 03:33:00 +01:00
|
|
|
res = check_shortcut (suffix.path, h);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
if (!res)
|
|
|
|
/* check more below */;
|
2003-09-27 07:44:58 +02:00
|
|
|
else if (contents[0] == ':' && contents[1] == '\\' && parse_device (contents))
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
goto file_not_symlink;
|
|
|
|
else
|
2001-05-25 17:07:46 +02:00
|
|
|
break;
|
2001-04-22 18:19:27 +02:00
|
|
|
/* If searching for `foo' and then finding a `foo.lnk' which is
|
|
|
|
no shortcut, return the same as if file not found. */
|
2001-05-25 17:07:46 +02:00
|
|
|
if (!suffix.lnk_match () || !ext_tacked_on)
|
2001-04-22 18:19:27 +02:00
|
|
|
goto file_not_symlink;
|
|
|
|
|
2002-01-14 21:39:59 +01:00
|
|
|
fileattr = INVALID_FILE_ATTRIBUTES;
|
2001-04-22 18:19:27 +02:00
|
|
|
continue; /* in case we're going to tack *another* .lnk on this filename. */
|
|
|
|
case 2:
|
2005-03-12 03:33:00 +01:00
|
|
|
res = check_sysfile (suffix.path, h);
|
2001-04-22 18:19:27 +02:00
|
|
|
if (!res)
|
|
|
|
goto file_not_symlink;
|
|
|
|
break;
|
2006-10-31 12:40:47 +01:00
|
|
|
case 3:
|
|
|
|
res = check_reparse_point (suffix.path, h);
|
|
|
|
if (!res)
|
|
|
|
goto file_not_symlink;
|
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2001-03-05 07:28:25 +01:00
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-05-25 17:07:46 +02:00
|
|
|
file_not_symlink:
|
2005-12-01 18:33:59 +01:00
|
|
|
issymlink = false;
|
|
|
|
syscall_printf ("%s", isdevice ? "is a device" : "not a symlink");
|
2001-05-25 17:07:46 +02:00
|
|
|
res = 0;
|
|
|
|
break;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-04-14 00:43:48 +02:00
|
|
|
syscall_printf ("%d = symlink.check (%s, %p) (%p)",
|
2001-03-05 07:28:25 +01:00
|
|
|
res, suffix.path, contents, pflags);
|
2000-02-17 20:38:33 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2005-01-29 12:23:07 +01:00
|
|
|
/* "path" is the path in a virtual symlink. Set a symlink_info struct from
|
|
|
|
that and proceed with further path checking afterwards. */
|
|
|
|
int
|
2005-02-01 16:11:47 +01:00
|
|
|
symlink_info::set (char *path)
|
2005-01-29 12:23:07 +01:00
|
|
|
{
|
|
|
|
strcpy (contents, path);
|
|
|
|
pflags = PATH_SYMLINK;
|
2005-01-31 11:28:55 +01:00
|
|
|
fileattr = FILE_ATTRIBUTE_NORMAL;
|
|
|
|
error = 0;
|
2005-12-01 18:33:59 +01:00
|
|
|
issymlink = true;
|
|
|
|
isdevice = false;
|
2005-01-29 12:23:07 +01:00
|
|
|
ext_tacked_on = case_clash = false;
|
|
|
|
ext_here = NULL;
|
|
|
|
extn = major = minor = mode = 0;
|
|
|
|
return strlen (path);
|
|
|
|
}
|
|
|
|
|
2001-04-12 23:21:37 +02:00
|
|
|
/* Check the correct case of the last path component (given in DOS style).
|
|
|
|
Adjust the case in this->path if pcheck_case == PCHECK_ADJUST or return
|
2001-12-07 06:03:32 +01:00
|
|
|
false if pcheck_case == PCHECK_STRICT.
|
2001-04-12 23:21:37 +02:00
|
|
|
Dont't call if pcheck_case == PCHECK_RELAXED.
|
|
|
|
*/
|
|
|
|
|
2003-12-07 23:37:12 +01:00
|
|
|
bool
|
2001-04-30 03:46:31 +02:00
|
|
|
symlink_info::case_check (char *path)
|
2001-04-12 23:21:37 +02:00
|
|
|
{
|
|
|
|
WIN32_FIND_DATA data;
|
|
|
|
HANDLE h;
|
2001-04-30 03:46:31 +02:00
|
|
|
char *c;
|
2001-04-12 23:21:37 +02:00
|
|
|
|
|
|
|
/* Set a pointer to the beginning of the last component. */
|
|
|
|
if (!(c = strrchr (path, '\\')))
|
|
|
|
c = path;
|
|
|
|
else
|
|
|
|
++c;
|
|
|
|
|
|
|
|
if ((h = FindFirstFile (path, &data))
|
|
|
|
!= INVALID_HANDLE_VALUE)
|
|
|
|
{
|
|
|
|
FindClose (h);
|
|
|
|
|
|
|
|
/* If that part of the component exists, check the case. */
|
2005-03-30 22:01:43 +02:00
|
|
|
if (strncmp (c, data.cFileName, strlen (data.cFileName)))
|
2001-04-12 23:21:37 +02:00
|
|
|
{
|
2003-12-07 23:37:12 +01:00
|
|
|
case_clash = true;
|
2001-04-17 13:47:37 +02:00
|
|
|
|
2001-04-12 23:21:37 +02:00
|
|
|
/* If check is set to STRICT, a wrong case results
|
|
|
|
in returning a ENOENT. */
|
|
|
|
if (pcheck_case == PCHECK_STRICT)
|
2001-12-07 06:03:32 +01:00
|
|
|
return false;
|
2001-04-12 23:21:37 +02:00
|
|
|
|
|
|
|
/* PCHECK_ADJUST adjusts the case in the incoming
|
|
|
|
path which points to the path in *this. */
|
2001-04-30 03:46:31 +02:00
|
|
|
strcpy (c, data.cFileName);
|
2001-04-12 23:21:37 +02:00
|
|
|
}
|
|
|
|
}
|
2003-12-07 23:37:12 +01:00
|
|
|
return true;
|
2001-04-12 23:21:37 +02:00
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* readlink system call */
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
readlink (const char *path, char *buf, int buflen)
|
|
|
|
{
|
2000-04-14 00:43:48 +02:00
|
|
|
extern suffix_info stat_suffixes[];
|
2000-09-04 19:52:42 +02:00
|
|
|
|
|
|
|
if (buflen < 0)
|
|
|
|
{
|
|
|
|
set_errno (ENAMETOOLONG);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2000-07-17 21:18:21 +02:00
|
|
|
path_conv pathbuf (path, PC_SYM_CONTENTS, stat_suffixes);
|
2000-04-14 00:43:48 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
if (pathbuf.error)
|
|
|
|
{
|
|
|
|
set_errno (pathbuf.error);
|
|
|
|
syscall_printf ("-1 = readlink (%s, %p, %d)", path, buf, buflen);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2001-10-01 06:10:07 +02:00
|
|
|
if (!pathbuf.exists ())
|
2000-11-01 00:01:21 +01:00
|
|
|
{
|
|
|
|
set_errno (ENOENT);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
if (!pathbuf.issymlink ())
|
|
|
|
{
|
2002-07-24 07:37:47 +02:00
|
|
|
if (pathbuf.exists ())
|
2000-02-17 20:38:33 +01:00
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2000-09-05 23:51:06 +02:00
|
|
|
int len = min (buflen, (int) strlen (pathbuf.get_win32 ()));
|
2000-02-17 20:38:33 +01:00
|
|
|
memcpy (buf, pathbuf.get_win32 (), len);
|
|
|
|
|
2000-04-14 00:43:48 +02:00
|
|
|
/* errno set by symlink.check if error */
|
2000-02-17 20:38:33 +01:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Some programs rely on st_dev/st_ino being unique for each file.
|
|
|
|
Hash the path name and hope for the best. The hash arg is not
|
|
|
|
always initialized to zero since readdir needs to compute the
|
|
|
|
dirent ino_t based on a combination of the hash of the directory
|
|
|
|
done during the opendir call and the hash or the filename within
|
|
|
|
the directory. FIXME: Not bullet-proof. */
|
|
|
|
/* Cygwin internal */
|
|
|
|
|
2003-05-11 23:52:09 +02:00
|
|
|
__ino64_t __stdcall
|
|
|
|
hash_path_name (__ino64_t hash, const char *name)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
if (!*name)
|
|
|
|
return hash;
|
|
|
|
|
|
|
|
/* Perform some initial permutations on the pathname if this is
|
|
|
|
not "seeded" */
|
|
|
|
if (!hash)
|
|
|
|
{
|
|
|
|
/* Simplistic handling of drives. If there is a drive specified,
|
|
|
|
make sure that the initial letter is upper case. If there is
|
|
|
|
no \ after the ':' assume access through the root directory
|
|
|
|
of that drive.
|
|
|
|
FIXME: Should really honor MS-Windows convention of using
|
|
|
|
the environment to track current directory on various drives. */
|
|
|
|
if (name[1] == ':')
|
|
|
|
{
|
|
|
|
char *nn, *newname = (char *) alloca (strlen (name) + 2);
|
2001-05-04 22:39:38 +02:00
|
|
|
nn = newname;
|
|
|
|
*nn = isupper (*name) ? cyg_tolower (*name) : *name;
|
|
|
|
*++nn = ':';
|
2000-02-17 20:38:33 +01:00
|
|
|
name += 2;
|
|
|
|
if (*name != '\\')
|
2001-05-04 22:39:38 +02:00
|
|
|
*++nn = '\\';
|
|
|
|
strcpy (++nn, name);
|
2000-02-17 20:38:33 +01:00
|
|
|
name = newname;
|
|
|
|
goto hashit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fill out the hashed path name with the current working directory if
|
|
|
|
this is not an absolute path and there is no pre-specified hash value.
|
|
|
|
Otherwise the inodes same will differ depending on whether a file is
|
|
|
|
referenced with an absolute value or relatively. */
|
|
|
|
|
2000-10-15 03:37:07 +02:00
|
|
|
if (!hash && !isabspath (name))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-04-17 05:52:08 +02:00
|
|
|
hash = cygheap->cwd.get_hash ();
|
2000-02-17 20:38:33 +01:00
|
|
|
if (name[0] == '.' && name[1] == '\0')
|
|
|
|
return hash;
|
2004-04-08 14:21:15 +02:00
|
|
|
hash = '\\' + (hash << 6) + (hash << 16) - hash;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
hashit:
|
2004-09-23 02:32:08 +02:00
|
|
|
/* Build up hash. Name is already normalized */
|
2000-02-17 20:38:33 +01:00
|
|
|
do
|
|
|
|
{
|
2002-09-22 05:38:57 +02:00
|
|
|
int ch = cyg_tolower (*name);
|
2004-04-08 14:21:15 +02:00
|
|
|
hash = ch + (hash << 6) + (hash << 16) - hash;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2004-09-23 02:32:08 +02:00
|
|
|
while (*++name != '\0');
|
2000-02-17 20:38:33 +01:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2000-03-16 20:35:18 +01:00
|
|
|
char *
|
2000-09-05 05:16:28 +02:00
|
|
|
getcwd (char *buf, size_t ulen)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-09-16 16:26:11 +02:00
|
|
|
char* res = NULL;
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
/* errno set */;
|
|
|
|
else if (ulen == 0 && buf)
|
2001-09-16 16:26:11 +02:00
|
|
|
set_errno (EINVAL);
|
2005-07-03 04:40:30 +02:00
|
|
|
else
|
2001-09-16 16:26:11 +02:00
|
|
|
res = cygheap->cwd.get (buf, 1, 1, ulen);
|
|
|
|
return res;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* getwd: standards? */
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" char *
|
2000-02-17 20:38:33 +01:00
|
|
|
getwd (char *buf)
|
|
|
|
{
|
2003-11-15 00:40:06 +01:00
|
|
|
return getcwd (buf, CYG_MAX_PATH);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* chdir: POSIX 5.2.1.1 */
|
2001-06-16 19:09:19 +02:00
|
|
|
extern "C" int
|
2001-06-11 02:24:28 +02:00
|
|
|
chdir (const char *in_dir)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2001-06-28 04:19:57 +02:00
|
|
|
return -1;
|
2005-07-03 04:40:30 +02:00
|
|
|
if (!*in_dir)
|
|
|
|
{
|
|
|
|
set_errno (ENOENT);
|
|
|
|
return -1;
|
|
|
|
}
|
2001-06-11 02:24:28 +02:00
|
|
|
|
|
|
|
syscall_printf ("dir '%s'", in_dir);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-06-11 17:20:49 +02:00
|
|
|
/* Convert path. First argument ensures that we don't check for NULL/empty/invalid
|
2001-06-11 02:24:28 +02:00
|
|
|
again. */
|
2005-05-13 17:46:07 +02:00
|
|
|
path_conv path (PC_NONULLEMPTY, in_dir, PC_SYM_FOLLOW | PC_POSIX);
|
2001-06-11 02:24:28 +02:00
|
|
|
if (path.error)
|
|
|
|
{
|
|
|
|
set_errno (path.error);
|
2004-05-06 18:26:10 +02:00
|
|
|
syscall_printf ("-1 = chdir (%s)", in_dir);
|
2001-06-11 02:24:28 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-05-06 18:26:10 +02:00
|
|
|
int res = -1;
|
2004-05-15 17:55:43 +02:00
|
|
|
bool doit = false;
|
|
|
|
const char *native_dir = path, *posix_cwd = NULL;
|
2002-09-22 05:38:57 +02:00
|
|
|
int devn = path.get_devn ();
|
2002-05-02 06:13:48 +02:00
|
|
|
if (!isvirtual_dev (devn))
|
2002-05-31 05:11:21 +02:00
|
|
|
{
|
2004-05-06 18:26:10 +02:00
|
|
|
/* Check to see if path translates to something like C:.
|
|
|
|
If it does, append a \ to the native directory specification to
|
|
|
|
defeat the Windows 95 (i.e. MS-DOS) tendency of returning to
|
|
|
|
the last directory visited on the given drive. */
|
|
|
|
if (isdrive (native_dir) && !native_dir[2])
|
2004-05-28 21:50:07 +02:00
|
|
|
{
|
2004-05-06 18:26:10 +02:00
|
|
|
path.get_win32 ()[2] = '\\';
|
|
|
|
path.get_win32 ()[3] = '\0';
|
|
|
|
}
|
2004-05-15 17:55:43 +02:00
|
|
|
/* The sequence chdir("xx"); chdir(".."); must be a noop if xx
|
|
|
|
is not a symlink. This is exploited by find.exe.
|
|
|
|
The posix_cwd is just path.normalized_path.
|
|
|
|
In other cases we let cwd.set obtain the Posix path through
|
|
|
|
the mount table. */
|
2004-05-28 21:50:07 +02:00
|
|
|
if (!isdrive(path.normalized_path))
|
2004-05-15 17:55:43 +02:00
|
|
|
posix_cwd = path.normalized_path;
|
|
|
|
res = 0;
|
|
|
|
doit = true;
|
2002-05-31 05:11:21 +02:00
|
|
|
}
|
2004-05-06 18:26:10 +02:00
|
|
|
else if (!path.exists ())
|
|
|
|
set_errno (ENOENT);
|
2002-06-01 20:20:51 +02:00
|
|
|
else if (!path.isdir ())
|
2004-05-06 18:26:10 +02:00
|
|
|
set_errno (ENOTDIR);
|
2001-11-24 04:35:58 +01:00
|
|
|
else
|
2004-05-15 17:55:43 +02:00
|
|
|
{
|
|
|
|
posix_cwd = path.normalized_path;
|
|
|
|
res = 0;
|
|
|
|
}
|
2001-01-27 16:34:38 +01:00
|
|
|
|
2004-05-15 17:55:43 +02:00
|
|
|
if (!res)
|
|
|
|
res = cygheap->cwd.set (native_dir, posix_cwd, doit);
|
2000-09-05 05:16:28 +02:00
|
|
|
|
|
|
|
/* Note that we're accessing cwd.posix without a lock here. I didn't think
|
|
|
|
it was worth locking just for strace. */
|
2001-04-17 05:52:08 +02:00
|
|
|
syscall_printf ("%d = chdir() cygheap->cwd.posix '%s' native '%s'", res,
|
|
|
|
cygheap->cwd.posix, native_dir);
|
2000-10-02 04:26:04 +02:00
|
|
|
MALLOC_CHECK;
|
2000-05-30 02:38:51 +02:00
|
|
|
return res;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2001-06-10 12:00:21 +02:00
|
|
|
fchdir (int fd)
|
|
|
|
{
|
2001-10-16 01:39:33 +02:00
|
|
|
int res;
|
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd >= 0)
|
2004-06-08 09:20:04 +02:00
|
|
|
res = chdir (cfd->get_name ());
|
2001-10-16 01:39:33 +02:00
|
|
|
else
|
|
|
|
res = -1;
|
|
|
|
|
|
|
|
syscall_printf ("%d = fchdir (%d)", res, fd);
|
|
|
|
return res;
|
2001-06-10 12:00:21 +02:00
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/******************** Exported Path Routines *********************/
|
|
|
|
|
|
|
|
/* Cover functions to the path conversion routines.
|
|
|
|
These are exported to the world as cygwin_foo by cygwin.din. */
|
|
|
|
|
2004-02-21 05:46:00 +01:00
|
|
|
#define return_with_errno(x) \
|
|
|
|
do {\
|
|
|
|
int err = (x);\
|
|
|
|
if (!err)\
|
|
|
|
return 0;\
|
|
|
|
set_errno (err);\
|
|
|
|
return -1;\
|
|
|
|
} while (0)
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
cygwin_conv_to_win32_path (const char *path, char *win32_path)
|
|
|
|
{
|
2006-08-01 20:00:44 +02:00
|
|
|
path_conv p (path, PC_SYM_FOLLOW | PC_NO_ACCESS_CHECK | PC_NOFULL | PC_NOWARN);
|
2000-02-17 20:38:33 +01:00
|
|
|
if (p.error)
|
|
|
|
{
|
2001-12-06 23:36:08 +01:00
|
|
|
win32_path[0] = '\0';
|
2000-02-17 20:38:33 +01:00
|
|
|
set_errno (p.error);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-02-17 21:12:11 +01:00
|
|
|
|
|
|
|
strcpy (win32_path, strcmp ((char *) p, ".\\") == 0 ? "." : (char *) p);
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
cygwin_conv_to_full_win32_path (const char *path, char *win32_path)
|
|
|
|
{
|
2006-08-01 20:00:44 +02:00
|
|
|
path_conv p (path, PC_SYM_FOLLOW | PC_NO_ACCESS_CHECK | PC_NOWARN);
|
2000-02-17 20:38:33 +01:00
|
|
|
if (p.error)
|
|
|
|
{
|
2001-12-06 23:36:08 +01:00
|
|
|
win32_path[0] = '\0';
|
2000-02-17 20:38:33 +01:00
|
|
|
set_errno (p.error);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2001-12-06 23:36:08 +01:00
|
|
|
strcpy (win32_path, p);
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is exported to the world as cygwin_foo by cygwin.din. */
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
cygwin_conv_to_posix_path (const char *path, char *posix_path)
|
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2000-02-17 20:38:33 +01:00
|
|
|
return -1;
|
2005-07-03 04:40:30 +02:00
|
|
|
if (!*path)
|
|
|
|
{
|
|
|
|
set_errno (ENOENT);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-02-21 05:46:00 +01:00
|
|
|
return_with_errno (mount_table->conv_to_posix_path (path, posix_path, 1));
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
cygwin_conv_to_full_posix_path (const char *path, char *posix_path)
|
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2000-02-17 20:38:33 +01:00
|
|
|
return -1;
|
2005-07-03 04:40:30 +02:00
|
|
|
if (!*path)
|
|
|
|
{
|
|
|
|
set_errno (ENOENT);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-02-21 05:46:00 +01:00
|
|
|
return_with_errno (mount_table->conv_to_posix_path (path, posix_path, 0));
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The realpath function is supported on some UNIX systems. */
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" char *
|
2000-02-17 20:38:33 +01:00
|
|
|
realpath (const char *path, char *resolved)
|
|
|
|
{
|
2005-01-25 21:28:40 +01:00
|
|
|
extern suffix_info stat_suffixes[];
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-08-25 23:18:26 +02:00
|
|
|
/* Make sure the right errno is returned if path is NULL. */
|
|
|
|
if (!path)
|
|
|
|
{
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-08-26 17:11:06 +02:00
|
|
|
/* Guard reading from a potentially invalid path and writing to a
|
|
|
|
potentially invalid resolved. */
|
2005-08-25 23:18:26 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return NULL;
|
|
|
|
|
2005-08-26 17:11:06 +02:00
|
|
|
char *tpath;
|
|
|
|
if (isdrive (path))
|
|
|
|
{
|
|
|
|
tpath = (char *) alloca (strlen (path)
|
|
|
|
+ strlen (mount_table->cygdrive)
|
|
|
|
+ 1);
|
|
|
|
mount_table->cygdrive_posix_path (path, tpath, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
tpath = (char *) path;
|
|
|
|
|
|
|
|
path_conv real_path (tpath, PC_SYM_FOLLOW | PC_POSIX, stat_suffixes);
|
|
|
|
|
|
|
|
|
2005-08-25 23:18:26 +02:00
|
|
|
/* Linux has this funny non-standard extension. If "resolved" is NULL,
|
|
|
|
realpath mallocs the space by itself and returns it to the application.
|
|
|
|
The application is responsible for calling free() then. This extension
|
|
|
|
is backed by POSIX, which allows implementation-defined behaviour if
|
|
|
|
"resolved" is NULL. That's good enough for us to do the same here. */
|
|
|
|
|
|
|
|
if (!real_path.error && real_path.exists ())
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2006-01-24 18:40:55 +01:00
|
|
|
/* Check for the suffix being tacked on. */
|
|
|
|
int tack_on = 0;
|
2006-02-05 19:18:02 +01:00
|
|
|
if (!transparent_exe && real_path.known_suffix)
|
2006-05-28 17:50:14 +02:00
|
|
|
{
|
2006-01-24 18:40:55 +01:00
|
|
|
char *c = strrchr (real_path.normalized_path, '.');
|
|
|
|
if (!c || !strcasematch (c, real_path.known_suffix))
|
|
|
|
tack_on = strlen (real_path.known_suffix);
|
|
|
|
}
|
|
|
|
|
2005-08-25 23:18:26 +02:00
|
|
|
if (!resolved)
|
|
|
|
{
|
2006-01-24 18:40:55 +01:00
|
|
|
resolved = (char *) malloc (strlen (real_path.normalized_path)
|
|
|
|
+ tack_on + 1);
|
2005-12-22 06:57:54 +01:00
|
|
|
if (!resolved)
|
2005-08-25 23:18:26 +02:00
|
|
|
return NULL;
|
2005-12-22 06:57:54 +01:00
|
|
|
}
|
2006-01-24 18:40:55 +01:00
|
|
|
strcpy (resolved, real_path.normalized_path);
|
|
|
|
if (tack_on)
|
|
|
|
strcat (resolved, real_path.known_suffix);
|
|
|
|
return resolved;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: on error, we are supposed to put the name of the path
|
|
|
|
component which could not be resolved into RESOLVED. */
|
2005-08-25 23:18:26 +02:00
|
|
|
if (resolved)
|
|
|
|
resolved[0] = '\0';
|
|
|
|
set_errno (real_path.error ?: ENOENT);
|
2000-02-17 20:38:33 +01:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return non-zero if path is a POSIX path list.
|
|
|
|
This is exported to the world as cygwin_foo by cygwin.din.
|
|
|
|
|
|
|
|
DOCTOOL-START
|
|
|
|
<sect1 id="add-func-cygwin-posix-path-list-p">
|
|
|
|
<para>Rather than use a mode to say what the "proper" path list
|
|
|
|
format is, we allow any, and give apps the tools they need to
|
|
|
|
convert between the two. If a ';' is present in the path list it's
|
|
|
|
a Win32 path list. Otherwise, if the first path begins with
|
|
|
|
[letter]: (in which case it can be the only element since if it
|
|
|
|
wasn't a ';' would be present) it's a Win32 path list. Otherwise,
|
|
|
|
it's a POSIX path list.</para>
|
|
|
|
</sect1>
|
|
|
|
DOCTOOL-END
|
|
|
|
*/
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
cygwin_posix_path_list_p (const char *path)
|
|
|
|
{
|
2001-03-05 07:28:25 +01:00
|
|
|
int posix_p = !(strchr (path, ';') || isdrive (path));
|
2000-02-17 20:38:33 +01:00
|
|
|
return posix_p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* These are used for apps that need to convert env vars like PATH back and
|
|
|
|
forth. The conversion is a two step process. First, an upper bound on the
|
|
|
|
size of the buffer needed is computed. Then the conversion is done. This
|
|
|
|
allows the caller to use alloca if it wants. */
|
|
|
|
|
|
|
|
static int
|
2003-02-05 22:12:58 +01:00
|
|
|
conv_path_list_buf_size (const char *path_list, bool to_posix)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int i, num_elms, max_mount_path_len, size;
|
|
|
|
const char *p;
|
|
|
|
|
2005-05-13 17:46:07 +02:00
|
|
|
path_conv pc(".", PC_POSIX);
|
2000-02-17 20:38:33 +01:00
|
|
|
/* The theory is that an upper bound is
|
|
|
|
current_size + (num_elms * max_mount_path_len) */
|
|
|
|
|
2003-02-05 22:12:58 +01:00
|
|
|
unsigned nrel;
|
|
|
|
char delim = to_posix ? ';' : ':';
|
|
|
|
for (p = path_list, num_elms = nrel = 0; p; num_elms++)
|
|
|
|
{
|
|
|
|
if (!isabspath (p))
|
|
|
|
nrel++;
|
|
|
|
p = strchr (++p, delim);
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* 7: strlen ("//c") + slop, a conservative initial value */
|
2003-02-05 22:12:58 +01:00
|
|
|
for (max_mount_path_len = sizeof ("/cygdrive/X"), i = 0;
|
|
|
|
i < mount_table->nmounts; i++)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-02-05 22:12:58 +01:00
|
|
|
int mount_len = (to_posix
|
2001-01-28 06:51:15 +01:00
|
|
|
? mount_table->mount[i].posix_pathlen
|
|
|
|
: mount_table->mount[i].native_pathlen);
|
2000-02-17 20:38:33 +01:00
|
|
|
if (max_mount_path_len < mount_len)
|
|
|
|
max_mount_path_len = mount_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 100: slop */
|
2003-02-05 22:12:58 +01:00
|
|
|
size = strlen (path_list)
|
|
|
|
+ (num_elms * max_mount_path_len)
|
2003-06-05 00:59:55 +02:00
|
|
|
+ (nrel * strlen (to_posix ? pc.normalized_path : pc.get_win32 ()))
|
2003-02-05 22:12:58 +01:00
|
|
|
+ 100;
|
2003-09-10 18:22:49 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2004-02-21 05:46:00 +01:00
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
cygwin_win32_to_posix_path_list_buf_size (const char *path_list)
|
|
|
|
{
|
2003-02-05 22:12:58 +01:00
|
|
|
return conv_path_list_buf_size (path_list, true);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
cygwin_posix_to_win32_path_list_buf_size (const char *path_list)
|
|
|
|
{
|
2003-02-05 22:12:58 +01:00
|
|
|
return conv_path_list_buf_size (path_list, false);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2006-08-02 17:11:48 +02:00
|
|
|
extern "C" int
|
|
|
|
env_win32_to_posix_path_list (const char *win32, char *posix)
|
|
|
|
{
|
|
|
|
return_with_errno (conv_path_list (win32, posix, ENV_CVT));
|
|
|
|
}
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
cygwin_win32_to_posix_path_list (const char *win32, char *posix)
|
|
|
|
{
|
2004-02-21 05:46:00 +01:00
|
|
|
return_with_errno (conv_path_list (win32, posix, 1));
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
cygwin_posix_to_win32_path_list (const char *posix, char *win32)
|
|
|
|
{
|
2004-02-21 05:46:00 +01:00
|
|
|
return_with_errno (conv_path_list (posix, win32, 0));
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* cygwin_split_path: Split a path into directory and file name parts.
|
|
|
|
Buffers DIR and FILE are assumed to be big enough.
|
|
|
|
|
|
|
|
Examples (path -> `dir' / `file'):
|
|
|
|
/ -> `/' / `'
|
|
|
|
"" -> `.' / `'
|
|
|
|
. -> `.' / `.' (FIXME: should this be `.' / `'?)
|
|
|
|
.. -> `.' / `..' (FIXME: should this be `..' / `'?)
|
|
|
|
foo -> `.' / `foo'
|
|
|
|
foo/bar -> `foo' / `bar'
|
|
|
|
foo/bar/ -> `foo' / `bar'
|
|
|
|
/foo -> `/' / `foo'
|
|
|
|
/foo/bar -> `/foo' / `bar'
|
|
|
|
c: -> `c:/' / `'
|
|
|
|
c:/ -> `c:/' / `'
|
|
|
|
c:foo -> `c:/' / `foo'
|
|
|
|
c:/foo -> `c:/' / `foo'
|
|
|
|
*/
|
|
|
|
|
2001-10-16 15:49:38 +02:00
|
|
|
extern "C" void
|
2000-02-17 20:38:33 +01:00
|
|
|
cygwin_split_path (const char *path, char *dir, char *file)
|
|
|
|
{
|
|
|
|
int dir_started_p = 0;
|
|
|
|
|
|
|
|
/* Deal with drives.
|
|
|
|
Remember that c:foo <==> c:/foo. */
|
2000-05-30 02:38:51 +02:00
|
|
|
if (isdrive (path))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
*dir++ = *path++;
|
|
|
|
*dir++ = *path++;
|
|
|
|
*dir++ = '/';
|
2001-03-05 07:28:25 +01:00
|
|
|
if (!*path)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
*dir = 0;
|
|
|
|
*file = 0;
|
|
|
|
return;
|
|
|
|
}
|
2003-01-09 09:22:05 +01:00
|
|
|
if (isdirsep (*path))
|
2000-02-17 20:38:33 +01:00
|
|
|
++path;
|
|
|
|
dir_started_p = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Determine if there are trailing slashes and "delete" them if present.
|
|
|
|
We pretend as if they don't exist. */
|
|
|
|
const char *end = path + strlen (path);
|
|
|
|
/* path + 1: keep leading slash. */
|
2003-01-09 09:22:05 +01:00
|
|
|
while (end > path + 1 && isdirsep (end[-1]))
|
2000-02-17 20:38:33 +01:00
|
|
|
--end;
|
|
|
|
|
|
|
|
/* At this point, END points to one beyond the last character
|
|
|
|
(with trailing slashes "deleted"). */
|
|
|
|
|
|
|
|
/* Point LAST_SLASH at the last slash (duh...). */
|
|
|
|
const char *last_slash;
|
|
|
|
for (last_slash = end - 1; last_slash >= path; --last_slash)
|
2003-01-09 09:22:05 +01:00
|
|
|
if (isdirsep (*last_slash))
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
if (last_slash == path)
|
|
|
|
{
|
|
|
|
*dir++ = '/';
|
|
|
|
*dir = 0;
|
|
|
|
}
|
|
|
|
else if (last_slash > path)
|
|
|
|
{
|
|
|
|
memcpy (dir, path, last_slash - path);
|
|
|
|
dir[last_slash - path] = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (dir_started_p)
|
|
|
|
; /* nothing to do */
|
|
|
|
else
|
|
|
|
*dir++ = '.';
|
|
|
|
*dir = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy (file, last_slash + 1, end - last_slash - 1);
|
|
|
|
file[end - last_slash - 1] = 0;
|
|
|
|
}
|
|
|
|
|
2000-10-19 05:12:44 +02:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
2000-09-05 05:16:28 +02:00
|
|
|
/* Return the hash value for the current win32 value.
|
|
|
|
This is used when constructing inodes. */
|
|
|
|
DWORD
|
|
|
|
cwdstuff::get_hash ()
|
|
|
|
{
|
|
|
|
DWORD hashnow;
|
2005-04-05 06:31:00 +02:00
|
|
|
cwd_lock.acquire ();
|
2000-09-05 05:16:28 +02:00
|
|
|
hashnow = hash;
|
2005-04-05 06:31:00 +02:00
|
|
|
cwd_lock.release ();
|
2000-09-05 05:16:28 +02:00
|
|
|
return hashnow;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Initialize cygcwd 'muto' for serializing access to cwd info. */
|
|
|
|
void
|
|
|
|
cwdstuff::init ()
|
|
|
|
{
|
2005-04-05 06:31:00 +02:00
|
|
|
cwd_lock.init ("cwd_lock");
|
2006-11-30 11:17:24 +01:00
|
|
|
get_initial ();
|
|
|
|
/* Actually chdir into the syste dir to avoid cwd problems. See comment
|
|
|
|
in cwdstuff::set below. */
|
|
|
|
extern char windows_system_directory[];
|
|
|
|
SetCurrentDirectory (windows_system_directory);
|
|
|
|
cwd_lock.release ();
|
2000-09-05 05:16:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Get initial cwd. Should only be called once in a
|
|
|
|
process tree. */
|
|
|
|
bool
|
|
|
|
cwdstuff::get_initial ()
|
|
|
|
{
|
2005-04-05 06:31:00 +02:00
|
|
|
cwd_lock.acquire ();
|
2000-10-17 01:55:58 +02:00
|
|
|
|
2000-09-06 08:42:08 +02:00
|
|
|
if (win32)
|
|
|
|
return 1;
|
2000-09-05 05:16:28 +02:00
|
|
|
|
2004-05-15 17:55:43 +02:00
|
|
|
/* Leaves cwd lock unreleased, if success */
|
|
|
|
return !set (NULL, NULL, false);
|
2000-09-05 05:16:28 +02:00
|
|
|
}
|
|
|
|
|
2004-05-15 17:55:43 +02:00
|
|
|
/* Chdir and fill out the elements of a cwdstuff struct.
|
2000-09-05 05:16:28 +02:00
|
|
|
It is assumed that the lock for the cwd is acquired if
|
|
|
|
win32_cwd == NULL. */
|
2004-05-15 17:55:43 +02:00
|
|
|
int
|
|
|
|
cwdstuff::set (const char *win32_cwd, const char *posix_cwd, bool doit)
|
2000-09-05 05:16:28 +02:00
|
|
|
{
|
2004-05-15 17:55:43 +02:00
|
|
|
char pathbuf[2 * CYG_MAX_PATH];
|
|
|
|
int res = -1;
|
2000-09-10 05:36:40 +02:00
|
|
|
|
2000-09-05 05:16:28 +02:00
|
|
|
if (win32_cwd)
|
|
|
|
{
|
2006-11-30 11:17:24 +01:00
|
|
|
cwd_lock.acquire ();
|
|
|
|
if (doit)
|
|
|
|
{
|
|
|
|
/* Check if we *could* chdir, if we actually would.
|
|
|
|
|
|
|
|
Why don't we actually chdir? For two reasons:
|
|
|
|
- A process has always an open handle to the current working
|
|
|
|
directory which disallows manipulating this directory.
|
|
|
|
POSIX allows to remove a directory if the permissions are
|
|
|
|
ok. The fact that its the cwd of some process doesn't matter.
|
|
|
|
- SetCurrentDirectory fails for directories with strict
|
|
|
|
permissions even for processes with the SE_BACKUP_NAME
|
|
|
|
privilege enabled. The reason is apparently that
|
|
|
|
SetCurrentDirectory calls NtOpenFile without the
|
|
|
|
FILE_OPEN_FOR_BACKUP_INTENT flag set. */
|
|
|
|
DWORD attr = GetFileAttributes (win32_cwd);
|
|
|
|
if (attr == INVALID_FILE_ATTRIBUTES)
|
|
|
|
{
|
2006-01-31 17:10:29 +01:00
|
|
|
set_errno (ENOENT);
|
2006-11-30 11:17:24 +01:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (!(attr & FILE_ATTRIBUTE_DIRECTORY))
|
|
|
|
{
|
|
|
|
set_errno (ENOTDIR);
|
|
|
|
goto out;
|
|
|
|
}
|
2006-12-05 14:20:38 +01:00
|
|
|
if (wincap.can_open_directories ())
|
2006-11-30 11:17:24 +01:00
|
|
|
{
|
2006-12-05 14:20:38 +01:00
|
|
|
HANDLE h = CreateFile (win32_cwd, GENERIC_READ, wincap.shared (),
|
|
|
|
NULL, OPEN_EXISTING,
|
|
|
|
FILE_FLAG_BACKUP_SEMANTICS, NULL);
|
|
|
|
if (h == INVALID_HANDLE_VALUE)
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
CloseHandle (h);
|
2006-11-30 11:17:24 +01:00
|
|
|
}
|
|
|
|
}
|
2004-05-15 17:55:43 +02:00
|
|
|
}
|
|
|
|
/* If there is no win32 path or it has the form c:xxx, get the value */
|
|
|
|
if (!win32_cwd || (isdrive (win32_cwd) && win32_cwd[2] != '\\'))
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
DWORD len, dlen;
|
|
|
|
for (i = 0, dlen = CYG_MAX_PATH/3; i < 2; i++, dlen = len)
|
2004-05-28 21:50:07 +02:00
|
|
|
{
|
2004-05-15 17:55:43 +02:00
|
|
|
win32 = (char *) crealloc (win32, dlen);
|
|
|
|
if ((len = GetCurrentDirectoryA (dlen, win32)) < dlen)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (len == 0)
|
2004-05-28 21:50:07 +02:00
|
|
|
{
|
2004-05-15 17:55:43 +02:00
|
|
|
__seterrno ();
|
|
|
|
debug_printf ("GetCurrentDirectory, %E");
|
|
|
|
win32_cwd = pathbuf; /* Force lock release */
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
posix_cwd = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-09-05 05:16:28 +02:00
|
|
|
win32 = (char *) crealloc (win32, strlen (win32_cwd) + 1);
|
|
|
|
strcpy (win32, win32_cwd);
|
|
|
|
}
|
2004-09-08 01:26:28 +02:00
|
|
|
if (win32[1] == ':')
|
|
|
|
drive_length = 2;
|
|
|
|
else if (win32[1] == '\\')
|
|
|
|
{
|
|
|
|
char * ptr = strechr (win32 + 2, '\\');
|
|
|
|
if (*ptr)
|
|
|
|
ptr = strechr (ptr + 1, '\\');
|
|
|
|
drive_length = ptr - win32;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
drive_length = 0;
|
2000-09-05 05:16:28 +02:00
|
|
|
|
2000-09-10 05:36:40 +02:00
|
|
|
if (!posix_cwd)
|
2004-04-10 02:50:16 +02:00
|
|
|
{
|
2004-05-06 18:26:10 +02:00
|
|
|
mount_table->conv_to_posix_path (win32, pathbuf, 0);
|
|
|
|
posix_cwd = pathbuf;
|
2004-04-10 02:50:16 +02:00
|
|
|
}
|
2004-05-06 18:26:10 +02:00
|
|
|
posix = (char *) crealloc (posix, strlen (posix_cwd) + 1);
|
|
|
|
strcpy (posix, posix_cwd);
|
2000-09-05 05:16:28 +02:00
|
|
|
|
2000-09-10 05:36:40 +02:00
|
|
|
hash = hash_path_name (0, win32);
|
2000-09-05 05:16:28 +02:00
|
|
|
|
2004-05-15 17:55:43 +02:00
|
|
|
res = 0;
|
|
|
|
out:
|
2000-09-05 05:16:28 +02:00
|
|
|
if (win32_cwd)
|
2005-04-05 06:31:00 +02:00
|
|
|
cwd_lock.release ();
|
2004-05-15 17:55:43 +02:00
|
|
|
return res;
|
2000-09-05 05:16:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy the value for either the posix or the win32 cwd into a buffer. */
|
|
|
|
char *
|
|
|
|
cwdstuff::get (char *buf, int need_posix, int with_chroot, unsigned ulen)
|
|
|
|
{
|
2000-10-02 04:26:04 +02:00
|
|
|
MALLOC_CHECK;
|
2000-10-10 21:24:32 +02:00
|
|
|
|
2000-11-02 03:15:02 +01:00
|
|
|
if (ulen)
|
|
|
|
/* nothing */;
|
|
|
|
else if (buf == NULL)
|
|
|
|
ulen = (unsigned) -1;
|
|
|
|
else
|
2000-10-10 21:24:32 +02:00
|
|
|
{
|
|
|
|
set_errno (EINVAL);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2000-09-05 05:16:28 +02:00
|
|
|
if (!get_initial ()) /* Get initial cwd and set cwd lock */
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
char *tocopy;
|
|
|
|
if (!need_posix)
|
|
|
|
tocopy = win32;
|
|
|
|
else
|
2001-06-03 04:31:16 +02:00
|
|
|
tocopy = posix;
|
2000-09-05 05:16:28 +02:00
|
|
|
|
2002-09-22 05:38:57 +02:00
|
|
|
debug_printf ("posix %s", posix);
|
2000-09-05 05:16:28 +02:00
|
|
|
if (strlen (tocopy) >= ulen)
|
2000-09-06 03:56:17 +02:00
|
|
|
{
|
|
|
|
set_errno (ERANGE);
|
|
|
|
buf = NULL;
|
|
|
|
}
|
2000-09-05 05:16:28 +02:00
|
|
|
else
|
|
|
|
{
|
2000-10-10 21:24:32 +02:00
|
|
|
if (!buf)
|
2000-10-02 04:26:04 +02:00
|
|
|
buf = (char *) malloc (strlen (tocopy) + 1);
|
2000-09-05 05:16:28 +02:00
|
|
|
strcpy (buf, tocopy);
|
|
|
|
if (!buf[0]) /* Should only happen when chroot */
|
|
|
|
strcpy (buf, "/");
|
|
|
|
}
|
|
|
|
|
2005-04-05 06:31:00 +02:00
|
|
|
cwd_lock.release ();
|
2000-10-10 21:24:32 +02:00
|
|
|
|
|
|
|
out:
|
|
|
|
syscall_printf ("(%s) = cwdstuff::get (%p, %d, %d, %d), errno %d",
|
|
|
|
buf, buf, ulen, need_posix, with_chroot, errno);
|
2000-10-02 04:26:04 +02:00
|
|
|
MALLOC_CHECK;
|
2000-09-05 05:16:28 +02:00
|
|
|
return buf;
|
|
|
|
}
|
2003-01-20 03:57:54 +01:00
|
|
|
|
|
|
|
int etc::curr_ix = 0;
|
|
|
|
/* Note that the first elements of the below arrays are unused */
|
2003-01-21 06:07:28 +01:00
|
|
|
bool etc::change_possible[MAX_ETC_FILES + 1];
|
2003-01-20 03:57:54 +01:00
|
|
|
const char *etc::fn[MAX_ETC_FILES + 1];
|
|
|
|
FILETIME etc::last_modified[MAX_ETC_FILES + 1];
|
|
|
|
|
|
|
|
int
|
|
|
|
etc::init (int n, const char *etc_fn)
|
|
|
|
{
|
|
|
|
if (n > 0)
|
|
|
|
/* ok */;
|
|
|
|
else if (++curr_ix <= MAX_ETC_FILES)
|
|
|
|
n = curr_ix;
|
|
|
|
else
|
|
|
|
api_fatal ("internal error");
|
|
|
|
|
|
|
|
fn[n] = etc_fn;
|
|
|
|
change_possible[n] = false;
|
2005-07-06 22:05:03 +02:00
|
|
|
test_file_change (n);
|
2003-01-20 03:57:54 +01:00
|
|
|
paranoid_printf ("fn[%d] %s, curr_ix %d", n, fn[n], curr_ix);
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
etc::test_file_change (int n)
|
|
|
|
{
|
|
|
|
HANDLE h;
|
|
|
|
WIN32_FIND_DATA data;
|
|
|
|
bool res;
|
|
|
|
|
2003-01-21 06:07:28 +01:00
|
|
|
if ((h = FindFirstFile (fn[n], &data)) == INVALID_HANDLE_VALUE)
|
2003-01-20 03:57:54 +01:00
|
|
|
{
|
|
|
|
res = true;
|
|
|
|
memset (last_modified + n, 0, sizeof (last_modified[n]));
|
|
|
|
debug_printf ("FindFirstFile failed, %E");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FindClose (h);
|
|
|
|
res = CompareFileTime (&data.ftLastWriteTime, last_modified + n) > 0;
|
|
|
|
last_modified[n] = data.ftLastWriteTime;
|
|
|
|
debug_printf ("FindFirstFile succeeded");
|
|
|
|
}
|
|
|
|
|
|
|
|
paranoid_printf ("fn[%d] %s res %d", n, fn[n], res);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
etc::dir_changed (int n)
|
|
|
|
{
|
|
|
|
if (!change_possible[n])
|
|
|
|
{
|
|
|
|
static HANDLE changed_h NO_COPY;
|
|
|
|
|
|
|
|
if (!changed_h)
|
|
|
|
{
|
|
|
|
path_conv pwd ("/etc");
|
|
|
|
changed_h = FindFirstChangeNotification (pwd, FALSE,
|
2003-01-24 04:53:46 +01:00
|
|
|
FILE_NOTIFY_CHANGE_LAST_WRITE
|
|
|
|
| FILE_NOTIFY_CHANGE_FILE_NAME);
|
2003-01-20 03:57:54 +01:00
|
|
|
#ifdef DEBUGGING
|
|
|
|
if (changed_h == INVALID_HANDLE_VALUE)
|
2003-02-05 17:40:51 +01:00
|
|
|
system_printf ("Can't open %s for checking, %E", (char *) pwd);
|
2003-01-20 03:57:54 +01:00
|
|
|
#endif
|
2003-01-21 06:07:28 +01:00
|
|
|
memset (change_possible, true, sizeof (change_possible));
|
2003-01-20 03:57:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (changed_h == INVALID_HANDLE_VALUE)
|
2003-01-21 06:07:28 +01:00
|
|
|
change_possible[n] = true;
|
2003-01-20 03:57:54 +01:00
|
|
|
else if (WaitForSingleObject (changed_h, 0) == WAIT_OBJECT_0)
|
|
|
|
{
|
2005-07-06 22:05:03 +02:00
|
|
|
FindNextChangeNotification (changed_h);
|
2003-01-21 06:07:28 +01:00
|
|
|
memset (change_possible, true, sizeof change_possible);
|
2003-01-20 03:57:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
paranoid_printf ("fn[%d] %s change_possible %d", n, fn[n], change_possible[n]);
|
|
|
|
return change_possible[n];
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
etc::file_changed (int n)
|
|
|
|
{
|
|
|
|
bool res = false;
|
2003-01-21 06:07:28 +01:00
|
|
|
if (dir_changed (n) && test_file_change (n))
|
2003-01-20 03:57:54 +01:00
|
|
|
res = true;
|
2003-01-21 06:07:28 +01:00
|
|
|
change_possible[n] = false; /* Change is no longer possible */
|
2003-01-20 03:57:54 +01:00
|
|
|
paranoid_printf ("fn[%d] %s res %d", n, fn[n], res);
|
|
|
|
return res;
|
|
|
|
}
|
2005-02-22 20:45:41 +01:00
|
|
|
|
|
|
|
/* No need to be reentrant or thread-safe according to SUSv3.
|
|
|
|
/ and \\ are treated equally. Leading drive specifiers are
|
|
|
|
kept intact as far as it makes sense. Everything else is
|
|
|
|
POSIX compatible. */
|
|
|
|
extern "C" char *
|
|
|
|
basename (char *path)
|
|
|
|
{
|
2005-04-03 10:45:21 +02:00
|
|
|
static char buf[CYG_MAX_PATH];
|
2005-02-22 20:45:41 +01:00
|
|
|
char *c, *d, *bs = buf;
|
|
|
|
|
|
|
|
if (!path || !*path)
|
|
|
|
return strcpy (buf, ".");
|
|
|
|
strncpy (buf, path, CYG_MAX_PATH);
|
|
|
|
if (isalpha (buf[0]) && buf[1] == ':')
|
|
|
|
bs += 2;
|
|
|
|
else if (strspn (buf, "/\\") > 1)
|
|
|
|
++bs;
|
|
|
|
c = strrchr (bs, '/');
|
|
|
|
if ((d = strrchr (c ?: bs, '\\')) > c)
|
|
|
|
c = d;
|
|
|
|
if (c)
|
|
|
|
{
|
|
|
|
/* Trailing (back)slashes are eliminated. */
|
|
|
|
while (c && c > bs && c[1] == '\0')
|
2005-05-02 05:50:11 +02:00
|
|
|
{
|
2005-02-22 20:45:41 +01:00
|
|
|
*c = '\0';
|
|
|
|
c = strrchr (bs, '/');
|
|
|
|
if ((d = strrchr (c ?: bs, '\\')) > c)
|
|
|
|
c = d;
|
|
|
|
}
|
|
|
|
if (c && (c > bs || c[1]))
|
|
|
|
return c + 1;
|
|
|
|
}
|
|
|
|
else if (!bs[0])
|
|
|
|
strcpy (bs, ".");
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No need to be reentrant or thread-safe according to SUSv3.
|
|
|
|
/ and \\ are treated equally. Leading drive specifiers and
|
|
|
|
leading double (back)slashes are kept intact as far as it
|
|
|
|
makes sense. Everything else is POSIX compatible. */
|
|
|
|
extern "C" char *
|
|
|
|
dirname (char *path)
|
|
|
|
{
|
2005-04-03 10:45:21 +02:00
|
|
|
static char buf[CYG_MAX_PATH];
|
2005-02-22 20:45:41 +01:00
|
|
|
char *c, *d, *bs = buf;
|
|
|
|
|
|
|
|
if (!path || !*path)
|
|
|
|
return strcpy (buf, ".");
|
|
|
|
strncpy (buf, path, CYG_MAX_PATH);
|
|
|
|
if (isalpha (buf[0]) && buf[1] == ':')
|
|
|
|
bs += 2;
|
|
|
|
else if (strspn (buf, "/\\") > 1)
|
|
|
|
++bs;
|
|
|
|
c = strrchr (bs, '/');
|
|
|
|
if ((d = strrchr (c ?: bs, '\\')) > c)
|
|
|
|
c = d;
|
|
|
|
if (c)
|
|
|
|
{
|
|
|
|
/* Trailing (back)slashes are eliminated. */
|
|
|
|
while (c && c > bs && c[1] == '\0')
|
2005-05-02 05:50:11 +02:00
|
|
|
{
|
2005-02-22 20:45:41 +01:00
|
|
|
*c = '\0';
|
|
|
|
c = strrchr (bs, '/');
|
|
|
|
if ((d = strrchr (c ?: bs, '\\')) > c)
|
|
|
|
c = d;
|
|
|
|
}
|
|
|
|
if (!c)
|
2005-05-02 05:50:11 +02:00
|
|
|
strcpy (bs, ".");
|
2005-02-22 20:45:41 +01:00
|
|
|
else if (c > bs)
|
|
|
|
{
|
|
|
|
/* More trailing (back)slashes are eliminated. */
|
|
|
|
while (c > bs && (*c == '/' || *c == '\\'))
|
|
|
|
*c-- = '\0';
|
2005-05-02 05:50:11 +02:00
|
|
|
}
|
2005-02-22 20:45:41 +01:00
|
|
|
else
|
2005-05-02 05:50:11 +02:00
|
|
|
c[1] = '\0';
|
2005-02-22 20:45:41 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
strcpy (bs, ".");
|
|
|
|
return buf;
|
|
|
|
}
|