2000-02-17 20:38:33 +01:00
|
|
|
/* syscalls.cc: syscalls
|
|
|
|
|
2005-01-03 11:59:09 +01:00
|
|
|
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
|
|
2005 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. */
|
|
|
|
|
2003-03-17 20:08:11 +01:00
|
|
|
#define fstat __FOOfstat__
|
2003-08-13 13:28:42 +02:00
|
|
|
#define lstat __FOOlstat__
|
2003-03-17 20:08:11 +01:00
|
|
|
#define stat __FOOstat__
|
2002-10-21 03:00:58 +02:00
|
|
|
#define _close __FOO_close__
|
|
|
|
#define _lseek __FOO_lseek__
|
|
|
|
#define _open __FOO_open__
|
|
|
|
#define _read __FOO_read__
|
|
|
|
#define _write __FOO_write__
|
2003-03-09 22:51:00 +01:00
|
|
|
#define _open64 __FOO_open64__
|
|
|
|
#define _lseek64 __FOO_lseek64__
|
|
|
|
#define _fstat64 __FOO_fstat64__
|
2005-07-29 19:04:46 +02:00
|
|
|
#define pread __FOO_pread
|
|
|
|
#define pwrite __FOO_pwrite
|
2002-10-21 03:00:58 +02:00
|
|
|
|
2000-08-02 18:28:18 +02:00
|
|
|
#include "winsup.h"
|
2000-02-17 20:38:33 +01:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/vfs.h> /* needed for statfs */
|
2005-02-23 14:12:43 +01:00
|
|
|
#include <sys/statvfs.h> /* needed for statvfs */
|
2000-02-17 20:38:33 +01:00
|
|
|
#include <pwd.h>
|
|
|
|
#include <grp.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <process.h>
|
|
|
|
#include <utmp.h>
|
2004-12-15 18:29:01 +01:00
|
|
|
#include <utmpx.h>
|
2000-02-17 20:38:33 +01:00
|
|
|
#include <sys/uio.h>
|
2003-09-08 22:08:53 +02:00
|
|
|
#include <errno.h>
|
|
|
|
#include <ctype.h>
|
2000-02-17 20:38:33 +01:00
|
|
|
#include <limits.h>
|
2003-03-17 20:08:11 +01:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <setjmp.h>
|
2000-07-27 19:30:51 +02:00
|
|
|
#include <winnls.h>
|
2001-06-09 23:25:55 +02:00
|
|
|
#include <wininet.h>
|
2000-02-17 20:38:33 +01:00
|
|
|
#include <lmcons.h> /* for UNLEN */
|
2003-04-16 05:03:45 +02:00
|
|
|
#include <rpc.h>
|
2003-03-17 20:08:11 +01:00
|
|
|
|
|
|
|
#undef fstat
|
2003-08-13 13:28:42 +02:00
|
|
|
#undef lstat
|
2003-03-17 20:08:11 +01:00
|
|
|
#undef stat
|
2005-07-29 19:04:46 +02:00
|
|
|
#undef pread
|
|
|
|
#undef pwrite
|
2003-03-17 20:08:11 +01:00
|
|
|
|
2000-09-08 04:56:55 +02:00
|
|
|
#include <cygwin/version.h>
|
|
|
|
#include <sys/cygwin.h>
|
2000-08-22 07:10:20 +02:00
|
|
|
#include "cygerrno.h"
|
2001-03-05 07:28:25 +01:00
|
|
|
#include "perprocess.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-12 07:35:42 +02:00
|
|
|
#include "dtable.h"
|
2000-08-22 07:10:20 +02:00
|
|
|
#include "sigproc.h"
|
2000-08-12 07:35:42 +02:00
|
|
|
#include "pinfo.h"
|
2000-09-07 18:23:51 +02:00
|
|
|
#include "shared_info.h"
|
2000-11-14 06:53:32 +01:00
|
|
|
#include "cygheap.h"
|
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by
pwdgrp_check::isinitializing ().
(pwdgrp_check::isinitializing): Create.
* passwd.cc (grab_int): Change type to unsigned, use strtoul and
set the pointer content to 0 if the field is invalid.
(parse_pwd): Move validity test after getting pw_gid.
(read_etc_passwd): Replace "passwd_state <= " by
passwd_state::isinitializing ().
(internal_getpwuid): Ditto.
(internal_getpwnam): Ditto.
(getpwent): Ditto.
(getpass): Ditto.
* grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity.
(read_etc_group): Replace "group_state <= " by
group_state::isinitializing ().
(internal_getgrgid): Ditto.
(getgrent32): Ditto.
(internal_getgrent): Ditto.
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* security.h: Move declarations of internal_getgrent,
internal_getpwsid and internal_getgrsid to pwdgrp.h.
* pwdgrp.h: Declare internal_getpwsid, internal_getpwnam,
internal_getpwuid, internal_getgrsid, internal_getgrgid,
internal_getgrnam, internal_getgrent and internal_getgroups.
Delete "emulated" from enum pwdgrp_state.
(pwdgrp_check::isuninitialized): Create.
(pwdgrp_check::pwdgrp_state): Change state to initializing
rather than to uninitialized.
(pwdgrp_read::gets): Remove trailing CRs.
* passwd.cc (grab_string): Don't look for NLs.
(grab_int): Ditto.
(parse_pwd): Don't look for CRs. Return 0 if entry is too short.
(search_for): Delete.
(read_etc_passwd): Simplify tests to actually read the file.
Set state to loaded before making internal_getpwXX calls.
Replace search_for calls by equivalent internal_pwgetXX calls.
(internal_getpwsid): Use passwd_state.isuninitialized to decide
to call read_etc_passwd.
(internal_getpwuid): Create.
(internal_getpwnam): Create.
(getpwuid32): Simply call internal_getpwuid.
(getpwuid_r32): Call internal_getpwuid.
(getpwnam): Simply call internal_getpwnam.
(getpwnam_r): Call internal_getpwnam.
* grp.cc (parse_grp): Don't look for CRs. Adjust blank space.
(add_grp_line): Adjust blank space.
(class group_lock): Ditto.
(read_etc_group): Simplify tests to actually read the file.
Set state to loaded before making internal_getgrXX calls.
Replace getgrXX calls by equivalent internal calls.
(internal_getgrsid): Use group_state.isuninitialized to decide
to call read_etc_group.
(internal_getgrgid): Create.
(internal_getgrnam): Create.
(getgroups32): Simply call internal_getgrgid.
(getgrnam32): Simply call internal_getgrnam.
(internal_getgrent): Call group_state.isuninitialized.
(internal_getgroups): Create from the former getgroups32, using
two of the four arguments. Set gid to myself->gid and username
to cygheap->user.name ().
(getgroups32): Simply call internal_getgroup.
(getgroups): Call internal_getgroup instead of getgroups32.
(setgroups32): Call internal versions of get{pw,gr}XX.
* sec_helper.cc: Include pwdgrp.h.
(is_grp_member): Call internal versions of get{pw,gr}XX.
* security.cc: Include pwdgrp.h.
(alloc_sd): Call internal versions of get{pw,gr}XX.
* syscalls.cc: Include pwdgrp.h.
(seteuid32): Call internal versions of get{pw,gr}XX.
(setegid32): Ditto.
* uinfo.cc: Include pwdgrp.h.
(internal_getlogin): Call internal versions of get{pw,gr}XX.
(cygheap_user::ontherange): Ditto.
* sec_acl.cc: Include pwdgrp.h.
(setacl): Call internal versions of get{pw,gr}XX.
(acl_access): Ditto and simplify logic.
(aclfromtext): Ditto.
2002-12-10 13:43:49 +01:00
|
|
|
#include "pwdgrp.h"
|
2003-04-16 05:03:45 +02:00
|
|
|
#include "cpuid.h"
|
|
|
|
#include "registry.h"
|
2004-05-08 04:55:38 +02:00
|
|
|
#include "environ.h"
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-10-21 03:00:58 +02:00
|
|
|
#undef _close
|
|
|
|
#undef _lseek
|
|
|
|
#undef _open
|
|
|
|
#undef _read
|
|
|
|
#undef _write
|
2003-03-09 22:51:00 +01:00
|
|
|
#undef _open64
|
|
|
|
#undef _lseek64
|
|
|
|
#undef _fstat64
|
2002-10-21 03:00:58 +02:00
|
|
|
|
2004-04-13 22:36:58 +02:00
|
|
|
suffix_info stat_suffixes[] =
|
|
|
|
{
|
|
|
|
suffix_info ("", 1),
|
|
|
|
suffix_info (".exe", 1),
|
|
|
|
suffix_info (NULL)
|
|
|
|
};
|
|
|
|
|
2001-01-28 06:51:15 +01:00
|
|
|
SYSTEM_INFO system_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
|
|
|
static int __stdcall mknod_worker (const char *, mode_t, mode_t, _major_t,
|
|
|
|
_minor_t);
|
|
|
|
|
|
|
|
static int __stdcall stat_worker (const char *name, struct __stat64 *buf,
|
|
|
|
int nofollow) __attribute__ ((regparm (3)));
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Close all files and process any queued deletions.
|
|
|
|
Lots of unix style applications will open a tmp file, unlink it,
|
|
|
|
but never call close. This function is called by _exit to
|
|
|
|
ensure we don't leave any such files lying around. */
|
|
|
|
|
|
|
|
void __stdcall
|
2005-07-05 04:05:07 +02:00
|
|
|
close_all_files (bool norelease)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2004-01-14 16:45:37 +01:00
|
|
|
cygheap->fdtab.lock ();
|
2000-10-15 03:37:07 +02:00
|
|
|
|
2000-11-03 05:27:03 +01:00
|
|
|
fhandler_base *fh;
|
2001-04-18 23:10:15 +02:00
|
|
|
for (int i = 0; i < (int) cygheap->fdtab.size; i++)
|
|
|
|
if ((fh = cygheap->fdtab[i]) != NULL)
|
2000-10-15 03:37:07 +02:00
|
|
|
{
|
2003-12-17 00:28:03 +01:00
|
|
|
#ifdef DEBUGGING
|
|
|
|
debug_printf ("closing fd %d", i);
|
|
|
|
#endif
|
2000-11-03 05:27:03 +01:00
|
|
|
fh->close ();
|
2005-07-05 04:05:07 +02:00
|
|
|
if (!norelease)
|
|
|
|
cygheap->fdtab.release (i);
|
2000-10-15 03:37:07 +02:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-12-27 03:41:07 +01:00
|
|
|
if (cygheap->ctty)
|
2004-01-14 16:45:37 +01:00
|
|
|
cygheap->close_ctty ();
|
2003-12-27 03:41:07 +01:00
|
|
|
|
2004-01-14 16:45:37 +01:00
|
|
|
cygheap->fdtab.unlock ();
|
2003-09-25 04:29:05 +02:00
|
|
|
user_shared->delqueue.process_queue ();
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-09-24 23:50:44 +02:00
|
|
|
int
|
|
|
|
dup (int fd)
|
|
|
|
{
|
2002-05-23 00:09:58 +02:00
|
|
|
return cygheap->fdtab.dup2 (fd, cygheap_fdnew ());
|
2001-09-24 23:50:44 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
dup2 (int oldfd, int newfd)
|
|
|
|
{
|
|
|
|
return cygheap->fdtab.dup2 (oldfd, newfd);
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2002-10-21 03:00:58 +02:00
|
|
|
unlink (const char *ourname)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int res = -1;
|
2002-06-05 18:01:55 +02:00
|
|
|
DWORD devn;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-05-13 17:46:07 +02:00
|
|
|
path_conv win32_name (ourname, PC_SYM_NOFOLLOW);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
if (win32_name.error)
|
|
|
|
{
|
|
|
|
set_errno (win32_name.error);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2002-06-05 18:01:55 +02:00
|
|
|
if ((devn = win32_name.get_devn ()) == FH_PROC || devn == FH_REGISTRY
|
|
|
|
|| devn == FH_PROCESS)
|
|
|
|
{
|
|
|
|
set_errno (EROFS);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
syscall_printf ("_unlink (%s)", win32_name.get_win32 ());
|
|
|
|
|
2001-10-01 06:10:07 +02:00
|
|
|
if (!win32_name.exists ())
|
2001-07-18 13:00:05 +02:00
|
|
|
{
|
2001-10-01 06:10:07 +02:00
|
|
|
syscall_printf ("unlinking a nonexistent file");
|
2001-07-18 13:00:05 +02:00
|
|
|
set_errno (ENOENT);
|
|
|
|
goto done;
|
|
|
|
}
|
2001-10-01 06:10:07 +02:00
|
|
|
else if (win32_name.isdir ())
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
syscall_printf ("unlinking a directory");
|
|
|
|
set_errno (EPERM);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2003-03-20 02:34:53 +01:00
|
|
|
bool setattrs;
|
|
|
|
if (!((DWORD) win32_name & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)))
|
|
|
|
setattrs = false;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Allow us to delete even if read-only */
|
2003-03-22 18:48:40 +01:00
|
|
|
setattrs = SetFileAttributes (win32_name,
|
|
|
|
(DWORD) win32_name
|
|
|
|
& ~(FILE_ATTRIBUTE_READONLY
|
|
|
|
| FILE_ATTRIBUTE_SYSTEM));
|
2003-03-20 02:34:53 +01:00
|
|
|
}
|
2003-03-09 01:10:29 +01:00
|
|
|
/* Attempt to use "delete on close" semantics to handle removing
|
2004-09-17 11:10:53 +02:00
|
|
|
a file which may be open.
|
|
|
|
|
|
|
|
CV 2004-09-17: Not if the file is on a remote share. If two processes
|
|
|
|
have open handles on a file and one of them calls unlink, then it
|
|
|
|
happens that the file is remove from the remote share even though the
|
|
|
|
other process still has an open handle. This other process than gets
|
2005-02-13 19:17:29 +01:00
|
|
|
Win32 error 59, ERROR_UNEXP_NET_ERR when trying to access the file.
|
2004-09-17 11:10:53 +02:00
|
|
|
|
|
|
|
For some reason, that does not happen when using DeleteFile, which
|
2005-02-13 19:17:29 +01:00
|
|
|
nicely succeeds but still, the file is available for the other process.
|
2004-09-17 11:10:53 +02:00
|
|
|
To reproduce, mount /tmp on a remote share and call
|
2005-02-13 19:17:29 +01:00
|
|
|
|
2004-09-17 11:10:53 +02:00
|
|
|
bash -c "cat << EOF"
|
|
|
|
|
|
|
|
Microsoft KB 837665 describes this problem as a bug in 2K3, but I have
|
|
|
|
reproduced it on shares on Samba 2.2.8, Samba 3.0.2, NT4SP6, XP64SP1 and
|
|
|
|
2K3 and in all cases, DeleteFile works, "delete on close" does not. */
|
|
|
|
if (!win32_name.isremote () && wincap.has_delete_on_close ())
|
2003-03-09 01:10:29 +01:00
|
|
|
{
|
2003-10-08 11:17:08 +02:00
|
|
|
HANDLE h;
|
|
|
|
h = CreateFile (win32_name, 0, FILE_SHARE_READ, &sec_none_nih,
|
|
|
|
OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, 0);
|
|
|
|
if (h != INVALID_HANDLE_VALUE)
|
2003-03-09 19:10:42 +01:00
|
|
|
{
|
2003-10-08 11:17:08 +02:00
|
|
|
if (wincap.has_hard_links () && setattrs)
|
2005-07-06 22:05:03 +02:00
|
|
|
SetFileAttributes (win32_name, (DWORD) win32_name);
|
2003-10-08 11:17:08 +02:00
|
|
|
BOOL res = CloseHandle (h);
|
|
|
|
syscall_printf ("%d = CloseHandle (%p)", res, h);
|
|
|
|
if (GetFileAttributes (win32_name) == INVALID_FILE_ATTRIBUTES
|
|
|
|
|| !win32_name.isremote ())
|
|
|
|
{
|
|
|
|
syscall_printf ("CreateFile (FILE_FLAG_DELETE_ON_CLOSE) succeeded");
|
|
|
|
goto ok;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
syscall_printf ("CreateFile (FILE_FLAG_DELETE_ON_CLOSE) failed");
|
|
|
|
if (setattrs)
|
|
|
|
SetFileAttributes (win32_name, (DWORD) win32_name & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM));
|
|
|
|
}
|
2003-03-09 19:10:42 +01:00
|
|
|
}
|
2003-03-09 01:10:29 +01:00
|
|
|
}
|
2000-05-04 21:46:32 +02:00
|
|
|
|
2003-03-09 19:10:42 +01:00
|
|
|
/* Try a delete with attributes reset */
|
2003-03-09 01:10:29 +01:00
|
|
|
if (DeleteFile (win32_name))
|
|
|
|
{
|
2003-03-22 18:48:40 +01:00
|
|
|
syscall_printf ("DeleteFile after CreateFile/CloseHandle succeeded");
|
2003-03-09 01:10:29 +01:00
|
|
|
goto ok;
|
2001-06-18 23:18:59 +02:00
|
|
|
}
|
2000-03-18 07:26:14 +01:00
|
|
|
|
2003-03-09 19:10:42 +01:00
|
|
|
DWORD lasterr;
|
|
|
|
lasterr = GetLastError ();
|
|
|
|
|
2005-07-06 22:05:03 +02:00
|
|
|
SetFileAttributes (win32_name, (DWORD) win32_name);
|
2003-03-09 19:10:42 +01:00
|
|
|
|
2001-07-13 19:22:15 +02:00
|
|
|
/* Windows 9x seems to report ERROR_ACCESS_DENIED rather than sharing
|
|
|
|
violation. So, set lasterr to ERROR_SHARING_VIOLATION in this case
|
|
|
|
to simplify tests. */
|
* Makefile.in: Build wincap.o.
* wincap.cc: New file.
* wincap.h: Ditto.
* autoload.cc: Add dynamic load statement for `CreateHardLinkA'.
* dcrt0.cc (os_being_run): Eliminated.
(osname): Ditto.
(iswinnt): Ditto.
(set_os_type): Ditto.
(dll_crt0_1): Call wincap.init() instead of set_os_type().
(_dll_crt0): Ditto.
* environ.cc (set_chunksize): New function.
(parse_thing): `forkchunk' setting now invokes function `set_chunksize'.
* fork.cc (chunksize): Eliminated. Moved to be member of wincap.
* host_dependent.h: Removed.
* syscalls.cc (_link): Try using `CreateHardLinkA' first, if available.
* cygheap.cc, dcrt0.cc, delqueue.cc, dir.cc,
environ.cc, fhandler.cc, fhandler.h, fhandler_console.cc,
fhandler_mem.cc, fork.cc, mmap.cc, net.cc, pinfo.cc, pinfo.h,
security.cc, syscalls.cc, sysconf.cc, syslog.cc, thread.cc,
times.cc, tty.cc, uinfo.cc, uname.cc, winsup.h: Use new wincap
capability check throughout.
* winsup.h: Include wincap.h. Eliminate extern declarations of
`os_being_run' and `iswinnt'. Eliminate `os_type" definition.
* include/cygwin/version.h: Bump version to 1.3.4.
2001-09-12 19:46:37 +02:00
|
|
|
if (wincap.access_denied_on_delete () && lasterr == ERROR_ACCESS_DENIED
|
2001-07-13 19:22:15 +02:00
|
|
|
&& !win32_name.isremote ())
|
|
|
|
lasterr = ERROR_SHARING_VIOLATION;
|
|
|
|
|
|
|
|
/* FILE_FLAGS_DELETE_ON_CLOSE was a bust. If this is a sharing
|
|
|
|
violation, then queue the file for deletion when the process
|
|
|
|
exits. Otherwise, punt. */
|
|
|
|
if (lasterr != ERROR_SHARING_VIOLATION)
|
2001-06-18 23:18:59 +02:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
syscall_printf ("couldn't delete file, err %d", lasterr);
|
|
|
|
|
|
|
|
/* Add file to the "to be deleted" queue. */
|
2003-09-25 04:29:05 +02:00
|
|
|
user_shared->delqueue.queue_file (win32_name);
|
2001-06-18 23:18:59 +02:00
|
|
|
|
|
|
|
/* Success condition. */
|
|
|
|
ok:
|
|
|
|
res = 0;
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* Error condition. */
|
|
|
|
err:
|
|
|
|
__seterrno ();
|
|
|
|
res = -1;
|
|
|
|
|
|
|
|
done:
|
2000-02-17 20:38:33 +01:00
|
|
|
syscall_printf ("%d = unlink (%s)", res, ourname);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2003-08-23 20:03:16 +02:00
|
|
|
extern "C" int
|
|
|
|
_remove_r (struct _reent *, const char *ourname)
|
|
|
|
{
|
2005-05-13 17:46:07 +02:00
|
|
|
path_conv win32_name (ourname, PC_SYM_NOFOLLOW);
|
2003-08-23 20:03:16 +02:00
|
|
|
|
|
|
|
if (win32_name.error)
|
|
|
|
{
|
|
|
|
set_errno (win32_name.error);
|
|
|
|
syscall_printf ("-1 = remove (%s)", ourname);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return win32_name.isdir () ? rmdir (ourname) : unlink (ourname);
|
|
|
|
}
|
|
|
|
|
2000-12-19 21:43:41 +01:00
|
|
|
extern "C" int
|
|
|
|
remove (const char *ourname)
|
|
|
|
{
|
2005-05-13 17:46:07 +02:00
|
|
|
path_conv win32_name (ourname, PC_SYM_NOFOLLOW);
|
2000-12-19 21:43:41 +01:00
|
|
|
|
|
|
|
if (win32_name.error)
|
|
|
|
{
|
|
|
|
set_errno (win32_name.error);
|
|
|
|
syscall_printf ("-1 = remove (%s)", ourname);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2002-10-21 03:00:58 +02:00
|
|
|
return win32_name.isdir () ? rmdir (ourname) : unlink (ourname);
|
2000-12-19 21:43:41 +01:00
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" pid_t
|
2002-10-20 06:15:50 +02:00
|
|
|
getpid ()
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
return myself->pid;
|
|
|
|
}
|
|
|
|
|
2002-10-20 06:15:50 +02:00
|
|
|
extern "C" pid_t
|
|
|
|
_getpid_r (struct _reent *)
|
|
|
|
{
|
|
|
|
return getpid ();
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* getppid: POSIX 4.1.1.1 */
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" pid_t
|
2000-02-17 20:38:33 +01:00
|
|
|
getppid ()
|
|
|
|
{
|
|
|
|
return myself->ppid;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* setsid: POSIX 4.3.2.1 */
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" pid_t
|
2000-02-17 20:38:33 +01:00
|
|
|
setsid (void)
|
|
|
|
{
|
2004-01-24 00:05:33 +01:00
|
|
|
#ifdef NEWVFORK
|
2002-08-18 07:49:26 +02:00
|
|
|
vfork_save *vf = vfork_storage.val ();
|
|
|
|
/* This is a horrible, horrible kludge */
|
|
|
|
if (vf && vf->pid < 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2002-08-18 07:49:26 +02:00
|
|
|
pid_t pid = fork ();
|
|
|
|
if (pid > 0)
|
|
|
|
{
|
|
|
|
syscall_printf ("longjmping due to vfork");
|
|
|
|
vf->restore_pid (pid);
|
|
|
|
}
|
|
|
|
/* assuming that fork was successful */
|
|
|
|
}
|
2004-01-24 00:05:33 +01:00
|
|
|
#endif
|
2002-08-18 07:49:26 +02:00
|
|
|
|
2003-12-23 17:26:31 +01:00
|
|
|
if (myself->pgid == myself->pid)
|
|
|
|
syscall_printf ("hmm. pgid %d pid %d", myself->pgid, myself->pid);
|
|
|
|
else
|
2002-08-18 07:49:26 +02:00
|
|
|
{
|
2003-12-30 02:57:16 +01:00
|
|
|
if (myself->ctty >= 0 && cygheap->open_fhs <= 0)
|
2003-03-14 00:11:38 +01:00
|
|
|
{
|
2003-07-26 06:53:59 +02:00
|
|
|
syscall_printf ("freeing console");
|
2003-03-14 00:11:38 +01:00
|
|
|
FreeConsole ();
|
|
|
|
}
|
2003-04-18 02:25:41 +02:00
|
|
|
myself->ctty = -1;
|
2002-10-20 06:15:50 +02:00
|
|
|
myself->sid = getpid ();
|
|
|
|
myself->pgid = getpid ();
|
2003-12-11 07:12:41 +01:00
|
|
|
if (cygheap->ctty)
|
2004-01-14 16:45:37 +01:00
|
|
|
cygheap->close_ctty ();
|
2004-01-24 04:40:33 +01:00
|
|
|
syscall_printf ("sid %d, pgid %d, ctty %d, open_fhs %d", myself->sid,
|
|
|
|
myself->pgid, myself->ctty, cygheap->open_fhs);
|
2000-02-17 20:38:33 +01:00
|
|
|
return myself->sid;
|
|
|
|
}
|
2002-08-18 07:49:26 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
set_errno (EPERM);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2002-08-18 07:49:26 +02:00
|
|
|
extern "C" pid_t
|
|
|
|
getsid (pid_t pid)
|
|
|
|
{
|
|
|
|
pid_t res;
|
|
|
|
if (!pid)
|
|
|
|
res = myself->sid;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pinfo p (pid);
|
|
|
|
if (p)
|
|
|
|
res = p->sid;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
set_errno (ESRCH);
|
|
|
|
res = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2001-03-07 21:52:33 +01:00
|
|
|
extern "C" ssize_t
|
2002-10-21 03:00:58 +02:00
|
|
|
read (int fd, void *ptr, size_t len)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2002-11-29 08:05:26 +01:00
|
|
|
const iovec iov =
|
2002-08-30 17:47:10 +02:00
|
|
|
{
|
|
|
|
iov_base: ptr,
|
|
|
|
iov_len: len
|
|
|
|
};
|
|
|
|
|
|
|
|
return readv (fd, &iov, 1);
|
|
|
|
}
|
2001-10-24 06:16:45 +02:00
|
|
|
|
2005-07-29 19:04:46 +02:00
|
|
|
extern "C" ssize_t
|
|
|
|
pread (int fd, void *ptr, size_t len, _off64_t off)
|
|
|
|
{
|
|
|
|
ssize_t res;
|
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
res = -1;
|
|
|
|
else
|
|
|
|
res = cfd->pread (ptr, len, off);
|
|
|
|
|
|
|
|
syscall_printf ("%d = pread (%d, %p, %d, %d), errno %d",
|
|
|
|
res, fd, ptr, len, off, get_errno ());
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" ssize_t
|
|
|
|
pwrite (int fd, void *ptr, size_t len, _off64_t off)
|
|
|
|
{
|
|
|
|
ssize_t res;
|
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
res = -1;
|
|
|
|
else
|
|
|
|
res = cfd->pwrite (ptr, len, off);
|
|
|
|
|
|
|
|
syscall_printf ("%d = pwrite (%d, %p, %d, %d), errno %d",
|
|
|
|
res, fd, ptr, len, off, get_errno ());
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2004-09-10 10:30:51 +02:00
|
|
|
EXPORT_ALIAS (read, _read)
|
2002-10-21 03:00:58 +02:00
|
|
|
|
2002-08-30 17:47:10 +02:00
|
|
|
extern "C" ssize_t
|
2002-10-21 03:00:58 +02:00
|
|
|
write (int fd, const void *ptr, size_t len)
|
2002-08-30 17:47:10 +02:00
|
|
|
{
|
|
|
|
const struct iovec iov =
|
|
|
|
{
|
|
|
|
iov_base: (void *) ptr, // const_cast
|
|
|
|
iov_len: len
|
|
|
|
};
|
|
|
|
|
|
|
|
return writev (fd, &iov, 1);
|
|
|
|
}
|
2001-10-19 04:27:19 +02:00
|
|
|
|
2004-09-10 10:30:51 +02:00
|
|
|
EXPORT_ALIAS (write, _write)
|
2002-10-21 03:00:58 +02:00
|
|
|
|
2002-08-30 17:47:10 +02:00
|
|
|
extern "C" ssize_t
|
|
|
|
readv (int fd, const struct iovec *const iov, const int iovcnt)
|
|
|
|
{
|
2000-10-15 03:37:07 +02:00
|
|
|
extern int sigcatchers;
|
2002-08-30 17:47:10 +02:00
|
|
|
const int e = get_errno ();
|
|
|
|
|
|
|
|
int res = -1;
|
|
|
|
|
|
|
|
const ssize_t tot = check_iovec_for_read (iov, iovcnt);
|
|
|
|
|
|
|
|
if (tot <= 0)
|
|
|
|
{
|
|
|
|
res = tot;
|
|
|
|
goto done;
|
|
|
|
}
|
2001-01-12 06:38:25 +01:00
|
|
|
|
2001-04-01 02:06:17 +02:00
|
|
|
while (1)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-08-19 06:10:42 +02:00
|
|
|
sig_dispatch_pending ();
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
2002-08-30 17:47:10 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
if ((cfd->get_flags () & O_ACCMODE) == O_WRONLY)
|
|
|
|
{
|
|
|
|
set_errno (EBADF);
|
|
|
|
break;
|
|
|
|
}
|
2000-09-25 18:36:12 +02:00
|
|
|
|
2001-10-16 01:39:33 +02:00
|
|
|
DWORD wait = cfd->is_nonblocking () ? 0 : INFINITE;
|
2000-09-25 18:36:12 +02:00
|
|
|
|
2001-04-01 02:06:17 +02:00
|
|
|
/* Could block, so let user know we at least got here. */
|
2002-08-30 17:47:10 +02:00
|
|
|
syscall_printf ("readv (%d, %p, %d) %sblocking, sigcatchers %d",
|
|
|
|
fd, iov, iovcnt, wait ? "" : "non", sigcatchers);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-04-10 15:45:10 +02:00
|
|
|
if (wait && (!cfd->is_slow () || cfd->uninterruptible_io ()))
|
2002-09-30 06:35:18 +02:00
|
|
|
debug_printf ("no need to call ready_for_read");
|
2001-11-04 03:31:58 +01:00
|
|
|
else if (!cfd->ready_for_read (fd, wait))
|
2001-04-01 02:06:17 +02:00
|
|
|
{
|
|
|
|
res = -1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2001-11-02 00:48:34 +01:00
|
|
|
/* FIXME: This is not thread safe. We need some method to
|
2001-11-05 07:09:15 +01:00
|
|
|
ensure that an fd, closed in another thread, aborts I/O
|
2001-11-02 00:48:34 +01:00
|
|
|
operations. */
|
2002-08-02 04:10:24 +02:00
|
|
|
if (!cfd.isopen ())
|
2002-08-30 17:47:10 +02:00
|
|
|
break;
|
2001-10-31 01:55:32 +01:00
|
|
|
|
2001-04-01 02:06:17 +02:00
|
|
|
/* Check to see if this is a background read from a "tty",
|
|
|
|
sending a SIGTTIN, if appropriate */
|
2001-10-16 01:39:33 +02:00
|
|
|
res = cfd->bg_check (SIGTTIN);
|
2001-11-02 00:48:34 +01:00
|
|
|
|
2002-07-29 05:18:41 +02:00
|
|
|
if (!cfd.isopen ())
|
2002-08-30 17:47:10 +02:00
|
|
|
{
|
|
|
|
res = -1;
|
|
|
|
break;
|
|
|
|
}
|
2001-11-02 00:48:34 +01:00
|
|
|
|
2001-04-01 02:06:17 +02:00
|
|
|
if (res > bg_eof)
|
|
|
|
{
|
|
|
|
myself->process_state |= PID_TTYIN;
|
2002-08-02 04:10:24 +02:00
|
|
|
if (!cfd.isopen ())
|
2002-08-30 17:47:10 +02:00
|
|
|
{
|
|
|
|
res = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
res = cfd->readv (iov, iovcnt, tot);
|
2001-04-01 02:06:17 +02:00
|
|
|
myself->process_state &= ~PID_TTYIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2004-02-12 04:01:58 +01:00
|
|
|
if (res >= 0 || get_errno () != EINTR || !_my_tls.call_signal_handler ())
|
2001-04-01 02:06:17 +02:00
|
|
|
break;
|
2001-09-12 07:09:24 +02:00
|
|
|
set_errno (e);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2002-08-30 17:47:10 +02:00
|
|
|
done:
|
|
|
|
syscall_printf ("%d = readv (%d, %p, %d), errno %d", res, fd, iov, iovcnt,
|
2001-11-05 07:09:15 +01:00
|
|
|
get_errno ());
|
2000-02-17 20:38:33 +01:00
|
|
|
MALLOC_CHECK;
|
2000-09-25 18:36:12 +02:00
|
|
|
return res;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-03-07 21:52:33 +01:00
|
|
|
extern "C" ssize_t
|
2002-08-30 17:47:10 +02:00
|
|
|
writev (const int fd, const struct iovec *const iov, const int iovcnt)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int res = -1;
|
2003-08-19 06:10:42 +02:00
|
|
|
sig_dispatch_pending ();
|
2002-08-30 17:47:10 +02:00
|
|
|
const ssize_t tot = check_iovec_for_write (iov, iovcnt);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
goto done;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-08-30 17:47:10 +02:00
|
|
|
if (tot <= 0)
|
2001-11-15 04:25:52 +01:00
|
|
|
{
|
2002-08-30 17:47:10 +02:00
|
|
|
res = tot;
|
2001-11-15 04:25:52 +01:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2002-08-30 17:47:10 +02:00
|
|
|
if ((cfd->get_flags () & O_ACCMODE) == O_RDONLY)
|
|
|
|
{
|
|
|
|
set_errno (EBADF);
|
|
|
|
goto done;
|
|
|
|
}
|
2001-11-15 04:25:52 +01:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Could block, so let user know we at least got here. */
|
|
|
|
if (fd == 1 || fd == 2)
|
2002-08-30 17:47:10 +02:00
|
|
|
paranoid_printf ("writev (%d, %p, %d)", fd, iov, iovcnt);
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
2002-08-30 17:47:10 +02:00
|
|
|
syscall_printf ("writev (%d, %p, %d)", fd, iov, iovcnt);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-10-16 01:39:33 +02:00
|
|
|
res = cfd->bg_check (SIGTTOU);
|
2001-09-03 04:13:05 +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
|
|
|
if (res > (int) bg_eof)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
myself->process_state |= PID_TTYOU;
|
2002-08-30 17:47:10 +02:00
|
|
|
res = cfd->writev (iov, iovcnt, tot);
|
2000-02-17 20:38:33 +01:00
|
|
|
myself->process_state &= ~PID_TTYOU;
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
if (fd == 1 || fd == 2)
|
2002-08-30 17:47:10 +02:00
|
|
|
paranoid_printf ("%d = write (%d, %p, %d), errno %d",
|
|
|
|
res, fd, iov, iovcnt, get_errno ());
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
2002-08-30 17:47:10 +02:00
|
|
|
syscall_printf ("%d = write (%d, %p, %d), errno %d",
|
|
|
|
res, fd, iov, iovcnt, get_errno ());
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-08-30 17:47:10 +02:00
|
|
|
MALLOC_CHECK;
|
|
|
|
return res;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* _open */
|
|
|
|
/* newlib's fcntl.h defines _open as taking variable args so we must
|
|
|
|
correspond. The third arg if it exists is: mode_t mode. */
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2002-10-21 03:00:58 +02:00
|
|
|
open (const char *unix_path, int flags, ...)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int res = -1;
|
|
|
|
va_list ap;
|
|
|
|
mode_t mode = 0;
|
2003-08-19 06:10:42 +02:00
|
|
|
sig_dispatch_pending ();
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
syscall_printf ("open (%s, %p)", unix_path, flags);
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
/* errno already set */;
|
|
|
|
else if (!*unix_path)
|
|
|
|
set_errno (ENOENT);
|
|
|
|
else
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
/* check for optional mode argument */
|
|
|
|
va_start (ap, flags);
|
|
|
|
mode = va_arg (ap, mode_t);
|
|
|
|
va_end (ap);
|
|
|
|
|
2001-10-16 01:39:33 +02:00
|
|
|
fhandler_base *fh;
|
|
|
|
cygheap_fdnew fd;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-11-03 04:32:27 +01:00
|
|
|
if (fd >= 0)
|
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
|
|
|
if (!(fh = build_fh_name (unix_path, NULL, PC_SYM_FOLLOW)))
|
2001-09-22 23:44:07 +02:00
|
|
|
res = -1; // errno already set
|
2005-04-28 05:41:09 +02:00
|
|
|
else if (((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) && fh->exists ())
|
|
|
|
{
|
|
|
|
delete fh;
|
|
|
|
res = -1;
|
|
|
|
set_errno (EEXIST);
|
|
|
|
}
|
* 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 (fh->is_fs_special () && fh->device_access_denied (flags))
|
|
|
|
{
|
|
|
|
delete fh;
|
|
|
|
res = -1;
|
|
|
|
}
|
|
|
|
else if (!fh->open (flags, (mode & 07777) & ~cygheap->umask))
|
2001-09-22 23:44:07 +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
|
|
|
delete fh;
|
2001-09-24 23:50:44 +02:00
|
|
|
res = -1;
|
2001-09-22 23:44:07 +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
|
|
|
|
{
|
|
|
|
cygheap->fdtab[fd] = fh;
|
|
|
|
if ((res = fd) <= 2)
|
|
|
|
set_std_handle (res);
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
syscall_printf ("%d = open (%s, %p)", res, unix_path, flags);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2004-09-10 10:30:51 +02:00
|
|
|
EXPORT_ALIAS (open, _open )
|
|
|
|
EXPORT_ALIAS (open, _open64 )
|
2003-03-09 22:51:00 +01:00
|
|
|
|
2003-04-01 18:11:41 +02:00
|
|
|
extern "C" _off64_t
|
|
|
|
lseek64 (int fd, _off64_t pos, int dir)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-04-01 18:11:41 +02:00
|
|
|
_off64_t res;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-03-03 04:56:34 +01:00
|
|
|
if (dir != SEEK_SET && dir != SEEK_CUR && dir != SEEK_END)
|
2001-02-16 19:49:20 +01:00
|
|
|
{
|
2001-03-03 04:56:34 +01:00
|
|
|
set_errno (EINVAL);
|
2001-02-16 19:49:20 +01:00
|
|
|
res = -1;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
|
|
|
{
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd >= 0)
|
|
|
|
res = cfd->lseek (pos, dir);
|
|
|
|
else
|
|
|
|
res = -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2004-04-21 10:16:13 +02:00
|
|
|
syscall_printf ("%D = lseek (%d, %D, %d)", res, fd, pos, dir);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2004-09-10 10:30:51 +02:00
|
|
|
EXPORT_ALIAS (lseek64, _lseek64)
|
2003-03-09 22:51:00 +01:00
|
|
|
|
2003-04-01 18:11:41 +02:00
|
|
|
extern "C" _off_t
|
|
|
|
lseek (int fd, _off_t pos, int dir)
|
2002-02-25 18:47:51 +01:00
|
|
|
{
|
2003-04-01 18:11:41 +02:00
|
|
|
return lseek64 (fd, (_off64_t) pos, dir);
|
2002-02-25 18:47:51 +01:00
|
|
|
}
|
|
|
|
|
2004-09-10 10:30:51 +02:00
|
|
|
EXPORT_ALIAS (lseek, _lseek)
|
2002-10-21 03:00:58 +02:00
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2002-10-21 03:00:58 +02:00
|
|
|
close (int fd)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int res;
|
|
|
|
|
|
|
|
syscall_printf ("close (%d)", fd);
|
|
|
|
|
|
|
|
MALLOC_CHECK;
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd, true);
|
|
|
|
if (cfd < 0)
|
|
|
|
res = -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
|
|
|
{
|
2002-07-26 21:58:00 +02:00
|
|
|
res = cfd->close ();
|
2001-10-16 01:39:33 +02:00
|
|
|
cfd.release ();
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
syscall_printf ("%d = close (%d)", res, fd);
|
|
|
|
MALLOC_CHECK;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2004-09-10 10:30:51 +02:00
|
|
|
EXPORT_ALIAS (close, _close)
|
2002-10-21 03:00:58 +02:00
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
isatty (int fd)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
res = 0;
|
2001-11-05 07:09:15 +01:00
|
|
|
else
|
2001-10-16 01:39:33 +02:00
|
|
|
res = cfd->is_tty ();
|
2000-02-17 20:38:33 +01:00
|
|
|
syscall_printf ("%d = isatty (%d)", res, fd);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Under NT, try to make a hard link using backup API. If that
|
|
|
|
fails or we are Win 95, just copy the file.
|
|
|
|
FIXME: We should actually be checking partition type, not OS.
|
|
|
|
Under NTFS, we should support hard links. On FAT partitions,
|
|
|
|
we should just copy the file.
|
|
|
|
*/
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2005-02-19 22:53:36 +01:00
|
|
|
link (const char *oldpath, const char *newpath)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int res = -1;
|
2005-02-19 22:53:36 +01:00
|
|
|
fhandler_base *fh;
|
2002-06-26 06:21:01 +02:00
|
|
|
|
2005-02-19 22:53:36 +01:00
|
|
|
if (!(fh = build_fh_name (oldpath, NULL, PC_SYM_NOFOLLOW)))
|
|
|
|
goto error;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-02-19 22:53:36 +01:00
|
|
|
if (fh->error ())
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-02-19 22:53:36 +01:00
|
|
|
debug_printf ("got %d error from build_fh_name", fh->error ());
|
|
|
|
set_errno (fh->error ());
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
else
|
2005-02-19 22:53:36 +01:00
|
|
|
res = fh->link (newpath);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-02-19 22:53:36 +01:00
|
|
|
delete fh;
|
|
|
|
error:
|
|
|
|
syscall_printf ("%d = link (%s, %s)", res, oldpath, newpath);
|
2000-02-17 20:38:33 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* chown: POSIX 5.6.5.1 */
|
|
|
|
/*
|
2001-03-03 04:56:34 +01:00
|
|
|
* chown () is only implemented for Windows NT. Under other operating
|
2000-02-17 20:38:33 +01:00
|
|
|
* systems, it is only a stub that always returns zero.
|
|
|
|
*/
|
2000-04-02 22:42:42 +02:00
|
|
|
static int
|
2002-05-29 17:04:29 +02:00
|
|
|
chown_worker (const char *name, unsigned fmode, __uid32_t uid, __gid32_t gid)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
* Makefile.in: Build wincap.o.
* wincap.cc: New file.
* wincap.h: Ditto.
* autoload.cc: Add dynamic load statement for `CreateHardLinkA'.
* dcrt0.cc (os_being_run): Eliminated.
(osname): Ditto.
(iswinnt): Ditto.
(set_os_type): Ditto.
(dll_crt0_1): Call wincap.init() instead of set_os_type().
(_dll_crt0): Ditto.
* environ.cc (set_chunksize): New function.
(parse_thing): `forkchunk' setting now invokes function `set_chunksize'.
* fork.cc (chunksize): Eliminated. Moved to be member of wincap.
* host_dependent.h: Removed.
* syscalls.cc (_link): Try using `CreateHardLinkA' first, if available.
* cygheap.cc, dcrt0.cc, delqueue.cc, dir.cc,
environ.cc, fhandler.cc, fhandler.h, fhandler_console.cc,
fhandler_mem.cc, fork.cc, mmap.cc, net.cc, pinfo.cc, pinfo.h,
security.cc, syscalls.cc, sysconf.cc, syslog.cc, thread.cc,
times.cc, tty.cc, uinfo.cc, uname.cc, winsup.h: Use new wincap
capability check throughout.
* winsup.h: Include wincap.h. Eliminate extern declarations of
`os_being_run' and `iswinnt'. Eliminate `os_type" definition.
* include/cygwin/version.h: Bump version to 1.3.4.
2001-09-12 19:46:37 +02:00
|
|
|
if (!wincap.has_security ()) // real chown only works on NT
|
2004-04-14 18:36:26 +02:00
|
|
|
return 0; // return zero (and do nothing) under Windows 9x
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-04-14 18:36:26 +02:00
|
|
|
int res = -1;
|
2004-04-20 17:51:24 +02:00
|
|
|
fhandler_base *fh;
|
|
|
|
|
|
|
|
if (!(fh = build_fh_name (name, NULL, fmode, stat_suffixes)))
|
|
|
|
goto error;
|
|
|
|
|
2004-04-14 18:36:26 +02:00
|
|
|
if (fh->error ())
|
|
|
|
{
|
|
|
|
debug_printf ("got %d error from build_fh_name", fh->error ());
|
|
|
|
set_errno (fh->error ());
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2004-04-14 18:36:26 +02:00
|
|
|
else
|
|
|
|
res = fh->fchown (uid, gid);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-04-14 23:11:45 +02:00
|
|
|
delete fh;
|
2004-04-20 17:51:24 +02:00
|
|
|
error:
|
2000-04-02 22:42:42 +02:00
|
|
|
syscall_printf ("%d = %schown (%s,...)",
|
2001-03-14 12:13:46 +01:00
|
|
|
res, (fmode & PC_SYM_NOFOLLOW) ? "l" : "", name);
|
2000-02-17 20:38:33 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2002-05-29 17:04:29 +02:00
|
|
|
chown32 (const char * name, __uid32_t uid, __gid32_t gid)
|
2000-04-02 22:42:42 +02:00
|
|
|
{
|
2000-07-17 21:18:21 +02:00
|
|
|
return chown_worker (name, PC_SYM_FOLLOW, uid, gid);
|
2000-04-02 22:42:42 +02:00
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
Change internal gid datatype from __gid16_t to __gid32_t
throughout.
* cygwin.din: Export new symbols chown32, fchown32, getegid32,
getgid32, getgrgid32, getgrnam32, getgroups32, initgroups32, lchown32,
setgid32, setegid32, getgrent32.
* grp.cc (grp32togrp16): New static function.
(getgrgid32): New function.
(getgrnam32): Ditto.
(getgrent32): Ditto.
(getgroups32): Change name of internal function from getgroups.
(getgroups32): New function.
(initgroups32): Ditto.
* syscalls.cc (chown32): Ditto.
(lchown32): Ditto.
(fchown32): Ditto.
(setegid32): Ditto.
(setgid32): Ditto.
* uinfo.cc (getgid32): Ditto.
(getegid32): Ditto.
* include/cygwin/grp.h: Remove declaration of getgrgid() and getgrnam().
Declare getgrgid32() and getgrnam32() instead. Declare getgid32().
2002-05-28 16:10:55 +02:00
|
|
|
chown (const char * name, __uid16_t uid, __gid16_t gid)
|
|
|
|
{
|
2002-06-25 10:06:29 +02:00
|
|
|
return chown_worker (name, PC_SYM_FOLLOW,
|
|
|
|
uid16touid32 (uid), gid16togid32 (gid));
|
Change internal gid datatype from __gid16_t to __gid32_t
throughout.
* cygwin.din: Export new symbols chown32, fchown32, getegid32,
getgid32, getgrgid32, getgrnam32, getgroups32, initgroups32, lchown32,
setgid32, setegid32, getgrent32.
* grp.cc (grp32togrp16): New static function.
(getgrgid32): New function.
(getgrnam32): Ditto.
(getgrent32): Ditto.
(getgroups32): Change name of internal function from getgroups.
(getgroups32): New function.
(initgroups32): Ditto.
* syscalls.cc (chown32): Ditto.
(lchown32): Ditto.
(fchown32): Ditto.
(setegid32): Ditto.
(setgid32): Ditto.
* uinfo.cc (getgid32): Ditto.
(getegid32): Ditto.
* include/cygwin/grp.h: Remove declaration of getgrgid() and getgrnam().
Declare getgrgid32() and getgrnam32() instead. Declare getgid32().
2002-05-28 16:10:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
2002-05-29 17:04:29 +02:00
|
|
|
lchown32 (const char * name, __uid32_t uid, __gid32_t gid)
|
2000-04-02 22:42:42 +02:00
|
|
|
{
|
2001-03-14 12:13:46 +01:00
|
|
|
return chown_worker (name, PC_SYM_NOFOLLOW, uid, gid);
|
2000-04-02 22:42:42 +02:00
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
Change internal gid datatype from __gid16_t to __gid32_t
throughout.
* cygwin.din: Export new symbols chown32, fchown32, getegid32,
getgid32, getgrgid32, getgrnam32, getgroups32, initgroups32, lchown32,
setgid32, setegid32, getgrent32.
* grp.cc (grp32togrp16): New static function.
(getgrgid32): New function.
(getgrnam32): Ditto.
(getgrent32): Ditto.
(getgroups32): Change name of internal function from getgroups.
(getgroups32): New function.
(initgroups32): Ditto.
* syscalls.cc (chown32): Ditto.
(lchown32): Ditto.
(fchown32): Ditto.
(setegid32): Ditto.
(setgid32): Ditto.
* uinfo.cc (getgid32): Ditto.
(getegid32): Ditto.
* include/cygwin/grp.h: Remove declaration of getgrgid() and getgrnam().
Declare getgrgid32() and getgrnam32() instead. Declare getgid32().
2002-05-28 16:10:55 +02:00
|
|
|
lchown (const char * name, __uid16_t uid, __gid16_t gid)
|
|
|
|
{
|
2002-06-25 10:06:29 +02:00
|
|
|
return chown_worker (name, PC_SYM_NOFOLLOW,
|
|
|
|
uid16touid32 (uid), gid16togid32 (gid));
|
Change internal gid datatype from __gid16_t to __gid32_t
throughout.
* cygwin.din: Export new symbols chown32, fchown32, getegid32,
getgid32, getgrgid32, getgrnam32, getgroups32, initgroups32, lchown32,
setgid32, setegid32, getgrent32.
* grp.cc (grp32togrp16): New static function.
(getgrgid32): New function.
(getgrnam32): Ditto.
(getgrent32): Ditto.
(getgroups32): Change name of internal function from getgroups.
(getgroups32): New function.
(initgroups32): Ditto.
* syscalls.cc (chown32): Ditto.
(lchown32): Ditto.
(fchown32): Ditto.
(setegid32): Ditto.
(setgid32): Ditto.
* uinfo.cc (getgid32): Ditto.
(getegid32): Ditto.
* include/cygwin/grp.h: Remove declaration of getgrgid() and getgrnam().
Declare getgrgid32() and getgrnam32() instead. Declare getgid32().
2002-05-28 16:10:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
2002-05-29 17:04:29 +02:00
|
|
|
fchown32 (int fd, __uid32_t uid, __gid32_t gid)
|
2000-04-02 22:42:42 +02:00
|
|
|
{
|
2004-04-16 23:22:13 +02:00
|
|
|
if (!wincap.has_security ()) // real chown only works on NT
|
|
|
|
return 0; // return zero (and do nothing) under Windows 9x
|
|
|
|
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
2000-04-02 22:42:42 +02:00
|
|
|
{
|
|
|
|
syscall_printf ("-1 = fchown (%d,...)", fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-04-14 18:36:26 +02:00
|
|
|
int res = cfd->fchown (uid, gid);
|
2000-04-02 22:42:42 +02:00
|
|
|
|
2004-04-14 18:36:26 +02:00
|
|
|
syscall_printf ("%d = fchown (%s,...)", res, cfd->get_name ());
|
|
|
|
return res;
|
2000-04-02 22:42:42 +02:00
|
|
|
}
|
|
|
|
|
Change internal gid datatype from __gid16_t to __gid32_t
throughout.
* cygwin.din: Export new symbols chown32, fchown32, getegid32,
getgid32, getgrgid32, getgrnam32, getgroups32, initgroups32, lchown32,
setgid32, setegid32, getgrent32.
* grp.cc (grp32togrp16): New static function.
(getgrgid32): New function.
(getgrnam32): Ditto.
(getgrent32): Ditto.
(getgroups32): Change name of internal function from getgroups.
(getgroups32): New function.
(initgroups32): Ditto.
* syscalls.cc (chown32): Ditto.
(lchown32): Ditto.
(fchown32): Ditto.
(setegid32): Ditto.
(setgid32): Ditto.
* uinfo.cc (getgid32): Ditto.
(getegid32): Ditto.
* include/cygwin/grp.h: Remove declaration of getgrgid() and getgrnam().
Declare getgrgid32() and getgrnam32() instead. Declare getgid32().
2002-05-28 16:10:55 +02:00
|
|
|
extern "C" int
|
|
|
|
fchown (int fd, __uid16_t uid, __gid16_t gid)
|
|
|
|
{
|
2002-06-25 10:06:29 +02:00
|
|
|
return fchown32 (fd, uid16touid32 (uid), gid16togid32 (gid));
|
Change internal gid datatype from __gid16_t to __gid32_t
throughout.
* cygwin.din: Export new symbols chown32, fchown32, getegid32,
getgid32, getgrgid32, getgrnam32, getgroups32, initgroups32, lchown32,
setgid32, setegid32, getgrent32.
* grp.cc (grp32togrp16): New static function.
(getgrgid32): New function.
(getgrnam32): Ditto.
(getgrent32): Ditto.
(getgroups32): Change name of internal function from getgroups.
(getgroups32): New function.
(initgroups32): Ditto.
* syscalls.cc (chown32): Ditto.
(lchown32): Ditto.
(fchown32): Ditto.
(setegid32): Ditto.
(setgid32): Ditto.
* uinfo.cc (getgid32): Ditto.
(getegid32): Ditto.
* include/cygwin/grp.h: Remove declaration of getgrgid() and getgrnam().
Declare getgrgid32() and getgrnam32() instead. Declare getgid32().
2002-05-28 16:10:55 +02:00
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* umask: POSIX 5.3.3.1 */
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" mode_t
|
2000-02-17 20:38:33 +01:00
|
|
|
umask (mode_t mask)
|
|
|
|
{
|
|
|
|
mode_t oldmask;
|
|
|
|
|
2000-11-14 06:53:32 +01:00
|
|
|
oldmask = cygheap->umask;
|
|
|
|
cygheap->umask = mask & 0777;
|
2000-02-17 20:38:33 +01:00
|
|
|
return oldmask;
|
|
|
|
}
|
|
|
|
|
* 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
|
|
|
|
chmod_device (path_conv& pc, mode_t mode)
|
|
|
|
{
|
|
|
|
return mknod_worker (pc, pc.dev.mode & S_IFMT, mode, pc.dev.major, pc.dev.minor);
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* chmod: POSIX 5.6.4.1 */
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
chmod (const char *path, mode_t mode)
|
|
|
|
{
|
|
|
|
int res = -1;
|
2004-04-20 17:51:24 +02:00
|
|
|
fhandler_base *fh;
|
|
|
|
if (!(fh = build_fh_name (path, NULL, PC_SYM_FOLLOW, stat_suffixes)))
|
|
|
|
goto error;
|
2004-05-28 21:50:07 +02:00
|
|
|
|
2004-04-13 22:36:58 +02:00
|
|
|
if (fh->error ())
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2004-04-13 22:36:58 +02:00
|
|
|
debug_printf ("got %d error from build_fh_name", fh->error ());
|
|
|
|
set_errno (fh->error ());
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
else
|
2004-04-13 22:36:58 +02:00
|
|
|
res = fh->fchmod (mode);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-04-14 23:11:45 +02:00
|
|
|
delete fh;
|
2004-04-20 17:51:24 +02:00
|
|
|
error:
|
2000-02-17 20:38:33 +01:00
|
|
|
syscall_printf ("%d = chmod (%s, %p)", res, path, mode);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* fchmod: P96 5.6.4.1 */
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
fchmod (int fd, mode_t mode)
|
|
|
|
{
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
syscall_printf ("-1 = fchmod (%d, 0%o)", fd, mode);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-04-13 22:36:58 +02:00
|
|
|
return cfd->fchmod (mode);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2002-02-25 18:47:51 +01:00
|
|
|
static void
|
|
|
|
stat64_to_stat32 (struct __stat64 *src, struct __stat32 *dst)
|
|
|
|
{
|
2002-06-03 19:44:09 +02:00
|
|
|
dst->st_dev = ((src->st_dev >> 8) & 0xff00) | (src->st_dev & 0xff);
|
2003-05-11 02:10:11 +02:00
|
|
|
dst->st_ino = ((unsigned) (src->st_ino >> 32)) | (unsigned) src->st_ino;
|
2002-02-25 18:47:51 +01:00
|
|
|
dst->st_mode = src->st_mode;
|
|
|
|
dst->st_nlink = src->st_nlink;
|
|
|
|
dst->st_uid = src->st_uid;
|
|
|
|
dst->st_gid = src->st_gid;
|
2002-06-21 17:01:19 +02:00
|
|
|
dst->st_rdev = ((src->st_rdev >> 8) & 0xff00) | (src->st_rdev & 0xff);
|
2002-02-25 18:47:51 +01:00
|
|
|
dst->st_size = src->st_size;
|
2002-06-06 17:35:09 +02:00
|
|
|
dst->st_atim = src->st_atim;
|
|
|
|
dst->st_mtim = src->st_mtim;
|
|
|
|
dst->st_ctim = src->st_ctim;
|
2002-02-25 18:47:51 +01:00
|
|
|
dst->st_blksize = src->st_blksize;
|
|
|
|
dst->st_blocks = src->st_blocks;
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2002-02-25 18:47:51 +01:00
|
|
|
fstat64 (int fd, struct __stat64 *buf)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-10-16 01:39:33 +02:00
|
|
|
int res;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
res = -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
|
|
|
{
|
2002-02-25 18:47:51 +01:00
|
|
|
memset (buf, 0, sizeof (struct __stat64));
|
* 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
|
|
|
res = cfd->fstat (buf);
|
|
|
|
if (!res)
|
2002-06-03 19:44:09 +02:00
|
|
|
{
|
|
|
|
if (!buf->st_ino)
|
2004-04-14 18:51:28 +02:00
|
|
|
buf->st_ino = cfd->get_namehash ();
|
2002-06-03 19:44:09 +02:00
|
|
|
if (!buf->st_dev)
|
* 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
|
|
|
buf->st_dev = cfd->get_device ();
|
2002-06-21 17:01:19 +02:00
|
|
|
if (!buf->st_rdev)
|
|
|
|
buf->st_rdev = buf->st_dev;
|
2002-06-03 19:44:09 +02:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-10-16 01:39:33 +02:00
|
|
|
syscall_printf ("%d = fstat (%d, %p)", res, fd, buf);
|
|
|
|
return res;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-05-12 13:06:27 +02:00
|
|
|
extern "C" int
|
|
|
|
_fstat64_r (struct _reent *ptr, int fd, struct __stat64 *buf)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2005-03-01 12:51:29 +01:00
|
|
|
if ((ret = fstat64 (fd, buf)) == -1)
|
2003-05-12 13:06:27 +02:00
|
|
|
ptr->_errno = get_errno ();
|
|
|
|
return ret;
|
|
|
|
}
|
2003-03-09 22:51:00 +01:00
|
|
|
|
2002-02-25 18:47:51 +01:00
|
|
|
extern "C" int
|
2003-03-17 20:08:11 +01:00
|
|
|
fstat (int fd, struct __stat32 *buf)
|
2002-02-25 18:47:51 +01:00
|
|
|
{
|
|
|
|
struct __stat64 buf64;
|
|
|
|
int ret = fstat64 (fd, &buf64);
|
|
|
|
if (!ret)
|
|
|
|
stat64_to_stat32 (&buf64, buf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2003-05-12 13:06:27 +02:00
|
|
|
extern "C" int
|
|
|
|
_fstat_r (struct _reent *ptr, int fd, struct __stat32 *buf)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2005-03-01 12:51:29 +01:00
|
|
|
if ((ret = fstat (fd, buf)) == -1)
|
2003-05-12 13:06:27 +02:00
|
|
|
ptr->_errno = get_errno ();
|
|
|
|
return ret;
|
|
|
|
}
|
2003-03-17 20:08:11 +01:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* fsync: P96 6.6.1.1 */
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
fsync (int fd)
|
|
|
|
{
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
syscall_printf ("-1 = fsync (%d)", fd);
|
|
|
|
return -1;
|
|
|
|
}
|
2005-02-20 14:28:23 +01:00
|
|
|
return cfd->fsync ();
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-02-22 16:30:09 +01:00
|
|
|
EXPORT_ALIAS (fsync, fdatasync)
|
|
|
|
|
2005-05-02 05:50:11 +02:00
|
|
|
static void
|
2005-02-20 14:28:23 +01:00
|
|
|
sync_worker (const char *vol)
|
|
|
|
{
|
|
|
|
HANDLE fh = CreateFileA (vol, GENERIC_WRITE, wincap.shared (),
|
|
|
|
&sec_none_nih, OPEN_EXISTING, 0, NULL);
|
|
|
|
if (fh != INVALID_HANDLE_VALUE)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-02-20 14:28:23 +01:00
|
|
|
FlushFileBuffers (fh);
|
|
|
|
CloseHandle (fh);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2005-02-20 14:28:23 +01:00
|
|
|
else
|
|
|
|
debug_printf ("Open failed with %E");
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2004-04-10 22:40:41 +02:00
|
|
|
/* sync: SUSv3 */
|
|
|
|
extern "C" void
|
2000-02-17 20:38:33 +01:00
|
|
|
sync ()
|
|
|
|
{
|
2005-02-20 14:28:23 +01:00
|
|
|
char vol[CYG_MAX_PATH];
|
2005-05-02 05:50:11 +02:00
|
|
|
|
2005-04-11 23:54:54 +02:00
|
|
|
if (wincap.has_guid_volumes ()) /* Win2k and newer */
|
2005-02-20 14:28:23 +01:00
|
|
|
{
|
2005-04-11 23:54:54 +02:00
|
|
|
char a_drive[CYG_MAX_PATH] = {0};
|
|
|
|
char b_drive[CYG_MAX_PATH] = {0};
|
|
|
|
|
|
|
|
if (is_floppy ("A:"))
|
2005-05-02 05:50:11 +02:00
|
|
|
GetVolumeNameForVolumeMountPointA ("A:\\", a_drive, CYG_MAX_PATH);
|
2005-04-11 23:54:54 +02:00
|
|
|
if (is_floppy ("B:"))
|
2005-05-02 05:50:11 +02:00
|
|
|
GetVolumeNameForVolumeMountPointA ("B:\\", a_drive, CYG_MAX_PATH);
|
2005-04-11 23:54:54 +02:00
|
|
|
|
2005-02-20 14:28:23 +01:00
|
|
|
HANDLE sh = FindFirstVolumeA (vol, CYG_MAX_PATH);
|
|
|
|
if (sh != INVALID_HANDLE_VALUE)
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
2005-04-11 23:54:54 +02:00
|
|
|
debug_printf ("Try volume %s", vol);
|
|
|
|
|
|
|
|
/* Check vol for being a floppy on A: or B:. Skip them. */
|
|
|
|
if (strcasematch (vol, a_drive) || strcasematch (vol, b_drive))
|
2005-05-02 05:50:11 +02:00
|
|
|
{
|
2005-04-11 23:54:54 +02:00
|
|
|
debug_printf ("Is floppy, don't sync");
|
|
|
|
continue;
|
2005-03-29 19:42:50 +02:00
|
|
|
}
|
|
|
|
|
2005-02-20 14:28:23 +01:00
|
|
|
/* Eliminate trailing backslash. */
|
|
|
|
vol[strlen (vol) - 1] = '\0';
|
|
|
|
sync_worker (vol);
|
|
|
|
}
|
|
|
|
while (FindNextVolumeA (sh, vol, CYG_MAX_PATH));
|
|
|
|
FindVolumeClose (sh);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (wincap.is_winnt ()) /* 9x has no concept for opening volumes */
|
|
|
|
{
|
2005-03-29 19:42:50 +02:00
|
|
|
DWORD drives = GetLogicalDrives ();
|
2005-02-20 14:28:23 +01:00
|
|
|
DWORD mask = 1;
|
2005-03-29 19:42:50 +02:00
|
|
|
/* Skip floppies on A: and B: as in setmntent. */
|
|
|
|
if ((drives & 1) && is_floppy ("A:"))
|
|
|
|
drives &= ~1;
|
|
|
|
if ((drives & 2) && is_floppy ("B:"))
|
|
|
|
drives &= ~2;
|
2005-02-20 14:28:23 +01:00
|
|
|
strcpy (vol, "\\\\.\\A:");
|
|
|
|
do
|
2005-05-02 05:50:11 +02:00
|
|
|
{
|
2005-03-10 18:02:52 +01:00
|
|
|
/* Geeh. Try to sync only non-floppy drives. */
|
2005-02-20 14:28:23 +01:00
|
|
|
if (drives & mask)
|
|
|
|
{
|
|
|
|
debug_printf ("Try volume %s", vol);
|
|
|
|
sync_worker (vol);
|
|
|
|
}
|
|
|
|
vol[4]++;
|
|
|
|
}
|
|
|
|
while ((mask <<= 1) <= 1 << 25);
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Cygwin internal */
|
* 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
|
|
|
static int __stdcall
|
|
|
|
stat_worker (const char *name, struct __stat64 *buf, int nofollow)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int res = -1;
|
2001-10-01 06:10:07 +02:00
|
|
|
fhandler_base *fh = NULL;
|
2000-04-25 18:31:14 +02:00
|
|
|
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2004-04-20 17:51:24 +02:00
|
|
|
goto error;
|
2002-06-02 05:13:22 +02:00
|
|
|
|
2004-05-28 21:50:07 +02:00
|
|
|
if (!(fh = build_fh_name (name, NULL, nofollow ? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW,
|
2004-04-20 17:51:24 +02:00
|
|
|
stat_suffixes)))
|
|
|
|
goto error;
|
2004-05-28 21:50:07 +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
|
|
|
if (fh->error ())
|
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
|
|
|
debug_printf ("got %d error from build_fh_name", fh->error ());
|
|
|
|
set_errno (fh->error ());
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2004-04-20 17:51:24 +02:00
|
|
|
else if (fh->exists ())
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-10-05 06:21:41 +02:00
|
|
|
debug_printf ("(%s, %p, %d, %p), file_attributes %d", name, buf, nofollow,
|
* 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
|
|
|
fh, (DWORD) *fh);
|
2002-06-02 05:13:22 +02:00
|
|
|
memset (buf, 0, sizeof (*buf));
|
* 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
|
|
|
res = fh->fstat (buf);
|
|
|
|
if (!res)
|
2002-06-02 05:13:22 +02:00
|
|
|
{
|
|
|
|
if (!buf->st_ino)
|
2004-04-14 23:11:45 +02:00
|
|
|
buf->st_ino = fh->get_namehash ();
|
2002-06-02 05:13:22 +02:00
|
|
|
if (!buf->st_dev)
|
* 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
|
|
|
buf->st_dev = fh->get_device ();
|
2002-06-21 17:01:19 +02:00
|
|
|
if (!buf->st_rdev)
|
|
|
|
buf->st_rdev = buf->st_dev;
|
2002-06-02 05:13:22 +02:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2004-04-20 17:51:24 +02:00
|
|
|
else
|
|
|
|
set_errno (ENOENT);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-04-20 17:51:24 +02:00
|
|
|
delete fh;
|
|
|
|
error:
|
2000-02-17 20:38:33 +01:00
|
|
|
MALLOC_CHECK;
|
2001-10-05 02:17:57 +02:00
|
|
|
syscall_printf ("%d = (%s, %p)", res, name, buf);
|
2000-02-17 20:38:33 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2002-02-25 18:47:51 +01:00
|
|
|
stat64 (const char *name, struct __stat64 *buf)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-10-05 02:17:57 +02:00
|
|
|
syscall_printf ("entering");
|
|
|
|
return stat_worker (name, buf, 0);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-05-12 13:06:27 +02:00
|
|
|
extern "C" int
|
|
|
|
_stat64_r (struct _reent *ptr, const char *name, struct __stat64 *buf)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2005-03-01 12:51:29 +01:00
|
|
|
if ((ret = stat64 (name, buf)) == -1)
|
2003-05-12 13:06:27 +02:00
|
|
|
ptr->_errno = get_errno ();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2002-02-25 18:47:51 +01:00
|
|
|
extern "C" int
|
2003-03-17 20:08:11 +01:00
|
|
|
stat (const char *name, struct __stat32 *buf)
|
2002-02-25 18:47:51 +01:00
|
|
|
{
|
|
|
|
struct __stat64 buf64;
|
|
|
|
int ret = stat64 (name, &buf64);
|
|
|
|
if (!ret)
|
|
|
|
stat64_to_stat32 (&buf64, buf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2003-05-12 13:06:27 +02:00
|
|
|
extern "C" int
|
|
|
|
_stat_r (struct _reent *ptr, const char *name, struct __stat32 *buf)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2005-03-01 12:51:29 +01:00
|
|
|
if ((ret = stat (name, buf)) == -1)
|
2003-05-12 13:06:27 +02:00
|
|
|
ptr->_errno = get_errno ();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* lstat: Provided by SVR4 and 4.3+BSD, POSIX? */
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2002-02-25 18:47:51 +01:00
|
|
|
lstat64 (const char *name, struct __stat64 *buf)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-10-05 02:17:57 +02:00
|
|
|
syscall_printf ("entering");
|
|
|
|
return stat_worker (name, buf, 1);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2002-02-25 18:47:51 +01:00
|
|
|
/* lstat: Provided by SVR4 and 4.3+BSD, POSIX? */
|
|
|
|
extern "C" int
|
2003-08-13 13:28:42 +02:00
|
|
|
lstat (const char *name, struct __stat32 *buf)
|
2002-02-25 18:47:51 +01:00
|
|
|
{
|
|
|
|
struct __stat64 buf64;
|
|
|
|
int ret = lstat64 (name, &buf64);
|
|
|
|
if (!ret)
|
|
|
|
stat64_to_stat32 (&buf64, buf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
* 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
|
|
|
extern "C" int
|
|
|
|
access (const char *fn, int flags)
|
|
|
|
{
|
|
|
|
// flags were incorrectly specified
|
2004-01-24 04:40:33 +01:00
|
|
|
int res = -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
|
|
|
if (flags & ~(F_OK|R_OK|W_OK|X_OK))
|
2004-01-24 04:40:33 +01:00
|
|
|
set_errno (EINVAL);
|
|
|
|
else
|
* 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-04-20 17:51:24 +02:00
|
|
|
fhandler_base *fh = build_fh_name (fn, NULL, PC_SYM_FOLLOW, stat_suffixes);
|
|
|
|
if (fh)
|
2004-05-28 21:50:07 +02:00
|
|
|
{
|
2004-04-20 17:51:24 +02:00
|
|
|
res = fh->fhaccess (flags);
|
|
|
|
delete fh;
|
|
|
|
}
|
* 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-01-24 04:40:33 +01:00
|
|
|
debug_printf ("returning %d", res);
|
|
|
|
return res;
|
* 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-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2002-10-21 03:00:58 +02:00
|
|
|
rename (const char *oldpath, const char *newpath)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int res = 0;
|
2001-06-01 13:53:20 +02:00
|
|
|
char *lnk_suffix = NULL;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-05-13 17:46:07 +02:00
|
|
|
path_conv real_old (oldpath, PC_SYM_NOFOLLOW);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
if (real_old.error)
|
|
|
|
{
|
|
|
|
syscall_printf ("-1 = rename (%s, %s)", oldpath, newpath);
|
2001-03-10 21:25:19 +01:00
|
|
|
set_errno (real_old.error);
|
2000-02-17 20:38:33 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2005-05-13 17:46:07 +02:00
|
|
|
path_conv real_new (newpath, PC_SYM_NOFOLLOW);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-02-22 15:51:16 +01:00
|
|
|
/* Shortcut hack. */
|
2003-11-15 00:40:06 +01:00
|
|
|
char new_lnk_buf[CYG_MAX_PATH + 5];
|
2005-04-14 19:34:03 +02:00
|
|
|
if (real_old.is_lnk_special () && !real_new.error && !real_new.case_clash)
|
2001-02-22 15:51:16 +01:00
|
|
|
{
|
2003-03-08 04:36:39 +01:00
|
|
|
strcpy (new_lnk_buf, newpath);
|
|
|
|
strcat (new_lnk_buf, ".lnk");
|
|
|
|
newpath = new_lnk_buf;
|
2005-05-13 17:46:07 +02:00
|
|
|
real_new.check (newpath, PC_SYM_NOFOLLOW);
|
2001-02-22 15:51:16 +01:00
|
|
|
}
|
|
|
|
|
2001-04-17 13:47:37 +02:00
|
|
|
if (real_new.error || real_new.case_clash)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
syscall_printf ("-1 = rename (%s, %s)", oldpath, newpath);
|
2001-04-17 13:47:37 +02:00
|
|
|
set_errno (real_new.case_clash ? ECASECLASH : real_new.error);
|
2000-02-17 20:38:33 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2001-10-01 06:10:07 +02:00
|
|
|
if (!real_old.exists ()) /* file to move doesn't exist */
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-01-06 23:10:08 +01:00
|
|
|
syscall_printf ("file to move doesn't exist");
|
|
|
|
set_errno (ENOENT);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (real_new.isdir () && !real_old.isdir ())
|
|
|
|
{
|
|
|
|
syscall_printf ("newpath is directory, but oldpath is not");
|
|
|
|
set_errno (EISDIR);
|
|
|
|
return -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-06-01 13:53:20 +02:00
|
|
|
/* Destination file exists and is read only, change that or else
|
|
|
|
the rename won't work. */
|
2001-10-01 06:10:07 +02:00
|
|
|
if (real_new.has_attribute (FILE_ATTRIBUTE_READONLY))
|
|
|
|
SetFileAttributes (real_new, (DWORD) real_new & ~FILE_ATTRIBUTE_READONLY);
|
2001-06-01 13:53:20 +02:00
|
|
|
|
|
|
|
/* Shortcut hack No. 2, part 1 */
|
2005-04-14 19:34:03 +02:00
|
|
|
if (!real_old.issymlink () && !real_new.error && real_new.is_lnk_special ()
|
2003-03-08 04:36:39 +01:00
|
|
|
&& (lnk_suffix = strrchr (real_new.get_win32 (), '.')))
|
2001-06-01 13:53:20 +02:00
|
|
|
*lnk_suffix = '\0';
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-02-16 12:45:04 +01:00
|
|
|
if (MoveFile (real_old, real_new))
|
2000-04-19 05:21:13 +02:00
|
|
|
goto done;
|
|
|
|
|
2004-02-16 12:45:04 +01:00
|
|
|
res = -1;
|
2005-01-06 23:10:08 +01:00
|
|
|
|
|
|
|
/* Test for an attempt to make a directory a subdirectory of itself first.
|
|
|
|
This test has to be made before any attempt to remove the potentially
|
|
|
|
existing file or directory real_new. Otherwise we end up with a
|
|
|
|
non-moved directory *and* a deleted read_new path. Also this case
|
|
|
|
has to generate an EINVAL in all circumstances,
|
2005-02-13 19:17:29 +01:00
|
|
|
|
2005-01-06 23:10:08 +01:00
|
|
|
NB: We could test this also before calling MoveFile but the idea is
|
|
|
|
that this is a somewhat seldom case and we like to avoid expensive
|
|
|
|
string comparison. So we allow MoveFile to fail and test the error
|
2005-02-13 19:17:29 +01:00
|
|
|
code instead.
|
|
|
|
|
2005-01-06 23:10:08 +01:00
|
|
|
The order in the condition is (hopefully) trimmed for doing the least
|
|
|
|
expensive stuff first. Nevertheless it would be nice if 9x could
|
|
|
|
generate the same error codes as NT.
|
|
|
|
NT generates ERROR_SHARING_VIOLATION in all cases, while 9x generates
|
|
|
|
ERROR_ACCESS_DENIED if the target path doesn't exist,
|
|
|
|
ERROR_ALREADY_EXISTS otherwise */
|
|
|
|
int len;
|
|
|
|
DWORD lasterr;
|
|
|
|
lasterr = GetLastError ();
|
|
|
|
if (real_old.isdir ()
|
|
|
|
&& ((lasterr == ERROR_SHARING_VIOLATION && wincap.has_move_file_ex ())
|
|
|
|
|| (lasterr == ERROR_ACCESS_DENIED && !real_new.exists ()
|
2005-05-02 05:50:11 +02:00
|
|
|
&& !wincap.has_move_file_ex ())
|
2005-01-06 23:10:08 +01:00
|
|
|
|| (lasterr == ERROR_ALREADY_EXISTS && real_new.exists ()
|
2005-05-02 05:50:11 +02:00
|
|
|
&& !wincap.has_move_file_ex ()))
|
2005-01-06 23:10:08 +01:00
|
|
|
&& (len = strlen (real_old), strncasematch (real_old, real_new, len))
|
|
|
|
&& real_new[len] == '\\')
|
|
|
|
SetLastError (ERROR_INVALID_PARAMETER);
|
|
|
|
else if (real_new.isdir ())
|
|
|
|
{
|
|
|
|
/* Since neither MoveFileEx(MOVEFILE_REPLACE_EXISTING) nor DeleteFile
|
|
|
|
allow to remove directories, this case is handled separately. */
|
|
|
|
if (!RemoveDirectoryA (real_new))
|
|
|
|
{
|
|
|
|
syscall_printf ("Can't remove target directory");
|
|
|
|
/* On 9X ERROR_ACCESS_DENIED is returned if you try to remove
|
|
|
|
a non-empty directory. */
|
|
|
|
if (GetLastError () == ERROR_ACCESS_DENIED
|
|
|
|
&& wincap.access_denied_on_delete ())
|
|
|
|
SetLastError (ERROR_DIR_NOT_EMPTY);
|
|
|
|
}
|
|
|
|
else if (MoveFile (real_old, real_new))
|
|
|
|
res = 0;
|
|
|
|
}
|
|
|
|
else if (wincap.has_move_file_ex ())
|
2000-04-19 05:21:13 +02:00
|
|
|
{
|
|
|
|
if (MoveFileEx (real_old.get_win32 (), real_new.get_win32 (),
|
|
|
|
MOVEFILE_REPLACE_EXISTING))
|
|
|
|
res = 0;
|
|
|
|
}
|
2005-01-06 23:10:08 +01:00
|
|
|
else if (lasterr == ERROR_ALREADY_EXISTS || lasterr == ERROR_FILE_EXISTS)
|
2000-04-19 05:21:13 +02:00
|
|
|
{
|
|
|
|
syscall_printf ("try win95 hack");
|
2001-10-02 03:58:06 +02:00
|
|
|
for (int i = 0; i < 2; i++)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-01-06 23:10:08 +01:00
|
|
|
if (!DeleteFileA (real_new) &&
|
2000-04-19 05:21:13 +02:00
|
|
|
GetLastError () != ERROR_FILE_NOT_FOUND)
|
|
|
|
{
|
|
|
|
syscall_printf ("deleting %s to be paranoid",
|
|
|
|
real_new.get_win32 ());
|
|
|
|
break;
|
|
|
|
}
|
2005-01-06 23:10:08 +01:00
|
|
|
else if (MoveFile (real_old, real_new))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-10-02 03:58:06 +02:00
|
|
|
res = 0;
|
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-04-19 05:21:13 +02:00
|
|
|
done:
|
|
|
|
if (res)
|
2001-06-01 13:53:20 +02:00
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
/* Reset R/O attributes if neccessary. */
|
2001-10-01 06:10:07 +02:00
|
|
|
if (real_new.has_attribute (FILE_ATTRIBUTE_READONLY))
|
|
|
|
SetFileAttributes (real_new, real_new);
|
2001-06-01 13:53:20 +02:00
|
|
|
}
|
|
|
|
else
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
/* make the new file have the permissions of the old one */
|
2001-11-13 22:49:06 +01:00
|
|
|
DWORD attr = real_old;
|
|
|
|
#ifdef HIDDEN_DOT_FILES
|
|
|
|
char *c = strrchr (real_old.get_win32 (), '\\');
|
|
|
|
if ((c && c[1] == '.') || *real_old.get_win32 () == '.')
|
2002-05-28 03:55:40 +02:00
|
|
|
attr &= ~FILE_ATTRIBUTE_HIDDEN;
|
2001-11-13 22:49:06 +01:00
|
|
|
c = strrchr (real_new.get_win32 (), '\\');
|
|
|
|
if ((c && c[1] == '.') || *real_new.get_win32 () == '.')
|
2002-05-28 03:55:40 +02:00
|
|
|
attr |= FILE_ATTRIBUTE_HIDDEN;
|
2001-11-13 22:49:06 +01:00
|
|
|
#endif
|
|
|
|
SetFileAttributes (real_new, attr);
|
2001-06-01 13:53:20 +02:00
|
|
|
|
|
|
|
/* Shortcut hack, No. 2, part 2 */
|
|
|
|
/* if the new filename was an existing shortcut, remove it now if the
|
2001-09-07 23:32:07 +02:00
|
|
|
new filename is equal to the shortcut name without .lnk suffix. */
|
2001-06-01 13:53:20 +02:00
|
|
|
if (lnk_suffix)
|
2001-09-07 23:32:07 +02:00
|
|
|
{
|
2001-06-01 13:53:20 +02:00
|
|
|
*lnk_suffix = '.';
|
2001-10-01 06:10:07 +02:00
|
|
|
DeleteFile (real_new);
|
2001-06-01 13:53:20 +02:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-10-01 06:10:07 +02:00
|
|
|
syscall_printf ("%d = rename (%s, %s)", res, (char *) real_old,
|
|
|
|
(char *) real_new);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
system (const char *cmdstring)
|
|
|
|
{
|
2003-01-14 21:19:27 +01:00
|
|
|
pthread_testcancel ();
|
|
|
|
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2001-10-19 04:27:19 +02:00
|
|
|
return -1;
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
int res;
|
|
|
|
const char* command[4];
|
|
|
|
|
2005-07-03 04:40:30 +02:00
|
|
|
if (cmdstring == NULL)
|
2003-09-20 02:31:13 +02:00
|
|
|
return 1;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
command[0] = "sh";
|
|
|
|
command[1] = "-c";
|
|
|
|
command[2] = cmdstring;
|
|
|
|
command[3] = (const char *) NULL;
|
|
|
|
|
2005-01-12 19:05:07 +01:00
|
|
|
if ((res = spawnvp (_P_SYSTEM, "/bin/sh", command)) == -1)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
// when exec fails, return value should be as if shell
|
|
|
|
// executed exit (127)
|
|
|
|
res = 127;
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2001-01-18 05:26:04 +01:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
setdtablesize (int size)
|
|
|
|
{
|
2001-04-18 23:10:15 +02:00
|
|
|
if (size <= (int)cygheap->fdtab.size || cygheap->fdtab.extend (size - cygheap->fdtab.size))
|
2001-01-18 05:26:04 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
return -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
getdtablesize ()
|
|
|
|
{
|
2001-08-16 16:29:21 +02:00
|
|
|
return cygheap->fdtab.size > OPEN_MAX ? cygheap->fdtab.size : OPEN_MAX;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" size_t
|
2000-02-17 20:38:33 +01:00
|
|
|
getpagesize ()
|
|
|
|
{
|
2001-01-28 06:51:15 +01:00
|
|
|
if (!system_info.dwPageSize)
|
2001-03-03 04:56:34 +01:00
|
|
|
GetSystemInfo (&system_info);
|
2001-01-28 06:51:15 +01:00
|
|
|
return (int) system_info.dwPageSize;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-11-06 15:33:16 +01:00
|
|
|
size_t
|
|
|
|
getshmlba ()
|
|
|
|
{
|
|
|
|
if (!system_info.dwAllocationGranularity)
|
|
|
|
GetSystemInfo (&system_info);
|
|
|
|
return system_info.dwAllocationGranularity;
|
|
|
|
}
|
|
|
|
|
2001-03-19 12:02:41 +01:00
|
|
|
static int
|
|
|
|
check_posix_perm (const char *fname, int v)
|
|
|
|
{
|
|
|
|
/* Windows 95/98/ME don't support file system security at all. */
|
* Makefile.in: Build wincap.o.
* wincap.cc: New file.
* wincap.h: Ditto.
* autoload.cc: Add dynamic load statement for `CreateHardLinkA'.
* dcrt0.cc (os_being_run): Eliminated.
(osname): Ditto.
(iswinnt): Ditto.
(set_os_type): Ditto.
(dll_crt0_1): Call wincap.init() instead of set_os_type().
(_dll_crt0): Ditto.
* environ.cc (set_chunksize): New function.
(parse_thing): `forkchunk' setting now invokes function `set_chunksize'.
* fork.cc (chunksize): Eliminated. Moved to be member of wincap.
* host_dependent.h: Removed.
* syscalls.cc (_link): Try using `CreateHardLinkA' first, if available.
* cygheap.cc, dcrt0.cc, delqueue.cc, dir.cc,
environ.cc, fhandler.cc, fhandler.h, fhandler_console.cc,
fhandler_mem.cc, fork.cc, mmap.cc, net.cc, pinfo.cc, pinfo.h,
security.cc, syscalls.cc, sysconf.cc, syslog.cc, thread.cc,
times.cc, tty.cc, uinfo.cc, uname.cc, winsup.h: Use new wincap
capability check throughout.
* winsup.h: Include wincap.h. Eliminate extern declarations of
`os_being_run' and `iswinnt'. Eliminate `os_type" definition.
* include/cygwin/version.h: Bump version to 1.3.4.
2001-09-12 19:46:37 +02:00
|
|
|
if (!wincap.has_security ())
|
2001-03-19 12:02:41 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* ntea is ok for supporting permission bits but it doesn't support
|
|
|
|
full POSIX security settings. */
|
|
|
|
if (v == _PC_POSIX_PERMISSIONS && allow_ntea)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (!allow_ntsec)
|
|
|
|
return 0;
|
|
|
|
|
2004-04-10 21:24:55 +02:00
|
|
|
char *root = rootdir (fname, (char *)alloca (strlen (fname)));
|
2001-03-19 12:02:41 +01:00
|
|
|
|
|
|
|
if (!allow_smbntsec
|
|
|
|
&& ((root[0] == '\\' && root[1] == '\\')
|
2001-09-07 23:32:07 +02:00
|
|
|
|| GetDriveType (root) == DRIVE_REMOTE))
|
2001-03-19 12:02:41 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
DWORD vsn, len, flags;
|
|
|
|
if (!GetVolumeInformation (root, NULL, 0, &vsn, &len, &flags, NULL, 16))
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (flags & FS_PERSISTENT_ACLS) ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* FIXME: not all values are correct... */
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" long int
|
2000-02-17 20:38:33 +01:00
|
|
|
fpathconf (int fd, int v)
|
|
|
|
{
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
return -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
switch (v)
|
|
|
|
{
|
|
|
|
case _PC_LINK_MAX:
|
|
|
|
return _POSIX_LINK_MAX;
|
|
|
|
case _PC_MAX_CANON:
|
|
|
|
case _PC_MAX_INPUT:
|
|
|
|
if (isatty (fd))
|
|
|
|
return _POSIX_MAX_CANON;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
set_errno (EBADF);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
case _PC_NAME_MAX:
|
|
|
|
case _PC_PATH_MAX:
|
|
|
|
return PATH_MAX;
|
|
|
|
case _PC_PIPE_BUF:
|
2001-09-07 10:31:16 +02:00
|
|
|
return PIPE_BUF;
|
2000-02-17 20:38:33 +01:00
|
|
|
case _PC_CHOWN_RESTRICTED:
|
|
|
|
case _PC_NO_TRUNC:
|
|
|
|
return -1;
|
|
|
|
case _PC_VDISABLE:
|
2001-10-16 01:39:33 +02:00
|
|
|
if (cfd->is_tty ())
|
2000-02-17 20:38:33 +01:00
|
|
|
return -1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
set_errno (EBADF);
|
|
|
|
return -1;
|
|
|
|
}
|
2001-03-19 12:02:41 +01:00
|
|
|
case _PC_POSIX_PERMISSIONS:
|
|
|
|
case _PC_POSIX_SECURITY:
|
* 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 (cfd->get_device () == FH_FS)
|
2001-10-16 01:39:33 +02:00
|
|
|
return check_posix_perm (cfd->get_win32_name (), v);
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
default:
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" long int
|
2000-02-17 20:38:33 +01:00
|
|
|
pathconf (const char *file, int v)
|
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
if (!*file)
|
|
|
|
{
|
|
|
|
set_errno (ENOENT);
|
|
|
|
return -1;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
switch (v)
|
|
|
|
{
|
|
|
|
case _PC_PATH_MAX:
|
|
|
|
return PATH_MAX - strlen (file);
|
|
|
|
case _PC_NAME_MAX:
|
|
|
|
return PATH_MAX;
|
|
|
|
case _PC_LINK_MAX:
|
|
|
|
return _POSIX_LINK_MAX;
|
|
|
|
case _PC_MAX_CANON:
|
|
|
|
case _PC_MAX_INPUT:
|
2001-03-19 12:02:41 +01:00
|
|
|
return _POSIX_MAX_CANON;
|
2000-02-17 20:38:33 +01:00
|
|
|
case _PC_PIPE_BUF:
|
2001-09-07 10:31:16 +02:00
|
|
|
return PIPE_BUF;
|
2000-02-17 20:38:33 +01:00
|
|
|
case _PC_CHOWN_RESTRICTED:
|
|
|
|
case _PC_NO_TRUNC:
|
|
|
|
return -1;
|
|
|
|
case _PC_VDISABLE:
|
2001-03-19 12:02:41 +01:00
|
|
|
return -1;
|
|
|
|
case _PC_POSIX_PERMISSIONS:
|
|
|
|
case _PC_POSIX_SECURITY:
|
|
|
|
{
|
2005-05-13 17:46:07 +02:00
|
|
|
path_conv full_path (file, PC_SYM_FOLLOW);
|
2001-03-19 12:02:41 +01:00
|
|
|
if (full_path.error)
|
|
|
|
{
|
|
|
|
set_errno (full_path.error);
|
|
|
|
return -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
|
|
|
if (full_path.is_auto_device ())
|
2001-03-19 12:02:41 +01:00
|
|
|
{
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
2001-09-07 23:32:07 +02:00
|
|
|
return check_posix_perm (full_path, v);
|
2001-03-19 12:02:41 +01:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
default:
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-04-14 11:12:04 +02:00
|
|
|
extern "C" int
|
|
|
|
ttyname_r (int fd, char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted ())
|
|
|
|
ret = EFAULT;
|
2004-04-14 11:12:04 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
cygheap_fdget cfd (fd, true);
|
|
|
|
if (cfd < 0)
|
|
|
|
ret = EBADF;
|
|
|
|
else if (!cfd->is_tty ())
|
|
|
|
ret = ENOTTY;
|
|
|
|
else if (buflen < strlen (cfd->ttyname ()) + 1)
|
|
|
|
ret = ERANGE;
|
|
|
|
else
|
2004-05-28 21:50:07 +02:00
|
|
|
strcpy (buf, cfd->ttyname ());
|
2004-04-14 11:12:04 +02:00
|
|
|
}
|
|
|
|
debug_printf ("returning %d tty: %s", ret, ret ? "NULL" : buf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" char *
|
|
|
|
ttyname (int fd)
|
|
|
|
{
|
2004-04-14 12:20:26 +02:00
|
|
|
static char name[TTY_NAME_MAX + 1];
|
|
|
|
int ret = ttyname_r (fd, name, TTY_NAME_MAX + 1);
|
2004-04-14 11:12:04 +02:00
|
|
|
if (ret)
|
|
|
|
{
|
|
|
|
set_errno (ret);
|
|
|
|
return NULL;
|
|
|
|
}
|
2003-09-27 07:35:02 +02:00
|
|
|
return name;
|
2000-09-03 06:16:35 +02:00
|
|
|
}
|
|
|
|
|
2000-07-29 18:24:59 +02:00
|
|
|
extern "C" char *
|
2000-02-17 20:38:33 +01:00
|
|
|
ctermid (char *str)
|
|
|
|
{
|
|
|
|
static NO_COPY char buf[16];
|
|
|
|
if (str == NULL)
|
|
|
|
str = buf;
|
2001-04-29 01:48:28 +02:00
|
|
|
if (!real_tty_attached (myself))
|
2000-02-17 20:38:33 +01:00
|
|
|
strcpy (str, "/dev/conin");
|
|
|
|
else
|
|
|
|
__small_sprintf (str, "/dev/tty%d", myself->ctty);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2000-05-24 01:52:50 +02:00
|
|
|
/* Tells stdio if it should do the cr/lf conversion for this file */
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" int
|
2000-05-24 01:52:50 +02:00
|
|
|
_cygwin_istext_for_stdio (int fd)
|
|
|
|
{
|
|
|
|
if (CYGWIN_VERSION_OLD_STDIO_CRLF_HANDLING)
|
|
|
|
{
|
2004-01-26 19:52:02 +01:00
|
|
|
syscall_printf ("fd %d: old API", fd);
|
2000-05-24 01:52:50 +02:00
|
|
|
return 0; /* we do it for old apps, due to getc/putc macros */
|
|
|
|
}
|
|
|
|
|
2001-10-16 05:31:50 +02:00
|
|
|
cygheap_fdget cfd (fd, false, false);
|
2001-10-16 01:39:33 +02:00
|
|
|
if (cfd < 0)
|
2000-05-24 01:52:50 +02:00
|
|
|
{
|
2004-01-26 19:52:02 +01:00
|
|
|
syscall_printf ("fd %d: not open", fd);
|
2000-05-24 01:52:50 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-01-26 19:52:02 +01:00
|
|
|
#if 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 (cfd->get_device () != FH_FS)
|
2000-05-24 01:52:50 +02:00
|
|
|
{
|
2004-01-26 19:52:02 +01:00
|
|
|
syscall_printf ("fd not disk file. Defaulting to binary.");
|
2000-05-24 01:52:50 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2004-01-26 19:52:02 +01:00
|
|
|
#endif
|
2000-05-24 01:52:50 +02:00
|
|
|
|
2004-04-10 15:45:10 +02:00
|
|
|
if (cfd->wbinary () || cfd->rbinary ())
|
2000-05-24 01:52:50 +02:00
|
|
|
{
|
2004-01-26 19:52:02 +01:00
|
|
|
syscall_printf ("fd %d: opened as binary", fd);
|
2000-05-24 01:52:50 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-01-26 19:52:02 +01:00
|
|
|
syscall_printf ("fd %d: defaulting to text", fd);
|
2000-05-24 01:52:50 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2000-05-19 19:15:02 +02:00
|
|
|
/* internal newlib function */
|
2001-03-03 04:56:34 +01:00
|
|
|
extern "C" int _fwalk (struct _reent *ptr, int (*function) (FILE *));
|
2000-05-19 19:15:02 +02:00
|
|
|
|
|
|
|
static int
|
|
|
|
setmode_helper (FILE *f)
|
|
|
|
{
|
2005-06-10 00:33:57 +02:00
|
|
|
if (fileno (f) != _my_tls.locals.setmode_file)
|
2004-01-26 19:52:02 +01:00
|
|
|
{
|
2005-06-10 00:33:57 +02:00
|
|
|
syscall_printf ("improbable, but %d != %d", fileno (f), _my_tls.locals.setmode_file);
|
2004-01-26 19:52:02 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
syscall_printf ("file was %s now %s", f->_flags & __SCLE ? "text" : "binary",
|
2005-06-10 00:33:57 +02:00
|
|
|
_my_tls.locals.setmode_mode & O_TEXT ? "text" : "binary");
|
|
|
|
if (_my_tls.locals.setmode_mode & O_TEXT)
|
2000-05-19 19:15:02 +02:00
|
|
|
f->_flags |= __SCLE;
|
|
|
|
else
|
|
|
|
f->_flags &= ~__SCLE;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-07-09 07:29:51 +02:00
|
|
|
extern "C" int
|
|
|
|
getmode (int fd)
|
|
|
|
{
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
return -1;
|
2000-07-09 07:29:51 +02:00
|
|
|
|
2001-10-16 01:39:33 +02:00
|
|
|
return cfd->get_flags () & (O_BINARY | O_TEXT);
|
2000-07-09 07:29:51 +02:00
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Set a file descriptor into text or binary mode, returning the
|
|
|
|
previous mode. */
|
|
|
|
|
2000-07-09 07:29:51 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
setmode (int fd, int mode)
|
|
|
|
{
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
return -1;
|
2001-04-23 18:46:30 +02:00
|
|
|
if (mode != O_BINARY && mode != O_TEXT && mode != 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Note that we have no way to indicate the case that writes are
|
|
|
|
binary but not reads, or vice-versa. These cases can arise when
|
|
|
|
using the tty or console interface. People using those
|
|
|
|
interfaces should not use setmode. */
|
|
|
|
|
|
|
|
int res;
|
2004-04-10 15:45:10 +02:00
|
|
|
if (cfd->wbinary () && cfd->rbinary ())
|
2000-02-17 20:38:33 +01:00
|
|
|
res = O_BINARY;
|
2004-04-10 15:45:10 +02:00
|
|
|
else if (cfd->wbinset () && cfd->rbinset ())
|
2001-04-23 19:29:33 +02:00
|
|
|
res = O_TEXT; /* Specifically set O_TEXT */
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
2001-04-23 19:29:33 +02:00
|
|
|
res = 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-04-24 04:07:58 +02:00
|
|
|
if (!mode)
|
2001-10-16 01:39:33 +02:00
|
|
|
cfd->reset_to_open_binmode ();
|
2001-04-24 04:07:58 +02:00
|
|
|
else
|
2002-06-05 03:42:28 +02:00
|
|
|
cfd->set_flags ((cfd->get_flags () & ~(O_TEXT | O_BINARY)) | mode);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-01-26 19:52:02 +01:00
|
|
|
syscall_printf ("(%d<%s>, %p) returning %s", fd, cfd->get_name (),
|
2002-06-05 03:42:28 +02:00
|
|
|
mode, res & O_TEXT ? "text" : "binary");
|
2000-02-17 20:38:33 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2005-06-10 00:33:57 +02:00
|
|
|
extern "C" int
|
|
|
|
cygwin_setmode (int fd, int mode)
|
|
|
|
{
|
|
|
|
int res = setmode (fd, mode);
|
|
|
|
if (res != -1)
|
|
|
|
{
|
|
|
|
_my_tls.locals.setmode_file = fd;
|
|
|
|
if (_cygwin_istext_for_stdio (fd))
|
|
|
|
_my_tls.locals.setmode_mode = O_TEXT;
|
|
|
|
else
|
|
|
|
_my_tls.locals.setmode_mode = O_BINARY;
|
|
|
|
_fwalk (_GLOBAL_REENT, setmode_helper);
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" int
|
2003-04-01 18:11:41 +02:00
|
|
|
ftruncate64 (int fd, _off64_t length)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-02-02 23:42:06 +01:00
|
|
|
int res = -1;
|
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd >= 0)
|
|
|
|
res = cfd->ftruncate (length);
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
2005-02-02 23:42:06 +01:00
|
|
|
set_errno (EBADF);
|
2003-11-08 17:38:34 +01:00
|
|
|
syscall_printf ("%d = ftruncate (%d, %D)", res, fd, length);
|
2000-02-17 20:38:33 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2002-02-25 18:47:51 +01:00
|
|
|
/* ftruncate: P96 5.6.7.1 */
|
|
|
|
extern "C" int
|
2003-04-01 18:11:41 +02:00
|
|
|
ftruncate (int fd, _off_t length)
|
2002-02-25 18:47:51 +01:00
|
|
|
{
|
2003-04-01 18:11:41 +02:00
|
|
|
return ftruncate64 (fd, (_off64_t)length);
|
2002-02-25 18:47:51 +01:00
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* truncate: Provided by SVR4 and 4.3+BSD. Not part of POSIX.1 or XPG3 */
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" int
|
2003-04-01 18:11:41 +02:00
|
|
|
truncate64 (const char *pathname, _off64_t length)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
int res = -1;
|
|
|
|
|
|
|
|
fd = open (pathname, O_RDWR);
|
|
|
|
|
2004-12-01 16:00:40 +01:00
|
|
|
if (fd != -1)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2002-03-04 17:47:41 +01:00
|
|
|
res = ftruncate64 (fd, length);
|
2000-02-17 20:38:33 +01:00
|
|
|
close (fd);
|
|
|
|
}
|
2004-04-21 10:16:13 +02:00
|
|
|
syscall_printf ("%d = truncate (%s, %D)", res, pathname, length);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2002-02-25 18:47:51 +01:00
|
|
|
/* truncate: Provided by SVR4 and 4.3+BSD. Not part of POSIX.1 or XPG3 */
|
|
|
|
extern "C" int
|
2003-04-01 18:11:41 +02:00
|
|
|
truncate (const char *pathname, _off_t length)
|
2002-02-25 18:47:51 +01:00
|
|
|
{
|
2003-04-01 18:11:41 +02:00
|
|
|
return truncate64 (pathname, (_off64_t)length);
|
2002-02-25 18:47:51 +01:00
|
|
|
}
|
|
|
|
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" long
|
2000-02-17 20:38:33 +01:00
|
|
|
get_osfhandle (int fd)
|
|
|
|
{
|
2001-10-16 01:39:33 +02:00
|
|
|
long res;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd >= 0)
|
|
|
|
res = (long) cfd->get_handle ();
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
2001-10-16 01:39:33 +02:00
|
|
|
res = -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-08-23 04:27:01 +02:00
|
|
|
syscall_printf ("%d = get_osfhandle (%d)", res, fd);
|
2000-02-17 20:38:33 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" int
|
2005-02-23 14:12:43 +01:00
|
|
|
statvfs (const char *fname, struct statvfs *sfs)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-04-03 15:06:43 +02:00
|
|
|
int ret = -1;
|
2004-04-10 21:24:55 +02:00
|
|
|
char root[CYG_MAX_PATH];
|
|
|
|
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2005-02-23 14:12:43 +01:00
|
|
|
return -1;
|
2005-07-03 04:40:30 +02:00
|
|
|
if (!*fname)
|
|
|
|
{
|
|
|
|
set_errno (ENOENT);
|
|
|
|
return -1;
|
|
|
|
}
|
2005-02-23 14:12:43 +01:00
|
|
|
|
2004-04-10 21:24:55 +02:00
|
|
|
syscall_printf ("statfs %s", fname);
|
2004-04-10 15:45:10 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
if (!sfs)
|
|
|
|
{
|
|
|
|
set_errno (EFAULT);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2005-05-13 17:46:07 +02:00
|
|
|
path_conv full_path (fname, PC_SYM_FOLLOW);
|
2004-04-10 21:24:55 +02:00
|
|
|
if (!rootdir (full_path, root))
|
2005-06-24 11:12:15 +02:00
|
|
|
{
|
|
|
|
set_errno (ENOTDIR);
|
|
|
|
return -1;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-05-26 18:52:58 +02:00
|
|
|
ULARGE_INTEGER availb, freeb, totalb;
|
2005-04-03 15:06:43 +02:00
|
|
|
DWORD spc, bps, availc, freec, totalc, vsn, maxlen, flags;
|
2005-06-16 17:46:40 +02:00
|
|
|
BOOL status, statusex;
|
2003-05-26 18:52:58 +02:00
|
|
|
|
2005-04-03 15:06:43 +02:00
|
|
|
push_thread_privilege (SE_CHANGE_NOTIFY_PRIV, true);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-04-03 15:06:43 +02:00
|
|
|
/* GetDiskFreeSpaceEx must be called before GetDiskFreeSpace on
|
|
|
|
WinME, to avoid the MS KB 314417 bug */
|
2005-06-16 17:46:40 +02:00
|
|
|
statusex = GetDiskFreeSpaceEx (root, &availb, &totalb, &freeb);
|
|
|
|
status = GetDiskFreeSpace (root, &spc, &bps, &freec, &totalc);
|
|
|
|
if (!status && statusex)
|
2003-05-25 11:18:43 +02:00
|
|
|
{
|
2005-06-16 17:46:40 +02:00
|
|
|
/* Grrr, this can happen on 9x when a share isn't attached to
|
2005-08-12 04:39:13 +02:00
|
|
|
a drive letter. Fake, fake, hoorah. */
|
2005-06-16 17:46:40 +02:00
|
|
|
status = TRUE;
|
|
|
|
bps = 512;
|
|
|
|
spc = 8;
|
|
|
|
while ((totalb.QuadPart % (spc*bps)) && spc > 1)
|
2005-08-12 04:39:13 +02:00
|
|
|
spc >>= 1;
|
2005-06-16 17:46:40 +02:00
|
|
|
}
|
|
|
|
if (status)
|
|
|
|
{
|
|
|
|
if (statusex)
|
2005-04-03 15:06:43 +02:00
|
|
|
{
|
|
|
|
availc = availb.QuadPart / (spc*bps);
|
|
|
|
totalc = totalb.QuadPart / (spc*bps);
|
|
|
|
freec = freeb.QuadPart / (spc*bps);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
availc = freec;
|
|
|
|
if (GetVolumeInformation (root, NULL, 0, &vsn, &maxlen, &flags, NULL, 0))
|
2005-05-02 05:50:11 +02:00
|
|
|
{
|
2005-04-03 15:06:43 +02:00
|
|
|
sfs->f_bsize = spc*bps;
|
|
|
|
sfs->f_frsize = spc*bps;
|
|
|
|
sfs->f_blocks = totalc;
|
|
|
|
sfs->f_bfree = freec;
|
|
|
|
sfs->f_bavail = availc;
|
|
|
|
sfs->f_files = ULONG_MAX;
|
|
|
|
sfs->f_ffree = ULONG_MAX;
|
|
|
|
sfs->f_favail = ULONG_MAX;
|
|
|
|
sfs->f_fsid = vsn;
|
|
|
|
sfs->f_flag = flags;
|
|
|
|
sfs->f_namemax = maxlen;
|
|
|
|
ret = 0;
|
|
|
|
}
|
2003-05-25 11:18:43 +02:00
|
|
|
}
|
2005-04-03 15:06:43 +02:00
|
|
|
if (ret)
|
|
|
|
__seterrno ();
|
2003-05-25 11:18:43 +02:00
|
|
|
|
2005-04-03 15:06:43 +02:00
|
|
|
pop_thread_privilege ();
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-04-03 15:06:43 +02:00
|
|
|
return ret;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2005-02-23 14:12:43 +01:00
|
|
|
extern "C" int
|
|
|
|
fstatvfs (int fd, struct statvfs *sfs)
|
|
|
|
{
|
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
return -1;
|
|
|
|
return statvfs (cfd->get_name (), sfs);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
statfs (const char *fname, struct statfs *sfs)
|
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2005-02-23 14:12:43 +01:00
|
|
|
return -1;
|
|
|
|
struct statvfs vfs;
|
|
|
|
int ret = statvfs (fname, &vfs);
|
|
|
|
if (!ret)
|
|
|
|
{
|
|
|
|
sfs->f_type = vfs.f_flag;
|
|
|
|
sfs->f_bsize = vfs.f_bsize;
|
|
|
|
sfs->f_blocks = vfs.f_blocks;
|
|
|
|
sfs->f_bavail = vfs.f_bavail;
|
|
|
|
sfs->f_bfree = vfs.f_bfree;
|
|
|
|
sfs->f_files = -1;
|
|
|
|
sfs->f_ffree = -1;
|
|
|
|
sfs->f_fsid = vfs.f_fsid;
|
|
|
|
sfs->f_namelen = vfs.f_namemax;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
fstatfs (int fd, struct statfs *sfs)
|
|
|
|
{
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
return -1;
|
|
|
|
return statfs (cfd->get_name (), sfs);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* setpgid: POSIX 4.3.3.1 */
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
setpgid (pid_t pid, pid_t pgid)
|
|
|
|
{
|
|
|
|
int res = -1;
|
|
|
|
if (pid == 0)
|
|
|
|
pid = getpid ();
|
|
|
|
if (pgid == 0)
|
|
|
|
pgid = pid;
|
|
|
|
|
|
|
|
if (pgid < 0)
|
2005-07-03 04:40:30 +02:00
|
|
|
set_errno (EINVAL);
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
|
|
|
{
|
2003-09-13 19:14:15 +02:00
|
|
|
pinfo p (pid, PID_MAP_RW);
|
2000-07-29 18:24:59 +02:00
|
|
|
if (!p)
|
2005-07-03 04:40:30 +02:00
|
|
|
set_errno (ESRCH);
|
|
|
|
else if (p->pgid == pgid)
|
|
|
|
res = 0;
|
2000-07-29 18:24:59 +02:00
|
|
|
/* A process may only change the process group of itself and its children */
|
2005-07-03 04:40:30 +02:00
|
|
|
else if (p != myself && p->ppid != myself->pid)
|
|
|
|
set_errno (EPERM);
|
|
|
|
else
|
2000-07-29 18:24:59 +02:00
|
|
|
{
|
|
|
|
p->pgid = pgid;
|
2000-10-25 05:54:50 +02:00
|
|
|
if (p->pid != p->pgid)
|
|
|
|
p->set_has_pgid_children (0);
|
2000-07-29 18:24:59 +02:00
|
|
|
res = 0;
|
2005-07-03 04:40:30 +02:00
|
|
|
// init_console_handler (FALSE);
|
2000-07-29 18:24:59 +02:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2005-07-03 04:40:30 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
syscall_printf ("pid %d, pgid %d, res %d", pid, pgid, res);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" pid_t
|
2000-02-17 20:38:33 +01:00
|
|
|
getpgid (pid_t pid)
|
|
|
|
{
|
|
|
|
if (pid == 0)
|
|
|
|
pid = getpid ();
|
|
|
|
|
2000-07-29 18:24:59 +02:00
|
|
|
pinfo p (pid);
|
2000-02-17 20:38:33 +01:00
|
|
|
if (p == 0)
|
|
|
|
{
|
|
|
|
set_errno (ESRCH);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return p->pgid;
|
|
|
|
}
|
|
|
|
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
setpgrp (void)
|
|
|
|
{
|
|
|
|
return setpgid (0, 0);
|
|
|
|
}
|
|
|
|
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" pid_t
|
2000-02-17 20:38:33 +01:00
|
|
|
getpgrp (void)
|
|
|
|
{
|
|
|
|
return getpgid (0);
|
|
|
|
}
|
|
|
|
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" char *
|
2000-02-17 20:38:33 +01:00
|
|
|
ptsname (int fd)
|
|
|
|
{
|
2001-10-16 01:39:33 +02:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
return 0;
|
|
|
|
return (char *) (cfd->ptsname ());
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: what is this? */
|
2002-01-21 04:15:24 +01:00
|
|
|
extern "C" int __declspec(dllexport)
|
2000-02-17 20:38:33 +01:00
|
|
|
regfree ()
|
|
|
|
{
|
|
|
|
return 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
|
|
|
static int __stdcall
|
|
|
|
mknod_worker (const char *path, mode_t type, mode_t mode, _major_t major,
|
|
|
|
_minor_t minor)
|
|
|
|
{
|
2003-11-15 00:40:06 +01:00
|
|
|
char buf[sizeof (":\\00000000:00000000:00000000") + CYG_MAX_PATH];
|
2003-09-27 07:44:58 +02:00
|
|
|
sprintf (buf, ":\\%x:%x:%x", major, minor,
|
* 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
|
|
|
type | (mode & (S_IRWXU | S_IRWXG | S_IRWXO)));
|
|
|
|
return symlink_worker (buf, path, true, true);
|
|
|
|
}
|
|
|
|
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" int
|
* 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
|
|
|
mknod32 (const char *path, mode_t mode, __dev32_t dev)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
* 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
|
|
|
return -1;
|
2005-07-03 04:40:30 +02:00
|
|
|
if (!*path)
|
|
|
|
{
|
|
|
|
set_errno (ENOENT);
|
|
|
|
return -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
|
|
|
|
2003-11-15 00:40:06 +01:00
|
|
|
if (strlen (path) >= CYG_MAX_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
|
|
|
return -1;
|
|
|
|
|
2005-05-13 17:46:07 +02:00
|
|
|
path_conv w32path (path, PC_SYM_NOFOLLOW);
|
* 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 (w32path.exists ())
|
|
|
|
{
|
|
|
|
set_errno (EEXIST);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
mode_t type = mode & S_IFMT;
|
|
|
|
_major_t major = _major (dev);
|
|
|
|
_minor_t minor = _minor (dev);
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case S_IFCHR:
|
|
|
|
case S_IFBLK:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case S_IFIFO:
|
|
|
|
major = _major (FH_FIFO);
|
|
|
|
minor = _minor (FH_FIFO);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0:
|
|
|
|
case S_IFREG:
|
|
|
|
{
|
|
|
|
int fd = open (path, O_CREAT, mode);
|
|
|
|
if (fd < 0)
|
|
|
|
return -1;
|
|
|
|
close (fd);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return mknod_worker (w32path, type, mode, major, minor);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-03-09 22:51:00 +01:00
|
|
|
extern "C" int
|
|
|
|
mknod (const char *_path, mode_t mode, __dev16_t dev)
|
|
|
|
{
|
|
|
|
return mknod32 (_path, mode, (__dev32_t) dev);
|
|
|
|
}
|
|
|
|
|
2001-04-12 18:50:13 +02:00
|
|
|
extern "C" int
|
2004-09-03 03:53:12 +02:00
|
|
|
mkfifo (const char *path, mode_t mode)
|
2001-04-12 18:50:13 +02:00
|
|
|
{
|
2004-09-03 03:53:12 +02:00
|
|
|
return mknod32 (path, (mode & ~S_IFMT) | S_IFIFO, 0);
|
2001-04-12 18:50:13 +02:00
|
|
|
}
|
|
|
|
|
2000-06-16 21:36:07 +02:00
|
|
|
/* seteuid: standards? */
|
2000-09-03 06:16:35 +02:00
|
|
|
extern "C" int
|
2002-05-29 17:04:29 +02:00
|
|
|
seteuid32 (__uid32_t uid)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-04-15 10:19:07 +02:00
|
|
|
debug_printf ("uid: %u myself->uid: %u myself->gid: %u",
|
2005-05-02 05:50:11 +02:00
|
|
|
uid, myself->uid, myself->gid);
|
2002-05-27 13:48:15 +02:00
|
|
|
|
2003-01-25 11:36:46 +01:00
|
|
|
if (uid == myself->uid && !cygheap->user.groups.ischanged)
|
2002-05-27 13:48:15 +02:00
|
|
|
{
|
2002-07-02 05:06:32 +02:00
|
|
|
debug_printf ("Nothing happens");
|
2002-05-27 13:48:15 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-07-29 14:51:52 +02:00
|
|
|
cygsid usersid;
|
|
|
|
user_groups &groups = cygheap->user.groups;
|
2005-04-03 15:06:43 +02:00
|
|
|
HANDLE new_token = INVALID_HANDLE_VALUE;
|
2002-06-14 20:01:21 +02:00
|
|
|
struct passwd * pw_new;
|
2004-11-20 20:09:19 +01:00
|
|
|
bool token_is_internal, issamesid = false;
|
2003-11-28 21:55:59 +01:00
|
|
|
|
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by
pwdgrp_check::isinitializing ().
(pwdgrp_check::isinitializing): Create.
* passwd.cc (grab_int): Change type to unsigned, use strtoul and
set the pointer content to 0 if the field is invalid.
(parse_pwd): Move validity test after getting pw_gid.
(read_etc_passwd): Replace "passwd_state <= " by
passwd_state::isinitializing ().
(internal_getpwuid): Ditto.
(internal_getpwnam): Ditto.
(getpwent): Ditto.
(getpass): Ditto.
* grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity.
(read_etc_group): Replace "group_state <= " by
group_state::isinitializing ().
(internal_getgrgid): Ditto.
(getgrent32): Ditto.
(internal_getgrent): Ditto.
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* security.h: Move declarations of internal_getgrent,
internal_getpwsid and internal_getgrsid to pwdgrp.h.
* pwdgrp.h: Declare internal_getpwsid, internal_getpwnam,
internal_getpwuid, internal_getgrsid, internal_getgrgid,
internal_getgrnam, internal_getgrent and internal_getgroups.
Delete "emulated" from enum pwdgrp_state.
(pwdgrp_check::isuninitialized): Create.
(pwdgrp_check::pwdgrp_state): Change state to initializing
rather than to uninitialized.
(pwdgrp_read::gets): Remove trailing CRs.
* passwd.cc (grab_string): Don't look for NLs.
(grab_int): Ditto.
(parse_pwd): Don't look for CRs. Return 0 if entry is too short.
(search_for): Delete.
(read_etc_passwd): Simplify tests to actually read the file.
Set state to loaded before making internal_getpwXX calls.
Replace search_for calls by equivalent internal_pwgetXX calls.
(internal_getpwsid): Use passwd_state.isuninitialized to decide
to call read_etc_passwd.
(internal_getpwuid): Create.
(internal_getpwnam): Create.
(getpwuid32): Simply call internal_getpwuid.
(getpwuid_r32): Call internal_getpwuid.
(getpwnam): Simply call internal_getpwnam.
(getpwnam_r): Call internal_getpwnam.
* grp.cc (parse_grp): Don't look for CRs. Adjust blank space.
(add_grp_line): Adjust blank space.
(class group_lock): Ditto.
(read_etc_group): Simplify tests to actually read the file.
Set state to loaded before making internal_getgrXX calls.
Replace getgrXX calls by equivalent internal calls.
(internal_getgrsid): Use group_state.isuninitialized to decide
to call read_etc_group.
(internal_getgrgid): Create.
(internal_getgrnam): Create.
(getgroups32): Simply call internal_getgrgid.
(getgrnam32): Simply call internal_getgrnam.
(internal_getgrent): Call group_state.isuninitialized.
(internal_getgroups): Create from the former getgroups32, using
two of the four arguments. Set gid to myself->gid and username
to cygheap->user.name ().
(getgroups32): Simply call internal_getgroup.
(getgroups): Call internal_getgroup instead of getgroups32.
(setgroups32): Call internal versions of get{pw,gr}XX.
* sec_helper.cc: Include pwdgrp.h.
(is_grp_member): Call internal versions of get{pw,gr}XX.
* security.cc: Include pwdgrp.h.
(alloc_sd): Call internal versions of get{pw,gr}XX.
* syscalls.cc: Include pwdgrp.h.
(seteuid32): Call internal versions of get{pw,gr}XX.
(setegid32): Ditto.
* uinfo.cc: Include pwdgrp.h.
(internal_getlogin): Call internal versions of get{pw,gr}XX.
(cygheap_user::ontherange): Ditto.
* sec_acl.cc: Include pwdgrp.h.
(setacl): Call internal versions of get{pw,gr}XX.
(acl_access): Ditto and simplify logic.
(aclfromtext): Ditto.
2002-12-10 13:43:49 +01:00
|
|
|
pw_new = internal_getpwuid (uid);
|
2003-01-25 11:36:46 +01:00
|
|
|
if (!wincap.has_security () && pw_new)
|
2004-11-20 20:09:19 +01:00
|
|
|
{
|
|
|
|
load_registry_hive (pw_new->pw_name);
|
2005-01-08 19:33:07 +01:00
|
|
|
goto success_9x;
|
2004-11-20 20:09:19 +01:00
|
|
|
}
|
2002-07-29 14:51:52 +02:00
|
|
|
if (!usersid.getfrompw (pw_new))
|
2000-04-20 00:33:20 +02:00
|
|
|
{
|
2002-05-27 13:48:15 +02:00
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
2001-06-09 23:25:55 +02:00
|
|
|
|
2005-04-03 15:06:43 +02:00
|
|
|
cygheap->user.deimpersonate ();
|
2003-06-30 15:07:36 +02:00
|
|
|
|
|
|
|
/* Verify if the process token is suitable. */
|
2005-04-03 15:06:43 +02:00
|
|
|
if (verify_token (hProcToken, usersid, groups))
|
|
|
|
new_token = hProcToken;
|
2003-07-14 19:04:21 +02:00
|
|
|
/* Verify if the external token is suitable */
|
2004-10-28 03:46:01 +02:00
|
|
|
else if (cygheap->user.external_token != NO_IMPERSONATION
|
2003-06-30 15:07:36 +02:00
|
|
|
&& verify_token (cygheap->user.external_token, usersid, groups))
|
2003-07-14 19:04:21 +02:00
|
|
|
new_token = cygheap->user.external_token;
|
|
|
|
/* Verify if the current token (internal or former external) is suitable */
|
2005-04-03 15:06:43 +02:00
|
|
|
else if (cygheap->user.curr_primary_token != NO_IMPERSONATION
|
|
|
|
&& cygheap->user.curr_primary_token != cygheap->user.external_token
|
|
|
|
&& verify_token (cygheap->user.curr_primary_token, usersid, groups,
|
2003-07-14 19:04:21 +02:00
|
|
|
&token_is_internal))
|
2005-04-03 15:06:43 +02:00
|
|
|
new_token = cygheap->user.curr_primary_token;
|
2003-07-14 19:04:21 +02:00
|
|
|
/* Verify if the internal token is suitable */
|
2004-10-28 03:46:01 +02:00
|
|
|
else if (cygheap->user.internal_token != NO_IMPERSONATION
|
2005-04-03 15:06:43 +02:00
|
|
|
&& cygheap->user.internal_token != cygheap->user.curr_primary_token
|
2003-06-30 15:07:36 +02:00
|
|
|
&& verify_token (cygheap->user.internal_token, usersid, groups,
|
|
|
|
&token_is_internal))
|
2003-07-14 19:04:21 +02:00
|
|
|
new_token = cygheap->user.internal_token;
|
2000-07-26 19:48:49 +02:00
|
|
|
|
2003-07-14 19:04:21 +02:00
|
|
|
debug_printf ("Found token %d", new_token);
|
* autoload.cc: Add load statements for `LookupAccountNameW',
`LsaClose', `LsaEnumerateAccountRights', `LsaFreeMemory',
`LsaOpenPolicy', `LsaQueryInformationPolicy', `NetLocalGroupEnum',
`NetLocalGroupGetMembers', `NetServerEnum', `NetUserGetGroups' and
`NtCreateToken'.
* ntdll.h: Add declaration for `NtCreateToken'.
* sec_helper.cc: Add `well_known_local_sid', `well_known_dialup_sid',
`well_known_network_sid', `well_known_batch_sid',
`well_known_interactive_sid', `well_known_service_sid' and
`well_known_authenticated_users_sid'.
(cygsid::string): Define as const method.
(cygsid::get_sid): Set psid to NO_SID on error.
(cygsid::getfromstr): Ditto.
(cygsid::getfrompw): Simplify.
(cygsid::getfromgr): Check for gr == NULL.
(legal_sid_type): Move to security.h.
(set_process_privilege): Return -1 on error, otherwise 0 or 1 related
to previous privilege setting.
* security.cc (extract_nt_dom_user): Remove `static'.
(lsa2wchar): New function.
(open_local_policy): Ditto.
(close_local_policy): Ditto.
(get_lsa_srv_inf): Ditto.
(get_logon_server): Ditto.
(get_logon_server_and_user_domain): Ditto.
(get_user_groups): Ditto.
(is_group_member): Ditto.
(get_user_local_groups): Ditto.
(sid_in_token_groups): Ditto.
(get_user_primary_group): Ditto.
(get_group_sidlist): Ditto.
(get_system_priv_list): Ditto.
(get_priv_list): Ditto.
(get_dacl): Ditto.
(create_token): Ditto.
(subauth): Return immediately if SE_TCB_NAME can't be assigned.
Change all return statements in case of error to jumps to `out'
label. Add `out' label to support cleanup.
* security.h: Add extern declarations for `well_known_local_sid',
`well_known_dialup_sid', `well_known_network_sid',
`well_known_batch_sid', `well_known_interactive_sid',
`well_known_service_sid' and `well_known_authenticated_users_sid'.
Add extern declarations for functions `create_token',
`extract_nt_dom_user' and `get_logon_server_and_user_domain'.
(class cygsid): Add method `assign'. Change operator= to call new
`assign' method. Add `debug_print' method.
(class cygsidlist): New class.
(legal_sid_type): Moved from sec_helper.cc to here.
* spawn.cc (spawn_guts) Revert reversion of previous patch.
Call `RevertToSelf' and `ImpersonateLoggedOnUser' instead of `seteuid'
again.
* syscalls.cc (seteuid): Rearranged. Call `create_token' now when
needed. Call `subauth' if `create_token' fails. Try setting token
owner and primary group only if token was not explicitely created
by `create_token'.
* uinfo.cc (internal_getlogin): Try harder to generate correct user
information. Especially don't trust return value of `GetUserName'.
2001-05-20 10:10:47 +02:00
|
|
|
|
2003-07-14 19:04:21 +02:00
|
|
|
/* If no impersonation token is available, try to
|
|
|
|
authenticate using NtCreateToken () or subauthentication. */
|
|
|
|
if (new_token == INVALID_HANDLE_VALUE)
|
2002-05-27 13:48:15 +02:00
|
|
|
{
|
2003-06-30 15:07:36 +02:00
|
|
|
new_token = create_token (usersid, groups, pw_new);
|
|
|
|
if (new_token == INVALID_HANDLE_VALUE)
|
2002-05-28 03:55:40 +02:00
|
|
|
{
|
2002-05-27 13:48:15 +02:00
|
|
|
/* create_token failed. Try subauthentication. */
|
|
|
|
debug_printf ("create token failed, try subauthentication.");
|
2003-06-30 15:07:36 +02:00
|
|
|
new_token = subauth (pw_new);
|
|
|
|
if (new_token == INVALID_HANDLE_VALUE)
|
2005-04-03 15:06:43 +02:00
|
|
|
{
|
|
|
|
cygheap->user.reimpersonate ();
|
|
|
|
return -1;
|
|
|
|
}
|
2000-07-26 19:48:49 +02:00
|
|
|
}
|
2003-07-14 19:04:21 +02:00
|
|
|
/* Keep at most one internal token */
|
2004-10-28 03:46:01 +02:00
|
|
|
if (cygheap->user.internal_token != NO_IMPERSONATION)
|
2003-07-14 19:04:21 +02:00
|
|
|
CloseHandle (cygheap->user.internal_token);
|
|
|
|
cygheap->user.internal_token = new_token;
|
2002-05-27 13:48:15 +02:00
|
|
|
}
|
2004-10-28 03:46:01 +02:00
|
|
|
|
2005-04-03 15:06:43 +02:00
|
|
|
if (new_token != hProcToken)
|
2002-05-27 13:48:15 +02:00
|
|
|
{
|
2003-09-10 04:12:26 +02:00
|
|
|
/* Avoid having HKCU use default user */
|
2004-11-20 20:09:19 +01:00
|
|
|
char name[128];
|
|
|
|
load_registry_hive (usersid.string (name));
|
2003-11-28 21:55:59 +01:00
|
|
|
|
2003-07-14 19:04:21 +02:00
|
|
|
/* Try setting owner to same value as user. */
|
|
|
|
if (!SetTokenInformation (new_token, TokenOwner,
|
|
|
|
&usersid, sizeof usersid))
|
2005-04-03 15:06:43 +02:00
|
|
|
debug_printf ("SetTokenInformation(user.token, TokenOwner), %E");
|
2003-07-14 19:04:21 +02:00
|
|
|
/* Try setting primary group in token to current group */
|
2003-10-17 01:20:41 +02:00
|
|
|
if (!SetTokenInformation (new_token, TokenPrimaryGroup,
|
2003-07-14 19:04:21 +02:00
|
|
|
&groups.pgsid, sizeof (cygsid)))
|
2005-04-03 15:06:43 +02:00
|
|
|
debug_printf ("SetTokenInformation(user.token, TokenPrimaryGroup), %E");
|
2003-10-17 01:20:41 +02:00
|
|
|
/* Try setting default DACL */
|
2005-06-07 21:31:42 +02:00
|
|
|
PACL dacl_buf = (PACL) alloca (MAX_DACL_LEN (5));
|
|
|
|
if (sec_acl (dacl_buf, true, true, usersid))
|
2005-05-02 05:50:11 +02:00
|
|
|
{
|
2005-06-07 21:31:42 +02:00
|
|
|
TOKEN_DEFAULT_DACL tdacl = { dacl_buf };
|
2005-04-03 15:06:43 +02:00
|
|
|
if (!SetTokenInformation (new_token, TokenDefaultDacl,
|
|
|
|
&tdacl, sizeof (tdacl)))
|
|
|
|
debug_printf ("SetTokenInformation (TokenDefaultDacl), %E");
|
|
|
|
}
|
2002-05-27 13:48:15 +02:00
|
|
|
}
|
2003-06-30 15:07:36 +02:00
|
|
|
|
2003-11-28 21:55:59 +01:00
|
|
|
issamesid = (usersid == cygheap->user.sid ());
|
2003-07-14 19:04:21 +02:00
|
|
|
cygheap->user.set_sid (usersid);
|
2005-04-03 15:06:43 +02:00
|
|
|
cygheap->user.curr_primary_token = new_token == hProcToken ? NO_IMPERSONATION
|
|
|
|
: new_token;
|
|
|
|
if (cygheap->user.current_token != NO_IMPERSONATION)
|
|
|
|
{
|
|
|
|
CloseHandle (cygheap->user.current_token);
|
|
|
|
cygheap->user.current_token = NO_IMPERSONATION;
|
|
|
|
}
|
|
|
|
if (cygheap->user.curr_primary_token != NO_IMPERSONATION)
|
|
|
|
{
|
|
|
|
if (!DuplicateTokenEx (cygheap->user.curr_primary_token, MAXIMUM_ALLOWED,
|
|
|
|
&sec_none, SecurityImpersonation,
|
|
|
|
TokenImpersonation, &cygheap->user.current_token))
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
cygheap->user.curr_primary_token = NO_IMPERSONATION;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
set_cygwin_privileges (cygheap->user.current_token);
|
|
|
|
}
|
|
|
|
if (!cygheap->user.reimpersonate ())
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
return -1;
|
|
|
|
}
|
2003-09-10 04:12:26 +02:00
|
|
|
|
2003-06-30 15:07:36 +02:00
|
|
|
success_9x:
|
2003-01-25 11:36:46 +01:00
|
|
|
cygheap->user.set_name (pw_new->pw_name);
|
2002-06-14 20:01:21 +02:00
|
|
|
myself->uid = uid;
|
2002-07-29 14:51:52 +02:00
|
|
|
groups.ischanged = FALSE;
|
2005-01-08 19:33:07 +01:00
|
|
|
if (!issamesid)
|
|
|
|
user_shared_initialize (true);
|
2002-06-14 20:01:21 +02:00
|
|
|
return 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2002-05-29 17:04:29 +02:00
|
|
|
extern "C" int
|
|
|
|
seteuid (__uid16_t uid)
|
|
|
|
{
|
|
|
|
return seteuid32 (uid16touid32 (uid));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* setuid: POSIX 4.2.2.1 */
|
|
|
|
extern "C" int
|
|
|
|
setuid32 (__uid32_t uid)
|
|
|
|
{
|
|
|
|
int ret = seteuid32 (uid);
|
|
|
|
if (!ret)
|
|
|
|
cygheap->user.real_uid = myself->uid;
|
|
|
|
debug_printf ("real: %d, effective: %d", cygheap->user.real_uid, myself->uid);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
setuid (__uid16_t uid)
|
|
|
|
{
|
|
|
|
return setuid32 (uid16touid32 (uid));
|
|
|
|
}
|
|
|
|
|
2003-01-24 16:23:15 +01:00
|
|
|
extern "C" int
|
|
|
|
setreuid32 (__uid32_t ruid, __uid32_t euid)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
bool tried = false;
|
|
|
|
__uid32_t old_euid = myself->uid;
|
|
|
|
|
|
|
|
if (ruid != ILLEGAL_UID && cygheap->user.real_uid != ruid && euid != ruid)
|
|
|
|
tried = !(ret = seteuid32 (ruid));
|
|
|
|
if (!ret && euid != ILLEGAL_UID)
|
|
|
|
ret = seteuid32 (euid);
|
|
|
|
if (tried && (ret || euid == ILLEGAL_UID) && seteuid32 (old_euid))
|
|
|
|
system_printf ("Cannot restore original euid %u", old_euid);
|
|
|
|
if (!ret && ruid != ILLEGAL_UID)
|
|
|
|
cygheap->user.real_uid = ruid;
|
|
|
|
debug_printf ("real: %u, effective: %u", cygheap->user.real_uid, myself->uid);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
setreuid (__uid16_t ruid, __uid16_t euid)
|
|
|
|
{
|
|
|
|
return setreuid32 (uid16touid32 (ruid), uid16touid32 (euid));
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* setegid: from System V. */
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
Change internal gid datatype from __gid16_t to __gid32_t
throughout.
* cygwin.din: Export new symbols chown32, fchown32, getegid32,
getgid32, getgrgid32, getgrnam32, getgroups32, initgroups32, lchown32,
setgid32, setegid32, getgrent32.
* grp.cc (grp32togrp16): New static function.
(getgrgid32): New function.
(getgrnam32): Ditto.
(getgrent32): Ditto.
(getgroups32): Change name of internal function from getgroups.
(getgroups32): New function.
(initgroups32): Ditto.
* syscalls.cc (chown32): Ditto.
(lchown32): Ditto.
(fchown32): Ditto.
(setegid32): Ditto.
(setgid32): Ditto.
* uinfo.cc (getgid32): Ditto.
(getegid32): Ditto.
* include/cygwin/grp.h: Remove declaration of getgrgid() and getgrnam().
Declare getgrgid32() and getgrnam32() instead. Declare getgid32().
2002-05-28 16:10:55 +02:00
|
|
|
setegid32 (__gid32_t gid)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-01-25 11:36:46 +01:00
|
|
|
debug_printf ("new egid: %u current: %u", gid, myself->gid);
|
2002-05-27 13:48:15 +02:00
|
|
|
|
2003-01-25 11:36:46 +01:00
|
|
|
if (gid == myself->gid || !wincap.has_security ())
|
2002-09-13 11:00:28 +02:00
|
|
|
{
|
2003-01-25 11:36:46 +01:00
|
|
|
myself->gid = gid;
|
|
|
|
return 0;
|
2002-09-13 11:00:28 +02:00
|
|
|
}
|
|
|
|
|
2002-07-29 14:51:52 +02:00
|
|
|
user_groups * groups = &cygheap->user.groups;
|
2002-05-27 13:48:15 +02:00
|
|
|
cygsid gsid;
|
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by
pwdgrp_check::isinitializing ().
(pwdgrp_check::isinitializing): Create.
* passwd.cc (grab_int): Change type to unsigned, use strtoul and
set the pointer content to 0 if the field is invalid.
(parse_pwd): Move validity test after getting pw_gid.
(read_etc_passwd): Replace "passwd_state <= " by
passwd_state::isinitializing ().
(internal_getpwuid): Ditto.
(internal_getpwnam): Ditto.
(getpwent): Ditto.
(getpass): Ditto.
* grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity.
(read_etc_group): Replace "group_state <= " by
group_state::isinitializing ().
(internal_getgrgid): Ditto.
(getgrent32): Ditto.
(internal_getgrent): Ditto.
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* security.h: Move declarations of internal_getgrent,
internal_getpwsid and internal_getgrsid to pwdgrp.h.
* pwdgrp.h: Declare internal_getpwsid, internal_getpwnam,
internal_getpwuid, internal_getgrsid, internal_getgrgid,
internal_getgrnam, internal_getgrent and internal_getgroups.
Delete "emulated" from enum pwdgrp_state.
(pwdgrp_check::isuninitialized): Create.
(pwdgrp_check::pwdgrp_state): Change state to initializing
rather than to uninitialized.
(pwdgrp_read::gets): Remove trailing CRs.
* passwd.cc (grab_string): Don't look for NLs.
(grab_int): Ditto.
(parse_pwd): Don't look for CRs. Return 0 if entry is too short.
(search_for): Delete.
(read_etc_passwd): Simplify tests to actually read the file.
Set state to loaded before making internal_getpwXX calls.
Replace search_for calls by equivalent internal_pwgetXX calls.
(internal_getpwsid): Use passwd_state.isuninitialized to decide
to call read_etc_passwd.
(internal_getpwuid): Create.
(internal_getpwnam): Create.
(getpwuid32): Simply call internal_getpwuid.
(getpwuid_r32): Call internal_getpwuid.
(getpwnam): Simply call internal_getpwnam.
(getpwnam_r): Call internal_getpwnam.
* grp.cc (parse_grp): Don't look for CRs. Adjust blank space.
(add_grp_line): Adjust blank space.
(class group_lock): Ditto.
(read_etc_group): Simplify tests to actually read the file.
Set state to loaded before making internal_getgrXX calls.
Replace getgrXX calls by equivalent internal calls.
(internal_getgrsid): Use group_state.isuninitialized to decide
to call read_etc_group.
(internal_getgrgid): Create.
(internal_getgrnam): Create.
(getgroups32): Simply call internal_getgrgid.
(getgrnam32): Simply call internal_getgrnam.
(internal_getgrent): Call group_state.isuninitialized.
(internal_getgroups): Create from the former getgroups32, using
two of the four arguments. Set gid to myself->gid and username
to cygheap->user.name ().
(getgroups32): Simply call internal_getgroup.
(getgroups): Call internal_getgroup instead of getgroups32.
(setgroups32): Call internal versions of get{pw,gr}XX.
* sec_helper.cc: Include pwdgrp.h.
(is_grp_member): Call internal versions of get{pw,gr}XX.
* security.cc: Include pwdgrp.h.
(alloc_sd): Call internal versions of get{pw,gr}XX.
* syscalls.cc: Include pwdgrp.h.
(seteuid32): Call internal versions of get{pw,gr}XX.
(setegid32): Ditto.
* uinfo.cc: Include pwdgrp.h.
(internal_getlogin): Call internal versions of get{pw,gr}XX.
(cygheap_user::ontherange): Ditto.
* sec_acl.cc: Include pwdgrp.h.
(setacl): Call internal versions of get{pw,gr}XX.
(acl_access): Ditto and simplify logic.
(aclfromtext): Ditto.
2002-12-10 13:43:49 +01:00
|
|
|
struct __group32 * gr = internal_getgrgid (gid);
|
2003-01-25 11:36:46 +01:00
|
|
|
|
|
|
|
if (!gsid.getfromgr (gr))
|
2000-06-16 21:36:07 +02:00
|
|
|
{
|
2002-05-27 13:48:15 +02:00
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
myself->gid = gid;
|
2001-04-25 11:43:25 +02:00
|
|
|
|
2002-07-29 14:51:52 +02:00
|
|
|
groups->update_pgrp (gsid);
|
2002-06-17 01:34:43 +02:00
|
|
|
if (cygheap->user.issetuid ())
|
2002-05-27 13:48:15 +02:00
|
|
|
{
|
2005-04-03 15:06:43 +02:00
|
|
|
/* If impersonated, update impersonation token... */
|
|
|
|
if (!SetTokenInformation (cygheap->user.primary_token (),
|
2005-05-02 05:50:11 +02:00
|
|
|
TokenPrimaryGroup, &gsid, sizeof gsid))
|
2005-04-03 15:06:43 +02:00
|
|
|
debug_printf ("SetTokenInformation(primary_token, "
|
2004-09-03 03:53:12 +02:00
|
|
|
"TokenPrimaryGroup), %E");
|
2005-04-03 15:06:43 +02:00
|
|
|
if (!SetTokenInformation (cygheap->user.token (), TokenPrimaryGroup,
|
2002-05-27 13:48:15 +02:00
|
|
|
&gsid, sizeof gsid))
|
2005-04-03 15:06:43 +02:00
|
|
|
debug_printf ("SetTokenInformation(token, TokenPrimaryGroup), %E");
|
|
|
|
}
|
|
|
|
cygheap->user.deimpersonate ();
|
|
|
|
if (!SetTokenInformation (hProcToken, TokenPrimaryGroup, &gsid, sizeof gsid))
|
|
|
|
debug_printf ("SetTokenInformation(hProcToken, TokenPrimaryGroup), %E");
|
|
|
|
if (!SetTokenInformation (hProcImpToken, TokenPrimaryGroup, &gsid,
|
|
|
|
sizeof gsid))
|
|
|
|
debug_printf ("SetTokenInformation(hProcImpToken, TokenPrimaryGroup), %E");
|
|
|
|
cygheap->user.reimpersonate ();
|
2000-06-16 21:36:07 +02:00
|
|
|
return 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
Change internal gid datatype from __gid16_t to __gid32_t
throughout.
* cygwin.din: Export new symbols chown32, fchown32, getegid32,
getgid32, getgrgid32, getgrnam32, getgroups32, initgroups32, lchown32,
setgid32, setegid32, getgrent32.
* grp.cc (grp32togrp16): New static function.
(getgrgid32): New function.
(getgrnam32): Ditto.
(getgrent32): Ditto.
(getgroups32): Change name of internal function from getgroups.
(getgroups32): New function.
(initgroups32): Ditto.
* syscalls.cc (chown32): Ditto.
(lchown32): Ditto.
(fchown32): Ditto.
(setegid32): Ditto.
(setgid32): Ditto.
* uinfo.cc (getgid32): Ditto.
(getegid32): Ditto.
* include/cygwin/grp.h: Remove declaration of getgrgid() and getgrnam().
Declare getgrgid32() and getgrnam32() instead. Declare getgid32().
2002-05-28 16:10:55 +02:00
|
|
|
extern "C" int
|
|
|
|
setegid (__gid16_t gid)
|
|
|
|
{
|
2002-05-29 17:04:29 +02:00
|
|
|
return setegid32 (gid16togid32 (gid));
|
Change internal gid datatype from __gid16_t to __gid32_t
throughout.
* cygwin.din: Export new symbols chown32, fchown32, getegid32,
getgid32, getgrgid32, getgrnam32, getgroups32, initgroups32, lchown32,
setgid32, setegid32, getgrent32.
* grp.cc (grp32togrp16): New static function.
(getgrgid32): New function.
(getgrnam32): Ditto.
(getgrent32): Ditto.
(getgroups32): Change name of internal function from getgroups.
(getgroups32): New function.
(initgroups32): Ditto.
* syscalls.cc (chown32): Ditto.
(lchown32): Ditto.
(fchown32): Ditto.
(setegid32): Ditto.
(setgid32): Ditto.
* uinfo.cc (getgid32): Ditto.
(getegid32): Ditto.
* include/cygwin/grp.h: Remove declaration of getgrgid() and getgrnam().
Declare getgrgid32() and getgrnam32() instead. Declare getgid32().
2002-05-28 16:10:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* setgid: POSIX 4.2.2.1 */
|
|
|
|
extern "C" int
|
|
|
|
setgid32 (__gid32_t gid)
|
|
|
|
{
|
|
|
|
int ret = setegid32 (gid);
|
|
|
|
if (!ret)
|
|
|
|
cygheap->user.real_gid = myself->gid;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
setgid (__gid16_t gid)
|
|
|
|
{
|
2002-05-29 17:04:29 +02:00
|
|
|
int ret = setegid32 (gid16togid32 (gid));
|
Change internal gid datatype from __gid16_t to __gid32_t
throughout.
* cygwin.din: Export new symbols chown32, fchown32, getegid32,
getgid32, getgrgid32, getgrnam32, getgroups32, initgroups32, lchown32,
setgid32, setegid32, getgrent32.
* grp.cc (grp32togrp16): New static function.
(getgrgid32): New function.
(getgrnam32): Ditto.
(getgrent32): Ditto.
(getgroups32): Change name of internal function from getgroups.
(getgroups32): New function.
(initgroups32): Ditto.
* syscalls.cc (chown32): Ditto.
(lchown32): Ditto.
(fchown32): Ditto.
(setegid32): Ditto.
(setgid32): Ditto.
* uinfo.cc (getgid32): Ditto.
(getegid32): Ditto.
* include/cygwin/grp.h: Remove declaration of getgrgid() and getgrnam().
Declare getgrgid32() and getgrnam32() instead. Declare getgid32().
2002-05-28 16:10:55 +02:00
|
|
|
if (!ret)
|
|
|
|
cygheap->user.real_gid = myself->gid;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2003-01-24 16:23:15 +01:00
|
|
|
extern "C" int
|
|
|
|
setregid32 (__gid32_t rgid, __gid32_t egid)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
bool tried = false;
|
|
|
|
__gid32_t old_egid = myself->gid;
|
|
|
|
|
|
|
|
if (rgid != ILLEGAL_GID && cygheap->user.real_gid != rgid && egid != rgid)
|
|
|
|
tried = !(ret = setegid32 (rgid));
|
|
|
|
if (!ret && egid != ILLEGAL_GID)
|
|
|
|
ret = setegid32 (egid);
|
|
|
|
if (tried && (ret || egid == ILLEGAL_GID) && setegid32 (old_egid))
|
|
|
|
system_printf ("Cannot restore original egid %u", old_egid);
|
|
|
|
if (!ret && rgid != ILLEGAL_GID)
|
|
|
|
cygheap->user.real_gid = rgid;
|
|
|
|
debug_printf ("real: %u, effective: %u", cygheap->user.real_gid, myself->gid);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
setregid (__gid16_t rgid, __gid16_t egid)
|
|
|
|
{
|
|
|
|
return setregid32 (gid16togid32 (rgid), gid16togid32 (egid));
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* chroot: privileged Unix system call. */
|
2000-07-19 22:14:24 +02:00
|
|
|
/* FIXME: Not privileged here. How should this be done? */
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-07-19 22:14:24 +02:00
|
|
|
chroot (const char *newroot)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-05-13 17:46:07 +02:00
|
|
|
path_conv path (newroot, PC_SYM_FOLLOW | PC_POSIX);
|
2000-07-26 19:48:49 +02:00
|
|
|
|
2004-05-08 04:55:38 +02:00
|
|
|
int ret = -1;
|
2000-07-19 22:14:24 +02:00
|
|
|
if (path.error)
|
2004-05-08 04:55:38 +02:00
|
|
|
set_errno (path.error);
|
2001-10-01 06:10:07 +02:00
|
|
|
else if (!path.exists ())
|
2004-05-08 04:55:38 +02:00
|
|
|
set_errno (ENOENT);
|
2001-10-01 06:10:07 +02:00
|
|
|
else if (!path.isdir ())
|
2004-05-08 04:55:38 +02:00
|
|
|
set_errno (ENOTDIR);
|
2001-10-01 06:10:07 +02:00
|
|
|
else
|
|
|
|
{
|
2004-05-08 04:55:38 +02:00
|
|
|
getwinenv("PATH="); /* Save the native PATH */
|
2002-05-02 06:13:48 +02:00
|
|
|
cygheap->root.set (path.normalized_path, path);
|
2001-10-01 06:10:07 +02:00
|
|
|
ret = 0;
|
2000-07-19 22:14:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
syscall_printf ("%d = chroot (%s)", ret ? get_errno () : 0,
|
2000-07-26 19:48:49 +02:00
|
|
|
newroot ? newroot : "NULL");
|
2000-07-19 22:14:24 +02:00
|
|
|
return ret;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
creat (const char *path, mode_t mode)
|
|
|
|
{
|
|
|
|
return open (path, O_WRONLY | O_CREAT | O_TRUNC, mode);
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" void
|
2000-02-17 20:38:33 +01:00
|
|
|
__assertfail ()
|
|
|
|
{
|
|
|
|
exit (99);
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
getw (FILE *fp)
|
|
|
|
{
|
|
|
|
int w, ret;
|
|
|
|
ret = fread (&w, sizeof (int), 1, fp);
|
|
|
|
return ret != 1 ? EOF : w;
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
putw (int w, FILE *fp)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
ret = fwrite (&w, sizeof (int), 1, fp);
|
|
|
|
if (feof (fp) || ferror (fp))
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-05-06 19:00:53 +02:00
|
|
|
wcscmp (const wchar_t *s1, const wchar_t *s2)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
while (*s1 && *s1 == *s2)
|
|
|
|
{
|
|
|
|
s1++;
|
|
|
|
s2++;
|
|
|
|
}
|
|
|
|
|
2001-03-03 04:56:34 +01:00
|
|
|
return (* (unsigned short *) s1) - (* (unsigned short *) s2);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" size_t
|
2000-05-06 19:00:53 +02:00
|
|
|
wcslen (const wchar_t *s1)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int l = 0;
|
|
|
|
while (s1[l])
|
|
|
|
l++;
|
|
|
|
return l;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: to do this right, maybe work out the usoft va_list machine
|
|
|
|
and use wsvprintfW instead?
|
|
|
|
*/
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
wprintf (const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
va_start (ap, fmt);
|
|
|
|
ret = vprintf (fmt, ap);
|
|
|
|
va_end (ap);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
vhangup ()
|
|
|
|
{
|
|
|
|
set_errno (ENOSYS);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" _PTR
|
2000-02-17 20:38:33 +01:00
|
|
|
memccpy (_PTR out, const _PTR in, int c, size_t len)
|
|
|
|
{
|
|
|
|
const char *inc = (char *) in;
|
|
|
|
char *outc = (char *) out;
|
|
|
|
|
|
|
|
while (len)
|
|
|
|
{
|
|
|
|
char x = *inc++;
|
|
|
|
*outc++ = x;
|
|
|
|
if (x == c)
|
|
|
|
return outc;
|
|
|
|
len --;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2005-01-25 23:45:11 +01:00
|
|
|
setpriority (int which, id_t who, int value)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-01-26 14:07:48 +01:00
|
|
|
DWORD prio = nice_to_winprio (value);
|
|
|
|
int error = 0;
|
|
|
|
|
|
|
|
switch (which)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-01-26 14:07:48 +01:00
|
|
|
case PRIO_PROCESS:
|
|
|
|
if (!who)
|
|
|
|
who = myself->pid;
|
|
|
|
if ((pid_t) who == myself->pid)
|
|
|
|
{
|
|
|
|
if (!SetPriorityClass (hMainProc, prio))
|
|
|
|
{
|
|
|
|
set_errno (EACCES);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
myself->nice = value;
|
|
|
|
debug_printf ("Set nice to %d", myself->nice);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case PRIO_PGRP:
|
|
|
|
if (!who)
|
|
|
|
who = myself->pgid;
|
|
|
|
break;
|
|
|
|
case PRIO_USER:
|
|
|
|
if (!who)
|
|
|
|
who = myself->uid;
|
|
|
|
break;
|
|
|
|
default:
|
2005-01-25 23:45:11 +01:00
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
2005-01-26 14:07:48 +01:00
|
|
|
winpids pids ((DWORD) PID_MAP_RW);
|
|
|
|
for (DWORD i = 0; i < pids.npids; ++i)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-01-26 14:07:48 +01:00
|
|
|
_pinfo *p = pids[i];
|
|
|
|
if (p)
|
|
|
|
{
|
|
|
|
switch (which)
|
|
|
|
{
|
|
|
|
case PRIO_PROCESS:
|
|
|
|
if ((pid_t) who != p->pid)
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
case PRIO_PGRP:
|
|
|
|
if ((pid_t) who != p->pgid)
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
case PRIO_USER:
|
|
|
|
if ((__uid32_t) who != p->uid)
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
HANDLE proc_h = OpenProcess (PROCESS_SET_INFORMATION, FALSE,
|
|
|
|
p->dwProcessId);
|
|
|
|
if (!proc_h)
|
|
|
|
error = EPERM;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!SetPriorityClass (proc_h, prio))
|
|
|
|
error = EACCES;
|
|
|
|
else
|
|
|
|
p->nice = value;
|
|
|
|
CloseHandle (proc_h);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pids.reset ();
|
|
|
|
if (error)
|
|
|
|
{
|
|
|
|
set_errno (error);
|
2005-01-25 23:45:11 +01:00
|
|
|
return -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2005-01-25 23:45:11 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-01-25 23:45:11 +01:00
|
|
|
extern "C" int
|
|
|
|
getpriority (int which, id_t who)
|
|
|
|
{
|
2005-01-26 14:07:48 +01:00
|
|
|
int nice = NZERO * 2; /* Illegal value */
|
|
|
|
|
|
|
|
switch (which)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-01-26 14:07:48 +01:00
|
|
|
case PRIO_PROCESS:
|
|
|
|
if (!who)
|
|
|
|
who = myself->pid;
|
|
|
|
if ((pid_t) who == myself->pid)
|
|
|
|
return myself->nice;
|
|
|
|
break;
|
|
|
|
case PRIO_PGRP:
|
|
|
|
if (!who)
|
|
|
|
who = myself->pgid;
|
|
|
|
break;
|
|
|
|
case PRIO_USER:
|
|
|
|
if (!who)
|
|
|
|
who = myself->uid;
|
|
|
|
break;
|
|
|
|
default:
|
2005-01-25 23:45:11 +01:00
|
|
|
set_errno (EINVAL);
|
2000-02-17 20:38:33 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2005-01-26 14:07:48 +01:00
|
|
|
winpids pids ((DWORD) 0);
|
|
|
|
for (DWORD i = 0; i < pids.npids; ++i)
|
|
|
|
{
|
|
|
|
_pinfo *p = pids[i];
|
|
|
|
if (p)
|
2005-05-02 05:50:11 +02:00
|
|
|
switch (which)
|
2005-01-26 14:07:48 +01:00
|
|
|
{
|
|
|
|
case PRIO_PROCESS:
|
|
|
|
if ((pid_t) who == p->pid)
|
|
|
|
{
|
|
|
|
nice = p->nice;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case PRIO_PGRP:
|
|
|
|
if ((pid_t) who == p->pgid && p->nice < nice)
|
|
|
|
nice = p->nice;
|
|
|
|
break;
|
|
|
|
case PRIO_USER:
|
|
|
|
if ((__uid32_t) who == p->uid && p->nice < nice)
|
|
|
|
nice = p->nice;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
pids.reset ();
|
|
|
|
if (nice == NZERO * 2)
|
|
|
|
{
|
|
|
|
set_errno (ESRCH);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return nice;
|
2005-01-25 23:45:11 +01:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-01-25 23:45:11 +01:00
|
|
|
extern "C" int
|
|
|
|
nice (int incr)
|
|
|
|
{
|
|
|
|
return setpriority (PRIO_PROCESS, myself->pid, myself->nice + incr);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find the first bit set in I.
|
|
|
|
*/
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" int
|
2000-02-17 20:38:33 +01:00
|
|
|
ffs (int i)
|
|
|
|
{
|
|
|
|
static const unsigned char table[] =
|
|
|
|
{
|
|
|
|
0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
|
|
|
|
6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
|
|
|
|
7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
|
|
|
|
7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
|
|
|
|
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
|
|
|
|
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
|
|
|
|
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
|
|
|
|
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
|
|
|
|
};
|
|
|
|
unsigned long int a;
|
|
|
|
unsigned long int x = i & -i;
|
|
|
|
|
|
|
|
a = x <= 0xffff ? (x <= 0xff ? 0 : 8) : (x <= 0xffffff ? 16 : 24);
|
|
|
|
|
|
|
|
return table[x >> a] + a;
|
|
|
|
}
|
|
|
|
|
2003-12-07 13:56:59 +01:00
|
|
|
static void
|
|
|
|
locked_append (int fd, const void * buf, size_t size)
|
|
|
|
{
|
|
|
|
struct __flock64 lock_buffer = {F_WRLCK, SEEK_SET, 0, 0, 0};
|
|
|
|
int count = 0;
|
|
|
|
|
|
|
|
do
|
|
|
|
if ((lock_buffer.l_start = lseek64 (fd, 0, SEEK_END)) != (_off64_t)-1
|
|
|
|
&& fcntl_worker (fd, F_SETLKW, &lock_buffer) != -1)
|
|
|
|
{
|
|
|
|
if (lseek64 (fd, 0, SEEK_END) != (_off64_t)-1)
|
|
|
|
write (fd, buf, size);
|
|
|
|
lock_buffer.l_type = F_UNLCK;
|
|
|
|
fcntl_worker (fd, F_SETLK, &lock_buffer);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
while (count++ < 1000
|
|
|
|
&& (errno == EACCES || errno == EAGAIN)
|
|
|
|
&& !usleep (1000));
|
|
|
|
}
|
|
|
|
|
2000-09-30 03:56:40 +02:00
|
|
|
extern "C" void
|
2003-09-10 17:51:59 +02:00
|
|
|
updwtmp (const char *wtmp_file, const struct utmp *ut)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-09-10 17:51:59 +02:00
|
|
|
int fd;
|
|
|
|
|
2003-12-07 13:56:59 +01:00
|
|
|
if ((fd = open (wtmp_file, O_WRONLY | O_BINARY, 0)) >= 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-12-07 13:56:59 +01:00
|
|
|
locked_append (fd, ut, sizeof *ut);
|
2003-03-29 13:44:01 +01:00
|
|
|
close (fd);
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-03-29 13:44:01 +01:00
|
|
|
static int utmp_fd = -1;
|
|
|
|
static bool utmp_readonly = false;
|
2001-12-28 16:53:27 +01:00
|
|
|
static char *utmp_file = (char *) _PATH_UTMP;
|
|
|
|
|
2003-03-29 13:44:01 +01:00
|
|
|
static void
|
|
|
|
internal_setutent (bool force_readwrite)
|
2001-12-28 16:53:27 +01:00
|
|
|
{
|
2003-03-29 13:44:01 +01:00
|
|
|
if (force_readwrite && utmp_readonly)
|
|
|
|
endutent ();
|
|
|
|
if (utmp_fd < 0)
|
|
|
|
{
|
|
|
|
utmp_fd = open (utmp_file, O_RDWR | O_BINARY);
|
|
|
|
/* If open fails, we assume an unprivileged process (who?). In this
|
|
|
|
case we try again for reading only unless the process calls
|
|
|
|
pututline() (==force_readwrite) in which case opening just fails. */
|
|
|
|
if (utmp_fd < 0 && !force_readwrite)
|
2003-07-26 06:53:59 +02:00
|
|
|
{
|
2003-03-29 13:44:01 +01:00
|
|
|
utmp_fd = open (utmp_file, O_RDONLY | O_BINARY);
|
|
|
|
if (utmp_fd >= 0)
|
|
|
|
utmp_readonly = true;
|
2003-07-26 06:53:59 +02:00
|
|
|
}
|
2003-03-29 13:44:01 +01:00
|
|
|
}
|
2003-03-08 04:36:39 +01:00
|
|
|
else
|
|
|
|
lseek (utmp_fd, 0, SEEK_SET);
|
2001-12-28 16:53:27 +01:00
|
|
|
}
|
|
|
|
|
2003-03-29 13:44:01 +01:00
|
|
|
extern "C" void
|
|
|
|
setutent ()
|
|
|
|
{
|
|
|
|
internal_setutent (false);
|
|
|
|
}
|
|
|
|
|
2001-12-28 16:53:27 +01:00
|
|
|
extern "C" void
|
|
|
|
endutent ()
|
|
|
|
{
|
2003-03-29 13:44:01 +01:00
|
|
|
if (utmp_fd >= 0)
|
2002-11-07 03:19:52 +01:00
|
|
|
{
|
|
|
|
close (utmp_fd);
|
2003-03-29 13:44:01 +01:00
|
|
|
utmp_fd = -1;
|
|
|
|
utmp_readonly = false;
|
2002-11-07 03:19:52 +01:00
|
|
|
}
|
2001-12-28 16:53:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" void
|
2005-01-25 23:45:11 +01:00
|
|
|
utmpname (const char *file)
|
2001-12-28 16:53:27 +01:00
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted () || !*file)
|
2001-12-28 16:53:27 +01:00
|
|
|
{
|
|
|
|
debug_printf ("Invalid file");
|
|
|
|
return;
|
|
|
|
}
|
2002-11-07 03:19:52 +01:00
|
|
|
endutent ();
|
2001-12-28 16:53:27 +01:00
|
|
|
utmp_file = strdup (file);
|
|
|
|
debug_printf ("New UTMP file: %s", utmp_file);
|
|
|
|
}
|
2005-03-03 23:08:12 +01:00
|
|
|
EXPORT_ALIAS (utmpname, utmpxname)
|
2001-12-28 16:53:27 +01:00
|
|
|
|
2003-08-05 06:49:44 +02:00
|
|
|
/* Note: do not make NO_COPY */
|
|
|
|
static struct utmp utmp_data_buf[16];
|
|
|
|
static unsigned utix = 0;
|
|
|
|
#define nutdbuf (sizeof (utmp_data_buf) / sizeof (utmp_data_buf[0]))
|
|
|
|
#define utmp_data ({ \
|
|
|
|
if (utix > nutdbuf) \
|
|
|
|
utix = 0; \
|
|
|
|
utmp_data_buf + utix++; \
|
|
|
|
})
|
|
|
|
|
2004-12-15 18:29:01 +01:00
|
|
|
static struct utmpx *
|
|
|
|
copy_ut_to_utx (struct utmp *ut, struct utmpx *utx)
|
|
|
|
{
|
|
|
|
if (!ut)
|
|
|
|
return NULL;
|
|
|
|
memcpy (utx, ut, sizeof *ut);
|
|
|
|
utx->ut_tv.tv_sec = ut->ut_time;
|
|
|
|
utx->ut_tv.tv_usec = 0;
|
|
|
|
return utx;
|
|
|
|
}
|
|
|
|
|
2001-12-28 16:53:27 +01:00
|
|
|
extern "C" struct utmp *
|
|
|
|
getutent ()
|
|
|
|
{
|
2003-03-29 13:44:01 +01:00
|
|
|
if (utmp_fd < 0)
|
|
|
|
{
|
|
|
|
internal_setutent (false);
|
|
|
|
if (utmp_fd < 0)
|
2003-07-26 06:53:59 +02:00
|
|
|
return NULL;
|
2003-03-29 13:44:01 +01:00
|
|
|
}
|
2003-08-05 06:49:44 +02:00
|
|
|
|
|
|
|
utmp *ut = utmp_data;
|
|
|
|
if (read (utmp_fd, ut, sizeof *ut) != sizeof *ut)
|
2001-12-28 16:53:27 +01:00
|
|
|
return NULL;
|
2003-08-05 06:49:44 +02:00
|
|
|
return ut;
|
2001-12-28 16:53:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" struct utmp *
|
|
|
|
getutid (struct utmp *id)
|
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2001-12-28 16:53:27 +01:00
|
|
|
return NULL;
|
2003-03-29 13:44:01 +01:00
|
|
|
if (utmp_fd < 0)
|
|
|
|
{
|
|
|
|
internal_setutent (false);
|
|
|
|
if (utmp_fd < 0)
|
2003-07-26 06:53:59 +02:00
|
|
|
return NULL;
|
2003-03-29 13:44:01 +01:00
|
|
|
}
|
2003-08-05 06:49:44 +02:00
|
|
|
|
|
|
|
utmp *ut = utmp_data;
|
|
|
|
while (read (utmp_fd, ut, sizeof *ut) == sizeof *ut)
|
2001-12-28 16:53:27 +01:00
|
|
|
{
|
|
|
|
switch (id->ut_type)
|
|
|
|
{
|
|
|
|
case RUN_LVL:
|
|
|
|
case BOOT_TIME:
|
|
|
|
case OLD_TIME:
|
|
|
|
case NEW_TIME:
|
2003-08-05 06:49:44 +02:00
|
|
|
if (id->ut_type == ut->ut_type)
|
|
|
|
return ut;
|
2001-12-28 16:53:27 +01:00
|
|
|
break;
|
|
|
|
case INIT_PROCESS:
|
|
|
|
case LOGIN_PROCESS:
|
|
|
|
case USER_PROCESS:
|
|
|
|
case DEAD_PROCESS:
|
2003-08-05 06:49:44 +02:00
|
|
|
if (strncmp (id->ut_id, ut->ut_id, UT_IDLEN) == 0)
|
|
|
|
return ut;
|
2001-12-28 16:53:27 +01:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" struct utmp *
|
|
|
|
getutline (struct utmp *line)
|
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2001-12-28 16:53:27 +01:00
|
|
|
return NULL;
|
2003-03-29 13:44:01 +01:00
|
|
|
if (utmp_fd < 0)
|
|
|
|
{
|
|
|
|
internal_setutent (false);
|
|
|
|
if (utmp_fd < 0)
|
2003-07-26 06:53:59 +02:00
|
|
|
return NULL;
|
2003-03-29 13:44:01 +01:00
|
|
|
}
|
2003-08-05 06:49:44 +02:00
|
|
|
|
|
|
|
utmp *ut = utmp_data;
|
|
|
|
while (read (utmp_fd, ut, sizeof *ut) == sizeof *ut)
|
|
|
|
if ((ut->ut_type == LOGIN_PROCESS ||
|
|
|
|
ut->ut_type == USER_PROCESS) &&
|
|
|
|
!strncmp (ut->ut_line, line->ut_line, sizeof (ut->ut_line)))
|
|
|
|
return ut;
|
|
|
|
|
2001-12-28 16:53:27 +01:00
|
|
|
return NULL;
|
|
|
|
}
|
2002-11-07 03:19:52 +01:00
|
|
|
|
2004-12-15 18:29:01 +01:00
|
|
|
extern "C" struct utmp *
|
2002-11-07 03:19:52 +01:00
|
|
|
pututline (struct utmp *ut)
|
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2004-12-15 18:29:01 +01:00
|
|
|
return NULL;
|
2003-03-29 13:44:01 +01:00
|
|
|
internal_setutent (true);
|
|
|
|
if (utmp_fd < 0)
|
2003-08-05 06:49:44 +02:00
|
|
|
{
|
|
|
|
debug_printf ("error: utmp_fd %d", utmp_fd);
|
2004-12-15 18:29:01 +01:00
|
|
|
return NULL;
|
2003-08-05 06:49:44 +02:00
|
|
|
}
|
|
|
|
debug_printf ("ut->ut_type %d, ut->ut_pid %d, ut->ut_line '%s', ut->ut_id '%s'\n",
|
|
|
|
ut->ut_type, ut->ut_pid, ut->ut_line, ut->ut_id);
|
|
|
|
debug_printf ("ut->ut_user '%s', ut->ut_host '%s'\n",
|
|
|
|
ut->ut_user, ut->ut_host);
|
2003-12-07 13:56:59 +01:00
|
|
|
|
2002-11-07 03:19:52 +01:00
|
|
|
struct utmp *u;
|
|
|
|
if ((u = getutid (ut)))
|
2003-03-29 13:44:01 +01:00
|
|
|
{
|
2003-12-07 13:56:59 +01:00
|
|
|
lseek (utmp_fd, -sizeof *ut, SEEK_CUR);
|
|
|
|
write (utmp_fd, ut, sizeof *ut);
|
2003-03-29 13:44:01 +01:00
|
|
|
}
|
2003-12-07 13:56:59 +01:00
|
|
|
else
|
|
|
|
locked_append (utmp_fd, ut, sizeof *ut);
|
2004-12-15 18:29:01 +01:00
|
|
|
return ut;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" void
|
|
|
|
setutxent ()
|
|
|
|
{
|
|
|
|
internal_setutent (false);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" void
|
|
|
|
endutxent ()
|
|
|
|
{
|
|
|
|
endutent ();
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" struct utmpx *
|
|
|
|
getutxent ()
|
|
|
|
{
|
|
|
|
static struct utmpx utx;
|
|
|
|
return copy_ut_to_utx (getutent (), &utx);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" struct utmpx *
|
|
|
|
getutxid (const struct utmpx *id)
|
|
|
|
{
|
|
|
|
static struct utmpx utx;
|
|
|
|
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2004-12-15 18:29:01 +01:00
|
|
|
return NULL;
|
|
|
|
((struct utmpx *)id)->ut_time = id->ut_tv.tv_sec;
|
|
|
|
return copy_ut_to_utx (getutid ((struct utmp *) id), &utx);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" struct utmpx *
|
|
|
|
getutxline (const struct utmpx *line)
|
|
|
|
{
|
|
|
|
static struct utmpx utx;
|
|
|
|
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2004-12-15 18:29:01 +01:00
|
|
|
return NULL;
|
|
|
|
((struct utmpx *)line)->ut_time = line->ut_tv.tv_sec;
|
|
|
|
return copy_ut_to_utx (getutline ((struct utmp *) line), &utx);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" struct utmpx *
|
|
|
|
pututxline (const struct utmpx *utmpx)
|
|
|
|
{
|
|
|
|
static struct utmpx utx;
|
|
|
|
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2004-12-15 18:29:01 +01:00
|
|
|
return NULL;
|
|
|
|
((struct utmpx *)utmpx)->ut_time = utmpx->ut_tv.tv_sec;
|
|
|
|
return copy_ut_to_utx (pututline ((struct utmp *) utmpx), &utx);
|
2002-11-07 03:19:52 +01:00
|
|
|
}
|
2003-04-16 05:03:45 +02:00
|
|
|
|
|
|
|
extern "C"
|
2003-11-28 21:55:59 +01:00
|
|
|
long gethostid (void)
|
2003-04-16 05:03:45 +02:00
|
|
|
{
|
|
|
|
unsigned data[13] = {0x92895012,
|
2003-07-26 06:53:59 +02:00
|
|
|
0x10293412,
|
|
|
|
0x29602018,
|
|
|
|
0x81928167,
|
|
|
|
0x34601329,
|
|
|
|
0x75630198,
|
|
|
|
0x89860395,
|
|
|
|
0x62897564,
|
|
|
|
0x00194362,
|
|
|
|
0x20548593,
|
|
|
|
0x96839102,
|
|
|
|
0x12219854,
|
|
|
|
0x00290012};
|
2003-04-16 05:03:45 +02:00
|
|
|
|
|
|
|
bool has_cpuid = false;
|
2003-07-06 22:08:42 +02:00
|
|
|
|
|
|
|
DWORD opmask = SetThreadAffinityMask (GetCurrentThread (), 1);
|
|
|
|
if (!opmask)
|
|
|
|
debug_printf ("SetThreadAffinityMask to 1 failed, %E");
|
2003-04-16 05:03:45 +02:00
|
|
|
|
|
|
|
if (!can_set_flag (0x00040000))
|
|
|
|
debug_printf ("386 processor - no cpuid");
|
|
|
|
else
|
|
|
|
{
|
|
|
|
debug_printf ("486 processor");
|
|
|
|
if (can_set_flag (0x00200000))
|
2003-07-26 06:53:59 +02:00
|
|
|
{
|
|
|
|
debug_printf ("processor supports CPUID instruction");
|
|
|
|
has_cpuid = true;
|
|
|
|
}
|
2003-04-16 05:03:45 +02:00
|
|
|
else
|
2003-07-26 06:53:59 +02:00
|
|
|
debug_printf ("processor does not support CPUID instruction");
|
2003-04-16 05:03:45 +02:00
|
|
|
}
|
|
|
|
if (has_cpuid)
|
|
|
|
{
|
|
|
|
unsigned maxf, unused[3];
|
|
|
|
cpuid (&maxf, &unused[0], &unused[1], &unused[2], 0);
|
|
|
|
maxf &= 0xffff;
|
|
|
|
if (maxf >= 1)
|
2003-07-26 06:53:59 +02:00
|
|
|
{
|
|
|
|
unsigned features;
|
|
|
|
cpuid (&data[0], &unused[0], &unused[1], &features, 1);
|
|
|
|
if (features & (1 << 18))
|
|
|
|
{
|
|
|
|
debug_printf ("processor has psn");
|
|
|
|
if (maxf >= 3)
|
|
|
|
{
|
|
|
|
cpuid (&unused[0], &unused[1], &data[1], &data[2], 3);
|
|
|
|
debug_printf ("Processor PSN: %04x-%04x-%04x-%04x-%04x-%04x",
|
|
|
|
data[0] >> 16, data[0] & 0xffff, data[2] >> 16, data[2] & 0xffff, data[1] >> 16, data[1] & 0xffff);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
debug_printf ("processor does not have psn");
|
|
|
|
}
|
2003-04-16 05:03:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
UUID Uuid;
|
|
|
|
RPC_STATUS status = UuidCreateSequential (&Uuid);
|
|
|
|
if (GetLastError () == ERROR_PROC_NOT_FOUND)
|
|
|
|
status = UuidCreate (&Uuid);
|
|
|
|
if (status == RPC_S_OK)
|
|
|
|
{
|
|
|
|
data[4] = *(unsigned *)&Uuid.Data4[2];
|
|
|
|
data[5] = *(unsigned short *)&Uuid.Data4[6];
|
|
|
|
// Unfortunately Windows will sometimes pick a virtual Ethernet card
|
|
|
|
// e.g. VMWare Virtual Ethernet Adaptor
|
|
|
|
debug_printf ("MAC address of first Ethernet card: %02x:%02x:%02x:%02x:%02x:%02x",
|
2003-07-26 06:53:59 +02:00
|
|
|
Uuid.Data4[2], Uuid.Data4[3], Uuid.Data4[4],
|
|
|
|
Uuid.Data4[5], Uuid.Data4[6], Uuid.Data4[7]);
|
2003-04-16 05:03:45 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
debug_printf ("no Ethernet card installed");
|
|
|
|
}
|
|
|
|
|
|
|
|
reg_key key (HKEY_LOCAL_MACHINE, KEY_READ, "SOFTWARE", "Microsoft", "Windows", "CurrentVersion", NULL);
|
|
|
|
key.get_string ("ProductId", (char *)&data[6], 24, "00000-000-0000000-00000");
|
|
|
|
debug_printf ("Windows Product ID: %s", (char *)&data[6]);
|
|
|
|
|
2003-09-17 23:47:12 +02:00
|
|
|
/* Contrary to MSDN, NT4 requires the second argument
|
|
|
|
or a STATUS_ACCESS_VIOLATION is generated */
|
|
|
|
ULARGE_INTEGER availb;
|
|
|
|
GetDiskFreeSpaceEx ("C:\\", &availb, (PULARGE_INTEGER) &data[11], NULL);
|
2003-04-16 05:03:45 +02:00
|
|
|
if (GetLastError () == ERROR_PROC_NOT_FOUND)
|
|
|
|
GetDiskFreeSpace ("C:\\", NULL, NULL, NULL, (DWORD *)&data[11]);
|
|
|
|
|
|
|
|
debug_printf ("hostid entropy: %08x %08x %08x %08x "
|
2003-07-26 06:53:59 +02:00
|
|
|
"%08x %08x %08x %08x "
|
|
|
|
"%08x %08x %08x %08x "
|
|
|
|
"%08x",
|
|
|
|
data[0], data[1],
|
|
|
|
data[2], data[3],
|
|
|
|
data[4], data[5],
|
|
|
|
data[6], data[7],
|
|
|
|
data[8], data[9],
|
|
|
|
data[10], data[11],
|
|
|
|
data[12]);
|
2003-04-16 05:03:45 +02:00
|
|
|
|
|
|
|
long hostid = 0x40291372;
|
|
|
|
// a random hashing algorithm
|
|
|
|
// dependancy on md5 is probably too costly
|
|
|
|
for (int i=0;i<13;i++)
|
2003-07-06 22:13:48 +02:00
|
|
|
hostid ^= ((data[i] << (i << 2)) | (data[i] >> (32 - (i << 2))));
|
2003-04-16 05:03:45 +02:00
|
|
|
|
2003-07-06 22:08:42 +02:00
|
|
|
if (opmask && !SetThreadAffinityMask (GetCurrentThread (), opmask))
|
|
|
|
debug_printf ("SetThreadAffinityMask to %p failed, %E", opmask);
|
|
|
|
|
2003-04-16 05:03:45 +02:00
|
|
|
debug_printf ("hostid: %08x", hostid);
|
|
|
|
|
|
|
|
return hostid;
|
|
|
|
}
|
2003-09-08 22:08:53 +02:00
|
|
|
|
|
|
|
#define ETC_SHELLS "/etc/shells"
|
|
|
|
static int shell_index;
|
* Makefile.in (DLL_OFILES): Add getopt.o and iruserok.o.
* cygwin.din: Export __check_rhosts_file, __rcmd_errstr, optarg,
opterr, optind, optopt, optreset, getopt, getopt_long, iruserok
and ruserok.
* getopt.c: Moved from lib to here. Define opt* variables as
dllexport.
* iruserok.c: Moved from lib to here. Rearrange function order.
Prefer using 64/32 bit functions.
* syscalls.cc (shell_fp): Define as struct __sFILE64.
(getusershell): Use fopen64 instead of fopen.
* winsup.h: Add declarations for seteuid32, fopen64,
cygwin_gethostbyname and cygwin_inet_addr.
* include/getopt.h: Declare opt* variables dllimport.
* include/cygwin/version.h: Bump API minor number.
2003-09-10 21:13:05 +02:00
|
|
|
static struct __sFILE64 *shell_fp;
|
2003-09-08 22:08:53 +02:00
|
|
|
|
|
|
|
extern "C" char *
|
|
|
|
getusershell ()
|
|
|
|
{
|
|
|
|
/* List of default shells if no /etc/shells exists, defined as on Linux.
|
|
|
|
FIXME: SunOS has a far longer list, containing all shells which
|
|
|
|
might be shipped with the OS. Should we do the same for the Cygwin
|
|
|
|
distro, adding bash, tcsh, ksh, pdksh and zsh? */
|
|
|
|
static NO_COPY const char *def_shells[] = {
|
|
|
|
"/bin/sh",
|
|
|
|
"/bin/csh",
|
|
|
|
"/usr/bin/sh",
|
|
|
|
"/usr/bin/csh",
|
|
|
|
NULL
|
|
|
|
};
|
2003-11-15 00:40:06 +01:00
|
|
|
static char buf[CYG_MAX_PATH];
|
2003-09-08 22:08:53 +02:00
|
|
|
int ch, buf_idx;
|
|
|
|
|
* Makefile.in (DLL_OFILES): Add getopt.o and iruserok.o.
* cygwin.din: Export __check_rhosts_file, __rcmd_errstr, optarg,
opterr, optind, optopt, optreset, getopt, getopt_long, iruserok
and ruserok.
* getopt.c: Moved from lib to here. Define opt* variables as
dllexport.
* iruserok.c: Moved from lib to here. Rearrange function order.
Prefer using 64/32 bit functions.
* syscalls.cc (shell_fp): Define as struct __sFILE64.
(getusershell): Use fopen64 instead of fopen.
* winsup.h: Add declarations for seteuid32, fopen64,
cygwin_gethostbyname and cygwin_inet_addr.
* include/getopt.h: Declare opt* variables dllimport.
* include/cygwin/version.h: Bump API minor number.
2003-09-10 21:13:05 +02:00
|
|
|
if (!shell_fp && !(shell_fp = fopen64 (ETC_SHELLS, "rt")))
|
2003-09-08 22:08:53 +02:00
|
|
|
{
|
|
|
|
if (def_shells[shell_index])
|
2003-11-28 21:55:59 +01:00
|
|
|
return strcpy (buf, def_shells[shell_index++]);
|
2003-09-08 22:08:53 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Skip white space characters. */
|
|
|
|
while ((ch = getc (shell_fp)) != EOF && isspace (ch))
|
|
|
|
;
|
|
|
|
/* Get each non-whitespace character as part of the shell path as long as
|
|
|
|
it fits in buf. */
|
|
|
|
for (buf_idx = 0;
|
2003-11-15 00:40:06 +01:00
|
|
|
ch != EOF && !isspace (ch) && buf_idx < CYG_MAX_PATH;
|
2003-09-08 22:08:53 +02:00
|
|
|
buf_idx++, ch = getc (shell_fp))
|
|
|
|
buf[buf_idx] = ch;
|
|
|
|
/* Skip any trailing non-whitespace character not fitting in buf. If the
|
2003-11-15 00:40:06 +01:00
|
|
|
path is longer than CYG_MAX_PATH, it's invalid anyway. */
|
2003-09-08 22:08:53 +02:00
|
|
|
while (ch != EOF && !isspace (ch))
|
|
|
|
ch = getc (shell_fp);
|
|
|
|
if (buf_idx)
|
|
|
|
{
|
|
|
|
buf[buf_idx] = '\0';
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" void
|
|
|
|
setusershell ()
|
|
|
|
{
|
|
|
|
if (shell_fp)
|
|
|
|
fseek (shell_fp, 0L, SEEK_SET);
|
|
|
|
shell_index = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" void
|
|
|
|
endusershell ()
|
|
|
|
{
|
|
|
|
if (shell_fp)
|
2005-08-24 17:50:11 +02:00
|
|
|
{
|
|
|
|
fclose (shell_fp);
|
|
|
|
shell_fp = NULL;
|
|
|
|
}
|
2003-09-08 22:08:53 +02:00
|
|
|
shell_index = 0;
|
|
|
|
}
|
2004-05-17 18:06:02 +02:00
|
|
|
|
|
|
|
extern "C" void
|
|
|
|
flockfile (FILE *file)
|
|
|
|
{
|
|
|
|
_flockfile (file);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
ftrylockfile (FILE *file)
|
|
|
|
{
|
|
|
|
return _ftrylockfile (file);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" void
|
|
|
|
funlockfile (FILE *file)
|
|
|
|
{
|
|
|
|
_funlockfile (file);
|
|
|
|
}
|