* Throughout, use __try/__except/__endtry blocks, rather than myfault
handler. * cygtls.cc (_cygtls::remove): Accommodate the fact that pathbufs has been moved from _local_storage to _cygtls. * cygtls.h (class tls_pathbuf): Add comment to hint to gendef usage of counters. Change type of counters to uint32_t for clarity. Remove _cygtls as friend class. (struct _local_storage): Move pathbufs from here... (struct _cygtls): ...to here, allowing to access it from _sigbe. (class san): Only define on 32 bit. Remove errno, _c_cnt and _w_cnt members. (san::setup): Drop parameter. Don't initialize removed members. (san::leave): Don't set removed members. (class myfault): Only define on 32 bit. (myfault::faulted): Only keep implementation not taking any parameter. Drop argument in call to sebastian.setup. (__try/__leave/__except/__endtry): Implement to support real SEH. For now stick to SJLJ on 32 bit. * dcrt0.cc (dll_crt0_0): Drop 64 bit call to exception::install_myfault_handler. * exception.h (exception_handler): Define with EXCEPTION_DISPOSITION as return type. (PDISPATCHER_CONTEXT): Define as void * on 32 bit. Define as pointer to _DISPATCHER_CONTEXT on 64 bit. (class exception): Define separately for 32 and 64 bit. (exception::myfault): Add handler for myfault SEH handling on 64 bit. (exception::exception): Fix mangled method name to account for change in type of last parameter. (exception::install_myfault_handler): Remove. * exceptions.cc (exception::myfault_handle): Remove. (exception::myfault): New SEH handler for 64 bit. * gendef (_sigbe): Set tls_pathbuf counters to 0 explicitely when returning to the caller. * ntdll.h: Move a comment to a better place. (struct _SCOPE_TABLE): Define on 64 bit. * thread.cc (verifyable_object_isvalid): Remove gcc 4.7 workaround. * tls_pbuf.cc (tls_pbuf): Fix to accommodate new place of pathbufs. (tls_pathbuf::destroy): Change type of loop variables to uint32_t. * tls_pbuf.h (class tmp_pathbuf): Change type of buffer counters to uint32_t. Accommodate new place of pathbufs. * tlsoffsets.h: Regenerate. * tlsoffsets64.h: Regenerate.
This commit is contained in:
Corinna Vinschen
@@ -1700,50 +1700,54 @@ mount (const char *win32_path, const char *posix_path, unsigned flags)
|
||||
isn't really supported except from fstab? */
|
||||
int res = -1;
|
||||
|
||||
myfault efault;
|
||||
if (efault.faulted (EFAULT))
|
||||
/* errno set */;
|
||||
else if (!*posix_path)
|
||||
set_errno (EINVAL);
|
||||
else if (strpbrk (posix_path, "\\:"))
|
||||
set_errno (EINVAL);
|
||||
else if (flags & MOUNT_CYGDRIVE) /* normal mount */
|
||||
__try
|
||||
{
|
||||
/* When flags include MOUNT_CYGDRIVE, take this to mean that
|
||||
we actually want to change the cygdrive prefix and flags
|
||||
without actually mounting anything. */
|
||||
res = mount_table->write_cygdrive_info (posix_path, flags);
|
||||
win32_path = NULL;
|
||||
}
|
||||
else if (!*win32_path)
|
||||
set_errno (EINVAL);
|
||||
else
|
||||
{
|
||||
char *w32_path = (char *) win32_path;
|
||||
if (flags & MOUNT_BIND)
|
||||
if (!*posix_path)
|
||||
set_errno (EINVAL);
|
||||
else if (strpbrk (posix_path, "\\:"))
|
||||
set_errno (EINVAL);
|
||||
else if (flags & MOUNT_CYGDRIVE) /* normal mount */
|
||||
{
|
||||
/* Prepend root path to bound path. */
|
||||
tmp_pathbuf tp;
|
||||
device dev;
|
||||
|
||||
unsigned conv_flags = 0;
|
||||
const char *bound_path = w32_path;
|
||||
|
||||
w32_path = tp.c_get ();
|
||||
int error = mount_table->conv_to_win32_path (bound_path, w32_path,
|
||||
dev, &conv_flags);
|
||||
if (error || strlen (w32_path) >= MAX_PATH)
|
||||
return true;
|
||||
if ((flags & ~MOUNT_SYSTEM) == (MOUNT_BIND | MOUNT_BINARY))
|
||||
flags = (MOUNT_BIND | conv_flags)
|
||||
& ~(MOUNT_IMMUTABLE | MOUNT_AUTOMATIC);
|
||||
/* When flags include MOUNT_CYGDRIVE, take this to mean that
|
||||
we actually want to change the cygdrive prefix and flags
|
||||
without actually mounting anything. */
|
||||
res = mount_table->write_cygdrive_info (posix_path, flags);
|
||||
win32_path = NULL;
|
||||
}
|
||||
/* Make sure all mounts are user mounts, even those added via mount -a. */
|
||||
flags &= ~MOUNT_SYSTEM;
|
||||
res = mount_table->add_item (w32_path, posix_path, flags);
|
||||
}
|
||||
else if (!*win32_path)
|
||||
set_errno (EINVAL);
|
||||
else
|
||||
{
|
||||
char *w32_path = (char *) win32_path;
|
||||
if (flags & MOUNT_BIND)
|
||||
{
|
||||
/* Prepend root path to bound path. */
|
||||
tmp_pathbuf tp;
|
||||
device dev;
|
||||
|
||||
syscall_printf ("%R = mount(%s, %s, %y)", res, win32_path, posix_path, flags);
|
||||
unsigned conv_flags = 0;
|
||||
const char *bound_path = w32_path;
|
||||
|
||||
w32_path = tp.c_get ();
|
||||
int error = mount_table->conv_to_win32_path (bound_path, w32_path,
|
||||
dev, &conv_flags);
|
||||
if (error || strlen (w32_path) >= MAX_PATH)
|
||||
return true;
|
||||
if ((flags & ~MOUNT_SYSTEM) == (MOUNT_BIND | MOUNT_BINARY))
|
||||
flags = (MOUNT_BIND | conv_flags)
|
||||
& ~(MOUNT_IMMUTABLE | MOUNT_AUTOMATIC);
|
||||
}
|
||||
/* Make sure all mounts are user mounts, even those added via
|
||||
mount -a. */
|
||||
flags &= ~MOUNT_SYSTEM;
|
||||
res = mount_table->add_item (w32_path, posix_path, flags);
|
||||
}
|
||||
|
||||
syscall_printf ("%R = mount(%s, %s, %y)",
|
||||
res, win32_path, posix_path, flags);
|
||||
}
|
||||
__except (EFAULT) {}
|
||||
__endtry
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -1755,15 +1759,18 @@ mount (const char *win32_path, const char *posix_path, unsigned flags)
|
||||
extern "C" int
|
||||
umount (const char *path)
|
||||
{
|
||||
myfault efault;
|
||||
if (efault.faulted (EFAULT))
|
||||
return -1;
|
||||
if (!*path)
|
||||
__try
|
||||
{
|
||||
set_errno (EINVAL);
|
||||
return -1;
|
||||
if (!*path)
|
||||
{
|
||||
set_errno (EINVAL);
|
||||
__leave;
|
||||
}
|
||||
return cygwin_umount (path, 0);
|
||||
}
|
||||
return cygwin_umount (path, 0);
|
||||
__except (EFAULT) {}
|
||||
__endtry
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* cygwin_umount: This is like umount but takes an additional flags
|
||||
|
||||
Reference in New Issue
Block a user