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,
|
2009-01-03 06:12:22 +01:00
|
|
|
2005, 2006, 2007, 2008, 2009 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"
|
2008-04-07 18:15:45 +02:00
|
|
|
#include "miscfuncs.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 <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 <ctype.h>
|
2009-05-13 17:00:06 +02:00
|
|
|
#include <locale.h>
|
2003-03-17 20:08:11 +01:00
|
|
|
#include <unistd.h>
|
2006-12-11 19:55:29 +01:00
|
|
|
#include <sys/wait.h>
|
2003-04-16 05:03:45 +02:00
|
|
|
#include <rpc.h>
|
2006-12-07 18:40:24 +01:00
|
|
|
#include "ntdll.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>
|
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"
|
2008-04-23 13:13:52 +02:00
|
|
|
#include "tls_pbuf.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
|
|
|
|
* 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);
|
|
|
|
|
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
|
|
|
|
2007-02-20 16:48:04 +01:00
|
|
|
semaphore::terminate ();
|
|
|
|
|
2000-11-03 05:27:03 +01:00
|
|
|
fhandler_base *fh;
|
2008-03-27 02:50:40 +01:00
|
|
|
HANDLE h = NULL;
|
|
|
|
|
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
|
2008-03-27 02:50:40 +01:00
|
|
|
if (i == 2)
|
|
|
|
DuplicateHandle (GetCurrentProcess (), fh->get_output_handle (), GetCurrentProcess (), &h, 0, false,
|
|
|
|
DUPLICATE_SAME_ACCESS);
|
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
|
|
|
|
2005-11-14 06:36:16 +01:00
|
|
|
if (!hExeced && cygheap->ctty)
|
2004-01-14 16:45:37 +01:00
|
|
|
cygheap->close_ctty ();
|
2003-12-27 03:41:07 +01:00
|
|
|
|
2008-03-27 02:50:40 +01:00
|
|
|
if (h)
|
|
|
|
SetStdHandle (STD_ERROR_HANDLE, h);
|
2004-01-14 16:45:37 +01:00
|
|
|
cygheap->fdtab.unlock ();
|
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);
|
|
|
|
}
|
|
|
|
|
2007-08-12 14:48:02 +02:00
|
|
|
static char desktop_ini[] =
|
|
|
|
"[.ShellClassInfo]\r\nCLSID={645FF040-5081-101B-9F08-00AA002F954E}\r\n";
|
|
|
|
static BYTE info2[] =
|
|
|
|
{
|
|
|
|
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
|
|
0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
|
|
|
};
|
|
|
|
|
2009-01-12 16:51:23 +01:00
|
|
|
enum bin_status
|
2006-12-10 17:43:30 +01:00
|
|
|
{
|
2009-01-12 16:51:23 +01:00
|
|
|
dont_move,
|
|
|
|
move_to_bin,
|
|
|
|
has_been_moved
|
|
|
|
};
|
|
|
|
|
|
|
|
static bin_status
|
|
|
|
try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access)
|
|
|
|
{
|
|
|
|
bin_status bin_stat = move_to_bin;
|
2006-12-10 17:43:30 +01:00
|
|
|
NTSTATUS status;
|
2007-08-12 14:48:02 +02:00
|
|
|
OBJECT_ATTRIBUTES attr;
|
2006-12-10 17:43:30 +01:00
|
|
|
IO_STATUS_BLOCK io;
|
2009-01-12 16:51:23 +01:00
|
|
|
HANDLE rootdir = NULL, recyclerdir = NULL, tmp_fh = NULL;
|
2007-08-12 14:48:02 +02:00
|
|
|
USHORT recycler_base_len = 0, recycler_user_len = 0;
|
|
|
|
UNICODE_STRING root, recycler, fname;
|
|
|
|
WCHAR recyclerbuf[NAME_MAX + 1]; /* Enough for recycler + SID + filename */
|
|
|
|
PFILE_NAME_INFORMATION pfni;
|
|
|
|
PFILE_INTERNAL_INFORMATION pfii;
|
|
|
|
PFILE_RENAME_INFORMATION pfri;
|
2009-01-12 16:51:23 +01:00
|
|
|
FILE_DISPOSITION_INFORMATION disp = { TRUE };
|
2006-12-10 17:43:30 +01:00
|
|
|
|
2009-04-09 19:55:01 +02:00
|
|
|
tmp_pathbuf tp;
|
|
|
|
PBYTE infobuf = (PBYTE) tp.w_get ();
|
|
|
|
|
2007-08-12 14:48:02 +02:00
|
|
|
pfni = (PFILE_NAME_INFORMATION) infobuf;
|
2009-04-09 19:55:01 +02:00
|
|
|
status = NtQueryInformationFile (fh, &io, pfni, 65536, FileNameInformation);
|
2007-08-12 14:48:02 +02:00
|
|
|
if (!NT_SUCCESS (status))
|
2006-12-10 17:43:30 +01:00
|
|
|
{
|
2007-08-12 14:48:02 +02:00
|
|
|
debug_printf ("NtQueryInformationFile (FileNameInformation) failed, %08x",
|
|
|
|
status);
|
|
|
|
goto out;
|
2006-12-10 17:43:30 +01:00
|
|
|
}
|
2007-08-12 14:48:02 +02:00
|
|
|
/* The filename could change, the parent dir not. So we split both paths
|
|
|
|
and take the prefix. However, there are two special cases:
|
|
|
|
- The handle refers to the root dir of the volume.
|
|
|
|
- The handle refers to the recycler or a subdir.
|
|
|
|
Both cases are handled by just returning and not even trying to move
|
|
|
|
them into the recycler. */
|
|
|
|
if (pfni->FileNameLength == 2) /* root dir. */
|
|
|
|
goto out;
|
|
|
|
/* Initialize recycler path. */
|
|
|
|
RtlInitEmptyUnicodeString (&recycler, recyclerbuf, sizeof recyclerbuf);
|
|
|
|
if (wincap.has_recycle_dot_bin ()) /* NTFS and FAT since Vista */
|
|
|
|
RtlAppendUnicodeToString (&recycler, L"\\$Recycle.Bin\\");
|
2009-01-12 16:51:23 +01:00
|
|
|
else if (pc.fs_is_ntfs ()) /* NTFS up to 2K3 */
|
2008-02-15 18:53:11 +01:00
|
|
|
RtlAppendUnicodeToString (&recycler, L"\\RECYCLER\\");
|
2009-01-12 16:51:23 +01:00
|
|
|
else if (pc.fs_is_fat ()) /* FAT up to 2K3 */
|
2008-02-15 18:53:11 +01:00
|
|
|
RtlAppendUnicodeToString (&recycler, L"\\Recycled\\");
|
2006-12-10 17:43:30 +01:00
|
|
|
else
|
2007-08-12 14:48:02 +02:00
|
|
|
goto out;
|
|
|
|
/* Is the file a subdir of the recycler? */
|
|
|
|
RtlInitCountedUnicodeString(&fname, pfni->FileName, pfni->FileNameLength);
|
|
|
|
if (RtlEqualUnicodePathPrefix (&fname, recycler.Buffer, TRUE))
|
|
|
|
goto out;
|
|
|
|
/* Is fname the recycler? Temporarily hide trailing backslash. */
|
|
|
|
recycler.Length -= sizeof (WCHAR);
|
|
|
|
if (RtlEqualUnicodeString (&fname, &recycler, TRUE))
|
|
|
|
goto out;
|
2006-12-07 12:53:46 +01:00
|
|
|
|
2007-08-12 14:48:02 +02:00
|
|
|
/* Create root dir path from file name information. */
|
|
|
|
RtlSplitUnicodePath (&fname, &fname, NULL);
|
2009-01-12 16:51:23 +01:00
|
|
|
RtlSplitUnicodePath (pc.get_nt_native_path (), &root, NULL);
|
2007-08-12 14:48:02 +02:00
|
|
|
root.Length -= fname.Length - sizeof (WCHAR);
|
|
|
|
|
2008-07-16 22:20:45 +02:00
|
|
|
/* Open root directory. All recycler bin ops are caseinsensitive. */
|
2007-08-12 14:48:02 +02:00
|
|
|
InitializeObjectAttributes (&attr, &root, OBJ_CASE_INSENSITIVE, NULL, NULL);
|
|
|
|
status = NtOpenFile (&rootdir, FILE_TRAVERSE, &attr, &io,
|
|
|
|
FILE_SHARE_VALID_FLAGS, FILE_OPEN_FOR_BACKUP_INTENT);
|
|
|
|
if (!NT_SUCCESS (status))
|
2006-12-10 17:43:30 +01:00
|
|
|
{
|
2007-08-12 14:48:02 +02:00
|
|
|
debug_printf ("NtOpenFile (%S) failed, %08x", &root, status);
|
|
|
|
goto out;
|
2006-12-10 17:43:30 +01:00
|
|
|
}
|
|
|
|
|
2007-08-12 14:48:02 +02:00
|
|
|
/* Strip leading backslash */
|
|
|
|
++recycler.Buffer;
|
|
|
|
recycler.Length -= sizeof (WCHAR);
|
|
|
|
/* Store length of recycler base dir, should it be necessary to create it. */
|
|
|
|
recycler_base_len = recycler.Length;
|
|
|
|
/* On NTFS the recycler dir contains user specific subdirs, which are the
|
|
|
|
actual recycle bins per user. The name if this dir is the string
|
|
|
|
representation of the user SID. */
|
2009-01-12 16:51:23 +01:00
|
|
|
if (pc.fs_is_ntfs ())
|
2006-12-10 17:43:30 +01:00
|
|
|
{
|
2007-08-12 14:48:02 +02:00
|
|
|
UNICODE_STRING sid;
|
|
|
|
WCHAR sidbuf[128];
|
|
|
|
/* Unhide trailing backslash. */
|
|
|
|
recycler.Length += sizeof (WCHAR);
|
|
|
|
RtlInitEmptyUnicodeString (&sid, sidbuf, sizeof sidbuf);
|
|
|
|
/* In contrast to what MSDN claims, this function is already available
|
|
|
|
since NT4. */
|
|
|
|
RtlConvertSidToUnicodeString (&sid, cygheap->user.sid (), FALSE);
|
|
|
|
RtlAppendUnicodeStringToString (&recycler, &sid);
|
|
|
|
recycler_user_len = recycler.Length;
|
|
|
|
}
|
|
|
|
/* Create hopefully unique filename. */
|
|
|
|
RtlAppendUnicodeToString (&recycler, L"\\cyg");
|
|
|
|
pfii = (PFILE_INTERNAL_INFORMATION) infobuf;
|
2009-04-09 19:55:01 +02:00
|
|
|
status = NtQueryInformationFile (fh, &io, pfii, 65536,
|
2007-08-12 14:48:02 +02:00
|
|
|
FileInternalInformation);
|
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
{
|
|
|
|
debug_printf ("NtQueryInformationFile (FileInternalInformation) failed, "
|
|
|
|
"%08x", status);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
RtlInt64ToHexUnicodeString (pfii->FileId.QuadPart, &recycler, TRUE);
|
|
|
|
/* Shoot. */
|
|
|
|
pfri = (PFILE_RENAME_INFORMATION) infobuf;
|
|
|
|
pfri->ReplaceIfExists = TRUE;
|
|
|
|
pfri->RootDirectory = rootdir;
|
|
|
|
pfri->FileNameLength = recycler.Length;
|
|
|
|
memcpy (pfri->FileName, recycler.Buffer, recycler.Length);
|
2009-04-09 19:55:01 +02:00
|
|
|
status = NtSetInformationFile (fh, &io, pfri, 65536, FileRenameInformation);
|
2007-08-12 14:48:02 +02:00
|
|
|
if (status == STATUS_OBJECT_PATH_NOT_FOUND)
|
|
|
|
{
|
|
|
|
/* Ok, so the recycler and/or the recycler/SID directory don't exist.
|
|
|
|
First reopen root dir with permission to create subdirs. */
|
|
|
|
NtClose (rootdir);
|
|
|
|
status = NtOpenFile (&rootdir, FILE_ADD_SUBDIRECTORY, &attr, &io,
|
|
|
|
FILE_SHARE_VALID_FLAGS, FILE_OPEN_FOR_BACKUP_INTENT);
|
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
{
|
|
|
|
debug_printf ("NtOpenFile (%S) failed, %08x", &recycler, status);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* Then check if recycler exists by opening and potentially creating it.
|
|
|
|
Yes, we can really do that. Typically the recycle bin is created
|
|
|
|
by the first user actually using the bin. The permissions are the
|
|
|
|
default permissions propagated from the root directory. */
|
|
|
|
InitializeObjectAttributes (&attr, &recycler, OBJ_CASE_INSENSITIVE,
|
|
|
|
rootdir, NULL);
|
|
|
|
recycler.Length = recycler_base_len;
|
|
|
|
status = NtCreateFile (&recyclerdir,
|
|
|
|
READ_CONTROL
|
2009-01-12 16:51:23 +01:00
|
|
|
| (pc.fs_is_ntfs () ? 0 : FILE_ADD_FILE),
|
2007-08-12 14:48:02 +02:00
|
|
|
&attr, &io, NULL,
|
|
|
|
FILE_ATTRIBUTE_DIRECTORY
|
|
|
|
| FILE_ATTRIBUTE_SYSTEM
|
|
|
|
| FILE_ATTRIBUTE_HIDDEN,
|
|
|
|
FILE_SHARE_VALID_FLAGS, FILE_OPEN_IF,
|
|
|
|
FILE_DIRECTORY_FILE, NULL, 0);
|
|
|
|
if (!NT_SUCCESS (status))
|
2006-12-12 16:58:08 +01:00
|
|
|
{
|
2007-08-12 14:48:02 +02:00
|
|
|
debug_printf ("NtCreateFile (%S) failed, %08x", &recycler, status);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* Next, if necessary, check if the recycler/SID dir exists and
|
2008-02-15 18:53:11 +01:00
|
|
|
create it if not. */
|
2009-01-12 16:51:23 +01:00
|
|
|
if (pc.fs_is_ntfs ())
|
2008-02-15 18:53:11 +01:00
|
|
|
{
|
2007-08-12 14:48:02 +02:00
|
|
|
NtClose (recyclerdir);
|
|
|
|
recycler.Length = recycler_user_len;
|
|
|
|
status = NtCreateFile (&recyclerdir, READ_CONTROL | FILE_ADD_FILE,
|
|
|
|
&attr, &io, NULL, FILE_ATTRIBUTE_DIRECTORY
|
|
|
|
| FILE_ATTRIBUTE_SYSTEM
|
|
|
|
| FILE_ATTRIBUTE_HIDDEN,
|
|
|
|
FILE_SHARE_VALID_FLAGS, FILE_OPEN_IF,
|
|
|
|
FILE_DIRECTORY_FILE, NULL, 0);
|
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
{
|
|
|
|
debug_printf ("NtCreateFile (%S) failed, %08x",
|
|
|
|
&recycler, status);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* The desktop.ini and INFO2 (pre-Vista) files are expected by
|
2008-02-15 18:53:11 +01:00
|
|
|
Windows Explorer. Otherwise, the created bin is treated as
|
2007-08-12 14:48:02 +02:00
|
|
|
corrupted */
|
|
|
|
if (io.Information == FILE_CREATED)
|
2008-02-15 18:53:11 +01:00
|
|
|
{
|
2007-08-12 14:48:02 +02:00
|
|
|
RtlInitUnicodeString (&fname, L"desktop.ini");
|
|
|
|
InitializeObjectAttributes (&attr, &fname, OBJ_CASE_INSENSITIVE,
|
|
|
|
recyclerdir, NULL);
|
2009-01-12 16:51:23 +01:00
|
|
|
status = NtCreateFile (&tmp_fh, FILE_GENERIC_WRITE, &attr, &io, NULL,
|
2007-08-12 14:48:02 +02:00
|
|
|
FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN,
|
|
|
|
FILE_SHARE_VALID_FLAGS, FILE_CREATE,
|
|
|
|
FILE_SYNCHRONOUS_IO_NONALERT
|
|
|
|
| FILE_NON_DIRECTORY_FILE, NULL, 0);
|
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
debug_printf ("NtCreateFile (%S) failed, %08x", &recycler, status);
|
|
|
|
else
|
|
|
|
{
|
2009-01-12 16:51:23 +01:00
|
|
|
status = NtWriteFile (tmp_fh, NULL, NULL, NULL, &io, desktop_ini,
|
2007-08-12 14:48:02 +02:00
|
|
|
sizeof desktop_ini - 1, NULL, NULL);
|
|
|
|
if (!NT_SUCCESS (status))
|
2008-02-15 18:53:11 +01:00
|
|
|
debug_printf ("NtWriteFile (%S) failed, %08x", &fname, status);
|
2009-01-12 16:51:23 +01:00
|
|
|
NtClose (tmp_fh);
|
2007-08-12 14:48:02 +02:00
|
|
|
}
|
|
|
|
if (!wincap.has_recycle_dot_bin ()) /* No INFO2 file since Vista */
|
2006-12-10 17:43:30 +01:00
|
|
|
{
|
2007-08-12 14:48:02 +02:00
|
|
|
RtlInitUnicodeString (&fname, L"INFO2");
|
2009-01-12 16:51:23 +01:00
|
|
|
status = NtCreateFile (&tmp_fh, FILE_GENERIC_WRITE, &attr, &io,
|
|
|
|
NULL, FILE_ATTRIBUTE_ARCHIVE
|
|
|
|
| FILE_ATTRIBUTE_HIDDEN,
|
2007-08-12 14:48:02 +02:00
|
|
|
FILE_SHARE_VALID_FLAGS, FILE_CREATE,
|
|
|
|
FILE_SYNCHRONOUS_IO_NONALERT
|
|
|
|
| FILE_NON_DIRECTORY_FILE, NULL, 0);
|
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
debug_printf ("NtCreateFile (%S) failed, %08x",
|
|
|
|
&recycler, status);
|
|
|
|
else
|
|
|
|
{
|
2009-01-12 16:51:23 +01:00
|
|
|
status = NtWriteFile (tmp_fh, NULL, NULL, NULL, &io, info2,
|
2007-08-12 14:48:02 +02:00
|
|
|
sizeof info2, NULL, NULL);
|
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
debug_printf ("NtWriteFile (%S) failed, %08x",
|
|
|
|
&fname, status);
|
2009-01-12 16:51:23 +01:00
|
|
|
NtClose (tmp_fh);
|
2007-08-12 14:48:02 +02:00
|
|
|
}
|
2006-12-10 17:43:30 +01:00
|
|
|
}
|
|
|
|
}
|
2007-08-12 14:48:02 +02:00
|
|
|
NtClose (recyclerdir);
|
|
|
|
/* Shoot again. */
|
2009-04-09 19:55:01 +02:00
|
|
|
status = NtSetInformationFile (fh, &io, pfri, 65536,
|
2007-08-12 14:48:02 +02:00
|
|
|
FileRenameInformation);
|
2006-12-10 17:43:30 +01:00
|
|
|
}
|
|
|
|
if (!NT_SUCCESS (status))
|
2009-01-12 16:51:23 +01:00
|
|
|
{
|
|
|
|
debug_printf ("Move %S to %S failed, status = %p",
|
|
|
|
pc.get_nt_native_path (), &recycler, status);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* Moving to the bin worked. */
|
|
|
|
bin_stat = has_been_moved;
|
|
|
|
/* Now we try to set the delete disposition. If that worked, we're done.
|
|
|
|
We try this here first, as long as we still have the open handle.
|
|
|
|
Otherwise the below code closes the handle to allow replacing the file. */
|
|
|
|
status = NtSetInformationFile (fh, &io, &disp, sizeof disp,
|
|
|
|
FileDispositionInformation);
|
|
|
|
/* In case of success, restore R/O attribute to accommodate hardlinks.
|
|
|
|
That leaves potentially hardlinks around with the R/O bit suddenly
|
|
|
|
off if setting the delete disposition failed, but please, keep in
|
|
|
|
mind this is really a border case only. */
|
|
|
|
if ((access & FILE_WRITE_ATTRIBUTES) && NT_SUCCESS (status) && !pc.isdir ())
|
|
|
|
NtSetAttributesFile (fh, pc.file_attributes ());
|
|
|
|
NtClose (fh);
|
|
|
|
fh = NULL; /* So unlink_nt doesn't close the handle twice. */
|
|
|
|
/* On success or when trying to unlink a directory we just return here.
|
|
|
|
The below code only works for files. */
|
|
|
|
if (NT_SUCCESS (status) || pc.isdir ())
|
|
|
|
goto out;
|
|
|
|
/* The final trick. We create a temporary file with delete-on-close
|
|
|
|
semantic and rename that file to the file just moved to the bin.
|
|
|
|
This typically overwrites the original file and we get rid of it,
|
|
|
|
even if neither setting the delete dispostion, nor setting
|
|
|
|
delete-on-close on the original file succeeds. There are still
|
|
|
|
cases in which this fails, for instance, when trying to delete a
|
|
|
|
hardlink to a DLL used by the unlinking application itself. */
|
|
|
|
RtlAppendUnicodeToString (&recycler, L"X");
|
|
|
|
InitializeObjectAttributes (&attr, &recycler, 0, rootdir, NULL);
|
|
|
|
status = NtCreateFile (&tmp_fh, DELETE, &attr, &io, NULL,
|
|
|
|
FILE_ATTRIBUTE_NORMAL, 0, FILE_SUPERSEDE,
|
|
|
|
FILE_NON_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE,
|
|
|
|
NULL, 0);
|
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
{
|
|
|
|
debug_printf ("Creating file for overwriting failed, status = %p",
|
|
|
|
status);
|
|
|
|
goto out;
|
|
|
|
}
|
2009-04-09 19:55:01 +02:00
|
|
|
status = NtSetInformationFile (tmp_fh, &io, pfri, 65536,
|
2009-01-12 16:51:23 +01:00
|
|
|
FileRenameInformation);
|
|
|
|
NtClose (tmp_fh);
|
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
debug_printf ("Overwriting with another file failed, status = %p",
|
|
|
|
status);
|
|
|
|
|
2007-08-12 14:48:02 +02:00
|
|
|
out:
|
|
|
|
if (rootdir)
|
|
|
|
NtClose (rootdir);
|
2009-01-12 16:51:23 +01:00
|
|
|
return bin_stat;
|
2006-12-07 12:53:46 +01:00
|
|
|
}
|
|
|
|
|
2007-08-01 16:46:09 +02:00
|
|
|
static NTSTATUS
|
|
|
|
check_dir_not_empty (HANDLE dir)
|
|
|
|
{
|
|
|
|
IO_STATUS_BLOCK io;
|
|
|
|
const ULONG bufsiz = 3 * sizeof (FILE_NAMES_INFORMATION)
|
|
|
|
+ 3 * NAME_MAX * sizeof (WCHAR);
|
|
|
|
PFILE_NAMES_INFORMATION pfni = (PFILE_NAMES_INFORMATION)
|
|
|
|
alloca (bufsiz);
|
|
|
|
NTSTATUS status = NtQueryDirectoryFile (dir, NULL, NULL, 0, &io, pfni,
|
|
|
|
bufsiz, FileNamesInformation,
|
|
|
|
FALSE, NULL, TRUE);
|
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
{
|
|
|
|
syscall_printf ("Checking if directory is empty failed, "
|
|
|
|
"status = %p", status);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
int cnt = 1;
|
|
|
|
while (pfni->NextEntryOffset)
|
|
|
|
{
|
|
|
|
pfni = (PFILE_NAMES_INFORMATION)
|
|
|
|
((caddr_t) pfni + pfni->NextEntryOffset);
|
|
|
|
++cnt;
|
|
|
|
}
|
|
|
|
if (cnt > 2)
|
|
|
|
{
|
|
|
|
syscall_printf ("Directory not empty");
|
|
|
|
return STATUS_DIRECTORY_NOT_EMPTY;
|
|
|
|
}
|
|
|
|
return STATUS_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2007-07-29 14:27:22 +02:00
|
|
|
NTSTATUS
|
|
|
|
unlink_nt (path_conv &pc)
|
2006-12-07 18:40:24 +01:00
|
|
|
{
|
2007-07-29 14:27:22 +02:00
|
|
|
NTSTATUS status;
|
|
|
|
HANDLE fh;
|
2006-12-07 18:40:24 +01:00
|
|
|
OBJECT_ATTRIBUTES attr;
|
|
|
|
IO_STATUS_BLOCK io;
|
2007-07-29 14:27:22 +02:00
|
|
|
|
|
|
|
ACCESS_MASK access = DELETE;
|
2007-07-29 17:57:41 +02:00
|
|
|
/* If the R/O attribute is set, we have to open the file with
|
|
|
|
FILE_WRITE_ATTRIBUTES to be able to remove this flags before trying
|
2007-07-29 14:27:22 +02:00
|
|
|
to delete it. */
|
2007-07-29 17:57:41 +02:00
|
|
|
if (pc.file_attributes () & FILE_ATTRIBUTE_READONLY)
|
2007-07-29 14:27:22 +02:00
|
|
|
access |= FILE_WRITE_ATTRIBUTES;
|
2006-12-07 18:40:24 +01:00
|
|
|
|
|
|
|
ULONG flags = FILE_OPEN_FOR_BACKUP_INTENT;
|
2006-12-07 18:53:05 +01:00
|
|
|
/* Add the reparse point flag to native symlinks, otherwise we remove the
|
|
|
|
target, not the symlink. */
|
2007-07-29 14:27:22 +02:00
|
|
|
if (pc.is_rep_symlink ())
|
2006-12-07 18:53:05 +01:00
|
|
|
flags |= FILE_OPEN_REPARSE_POINT;
|
2006-12-07 18:40:24 +01:00
|
|
|
|
2007-07-29 14:27:22 +02:00
|
|
|
pc.get_object_attr (attr, sec_none_nih);
|
2009-01-07 19:18:23 +01:00
|
|
|
/* First try to open the file with only allowing sharing for delete. If
|
|
|
|
the file has an open handle on it, other than just for deletion, this
|
|
|
|
will fail. That indicates that the file has to be moved to the recycle
|
|
|
|
bin so that it actually disappears from its directory even though its
|
|
|
|
in use. Otherwise, if opening doesn't fail, the file is not in use and
|
|
|
|
we can go straight to setting the delete disposition flag. */
|
2009-01-12 16:51:23 +01:00
|
|
|
bin_status bin_stat = dont_move;
|
2009-01-07 19:18:23 +01:00
|
|
|
status = NtOpenFile (&fh, access, &attr, &io, FILE_SHARE_DELETE, flags);
|
2009-04-16 14:16:35 +02:00
|
|
|
if (status == STATUS_SHARING_VIOLATION || status == STATUS_LOCK_NOT_GRANTED)
|
2007-01-13 21:56:01 +01:00
|
|
|
{
|
2009-04-16 14:16:35 +02:00
|
|
|
/* STATUS_LOCK_NOT_GRANTED can be generated under not quite clear
|
|
|
|
circumstances when trying to open a file on NFS with FILE_SHARE_DELETE
|
|
|
|
only. This has been observed with SFU 3.5 if the NFS share has been
|
|
|
|
mounted under a drive letter. It's not generated for all files, but
|
|
|
|
only for some. If it's generated once for a file, it will be
|
|
|
|
generated all the time. It looks like wrong file state information
|
|
|
|
is stored within the NFS client, for no apparent reason, which never
|
|
|
|
times out. Opening the file with FILE_SHARE_VALID_FLAGS will work,
|
|
|
|
though, and it is then possible to delete the file quite normally. */
|
|
|
|
|
2009-01-12 16:51:23 +01:00
|
|
|
/* Bin is only accessible locally. */
|
|
|
|
if (!pc.isremote ())
|
|
|
|
bin_stat = move_to_bin;
|
2007-07-29 14:27:22 +02:00
|
|
|
if (!pc.isdir () || pc.isremote ())
|
|
|
|
status = NtOpenFile (&fh, access, &attr, &io,
|
|
|
|
FILE_SHARE_VALID_FLAGS, flags);
|
2007-03-02 21:04:26 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* It's getting tricky. The directory is opened in some process,
|
|
|
|
so we're supposed to move it to the recycler and mark it for
|
|
|
|
deletion. But what if the directory is not empty? The move
|
|
|
|
will work, but the subsequent delete will fail. So we would
|
|
|
|
have to move it back. That's bad, because the directory would
|
|
|
|
be moved around which results in a temporary inconsistent state.
|
|
|
|
So, what we do here is to test if the directory is empty. If
|
|
|
|
not, we bail out with ERROR_DIR_NOT_EMTPY. The below code
|
|
|
|
tests for at least three entries in the directory, ".", "..",
|
|
|
|
and another one. Three entries means, not empty. This doesn't
|
|
|
|
work for the root directory of a drive, but the root dir can
|
|
|
|
neither be deleted, nor moved anyway. */
|
2007-07-29 14:27:22 +02:00
|
|
|
status = NtOpenFile (&fh, access | FILE_LIST_DIRECTORY | SYNCHRONIZE,
|
2007-03-02 21:04:26 +01:00
|
|
|
&attr, &io, FILE_SHARE_VALID_FLAGS,
|
|
|
|
flags | FILE_SYNCHRONOUS_IO_NONALERT);
|
|
|
|
if (NT_SUCCESS (status))
|
|
|
|
{
|
2007-08-01 16:46:09 +02:00
|
|
|
status = check_dir_not_empty (fh);
|
2007-03-02 21:04:26 +01:00
|
|
|
if (!NT_SUCCESS (status))
|
2008-02-15 18:53:11 +01:00
|
|
|
{
|
2007-07-29 14:27:22 +02:00
|
|
|
NtClose (fh);
|
|
|
|
return status;
|
2007-03-02 21:04:26 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-01-13 21:56:01 +01:00
|
|
|
}
|
2006-12-07 18:40:24 +01:00
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
{
|
|
|
|
if (status == STATUS_DELETE_PENDING)
|
|
|
|
{
|
2007-07-29 14:27:22 +02:00
|
|
|
syscall_printf ("Delete already pending");
|
2006-12-07 18:40:24 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
syscall_printf ("Opening file for delete failed, status = %p", status);
|
2007-07-29 14:27:22 +02:00
|
|
|
return status;
|
2006-12-07 18:40:24 +01:00
|
|
|
}
|
2007-07-29 17:57:41 +02:00
|
|
|
/* Get rid of read-only attribute. */
|
2007-07-29 14:27:22 +02:00
|
|
|
if (access & FILE_WRITE_ATTRIBUTES)
|
2008-10-20 21:30:06 +02:00
|
|
|
NtSetAttributesFile (fh, pc.file_attributes () & ~FILE_ATTRIBUTE_READONLY);
|
2009-01-12 16:51:23 +01:00
|
|
|
/* Try to move to bin if a sharing violation occured. If that worked,
|
|
|
|
we're done. */
|
|
|
|
if (bin_stat == move_to_bin
|
|
|
|
&& (bin_stat = try_to_bin (pc, fh, access)) == has_been_moved)
|
|
|
|
return 0;
|
|
|
|
/* Try to set delete disposition. */
|
2007-07-29 14:27:22 +02:00
|
|
|
FILE_DISPOSITION_INFORMATION disp = { TRUE };
|
|
|
|
status = NtSetInformationFile (fh, &io, &disp, sizeof disp,
|
|
|
|
FileDispositionInformation);
|
2006-12-07 18:40:24 +01:00
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
{
|
2009-01-07 19:18:23 +01:00
|
|
|
syscall_printf ("Setting delete disposition failed, status = %p",
|
|
|
|
status);
|
|
|
|
/* Trying to delete a hardlink to a file in use by the system in some
|
|
|
|
way (for instance, font files) by setting the delete disposition fails
|
|
|
|
with STATUS_CANNOT_DELETE. Strange enough, deleting these hardlinks
|
2009-01-12 16:51:23 +01:00
|
|
|
using delete-on-close semantic works... most of the time.
|
2009-01-07 19:18:23 +01:00
|
|
|
|
|
|
|
Don't use delete-on-close on remote shares. If two processes
|
|
|
|
have open handles on a file and one of them calls unlink, the
|
|
|
|
file is removed from the remote share even though the other
|
|
|
|
process still has an open handle. That process than gets Win32
|
|
|
|
error 59, ERROR_UNEXP_NET_ERR when trying to access the file.
|
|
|
|
Microsoft KB 837665 describes this problem as a bug in 2K3, but
|
|
|
|
I have reproduced it on other systems. */
|
|
|
|
if (status == STATUS_CANNOT_DELETE && !pc.isremote ())
|
|
|
|
{
|
|
|
|
HANDLE fh2;
|
|
|
|
UNICODE_STRING fname;
|
|
|
|
|
|
|
|
/* Re-open from handle so we open the correct file no matter if it
|
|
|
|
has been moved to the bin or not. */
|
|
|
|
RtlInitUnicodeString (&fname, L"");
|
|
|
|
InitializeObjectAttributes (&attr, &fname, 0, fh, NULL);
|
|
|
|
status = NtOpenFile (&fh2, DELETE, &attr, &io,
|
2009-01-12 16:51:23 +01:00
|
|
|
bin_stat == move_to_bin ? FILE_SHARE_VALID_FLAGS
|
|
|
|
: FILE_SHARE_DELETE,
|
2009-01-07 19:18:23 +01:00
|
|
|
flags | FILE_DELETE_ON_CLOSE);
|
|
|
|
if (!NT_SUCCESS (status))
|
2009-01-12 16:51:23 +01:00
|
|
|
{
|
|
|
|
syscall_printf ("Setting delete-on-close failed, status = %p",
|
|
|
|
status);
|
|
|
|
/* This is really the last chance. If it hasn't been moved
|
|
|
|
to the bin already, try it now. If moving to the bin
|
|
|
|
succeeds, we got rid of the file in some way, even if
|
|
|
|
unlinking didn't work. */
|
|
|
|
if (bin_stat == dont_move)
|
|
|
|
bin_stat = try_to_bin (pc, fh, access);
|
|
|
|
if (bin_stat == has_been_moved)
|
|
|
|
status = STATUS_SUCCESS;
|
|
|
|
}
|
2009-01-07 19:18:23 +01:00
|
|
|
else
|
|
|
|
NtClose (fh2);
|
|
|
|
}
|
2006-12-07 18:40:24 +01:00
|
|
|
}
|
2009-01-12 16:51:23 +01:00
|
|
|
if (fh)
|
2007-07-29 17:57:41 +02:00
|
|
|
{
|
|
|
|
/* Restore R/O attribute to accommodate hardlinks. Don't try this
|
|
|
|
with directories! For some reason the below NtSetInformationFile
|
2009-01-07 19:18:23 +01:00
|
|
|
changes the delete disposition back to FALSE, at least on XP. */
|
2009-01-12 16:51:23 +01:00
|
|
|
if ((access & FILE_WRITE_ATTRIBUTES)
|
|
|
|
&& (!NT_SUCCESS (status) || !pc.isdir ()))
|
|
|
|
NtSetAttributesFile (fh, pc.file_attributes ());
|
|
|
|
NtClose (fh);
|
2007-07-29 17:57:41 +02:00
|
|
|
}
|
2007-07-29 14:27:22 +02:00
|
|
|
return status;
|
2006-12-07 18:40:24 +01:00
|
|
|
}
|
|
|
|
|
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;
|
2007-07-29 14:27:22 +02:00
|
|
|
NTSTATUS status;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2008-04-13 18:47:21 +02:00
|
|
|
path_conv win32_name (ourname, PC_SYM_NOFOLLOW, stat_suffixes);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
if (win32_name.error)
|
|
|
|
{
|
|
|
|
set_errno (win32_name.error);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2007-01-17 20:26:58 +01:00
|
|
|
devn = win32_name.get_devn ();
|
|
|
|
if (isproc_dev (devn))
|
2002-06-05 18:01:55 +02:00
|
|
|
{
|
|
|
|
set_errno (EROFS);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2007-07-29 14:27:22 +02:00
|
|
|
status = unlink_nt (win32_name);
|
|
|
|
if (NT_SUCCESS (status))
|
2006-12-07 18:40:24 +01:00
|
|
|
res = 0;
|
|
|
|
else
|
2007-08-13 19:16:05 +02:00
|
|
|
__seterrno_from_nt_status (status);
|
2000-05-04 21:46:32 +02:00
|
|
|
|
2001-06-18 23:18:59 +02:00
|
|
|
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-04-18 02:25:41 +02:00
|
|
|
myself->ctty = -1;
|
2005-11-14 05:28:45 +01:00
|
|
|
cygheap->manage_console_count ("setsid", 0);
|
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 ();
|
2005-11-14 06:36:16 +01:00
|
|
|
syscall_printf ("sid %d, pgid %d, %s", myself->sid, myself->pgid, myctty ());
|
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
|
|
|
{
|
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;
|
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
|
|
|
{
|
2007-08-24 16:55:56 +02:00
|
|
|
if (!(fh = build_fh_name (unix_path, NULL,
|
|
|
|
(flags & (O_NOFOLLOW | O_EXCL))
|
|
|
|
? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW,
|
2008-04-13 18:47:21 +02:00
|
|
|
stat_suffixes)))
|
2001-09-22 23:44:07 +02:00
|
|
|
res = -1; // errno already set
|
2005-12-22 17:45:15 +01:00
|
|
|
else if ((flags & O_NOFOLLOW) && fh->issymlink ())
|
|
|
|
{
|
|
|
|
delete fh;
|
|
|
|
res = -1;
|
|
|
|
set_errno (ELOOP);
|
|
|
|
}
|
2009-02-11 17:06:39 +01:00
|
|
|
else if ((flags & O_DIRECTORY) && !fh->pc.isdir ())
|
|
|
|
{
|
|
|
|
delete fh;
|
|
|
|
res = -1;
|
|
|
|
set_errno (ENOTDIR);
|
|
|
|
}
|
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;
|
|
|
|
}
|
2008-02-13 18:21:05 +01:00
|
|
|
EXPORT_ALIAS (isatty, _isatty)
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* 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
|
|
|
|
2008-04-13 18:47:21 +02:00
|
|
|
if (!(fh = build_fh_name (oldpath, NULL, PC_SYM_NOFOLLOW, stat_suffixes)))
|
2005-02-19 22:53:36 +01:00
|
|
|
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
|
|
|
{
|
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
|
|
|
{
|
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)
|
|
|
|
{
|
2007-08-16 17:07:42 +02:00
|
|
|
return mknod_worker (pc.get_win32 (), pc.dev.mode & S_IFMT, mode, pc.dev.major, pc.dev.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
|
|
|
}
|
|
|
|
|
2008-05-21 10:05:53 +02:00
|
|
|
#define FILTERED_MODE(m) ((m) & (S_ISUID | S_ISGID | S_ISVTX \
|
|
|
|
| S_IRWXU | S_IRWXG | S_IRWXO))
|
|
|
|
|
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
|
2008-05-21 10:05:53 +02:00
|
|
|
res = fh->fchmod (FILTERED_MODE (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;
|
|
|
|
}
|
|
|
|
|
2008-05-21 10:05:53 +02:00
|
|
|
return cfd->fchmod (FILTERED_MODE (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)
|
2008-03-31 20:03:25 +02:00
|
|
|
buf->st_ino = cfd->get_ino ();
|
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)
|
|
|
|
{
|
2007-02-22 12:17:01 +01:00
|
|
|
HANDLE fh = CreateFileA (vol, GENERIC_WRITE, FILE_SHARE_VALID_FLAGS,
|
2005-02-20 14:28:23 +01:00
|
|
|
&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 ()
|
|
|
|
{
|
2008-03-11 12:12:09 +01:00
|
|
|
/* Per MSDN, 50 bytes should be enough here. */
|
|
|
|
char vol[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
|
|
|
{
|
2008-03-11 12:12:09 +01:00
|
|
|
char a_drive[MAX_PATH] = {0};
|
|
|
|
char b_drive[MAX_PATH] = {0};
|
2005-04-11 23:54:54 +02:00
|
|
|
|
|
|
|
if (is_floppy ("A:"))
|
2008-03-11 12:12:09 +01:00
|
|
|
GetVolumeNameForVolumeMountPointA ("A:\\", a_drive, MAX_PATH);
|
2005-04-11 23:54:54 +02:00
|
|
|
if (is_floppy ("B:"))
|
2008-03-11 12:12:09 +01:00
|
|
|
GetVolumeNameForVolumeMountPointA ("B:\\", b_drive, MAX_PATH);
|
2005-04-11 23:54:54 +02:00
|
|
|
|
2008-03-11 12:12:09 +01:00
|
|
|
HANDLE sh = FindFirstVolumeA (vol, MAX_PATH);
|
2005-02-20 14:28:23 +01:00
|
|
|
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);
|
|
|
|
}
|
2008-03-11 12:12:09 +01:00
|
|
|
while (FindNextVolumeA (sh, vol, MAX_PATH));
|
2005-02-20 14:28:23 +01:00
|
|
|
FindVolumeClose (sh);
|
|
|
|
}
|
|
|
|
}
|
2007-02-22 11:54:47 +01:00
|
|
|
else
|
2005-02-20 14:28:23 +01:00
|
|
|
{
|
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 */
|
2007-07-26 19:30:54 +02:00
|
|
|
int __stdcall
|
|
|
|
stat_worker (path_conv &pc, struct __stat64 *buf)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int res = -1;
|
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
|
|
|
|
2007-07-30 12:05:27 +02:00
|
|
|
if (pc.error)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2007-07-30 12:05:27 +02:00
|
|
|
debug_printf ("got %d error from build_fh_name", pc.error);
|
|
|
|
set_errno (pc.error);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2007-07-30 12:05:27 +02:00
|
|
|
else if (pc.exists ())
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2007-07-30 12:05:27 +02:00
|
|
|
fhandler_base *fh;
|
|
|
|
|
|
|
|
if (!(fh = build_fh_pc (pc)))
|
|
|
|
goto error;
|
|
|
|
|
2007-08-15 18:27:09 +02:00
|
|
|
debug_printf ("(%S, %p, %p), file_attributes %d",
|
|
|
|
pc.get_nt_native_path (), buf, 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)
|
2008-03-31 20:03:25 +02:00
|
|
|
buf->st_ino = fh->get_ino ();
|
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
|
|
|
}
|
2007-07-30 12:05:27 +02:00
|
|
|
delete fh;
|
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
|
|
|
error:
|
2000-02-17 20:38:33 +01:00
|
|
|
MALLOC_CHECK;
|
2007-08-15 18:27:09 +02:00
|
|
|
syscall_printf ("%d = (%S, %p)", res, pc.get_nt_native_path (), 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");
|
2007-07-26 19:30:54 +02:00
|
|
|
path_conv pc (name, PC_SYM_FOLLOW | PC_POSIX, stat_suffixes);
|
|
|
|
return stat_worker (pc, buf);
|
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");
|
2007-07-26 19:30:54 +02:00
|
|
|
path_conv pc (name, PC_SYM_NOFOLLOW | PC_POSIX, stat_suffixes);
|
|
|
|
return stat_worker (pc, buf);
|
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
|
|
|
}
|
|
|
|
|
2007-07-31 17:20:00 +02:00
|
|
|
static void
|
|
|
|
rename_append_suffix (path_conv &pc, const char *path, size_t len,
|
|
|
|
const char *suffix)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2007-07-31 17:20:00 +02:00
|
|
|
char buf[len + 5];
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2008-02-01 13:37:51 +01:00
|
|
|
if (ascii_strcasematch (path + len - 4, ".lnk")
|
|
|
|
|| ascii_strcasematch (path + len - 4, ".exe"))
|
2007-07-31 17:20:00 +02:00
|
|
|
len -= 4;
|
|
|
|
stpcpy (stpncpy (buf, path, len), suffix);
|
|
|
|
pc.check (buf, PC_SYM_NOFOLLOW);
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2008-05-15 18:34:01 +02:00
|
|
|
static void
|
|
|
|
start_transaction (HANDLE &old_trans, HANDLE &trans)
|
|
|
|
{
|
|
|
|
NTSTATUS status = NtCreateTransaction (&trans,
|
|
|
|
SYNCHRONIZE | TRANSACTION_ALL_ACCESS,
|
|
|
|
NULL, NULL, NULL, 0, 0, 0, NULL, NULL);
|
|
|
|
if (NT_SUCCESS (status))
|
|
|
|
{
|
|
|
|
old_trans = RtlGetCurrentTransaction ();
|
|
|
|
RtlSetCurrentTransaction (trans);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
debug_printf ("NtCreateTransaction failed, %p", status);
|
|
|
|
old_trans = trans = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static NTSTATUS
|
|
|
|
stop_transaction (NTSTATUS status, HANDLE old_trans, HANDLE trans)
|
|
|
|
{
|
|
|
|
RtlSetCurrentTransaction (old_trans);
|
|
|
|
if (NT_SUCCESS (status))
|
|
|
|
status = NtCommitTransaction (trans, TRUE);
|
|
|
|
else
|
|
|
|
status = NtRollbackTransaction (trans, TRUE);
|
|
|
|
NtClose (trans);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
2007-07-31 17:20:00 +02:00
|
|
|
extern "C" int
|
|
|
|
rename (const char *oldpath, const char *newpath)
|
|
|
|
{
|
2008-05-19 22:22:29 +02:00
|
|
|
tmp_pathbuf tp;
|
2007-07-31 17:20:00 +02:00
|
|
|
int res = -1;
|
2007-08-10 13:16:27 +02:00
|
|
|
char *oldbuf, *newbuf;
|
2007-07-31 17:20:00 +02:00
|
|
|
path_conv oldpc, newpc, new2pc, *dstpc, *removepc = NULL;
|
2007-08-10 13:16:27 +02:00
|
|
|
bool old_dir_requested = false, new_dir_requested = false;
|
2007-07-31 17:20:00 +02:00
|
|
|
bool old_explicit_suffix = false, new_explicit_suffix = false;
|
|
|
|
size_t olen, nlen;
|
2007-08-10 13:16:27 +02:00
|
|
|
bool equal_path;
|
2008-05-22 03:25:37 +02:00
|
|
|
NTSTATUS status = 0;
|
2007-08-10 13:16:27 +02:00
|
|
|
HANDLE fh = NULL, nfh;
|
2008-05-15 18:34:01 +02:00
|
|
|
HANDLE old_trans = NULL, trans = NULL;
|
2007-07-31 17:20:00 +02:00
|
|
|
OBJECT_ATTRIBUTES attr;
|
|
|
|
IO_STATUS_BLOCK io;
|
|
|
|
ULONG size;
|
2007-08-02 13:11:34 +02:00
|
|
|
FILE_STANDARD_INFORMATION ofsi;
|
2007-07-31 17:20:00 +02:00
|
|
|
PFILE_RENAME_INFORMATION pfri;
|
2007-08-01 16:46:09 +02:00
|
|
|
|
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
|
2008-03-27 14:02:07 +01:00
|
|
|
if (has_dot_last_component (oldpath, true))
|
2007-08-01 16:46:09 +02:00
|
|
|
{
|
2008-03-27 14:02:07 +01:00
|
|
|
oldpc.check (oldpath, PC_SYM_NOFOLLOW, stat_suffixes);
|
|
|
|
set_errno (oldpc.isdir () ? EBUSY : ENOTDIR);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (has_dot_last_component (newpath, true))
|
|
|
|
{
|
|
|
|
newpc.check (newpath, PC_SYM_NOFOLLOW, stat_suffixes);
|
|
|
|
set_errno (!newpc.exists () ? ENOENT : newpc.isdir () ? EBUSY : ENOTDIR);
|
2007-08-01 16:46:09 +02:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2007-08-10 13:16:27 +02:00
|
|
|
/* A trailing slash requires that the pathname points to an existing
|
|
|
|
directory. If it's not, it's a ENOTDIR condition. The same goes
|
|
|
|
for newpath a bit further down this function. */
|
|
|
|
olen = strlen (oldpath);
|
|
|
|
if (isdirsep (oldpath[olen - 1]))
|
|
|
|
{
|
2008-05-19 22:22:29 +02:00
|
|
|
stpcpy (oldbuf = tp.c_get (), oldpath);
|
2007-08-10 13:16:27 +02:00
|
|
|
while (olen > 0 && isdirsep (oldbuf[olen - 1]))
|
2008-02-15 18:53:11 +01:00
|
|
|
oldbuf[--olen] = '\0';
|
2007-08-10 13:16:27 +02:00
|
|
|
oldpath = oldbuf;
|
|
|
|
old_dir_requested = true;
|
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
oldpc.check (oldpath, PC_SYM_NOFOLLOW, stat_suffixes);
|
|
|
|
if (oldpc.error)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2007-07-31 17:20:00 +02:00
|
|
|
set_errno (oldpc.error);
|
|
|
|
goto out;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
if (!oldpc.exists ())
|
2006-03-09 16:31:08 +01:00
|
|
|
{
|
|
|
|
set_errno (ENOENT);
|
2007-07-31 17:20:00 +02:00
|
|
|
goto out;
|
2006-03-09 16:31:08 +01:00
|
|
|
}
|
2007-08-01 16:46:09 +02:00
|
|
|
if (oldpc.isspecial ()) /* No renames from virtual FS */
|
|
|
|
{
|
|
|
|
set_errno (EROFS);
|
|
|
|
goto out;
|
|
|
|
}
|
2007-08-10 13:16:27 +02:00
|
|
|
if (old_dir_requested && !oldpc.isdir ())
|
|
|
|
{
|
|
|
|
set_errno (ENOTDIR);
|
|
|
|
goto out;
|
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
if (oldpc.known_suffix
|
2008-02-01 13:37:51 +01:00
|
|
|
&& (ascii_strcasematch (oldpath + olen - 4, ".lnk")
|
|
|
|
|| ascii_strcasematch (oldpath + olen - 4, ".exe")))
|
2007-07-31 17:20:00 +02:00
|
|
|
old_explicit_suffix = true;
|
|
|
|
|
2007-08-10 13:16:27 +02:00
|
|
|
nlen = strlen (newpath);
|
|
|
|
if (isdirsep (newpath[nlen - 1]))
|
|
|
|
{
|
2008-05-19 22:22:29 +02:00
|
|
|
stpcpy (newbuf = tp.c_get (), newpath);
|
2007-08-10 13:16:27 +02:00
|
|
|
while (nlen > 0 && isdirsep (newbuf[nlen - 1]))
|
2008-02-15 18:53:11 +01:00
|
|
|
newbuf[--nlen] = '\0';
|
2007-08-10 13:16:27 +02:00
|
|
|
newpath = newbuf;
|
|
|
|
new_dir_requested = true;
|
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
newpc.check (newpath, PC_SYM_NOFOLLOW, stat_suffixes);
|
|
|
|
if (newpc.error)
|
|
|
|
{
|
|
|
|
set_errno (newpc.error);
|
|
|
|
goto out;
|
|
|
|
}
|
2007-08-01 16:46:09 +02:00
|
|
|
if (newpc.isspecial ()) /* No renames to virtual FSes */
|
2001-02-22 15:51:16 +01:00
|
|
|
{
|
2007-07-31 17:20:00 +02:00
|
|
|
set_errno (EROFS);
|
|
|
|
goto out;
|
|
|
|
}
|
2007-08-10 13:16:27 +02:00
|
|
|
if (new_dir_requested && !newpc.isdir ())
|
|
|
|
{
|
|
|
|
set_errno (ENOTDIR);
|
|
|
|
goto out;
|
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
if (newpc.known_suffix
|
2008-02-01 13:37:51 +01:00
|
|
|
&& (ascii_strcasematch (newpath + nlen - 4, ".lnk")
|
|
|
|
|| ascii_strcasematch (newpath + nlen - 4, ".exe")))
|
2007-07-31 17:20:00 +02:00
|
|
|
new_explicit_suffix = true;
|
2006-02-05 19:18:02 +01:00
|
|
|
|
2007-08-10 13:16:27 +02:00
|
|
|
/* This test is necessary in almost every case, so just do it once here. */
|
|
|
|
equal_path = RtlEqualUnicodeString (oldpc.get_nt_native_path (),
|
|
|
|
newpc.get_nt_native_path (),
|
2008-07-16 22:20:45 +02:00
|
|
|
oldpc.objcaseinsensitive ());
|
2007-08-10 13:16:27 +02:00
|
|
|
|
|
|
|
/* First check if oldpath and newpath only differ by case. If so, it's
|
|
|
|
just a request to change the case of the filename. By simply setting
|
|
|
|
the file attributes to INVALID_FILE_ATTRIBUTES (which translates to
|
2008-03-12 19:54:24 +01:00
|
|
|
"file doesn't exist"), all later tests are skipped. */
|
2008-10-09 11:43:02 +02:00
|
|
|
if (oldpc.objcaseinsensitive () && newpc.exists () && equal_path
|
|
|
|
&& old_explicit_suffix == new_explicit_suffix)
|
2008-03-12 19:46:10 +01:00
|
|
|
{
|
|
|
|
if (RtlEqualUnicodeString (oldpc.get_nt_native_path (),
|
2007-08-10 13:16:27 +02:00
|
|
|
newpc.get_nt_native_path (),
|
|
|
|
FALSE))
|
2008-03-12 19:46:10 +01:00
|
|
|
{
|
2008-03-12 19:54:24 +01:00
|
|
|
res = 0;
|
2008-03-12 19:46:10 +01:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
newpc.file_attributes (INVALID_FILE_ATTRIBUTES);
|
|
|
|
}
|
2007-08-10 13:16:27 +02:00
|
|
|
else if (oldpc.isdir ())
|
2007-07-31 17:20:00 +02:00
|
|
|
{
|
|
|
|
if (newpc.exists () && !newpc.isdir ())
|
2006-02-05 19:18:02 +01:00
|
|
|
{
|
2007-07-31 17:20:00 +02:00
|
|
|
set_errno (ENOTDIR);
|
|
|
|
goto out;
|
2006-02-05 19:18:02 +01:00
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
/* Check for newpath being a subdir of oldpath. */
|
|
|
|
if (RtlPrefixUnicodeString (oldpc.get_nt_native_path (),
|
|
|
|
newpc.get_nt_native_path (),
|
|
|
|
TRUE)
|
|
|
|
&& newpc.get_nt_native_path ()->Length >
|
|
|
|
oldpc.get_nt_native_path ()->Length
|
|
|
|
&& *(PWCHAR) ((PBYTE) newpc.get_nt_native_path ()->Buffer
|
2008-02-15 18:53:11 +01:00
|
|
|
+ oldpc.get_nt_native_path ()->Length) == L'\\')
|
2006-05-28 17:50:14 +02:00
|
|
|
{
|
2007-07-31 17:20:00 +02:00
|
|
|
set_errno (EINVAL);
|
|
|
|
goto out;
|
2006-02-05 19:18:02 +01:00
|
|
|
}
|
2001-02-22 15:51:16 +01:00
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
else if (!newpc.exists ())
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2007-08-10 13:16:27 +02:00
|
|
|
if (equal_path && old_explicit_suffix != new_explicit_suffix)
|
2007-07-31 17:20:00 +02:00
|
|
|
{
|
|
|
|
newpc.check (newpath, PC_SYM_NOFOLLOW);
|
|
|
|
if (RtlEqualUnicodeString (oldpc.get_nt_native_path (),
|
|
|
|
newpc.get_nt_native_path (),
|
2008-07-16 22:20:45 +02:00
|
|
|
oldpc.objcaseinsensitive ()))
|
2007-07-31 17:20:00 +02:00
|
|
|
{
|
|
|
|
res = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (oldpc.is_lnk_symlink ()
|
|
|
|
&& !RtlEqualUnicodePathSuffix (newpc.get_nt_native_path (),
|
|
|
|
L".lnk", TRUE))
|
2008-02-15 18:53:11 +01:00
|
|
|
rename_append_suffix (newpc, newpath, nlen, ".lnk");
|
2008-08-11 17:05:25 +02:00
|
|
|
else if (oldpc.is_binary () && !old_explicit_suffix
|
2007-07-31 17:20:00 +02:00
|
|
|
&& !RtlEqualUnicodePathSuffix (newpc.get_nt_native_path (),
|
|
|
|
L".exe", TRUE))
|
2008-08-11 17:05:25 +02:00
|
|
|
/* To rename an executable foo.exe to bar-without-exe-suffix, the
|
|
|
|
.exe suffix must be given explicitly in oldpath. */
|
2008-02-15 18:53:11 +01:00
|
|
|
rename_append_suffix (newpc, newpath, nlen, ".exe");
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
else if (newpc.isdir ())
|
2005-01-06 23:10:08 +01:00
|
|
|
{
|
|
|
|
set_errno (EISDIR);
|
2007-07-31 17:20:00 +02:00
|
|
|
goto out;
|
2001-06-01 13:53:20 +02:00
|
|
|
}
|
|
|
|
else
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2007-08-10 13:16:27 +02:00
|
|
|
if (equal_path && old_explicit_suffix != new_explicit_suffix)
|
2001-09-07 23:32:07 +02:00
|
|
|
{
|
2007-07-31 17:20:00 +02:00
|
|
|
newpc.check (newpath, PC_SYM_NOFOLLOW);
|
|
|
|
if (RtlEqualUnicodeString (oldpc.get_nt_native_path (),
|
|
|
|
newpc.get_nt_native_path (),
|
2008-07-16 22:20:45 +02:00
|
|
|
oldpc.objcaseinsensitive ()))
|
2007-07-31 17:20:00 +02:00
|
|
|
{
|
|
|
|
res = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (oldpc.is_lnk_symlink ())
|
2008-02-15 18:53:11 +01:00
|
|
|
{
|
2007-07-31 17:20:00 +02:00
|
|
|
if (!newpc.is_lnk_symlink ()
|
|
|
|
&& !RtlEqualUnicodePathSuffix (newpc.get_nt_native_path (),
|
|
|
|
L".lnk", TRUE))
|
|
|
|
{
|
|
|
|
rename_append_suffix (new2pc, newpath, nlen, ".lnk");
|
|
|
|
removepc = &newpc;
|
|
|
|
}
|
2001-06-01 13:53:20 +02:00
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
else if (oldpc.is_binary ())
|
2006-05-28 17:50:14 +02:00
|
|
|
{
|
2007-07-31 17:20:00 +02:00
|
|
|
if (!RtlEqualUnicodePathSuffix (newpc.get_nt_native_path (),
|
|
|
|
L".exe", TRUE))
|
|
|
|
{
|
|
|
|
rename_append_suffix (new2pc, newpath, nlen, ".exe");
|
|
|
|
removepc = &newpc;
|
|
|
|
}
|
2008-02-15 18:53:11 +01:00
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
else
|
2008-02-15 18:53:11 +01:00
|
|
|
{
|
2007-07-31 17:20:00 +02:00
|
|
|
if ((RtlEqualUnicodePathSuffix (newpc.get_nt_native_path (),
|
|
|
|
L".lnk", TRUE)
|
|
|
|
|| RtlEqualUnicodePathSuffix (newpc.get_nt_native_path (),
|
|
|
|
L".exe", TRUE))
|
|
|
|
&& !new_explicit_suffix)
|
|
|
|
{
|
|
|
|
new2pc.check (newpath, PC_SYM_NOFOLLOW, stat_suffixes);
|
|
|
|
newpc.get_nt_native_path ()->Length -= 4 * sizeof (WCHAR);
|
2007-08-01 09:52:35 +02:00
|
|
|
if (new2pc.is_binary () || new2pc.is_lnk_symlink ())
|
2007-07-31 17:20:00 +02:00
|
|
|
removepc = &new2pc;
|
|
|
|
}
|
2006-03-09 16:31:08 +01:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
dstpc = (removepc == &newpc) ? &new2pc : &newpc;
|
2007-08-01 09:52:35 +02:00
|
|
|
|
2008-05-15 18:34:01 +02:00
|
|
|
/* Opening the file must be part of the transaction. It's not sufficient
|
|
|
|
to call only NtSetInformationFile under the transaction. Therefore we
|
|
|
|
have to start the transaction here, if necessary. */
|
|
|
|
if (wincap.has_transactions ()
|
2008-05-15 19:23:29 +02:00
|
|
|
&& (dstpc->fs_flags () & FILE_SUPPORTS_TRANSACTIONS)
|
2008-05-20 12:24:25 +02:00
|
|
|
&& (dstpc->isdir ()
|
|
|
|
|| (!removepc && dstpc->has_attribute (FILE_ATTRIBUTE_READONLY))))
|
2008-05-15 18:34:01 +02:00
|
|
|
start_transaction (old_trans, trans);
|
|
|
|
|
2008-10-20 21:30:06 +02:00
|
|
|
/* DELETE is required to rename a file. Samba (only some versions?) doesn't
|
|
|
|
like the FILE_SHARE_DELETE mode if the file has the R/O attribute set
|
|
|
|
and returns STATUS_ACCESS_DENIED in that case. */
|
2007-07-31 17:20:00 +02:00
|
|
|
status = NtOpenFile (&fh, DELETE, oldpc.get_object_attr (attr, sec_none_nih),
|
2008-10-20 21:30:06 +02:00
|
|
|
&io,
|
|
|
|
oldpc.fs_is_samba () ? FILE_SHARE_READ | FILE_SHARE_WRITE
|
|
|
|
: FILE_SHARE_VALID_FLAGS,
|
2007-08-02 17:13:56 +02:00
|
|
|
FILE_OPEN_FOR_BACKUP_INTENT
|
|
|
|
| (oldpc.is_rep_symlink () ? FILE_OPEN_REPARSE_POINT : 0));
|
2007-07-31 17:20:00 +02:00
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
{
|
|
|
|
__seterrno_from_nt_status (status);
|
|
|
|
goto out;
|
|
|
|
}
|
2007-08-10 13:16:27 +02:00
|
|
|
|
|
|
|
/* Renaming a dir to another, existing dir fails always, even if
|
|
|
|
ReplaceIfExists is set to TRUE and the existing dir is empty. So
|
|
|
|
we have to remove the destination dir first. This also covers the
|
|
|
|
case that the destination directory is not empty. In that case,
|
|
|
|
unlink_nt returns with STATUS_DIRECTORY_NOT_EMPTY. */
|
|
|
|
if (dstpc->isdir ())
|
|
|
|
{
|
|
|
|
status = unlink_nt (*dstpc);
|
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
{
|
|
|
|
__seterrno_from_nt_status (status);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* You can't copy a file if the destination exists and has the R/O
|
2008-05-19 22:22:29 +02:00
|
|
|
attribute set. Remove the R/O attribute first. But first check
|
|
|
|
if a removepc exists. If so, dstpc points to a non-existing file
|
|
|
|
due to a mangled suffix. */
|
|
|
|
else if (!removepc && dstpc->has_attribute (FILE_ATTRIBUTE_READONLY))
|
2007-08-10 13:16:27 +02:00
|
|
|
{
|
|
|
|
status = NtOpenFile (&nfh, FILE_WRITE_ATTRIBUTES,
|
|
|
|
dstpc->get_object_attr (attr, sec_none_nih),
|
|
|
|
&io, FILE_SHARE_VALID_FLAGS,
|
|
|
|
FILE_OPEN_FOR_BACKUP_INTENT
|
|
|
|
| (dstpc->is_rep_symlink ()
|
|
|
|
? FILE_OPEN_REPARSE_POINT : 0));
|
|
|
|
if (!NT_SUCCESS (status))
|
2008-02-15 18:53:11 +01:00
|
|
|
{
|
2007-08-10 13:16:27 +02:00
|
|
|
__seterrno_from_nt_status (status);
|
|
|
|
goto out;
|
|
|
|
}
|
2008-10-20 21:30:06 +02:00
|
|
|
status = NtSetAttributesFile (nfh, dstpc->file_attributes ()
|
|
|
|
& ~FILE_ATTRIBUTE_READONLY);
|
2007-08-10 13:16:27 +02:00
|
|
|
NtClose (nfh);
|
|
|
|
if (!NT_SUCCESS (status))
|
2008-02-15 18:53:11 +01:00
|
|
|
{
|
2007-08-10 13:16:27 +02:00
|
|
|
__seterrno_from_nt_status (status);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-08-02 13:11:34 +02:00
|
|
|
/* SUSv3: If the old argument and the new argument resolve to the same
|
|
|
|
existing file, rename() shall return successfully and perform no
|
|
|
|
other action.
|
2008-04-29 11:24:54 +02:00
|
|
|
The test tries to be as quick as possible. First it tests for identical
|
|
|
|
volume serial numbers because that information is available anyway.
|
|
|
|
Then it tests if oldpath has more than 1 hardlink, then it opens newpath
|
|
|
|
and tests for identical file ids. If so, oldpath and newpath refer to
|
|
|
|
the same file. */
|
2007-08-01 23:02:24 +02:00
|
|
|
if ((removepc || dstpc->exists ())
|
2007-08-10 13:16:27 +02:00
|
|
|
&& !oldpc.isdir ()
|
2008-04-29 11:24:54 +02:00
|
|
|
&& dstpc->fs_serial_number () == oldpc.fs_serial_number ()
|
2007-08-02 13:11:34 +02:00
|
|
|
&& NT_SUCCESS (NtQueryInformationFile (fh, &io, &ofsi, sizeof ofsi,
|
|
|
|
FileStandardInformation))
|
|
|
|
&& ofsi.NumberOfLinks > 1
|
2007-08-01 23:02:24 +02:00
|
|
|
&& NT_SUCCESS (NtOpenFile (&nfh, READ_CONTROL,
|
|
|
|
(removepc ?: dstpc)->get_object_attr (attr, sec_none_nih),
|
2007-08-02 17:13:56 +02:00
|
|
|
&io, FILE_SHARE_VALID_FLAGS,
|
|
|
|
FILE_OPEN_FOR_BACKUP_INTENT
|
|
|
|
| ((removepc ?: dstpc)->is_rep_symlink ()
|
2008-02-15 18:53:11 +01:00
|
|
|
? FILE_OPEN_REPARSE_POINT : 0))))
|
2007-08-01 23:02:24 +02:00
|
|
|
{
|
|
|
|
FILE_INTERNAL_INFORMATION ofii, nfii;
|
|
|
|
|
2007-08-02 13:11:34 +02:00
|
|
|
if (NT_SUCCESS (NtQueryInformationFile (fh, &io, &ofii, sizeof ofii,
|
|
|
|
FileInternalInformation))
|
|
|
|
&& NT_SUCCESS (NtQueryInformationFile (nfh, &io, &nfii, sizeof nfii,
|
|
|
|
FileInternalInformation))
|
2008-04-29 11:24:54 +02:00
|
|
|
&& ofii.FileId.QuadPart == nfii.FileId.QuadPart)
|
2007-08-01 23:02:24 +02:00
|
|
|
{
|
|
|
|
debug_printf ("%s and %s are the same file", oldpath, newpath);
|
|
|
|
NtClose (nfh);
|
|
|
|
res = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
NtClose (nfh);
|
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
size = sizeof (FILE_RENAME_INFORMATION)
|
|
|
|
+ dstpc->get_nt_native_path ()->Length;
|
2008-05-19 22:22:29 +02:00
|
|
|
if (size > NT_MAX_PATH * sizeof (WCHAR)) /* Hopefully very seldom. */
|
|
|
|
pfri = (PFILE_RENAME_INFORMATION) alloca (size);
|
|
|
|
else
|
|
|
|
pfri = (PFILE_RENAME_INFORMATION) tp.w_get ();
|
2007-07-31 17:20:00 +02:00
|
|
|
pfri->ReplaceIfExists = TRUE;
|
|
|
|
pfri->RootDirectory = NULL;
|
|
|
|
pfri->FileNameLength = dstpc->get_nt_native_path ()->Length;
|
|
|
|
memcpy (&pfri->FileName, dstpc->get_nt_native_path ()->Buffer,
|
|
|
|
pfri->FileNameLength);
|
|
|
|
status = NtSetInformationFile (fh, &io, pfri, size, FileRenameInformation);
|
2007-08-10 13:16:27 +02:00
|
|
|
/* This happens if the access rights don't allow deleting the destination.
|
|
|
|
Even if the handle to the original file is opened with BACKUP
|
|
|
|
and/or RECOVERY, these flags don't apply to the destination of the
|
|
|
|
rename operation. So, a privileged user can't rename a file to an
|
|
|
|
existing file, if the permissions of the existing file aren't right.
|
|
|
|
Like directories, we have to handle this separately by removing the
|
|
|
|
destination before renaming. */
|
2008-05-15 18:34:01 +02:00
|
|
|
if (status == STATUS_ACCESS_DENIED && dstpc->exists () && !dstpc->isdir ())
|
|
|
|
{
|
2008-05-15 19:23:29 +02:00
|
|
|
if (wincap.has_transactions ()
|
|
|
|
&& (dstpc->fs_flags () & FILE_SUPPORTS_TRANSACTIONS)
|
|
|
|
&& !trans)
|
2008-05-15 18:34:01 +02:00
|
|
|
{
|
|
|
|
start_transaction (old_trans, trans);
|
|
|
|
/* As mentioned earlier, opening the file must be part of the
|
|
|
|
transaction. Therefore we have to reopen the file here if the
|
|
|
|
transaction hasn't been started already. Unfortunately we can't
|
|
|
|
use the NT "reopen file from existing handle" feature. In that
|
|
|
|
case NtOpenFile returns STATUS_TRANSACTIONAL_CONFLICT. We *have*
|
|
|
|
to close the handle to the file first, *then* we can re-open it.
|
|
|
|
Fortunately nothing has happened yet, so the atomicity of the
|
|
|
|
rename functionality is not spoiled. */
|
|
|
|
NtClose (fh);
|
|
|
|
status = NtOpenFile (&fh, DELETE,
|
|
|
|
oldpc.get_object_attr (attr, sec_none_nih),
|
|
|
|
&io, FILE_SHARE_VALID_FLAGS,
|
|
|
|
FILE_OPEN_FOR_BACKUP_INTENT
|
|
|
|
| (oldpc.is_rep_symlink ()
|
|
|
|
? FILE_OPEN_REPARSE_POINT : 0));
|
|
|
|
if (!NT_SUCCESS (status))
|
|
|
|
{
|
|
|
|
__seterrno_from_nt_status (status);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (NT_SUCCESS (status = unlink_nt (*dstpc)))
|
|
|
|
status = NtSetInformationFile (fh, &io, pfri, size,
|
|
|
|
FileRenameInformation);
|
|
|
|
}
|
2007-07-31 17:20:00 +02:00
|
|
|
if (NT_SUCCESS (status))
|
|
|
|
{
|
|
|
|
if (removepc)
|
|
|
|
unlink_nt (*removepc);
|
|
|
|
res = 0;
|
|
|
|
}
|
|
|
|
else
|
2007-08-10 13:16:27 +02:00
|
|
|
__seterrno_from_nt_status (status);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2007-07-31 17:20:00 +02:00
|
|
|
out:
|
2007-08-10 13:16:27 +02:00
|
|
|
if (fh)
|
|
|
|
NtClose (fh);
|
2008-05-15 18:34:01 +02:00
|
|
|
if (wincap.has_transactions () && trans)
|
|
|
|
stop_transaction (status, old_trans, trans);
|
2007-07-31 17:20:00 +02:00
|
|
|
syscall_printf ("%d = rename (%s, %s)", res, oldpath, newpath);
|
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 ()
|
|
|
|
{
|
2007-01-09 16:46:41 +01:00
|
|
|
if (!system_info.dwAllocationGranularity)
|
2001-03-03 04:56:34 +01:00
|
|
|
GetSystemInfo (&system_info);
|
2005-11-28 23:32:29 +01:00
|
|
|
return (size_t) system_info.dwAllocationGranularity;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-11-06 15:33:16 +01:00
|
|
|
size_t
|
2005-11-28 23:32:29 +01:00
|
|
|
getsystempagesize ()
|
2003-11-06 15:33:16 +01:00
|
|
|
{
|
2007-01-09 16:46:41 +01:00
|
|
|
if (!system_info.dwPageSize)
|
2003-11-06 15:33:16 +01:00
|
|
|
GetSystemInfo (&system_info);
|
2005-11-28 23:32:29 +01:00
|
|
|
return (size_t) system_info.dwPageSize;
|
2003-11-06 15:33:16 +01:00
|
|
|
}
|
|
|
|
|
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;
|
2006-11-07 18:59:54 +01:00
|
|
|
return cfd->fpathconf (v);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
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)
|
|
|
|
{
|
2006-11-07 18:59:54 +01:00
|
|
|
fhandler_base *fh;
|
2009-03-27 12:29:56 +01:00
|
|
|
long ret = -1;
|
2006-11-07 18:59:54 +01:00
|
|
|
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
2009-03-27 12:29:56 +01:00
|
|
|
|
2005-07-03 04:40:30 +02:00
|
|
|
if (!*file)
|
|
|
|
{
|
|
|
|
set_errno (ENOENT);
|
|
|
|
return -1;
|
|
|
|
}
|
2008-04-13 18:47:21 +02:00
|
|
|
if (!(fh = build_fh_name (file, NULL, PC_SYM_FOLLOW, stat_suffixes)))
|
2006-11-07 18:59:54 +01:00
|
|
|
return -1;
|
|
|
|
if (!fh->exists ())
|
2009-03-27 12:29:56 +01:00
|
|
|
set_errno (ENOENT);
|
|
|
|
else
|
|
|
|
ret = fh->fpathconf (v);
|
|
|
|
delete fh;
|
|
|
|
return ret;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
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)
|
|
|
|
{
|
2007-11-28 17:45:34 +01:00
|
|
|
static char name[TTY_NAME_MAX];
|
|
|
|
int ret = ttyname_r (fd, name, TTY_NAME_MAX);
|
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
|
|
|
|
2008-03-08 02:33:22 +01:00
|
|
|
syscall_printf ("(%d<%S>, %p) returning %s", fd,
|
2007-08-15 18:27:09 +02:00
|
|
|
cfd->pc.get_nt_native_path (), 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;
|
|
|
|
}
|
|
|
|
|
2006-08-07 21:29:14 +02:00
|
|
|
extern "C" int
|
|
|
|
posix_fadvise (int fd, _off64_t offset, _off64_t len, int advice)
|
|
|
|
{
|
|
|
|
int res = -1;
|
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd >= 0)
|
|
|
|
res = cfd->fadvise (offset, len, advice);
|
|
|
|
else
|
|
|
|
set_errno (EBADF);
|
|
|
|
syscall_printf ("%d = posix_fadvice (%d, %D, %D, %d)",
|
2006-12-12 16:58:08 +01:00
|
|
|
res, fd, offset, len, advice);
|
2006-08-07 21:29:14 +02:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
posix_fallocate (int fd, _off64_t offset, _off64_t len)
|
|
|
|
{
|
|
|
|
int res = -1;
|
|
|
|
if (offset < 0 || len == 0)
|
|
|
|
set_errno (EINVAL);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd >= 0)
|
|
|
|
res = cfd->ftruncate (offset + len, false);
|
|
|
|
else
|
|
|
|
set_errno (EBADF);
|
|
|
|
}
|
|
|
|
syscall_printf ("%d = posix_fallocate (%d, %D, %D)", res, fd, offset, len);
|
|
|
|
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)
|
2006-08-07 21:29:14 +02:00
|
|
|
res = cfd->ftruncate (length, true);
|
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
|
2007-02-27 13:58:56 +01:00
|
|
|
fstatvfs (int fd, struct statvfs *sfs)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2005-07-03 04:40:30 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
2005-02-23 14:12:43 +01:00
|
|
|
return -1;
|
|
|
|
|
2007-02-27 13:58:56 +01:00
|
|
|
cygheap_fdget cfd (fd);
|
|
|
|
if (cfd < 0)
|
|
|
|
return -1;
|
|
|
|
return cfd->fstatvfs (sfs);
|
|
|
|
}
|
2004-04-10 15:45:10 +02:00
|
|
|
|
2007-02-27 13:58:56 +01:00
|
|
|
extern "C" int
|
|
|
|
statvfs (const char *name, struct statvfs *sfs)
|
|
|
|
{
|
|
|
|
int res = -1;
|
|
|
|
fhandler_base *fh = NULL;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2007-02-27 13:58:56 +01:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
goto error;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2007-02-27 13:58:56 +01:00
|
|
|
if (!(fh = build_fh_name (name, NULL, PC_SYM_FOLLOW, stat_suffixes)))
|
|
|
|
goto error;
|
2003-05-26 18:52:58 +02:00
|
|
|
|
2007-02-27 13:58:56 +01:00
|
|
|
if (fh->error ())
|
2005-06-16 17:46:40 +02:00
|
|
|
{
|
2007-02-27 13:58:56 +01:00
|
|
|
debug_printf ("got %d error from build_fh_name", fh->error ());
|
|
|
|
set_errno (fh->error ());
|
2003-05-25 11:18:43 +02:00
|
|
|
}
|
2007-02-27 13:58:56 +01:00
|
|
|
else if (fh->exists ())
|
|
|
|
{
|
|
|
|
debug_printf ("(%s, %p), file_attributes %d", name, sfs, (DWORD) *fh);
|
|
|
|
res = fh->fstatvfs (sfs);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
set_errno (ENOENT);
|
2003-05-25 11:18:43 +02:00
|
|
|
|
2007-02-27 13:58:56 +01:00
|
|
|
delete fh;
|
|
|
|
error:
|
|
|
|
MALLOC_CHECK;
|
|
|
|
syscall_printf ("%d = (%s, %p)", res, name, sfs);
|
|
|
|
return res;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2005-02-23 14:12:43 +01:00
|
|
|
extern "C" int
|
2007-02-27 13:58:56 +01:00
|
|
|
fstatfs (int fd, struct statfs *sfs)
|
2005-02-23 14:12:43 +01:00
|
|
|
{
|
2007-02-27 13:58:56 +01:00
|
|
|
struct statvfs vfs;
|
|
|
|
int ret = fstatvfs (fd, &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;
|
2005-02-23 14:12:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
statfs (const char *fname, struct statfs *sfs)
|
|
|
|
{
|
|
|
|
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-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;
|
|
|
|
}
|
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
|
|
|
}
|
|
|
|
|
* 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)
|
|
|
|
{
|
2008-03-07 12:24:51 +01:00
|
|
|
char buf[sizeof (":\\00000000:00000000:00000000") + PATH_MAX];
|
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
|
|
|
|
2008-03-07 12:24:51 +01:00
|
|
|
if (strlen (path) >= PATH_MAX)
|
* 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;
|
|
|
|
}
|
|
|
|
|
2007-08-16 17:07:42 +02:00
|
|
|
return mknod_worker (w32path.get_win32 (), 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);
|
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. */
|
2008-11-26 11:18:10 +01:00
|
|
|
/* TODO, CV 2008-11-25: The check against saved_sid is a kludge and a
|
|
|
|
shortcut. We must check if it's really feasible in the long run.
|
|
|
|
The reason to add this shortcut is this: sshd switches back to the
|
|
|
|
privileged user running sshd at least twice in the process of
|
|
|
|
authentication. It calls seteuid first, then setegid. Due to this
|
|
|
|
order, the setgroups group list is still active when calling seteuid
|
|
|
|
and verify_token treats the original token of the privileged user as
|
|
|
|
insufficient. This in turn results in creating a new user token for
|
|
|
|
the privileged user instead of using the orignal token. This can have
|
|
|
|
unfortunate side effects. The created token has different group
|
|
|
|
memberships, different user rights, and misses possible network
|
2008-11-26 18:21:04 +01:00
|
|
|
credentials.
|
2008-11-26 11:18:10 +01:00
|
|
|
Therefore we try this shortcut now. When switching back to the
|
|
|
|
privileged user, we probably always want a correct (aka original)
|
|
|
|
user token for this privileged user, not only in sshd. */
|
|
|
|
if ((uid == cygheap->user.saved_uid && usersid == cygheap->user.saved_sid ())
|
|
|
|
|| verify_token (hProcToken, usersid, groups))
|
2005-04-03 15:06:43 +02:00
|
|
|
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
|
|
|
|
2008-11-26 11:18:10 +01:00
|
|
|
/* If no impersonation token is available, try to authenticate using
|
|
|
|
LSA private data stored password, LSA authentication using our own
|
|
|
|
LSA module, or, as last chance, NtCreateToken. */
|
2003-07-14 19:04:21 +02:00
|
|
|
if (new_token == INVALID_HANDLE_VALUE)
|
2002-05-27 13:48:15 +02:00
|
|
|
{
|
2008-11-26 11:18:10 +01:00
|
|
|
new_token = lsaprivkeyauth (pw_new);
|
|
|
|
if (new_token)
|
2008-11-26 18:21:04 +01:00
|
|
|
{
|
2008-11-26 11:18:10 +01:00
|
|
|
/* We have to verify this token since settings in /etc/group
|
|
|
|
might render it unusable im terms of group membership. */
|
|
|
|
if (!verify_token (new_token, usersid, groups))
|
|
|
|
{
|
|
|
|
CloseHandle (new_token);
|
|
|
|
new_token = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!new_token)
|
2008-11-26 18:21:04 +01:00
|
|
|
{
|
2008-11-26 11:18:10 +01:00
|
|
|
debug_printf ("lsaprivkeyauth failed, try lsaauth.");
|
|
|
|
if (!(new_token = lsaauth (usersid, groups, pw_new)))
|
2005-04-03 15:06:43 +02:00
|
|
|
{
|
2008-11-26 11:18:10 +01:00
|
|
|
debug_printf ("lsaauth failed, try create_token.");
|
|
|
|
new_token = create_token (usersid, groups, pw_new);
|
|
|
|
if (new_token == INVALID_HANDLE_VALUE)
|
|
|
|
{
|
|
|
|
debug_printf ("create_token failed, bail out of here");
|
|
|
|
cygheap->user.reimpersonate ();
|
|
|
|
return -1;
|
|
|
|
}
|
2005-04-03 15:06:43 +02:00
|
|
|
}
|
2006-07-25 Corinna Vinschen <corinna@vinschen.de>
* include/cygwin/version.h: Bump DLL version to 1.7.0.
2006-07-25 Corinna Vinschen <corinna@vinschen.de>
* select.h: Remove.
* fhandler_socket.cc: Don't include select.h.
* select.cc: Ditto.
2006-07-25 Corinna Vinschen <corinna@vinschen.de>
* cygtls.h: Drop socket related includes.
(struct _local_storage): Remove exitsock and exitsock_sin. Add
select_sockevt.
* cygtls.cc: Accomodate above change throughout.
* fhandler.h (class fhandler_socket): Make wsock_evt public.
* fhandler_socket.cc (fhandler_socket::fhandler_socket): Accomodate
reordering members.
(fhandler_socket::evaluate_events): Drop FD_CONNECT event as soon as
it gets read once. Never remove FD_WRITE event here.
(fhandler_socket::wait_for_events): Wait 50 ms instead of INFINITE for
socket events.
(fhandler_socket::accept): Fix conditional. Set wsock_events members
of accepted socket to useful start values.
(fhandler_socket::recv_internal): Always drop FD_READ/FD_OOB events from
wsock_events after the call to WSARecvFrom.
(fhandler_socket::send_internal): Drop FD_WRITE event from wsock_events
if the call to WSASendTo fails with WSAEWOULDBLOCK. Fix return value
condition.
* select.cc (struct socketinf): Change to accomodate using socket event
handling.
(peek_socket): Use event handling for peeking socket.
(thread_socket): Ditto.
(start_thread_socket): Ditto.
(socket_cleanup): Same here.
* tlsoffsets.h: Regenerate.
2006-07-20 Corinna Vinschen <corinna@vinschen.de>
* fhandler.h (class fhandler_socket): Rearrange slightly to keep
event handling methods and members together. Drop owner status flag.
Split wait method. Rename event handling methods for readability.
* fhandler_socket.cc (struct wsa_event): Add owner field.
(LOCK_EVENTS): New macro.
(UNLOCK_EVENTS): Ditto.
(fhandler_socket::init_events): rename from prepare.
(fhandler_socket::evaluate_events): First half of former wait method.
Do everything but wait. Allow specifiying whether or not events from
event_mask should be erased from wsock_events->events. Simplify
OOB handling. Allow sending SIGURG to any process (group).
(fhandler_socket::wait_for_events): Second half of former wait method.
Call evaluate_events and wait in a loop if socket is blocking.
(fhandler_socket::release_events): Rename from release.
(fhandler_socket::connect): Accomodate above name changes.
(fhandler_socket::accept): Ditto.
(fhandler_socket::recv_internal): Ditto.
(fhandler_socket::send_internal): Ditto.
(fhandler_socket::close): Ditto.
(fhandler_socket::fcntl): Always set owner to given input value on
F_SETOWN. Handle F_GETOWN.
* net.cc (fdsock): Accomodate above name changes.
2006-07-20 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (fhandler_socket::wait): Set Winsock errno to
WSAEWOULDBLOCK instead of WSAEINPROGRESS.
2006-07-18 Brian Ford <Brian.Ford@FlightSafety.com>
Corinna Vinschen <corinna@vinschen.de>
* winsup.h (mmap_region_status): New enum.
(mmap_is_attached_or_noreserve_page): Adjust prototype and rename
as below.
* mmap.cc (mmap_is_attached_or_noreserve_page): Rename
mmap_is_attached_or_noreserve. Add region length parameter.
Return enum above.
* exceptions.cc (_cygtls::handle_exceptions): Accomodate above.
* fhandler.cc (fhandler_base::raw_read): Call above for NOACCESS
errors and retry on success to allow reads into untouched
MAP_NORESERVE buffers.
2006-07-18 Corinna Vinschen <corinna@vinschen.de>
* cygwin.din (posix_openpt): Export.
* tty.cc (posix_openpt): New function.
* include/cygwin/stdlib.h (posix_openpt): Declare.
* include/cygwin/version.h: Bump API minor number.
2006-07-14 Corinna Vinschen <corinna@vinschen.de>
* security.cc (get_token_group_sidlist): Always add the interactive
group to the token. Add comment. Create logon_id group SID by
copying it from incoming group list.
(create_token): Add subauth_token parameter. Use information in
subauth_token if present. Tweak SourceIdentifier if subauth_token
is present for debugging purposes.
* security.h (create_token): Add subauth_token parameter in declaration.
* syscalls.cc (seteuid32): Call subauth first. Call create_token
regardless. Use subauth token in call to create_token if subauth
succeeded.
2006-07-13 Corinna Vinschen <corinna@vinschen.de>
* include/netinet/in.h: Update copyright.
2006-07-13 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (fhandler_socket::wait): Rework function so that
WaitForMultipleObjects is really only called when necessary.
2006-07-12 Corinna Vinschen <corinna@vinschen.de>
* include/netdb.h: Declare rcmd, rcmd_af, rexec, rresvport,
rresvport_af, iruserok, iruserok_sa, ruserok.
2006-07-12 Corinna Vinschen <corinna@vinschen.de>
* Makefile.in (DLL_OFILES): Drop iruserok.o. Add rcmd.o.
* autoload.cc (rcmd): Drop definition.
* cygwin.din: Export bindresvport, bindresvport_sa, iruserok_sa,
rcmd_af, rresvport_af.
* net.cc (cygwin_rcmd): Remove.
(last_used_bindresvport): Rename from last_used_rrecvport.
(cygwin_bindresvport_sa): New function implementing bindresvport_sa.
(cygwin_bindresvport): New function implementing bindresvport.
(cygwin_rresvport): Remove.
* include/cygwin/version.h: Bump API minor number.
* include/netinet/in.h: Declare bindresvport and bindresvport_sa.
* libc/iruserok.c: Remove file.
* libc/rcmd.cc: New file implementing rcmd, rcmd_af, rresvport,
rresvport_af, iruserok_sa, iruserok and ruserok.
2006-07-12 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (fhandler_socket::getsockname): Return valid
result for unbound sockets.
2006-07-11 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (fhandler_socket::fixup_after_fork): Handle
wsock_mtx and wsock_evt on fork, thus handling close_on_exec correctly.
(fhandler_socket::fixup_after_exec): Drop misguided attempt to handle
close_on_exec here.
(fhandler_socket::dup): Call fixup_after_fork with NULL parent.
Add comment.
(fhandler_socket::set_close_on_exec): Handle wsock_mtx and wsock_evt.
2006-07-10 Corinna Vinschen <corinna@vinschen.de>
* fhandler.h (class fhandler_socket): Add wsock_mtx, wsock_evt
and wsock_events members. Remove closed status flag, add listener
status flag. Accomodate new implementation of socket event handling
methods. Declare recv* and send* functions ssize_t as the POSIX
equivalents.
(fhandler_socket::recv_internal): Declare.
(fhandler_socket::send_internal): Ditto.
* fhandler_socket.cc (EVENT_MASK): Define mask of selected events.
(fhandler_socket::fhandler_socket): Initialize new members.
(fhandler_socket::af_local_setblocking): Don't actually set the
socket to blocking mode. Keep sane event selection.
(fhandler_socket::af_local_unsetblocking): Don't actually set the
socket to previous blocking setting, just remember it.
(struct wsa_event): New structure to keep event data per shared
socket.
(NUM_SOCKS): Define number of shared sockets concurrently handled by
all active Cygwin processes.
(wsa_events): New shared datastructure keeping all wsa_event records.
(socket_serial_number): New shared variable to identify shared sockets.
(wsa_slot_mtx): Global mutex to serialize wsa_events access.
(search_wsa_event_slot): New static function to select a new wsa_event
slot for a new socket.
(fhandler_socket::prepare): Rewrite. Prepare event selection
per new socket.
(fhandler_socket::wait): Rewrite. Wait for socket events in thread
safe and multiple process safe.
(fhandler_socket::release): Rewrite. Close per-socket descriptor
mutex handle and event handle.
(fhandler_socket::dup): Duplicate wsock_mtx and wsock_evt. Fix
copy-paste error in debug output.
(fhandler_socket::connect): Accomodate new event handling.
(fhandler_socket::listen): Set listener flag on successful listen.
(fhandler_socket::accept): Accomodate new event handling.
(fhandler_socket::recv_internal): New inline method centralizing
common recv code.
(fhandler_socket::recvfrom): Call recv_internal now.
(fhandler_socket::recvmsg): Ditto. Streamline copying from iovec
to WSABUF.
(fhandler_socket::send_internal): New inline method centralizing
common send code.
(fhandler_socket::sendto): Call send_internal now.
(fhandler_socket::sendmsg): Ditto. Streamline copying from iovec
to WSABUF.
(fhandler_socket::close): Call release now.
(fhandler_socket::ioctl): Never actually switch to blocking mode.
Just keep track of the setting.
* net.cc (fdsock): Call prepare now.
(cygwin_connect): Revert again to event driven technique.
(cygwin_accept): Ditto.
* poll.cc (poll): Don't call recvfrom on a listening socket.
Remove special case for failing recvfrom.
* include/sys/socket.h: Declare recv* and send* functions ssize_t as
requested by POSIX.
2006-07-07 Corinna Vinschen <corinna@vinschen.de>
* net.cc (cygwin_inet_ntop): Fix data type of forth parameter.
2006-07-06 Corinna Vinschen <corinna@vinschen.de>
* include/cygwin/in6.h (struct in6_addr): Fix typo.
2006-07-06 Corinna Vinschen <corinna@vinschen.de>
* cygwin.din: Export in6addr_any, in6addr_loopback, freeaddrinfo,
gai_strerror, getaddrinfo, getnameinfo.
* fhandler_socket.cc: Include cygwin/in6.h.
(get_inet_addr): Accomodate AF_INET6 usage.
(fhandler_socket::connect): Ditto.
(fhandler_socket::listen): Ditto.
(fhandler_socket::sendto): Ditto.
* net.cc: Include cygwin/in6.h.
(in6addr_any): Define.
(in6addr_loopback): Define.
(cygwin_socket): Accomodate AF_INET6 usage.
(socketpair): Bind socketpairs only to loopback for security.
(inet_pton4): New static function.
(inet_pton6): Ditto.
(cygwin_inet_pton): New AF_INET6 aware inet_pton implementation.
(inet_ntop4): New static function.
(inet_ntop6): Ditto.
(cygwin_inet_ntop): New AF_INET6 aware inet_ntop implementation.
(ga_aistruct): New static function.
(ga_clone): Ditto.
(ga_echeck): Ditto.
(ga_nsearch): Ditto.
(ga_port): Ditto.
(ga_serv): Ditto.
(ga_unix): Ditto.
(gn_ipv46): Ditto.
(ipv4_freeaddrinfo): Ditto.
(ipv4_getaddrinfo): Ditto.
(ipv4_getnameinfo): Ditto.
(gai_errmap_t): New structure holding error code - error string mapping.
(cygwin_gai_strerror): New function implementing gai_strerror.
(w32_to_gai_err): New static function.
(get_ipv6_funcs): Ditto.
(load_ipv6_funcs): Ditto.
(cygwin_freeaddrinfo): New function implementing freeaddrinfo.
(cygwin_getaddrinfo): New function implementing getaddrinfo.
(cygwin_getnameinfo): New function implementing getnameinfo.
* include/netdb.h: Include stdint.h and cygwin/socket.h. Define
data types and macros used by getaddrinfo and friends. Declare
freeaddrinfo, gai_strerror, getaddrinfo and getnameinfo.
* include/cygwin/in.h: Add IPv6 related IPPROTOs. Remove definition
of struct sockaddr_in6. Include cygwin/in6.h instead.
* include/cygwin/in6.h: New header file defining IPv6 releated
data types and macros.
* include/cygwin/socket.h: Enable AF_INET6 and PF_INET6. Add
IPv6 related socket options.
* include/cygwin/version.h: Bump API minor number.
2006-07-06 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (DsGetDcNameA): Define.
(NetGetAnyDCName): Define.
* security.cc: Include dsgetdc.h.
(DsGetDcNameA): Declare.
(DS_FORCE_REDISCOVERY): Define.
(get_logon_server): Add bool parameter to control rediscovery of DC.
Use DsGetDcNameA function if supported, NetGetDCName/NetGetAnyDCName
otherwise.
(get_server_groups): Rediscover DC if get_user_groups fails and
try again.
(get_reg_security): Use correct error code macro when testing
RegGetKeySecurity return value.
* security.h (get_logon_server): Remove default vaue from wserver
parameter. Add rediscovery parameter.
* uinfo.cc (cygheap_user::env_logsrv): Accomodate rediscovery parameter
in call to get_logon_server.
2006-07-25 21:23:23 +02:00
|
|
|
}
|
2006-11-27 13:59:59 +01: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 */
|
2008-02-14 17:47:11 +01:00
|
|
|
WCHAR name[128];
|
2004-11-20 20:09:19 +01:00
|
|
|
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;
|
2007-07-16 22:01:15 +02:00
|
|
|
if (cygheap->user.curr_imp_token != NO_IMPERSONATION)
|
2005-04-03 15:06:43 +02:00
|
|
|
{
|
2007-07-16 22:01:15 +02:00
|
|
|
CloseHandle (cygheap->user.curr_imp_token);
|
|
|
|
cygheap->user.curr_imp_token = NO_IMPERSONATION;
|
2005-04-03 15:06:43 +02:00
|
|
|
}
|
|
|
|
if (cygheap->user.curr_primary_token != NO_IMPERSONATION)
|
|
|
|
{
|
|
|
|
if (!DuplicateTokenEx (cygheap->user.curr_primary_token, MAXIMUM_ALLOWED,
|
|
|
|
&sec_none, SecurityImpersonation,
|
2007-07-16 22:01:15 +02:00
|
|
|
TokenImpersonation, &cygheap->user.curr_imp_token))
|
2005-04-03 15:06:43 +02:00
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
cygheap->user.curr_primary_token = NO_IMPERSONATION;
|
|
|
|
return -1;
|
|
|
|
}
|
2007-07-16 22:01:15 +02:00
|
|
|
set_cygwin_privileges (cygheap->user.curr_imp_token);
|
2005-04-03 15:06:43 +02:00
|
|
|
}
|
|
|
|
if (!cygheap->user.reimpersonate ())
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
return -1;
|
|
|
|
}
|
2003-09-10 04:12:26 +02:00
|
|
|
|
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)
|
2008-07-28 00:31:48 +02:00
|
|
|
/* Recreate and fill out the user shared region for a new user. */
|
|
|
|
user_shared_create (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
|
|
|
|
2007-02-23 16:15:50 +01:00
|
|
|
if (gid == myself->gid)
|
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");
|
2007-07-16 22:01:15 +02:00
|
|
|
if (!SetTokenInformation (cygheap->user.imp_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");
|
2006-12-12 17:27:32 +01:00
|
|
|
clear_procimptoken ();
|
2005-04-03 15:06:43 +02:00
|
|
|
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);
|
2006-03-02 19:08:09 +01:00
|
|
|
else if (path.isspecial ())
|
|
|
|
set_errno (EPERM);
|
2001-10-01 06:10:07 +02:00
|
|
|
else
|
|
|
|
{
|
2004-05-08 04:55:38 +02:00
|
|
|
getwinenv("PATH="); /* Save the native PATH */
|
2008-07-16 22:20:45 +02:00
|
|
|
cygheap->root.set (path.normalized_path, path.get_win32 (),
|
|
|
|
!!path.objcaseinsensitive ());
|
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
|
|
|
vhangup ()
|
|
|
|
{
|
|
|
|
set_errno (ENOSYS);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
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
|
2005-10-02 02:13:41 +02:00
|
|
|
if ((lock_buffer.l_start = lseek64 (fd, 0, SEEK_END)) != (_off64_t) -1
|
2008-04-01 12:22:33 +02:00
|
|
|
&& fcntl64 (fd, F_SETLKW, &lock_buffer) != -1)
|
2003-12-07 13:56:59 +01:00
|
|
|
{
|
2005-10-02 02:13:41 +02:00
|
|
|
if (lseek64 (fd, 0, SEEK_END) != (_off64_t) -1)
|
2003-12-07 13:56:59 +01:00
|
|
|
write (fd, buf, size);
|
|
|
|
lock_buffer.l_type = F_UNLCK;
|
2008-04-01 12:22:33 +02:00
|
|
|
fcntl64 (fd, F_SETLK, &lock_buffer);
|
2003-12-07 13:56:59 +01:00
|
|
|
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 *
|
2008-07-30 06:58:24 +02:00
|
|
|
getutid (const struct utmp *id)
|
2001-12-28 16:53:27 +01:00
|
|
|
{
|
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 *
|
2008-07-30 06:58:24 +02:00
|
|
|
getutline (const struct utmp *line)
|
2001-12-28 16:53:27 +01:00
|
|
|
{
|
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 *
|
2008-07-30 06:58:24 +02:00
|
|
|
pututline (const struct utmp *ut)
|
2002-11-07 03:19:52 +01:00
|
|
|
{
|
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);
|
2008-07-30 06:58:24 +02:00
|
|
|
/* The documentation says to return a pointer to this which implies that
|
|
|
|
this has to be cast from a const. That doesn't seem right but the
|
|
|
|
documentation seems pretty clear on this. */
|
|
|
|
return (struct utmp *) ut;
|
2004-12-15 18:29:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" void
|
|
|
|
setutxent ()
|
|
|
|
{
|
|
|
|
internal_setutent (false);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" void
|
|
|
|
endutxent ()
|
|
|
|
{
|
|
|
|
endutent ();
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" struct utmpx *
|
|
|
|
getutxent ()
|
|
|
|
{
|
2008-07-30 06:58:24 +02:00
|
|
|
/* UGH. Not thread safe. */
|
2004-12-15 18:29:01 +01:00
|
|
|
static struct utmpx utx;
|
|
|
|
return copy_ut_to_utx (getutent (), &utx);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" struct utmpx *
|
|
|
|
getutxid (const struct utmpx *id)
|
|
|
|
{
|
2008-07-30 06:58:24 +02:00
|
|
|
/* UGH. Not thread safe. */
|
2004-12-15 18:29:01 +01:00
|
|
|
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)
|
|
|
|
{
|
2008-07-30 06:58:24 +02:00
|
|
|
/* UGH. Not thread safe. */
|
2004-12-15 18:29:01 +01:00
|
|
|
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)
|
|
|
|
{
|
2008-07-30 06:58:24 +02:00
|
|
|
/* UGH. Not thread safe. */
|
2004-12-15 18:29:01 +01:00
|
|
|
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
|
|
|
|
2006-02-02 23:46:37 +01:00
|
|
|
extern "C" void
|
|
|
|
updwtmpx (const char *wtmpx_file, const struct utmpx *utmpx)
|
|
|
|
{
|
|
|
|
((struct utmpx *)utmpx)->ut_time = utmpx->ut_tv.tv_sec;
|
|
|
|
updwtmp (wtmpx_file, (const struct utmp *) utmpx);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
|
|
|
|
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
|
|
|
|
};
|
2008-03-07 12:24:51 +01:00
|
|
|
static char buf[PATH_MAX];
|
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;
|
2008-03-07 12:24:51 +01:00
|
|
|
ch != EOF && !isspace (ch) && buf_idx < PATH_MAX;
|
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
|
2008-03-07 12:24:51 +01:00
|
|
|
path is longer than PATH_MAX, 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);
|
|
|
|
}
|
2006-12-11 19:55:29 +01:00
|
|
|
|
|
|
|
extern "C" FILE *
|
2006-12-12 16:58:08 +01:00
|
|
|
popen (const char *command, const char *in_type)
|
2006-12-11 19:55:29 +01:00
|
|
|
{
|
2006-12-12 16:58:08 +01:00
|
|
|
const char *type = in_type;
|
|
|
|
char rw = *type++;
|
2006-12-11 19:55:29 +01:00
|
|
|
|
2006-12-12 16:58:08 +01:00
|
|
|
if (*type == 'b' || *type == 't')
|
|
|
|
type++;
|
|
|
|
if ((rw != 'r' && rw != 'w') || (*type != '\0'))
|
2006-12-11 19:55:29 +01:00
|
|
|
{
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return NULL;
|
|
|
|
}
|
2006-12-12 16:58:08 +01:00
|
|
|
|
|
|
|
int fd, other_fd, __stdin, __stdout, stdwhat;
|
|
|
|
|
|
|
|
int fds[2];
|
|
|
|
if (pipe (fds) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
switch (rw)
|
2006-12-11 19:55:29 +01:00
|
|
|
{
|
2006-12-12 16:58:08 +01:00
|
|
|
case 'r':
|
2006-12-11 19:55:29 +01:00
|
|
|
__stdin = -1;
|
|
|
|
stdwhat = 1;
|
|
|
|
other_fd = __stdout = fds[1];
|
|
|
|
fd = fds[0];
|
2006-12-12 16:58:08 +01:00
|
|
|
break;
|
|
|
|
case 'w':
|
2006-12-11 19:55:29 +01:00
|
|
|
__stdout = -1;
|
|
|
|
stdwhat = 0;
|
|
|
|
other_fd = __stdin = fds[0];
|
|
|
|
fd = fds[1];
|
2006-12-12 16:58:08 +01:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return NULL; /* avoid a compiler warning */
|
2006-12-11 19:55:29 +01:00
|
|
|
}
|
|
|
|
|
2006-12-12 16:58:08 +01:00
|
|
|
FILE *fp = fdopen (fd, in_type);
|
2008-04-01 12:22:33 +02:00
|
|
|
fcntl64 (fd, F_SETFD, fcntl64 (fd, F_GETFD, 0) | FD_CLOEXEC);
|
2006-12-11 19:55:29 +01:00
|
|
|
|
|
|
|
if (!fp)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
pid_t pid;
|
|
|
|
const char *argv[4];
|
|
|
|
|
|
|
|
argv[0] = "/bin/sh";
|
|
|
|
argv[1] = "-c";
|
|
|
|
argv[2] = command;
|
|
|
|
argv[3] = NULL;
|
|
|
|
|
|
|
|
{
|
|
|
|
lock_process now;
|
2008-04-01 12:22:33 +02:00
|
|
|
int state = fcntl64 (stdwhat, F_GETFD, 0);
|
|
|
|
fcntl64 (stdwhat, F_SETFD, state | FD_CLOEXEC);
|
2006-12-11 19:55:29 +01:00
|
|
|
pid = spawn_guts ("/bin/sh", argv, cur_environ (), _P_NOWAIT,
|
|
|
|
__stdin, __stdout);
|
2008-04-01 12:22:33 +02:00
|
|
|
fcntl64 (stdwhat, F_SETFD, state);
|
2006-12-11 19:55:29 +01:00
|
|
|
}
|
|
|
|
|
2008-09-11 06:34:24 +02:00
|
|
|
if (pid >= 0)
|
|
|
|
{
|
|
|
|
close (other_fd);
|
|
|
|
fhandler_pipe *fh = (fhandler_pipe *) cygheap->fdtab[fd];
|
|
|
|
fh->set_popen_pid (pid);
|
|
|
|
return fp;
|
|
|
|
}
|
2006-12-11 19:55:29 +01:00
|
|
|
|
|
|
|
err:
|
|
|
|
int save_errno = get_errno ();
|
|
|
|
close (fds[0]);
|
|
|
|
close (fds[1]);
|
|
|
|
set_errno (save_errno);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
pclose (FILE *fp)
|
|
|
|
{
|
|
|
|
fhandler_pipe *fh = (fhandler_pipe *) cygheap->fdtab[fileno(fp)];
|
|
|
|
|
|
|
|
if (fh->get_device () != FH_PIPEW && fh->get_device () != FH_PIPER)
|
|
|
|
{
|
|
|
|
set_errno (EBADF);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int pid = fh->get_popen_pid ();
|
|
|
|
if (!pid)
|
|
|
|
{
|
|
|
|
set_errno (ECHILD);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fclose (fp))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
int status;
|
|
|
|
while (1)
|
|
|
|
if (waitpid (pid, &status, 0) == pid)
|
|
|
|
break;
|
|
|
|
else if (get_errno () == EINTR)
|
|
|
|
continue;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return status;
|
|
|
|
}
|
2008-04-23 13:13:52 +02:00
|
|
|
|
|
|
|
/* Preliminary(?) implementation of the openat family of functions. */
|
|
|
|
|
|
|
|
static int
|
2008-05-22 13:18:46 +02:00
|
|
|
gen_full_path_at (char *path_ret, int dirfd, const char *pathname,
|
|
|
|
bool null_pathname_allowed = false)
|
2008-04-23 13:13:52 +02:00
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
/* Set null_pathname_allowed to true to allow GLIBC compatible behaviour
|
|
|
|
for NULL pathname. Only used by futimesat. */
|
|
|
|
if (!pathname && !null_pathname_allowed)
|
2008-04-23 13:13:52 +02:00
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
set_errno (EFAULT);
|
2008-04-23 13:13:52 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2008-05-22 13:18:46 +02:00
|
|
|
if (pathname)
|
2008-04-23 13:13:52 +02:00
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
if (!*pathname)
|
|
|
|
{
|
|
|
|
set_errno (ENOENT);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (strlen (pathname) >= PATH_MAX)
|
|
|
|
{
|
|
|
|
set_errno (ENAMETOOLONG);
|
|
|
|
return -1;
|
|
|
|
}
|
2008-04-23 13:13:52 +02:00
|
|
|
}
|
2008-12-15 21:53:18 +01:00
|
|
|
if (pathname && isabspath (pathname))
|
2008-04-23 13:13:52 +02:00
|
|
|
stpcpy (path_ret, pathname);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
if (dirfd == AT_FDCWD)
|
2009-05-13 17:00:06 +02:00
|
|
|
{
|
|
|
|
cwdstuff::cwd_lock.acquire ();
|
|
|
|
p = stpcpy (path_ret, cygheap->cwd.get_posix ());
|
|
|
|
cwdstuff::cwd_lock.release ();
|
|
|
|
}
|
2008-04-23 13:13:52 +02:00
|
|
|
else
|
2008-11-26 18:21:04 +01:00
|
|
|
{
|
2008-04-23 13:13:52 +02:00
|
|
|
cygheap_fdget cfd (dirfd);
|
|
|
|
if (cfd < 0)
|
|
|
|
return -1;
|
|
|
|
if (!cfd->pc.isdir ())
|
|
|
|
{
|
|
|
|
set_errno (ENOTDIR);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
p = stpcpy (path_ret, cfd->get_name ());
|
|
|
|
}
|
|
|
|
if (!p)
|
2008-11-26 18:21:04 +01:00
|
|
|
{
|
2008-04-23 13:13:52 +02:00
|
|
|
set_errno (ENOTDIR);
|
|
|
|
return -1;
|
|
|
|
}
|
2008-05-22 13:18:46 +02:00
|
|
|
if (pathname)
|
|
|
|
{
|
|
|
|
if (p[-1] != '/')
|
|
|
|
*p++ = '/';
|
|
|
|
stpcpy (p, pathname);
|
|
|
|
}
|
2008-04-23 13:13:52 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
openat (int dirfd, const char *pathname, int flags, ...)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *path = tp.c_get ();
|
|
|
|
if (gen_full_path_at (path, dirfd, pathname))
|
|
|
|
return -1;
|
2008-11-26 18:21:04 +01:00
|
|
|
|
2008-04-23 13:13:52 +02:00
|
|
|
va_list ap;
|
|
|
|
mode_t mode;
|
|
|
|
|
|
|
|
va_start (ap, flags);
|
|
|
|
mode = va_arg (ap, mode_t);
|
|
|
|
va_end (ap);
|
|
|
|
return open (path, flags, mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
faccessat (int dirfd, const char *pathname, int mode, int flags)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
int res = -1;
|
|
|
|
char *path = tp.c_get ();
|
|
|
|
if (!gen_full_path_at (path, dirfd, pathname))
|
|
|
|
{
|
|
|
|
if (flags & ~(F_OK|R_OK|W_OK|X_OK))
|
|
|
|
set_errno (EINVAL);
|
|
|
|
else
|
2008-11-26 18:21:04 +01:00
|
|
|
{
|
2008-04-23 13:13:52 +02:00
|
|
|
fhandler_base *fh = build_fh_name (path, NULL,
|
|
|
|
(flags & AT_SYMLINK_NOFOLLOW)
|
|
|
|
? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW,
|
2008-11-26 18:21:04 +01:00
|
|
|
stat_suffixes);
|
2008-04-23 13:13:52 +02:00
|
|
|
if (fh)
|
|
|
|
{
|
|
|
|
res = fh->fhaccess (mode);
|
|
|
|
delete fh;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
debug_printf ("returning %d", res);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
fchmodat (int dirfd, const char *pathname, mode_t mode, int flags)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *path = tp.c_get ();
|
|
|
|
if (gen_full_path_at (path, dirfd, pathname))
|
|
|
|
return -1;
|
|
|
|
return chmod (path, mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
fchownat (int dirfd, const char *pathname, __uid32_t uid, __gid32_t gid,
|
|
|
|
int flags)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *path = tp.c_get ();
|
|
|
|
if (gen_full_path_at (path, dirfd, pathname))
|
|
|
|
return -1;
|
|
|
|
return chown_worker (path, (flags & AT_SYMLINK_NOFOLLOW)
|
|
|
|
? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW, uid, gid);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
fstatat (int dirfd, const char *pathname, struct __stat64 *st, int flags)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *path = tp.c_get ();
|
|
|
|
if (gen_full_path_at (path, dirfd, pathname))
|
|
|
|
return -1;
|
|
|
|
return (flags & AT_SYMLINK_NOFOLLOW) ? lstat64 (path, st) : stat64 (path, st);
|
|
|
|
}
|
|
|
|
|
2008-04-24 11:59:54 +02:00
|
|
|
extern int utimens_worker (path_conv &, const struct timespec *);
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
utimensat (int dirfd, const char *pathname, const struct timespec *times,
|
|
|
|
int flags)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-24 11:59:54 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *path = tp.c_get ();
|
|
|
|
if (gen_full_path_at (path, dirfd, pathname))
|
|
|
|
return -1;
|
|
|
|
path_conv win32 (path, PC_POSIX | ((flags & AT_SYMLINK_NOFOLLOW)
|
|
|
|
? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW),
|
|
|
|
stat_suffixes);
|
|
|
|
return utimens_worker (win32, times);
|
|
|
|
}
|
|
|
|
|
2008-04-23 13:13:52 +02:00
|
|
|
extern "C" int
|
|
|
|
futimesat (int dirfd, const char *pathname, const struct timeval *times)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *path = tp.c_get ();
|
2008-05-22 13:18:46 +02:00
|
|
|
if (gen_full_path_at (path, dirfd, pathname, true))
|
2008-04-23 13:13:52 +02:00
|
|
|
return -1;
|
|
|
|
return utimes (path, times);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
linkat (int olddirfd, const char *oldpathname,
|
|
|
|
int newdirfd, const char *newpathname,
|
|
|
|
int flags)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *oldpath = tp.c_get ();
|
|
|
|
if (gen_full_path_at (oldpath, olddirfd, oldpathname))
|
|
|
|
return -1;
|
|
|
|
char *newpath = tp.c_get ();
|
|
|
|
if (gen_full_path_at (newpath, newdirfd, newpathname))
|
|
|
|
return -1;
|
|
|
|
if (flags & AT_SYMLINK_FOLLOW)
|
|
|
|
{
|
|
|
|
path_conv old_name (oldpath, PC_SYM_FOLLOW | PC_POSIX, stat_suffixes);
|
|
|
|
if (old_name.error)
|
|
|
|
{
|
|
|
|
set_errno (old_name.error);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
strcpy (oldpath, old_name.normalized_path);
|
|
|
|
}
|
|
|
|
return link (oldpath, newpath);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
mkdirat (int dirfd, const char *pathname, mode_t mode)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *path = tp.c_get ();
|
|
|
|
if (gen_full_path_at (path, dirfd, pathname))
|
|
|
|
return -1;
|
|
|
|
return mkdir (path, mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
mkfifoat (int dirfd, const char *pathname, mode_t mode)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *path = tp.c_get ();
|
|
|
|
if (gen_full_path_at (path, dirfd, pathname))
|
|
|
|
return -1;
|
|
|
|
return mkfifo (path, mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
mknodat (int dirfd, const char *pathname, mode_t mode, __dev32_t dev)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *path = tp.c_get ();
|
|
|
|
if (gen_full_path_at (path, dirfd, pathname))
|
|
|
|
return -1;
|
|
|
|
return mknod32 (path, mode, dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" ssize_t
|
|
|
|
readlinkat (int dirfd, const char *pathname, char *buf, size_t bufsize)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *path = tp.c_get ();
|
|
|
|
if (gen_full_path_at (path, dirfd, pathname))
|
|
|
|
return -1;
|
|
|
|
return readlink (path, buf, bufsize);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
renameat (int olddirfd, const char *oldpathname,
|
|
|
|
int newdirfd, const char *newpathname)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *oldpath = tp.c_get ();
|
|
|
|
if (gen_full_path_at (oldpath, olddirfd, oldpathname))
|
|
|
|
return -1;
|
|
|
|
char *newpath = tp.c_get ();
|
|
|
|
if (gen_full_path_at (newpath, newdirfd, newpathname))
|
|
|
|
return -1;
|
|
|
|
return rename (oldpath, newpath);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
symlinkat (const char *oldpath, int newdirfd, const char *newpathname)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *newpath = tp.c_get ();
|
|
|
|
if (gen_full_path_at (newpath, newdirfd, newpathname))
|
|
|
|
return -1;
|
|
|
|
return symlink (oldpath, newpath);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" int
|
|
|
|
unlinkat (int dirfd, const char *pathname, int flags)
|
|
|
|
{
|
2008-05-22 13:18:46 +02:00
|
|
|
tmp_pathbuf tp;
|
2008-04-23 13:13:52 +02:00
|
|
|
myfault efault;
|
|
|
|
if (efault.faulted (EFAULT))
|
|
|
|
return -1;
|
|
|
|
char *path = tp.c_get ();
|
|
|
|
if (gen_full_path_at (path, dirfd, pathname))
|
|
|
|
return -1;
|
|
|
|
return (flags & AT_REMOVEDIR) ? rmdir (path) : unlink (path);
|
|
|
|
}
|
2009-05-13 17:00:06 +02:00
|
|
|
|
2009-05-14 21:49:37 +02:00
|
|
|
static void
|
|
|
|
internal_setlocale ()
|
2009-05-13 17:00:06 +02:00
|
|
|
{
|
2009-05-14 21:49:37 +02:00
|
|
|
if (*cygheap->locale.charset == 'A')
|
|
|
|
{
|
|
|
|
cygheap->locale.mbtowc = __utf8_mbtowc;
|
|
|
|
cygheap->locale.wctomb = __utf8_wctomb;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
cygheap->locale.mbtowc = __mbtowc;
|
|
|
|
cygheap->locale.wctomb = __wctomb;
|
|
|
|
}
|
|
|
|
strcpy (cygheap->locale.charset, __locale_charset ());
|
2009-05-13 17:00:06 +02:00
|
|
|
/* Each setlocale potentially changes the multibyte representation
|
|
|
|
of the CWD. Therefore we have to rest the CWD's posix path and
|
|
|
|
reevaluate the next time it's used. */
|
|
|
|
/* FIXME: Other buffered paths might be affected as well. */
|
2009-05-14 21:49:37 +02:00
|
|
|
cygheap->cwd.reset_posix ();
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" char *
|
|
|
|
setlocale (int category, const char *locale)
|
|
|
|
{
|
2009-05-13 17:00:06 +02:00
|
|
|
char *ret = _setlocale_r (_REENT, category, locale);
|
2009-05-14 21:49:37 +02:00
|
|
|
if (ret && locale && (category == LC_ALL || category == LC_CTYPE))
|
|
|
|
internal_setlocale ();
|
2009-05-13 17:00:06 +02:00
|
|
|
return ret;
|
|
|
|
}
|