From b0e82b74fbdfa2dee89505aba03f2827480cc8ca Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 3 Sep 2000 04:16:35 +0000 Subject: * Makefile.in: Add cygheap.o. * child_info.h: Add specific exec class. * cygheap.h: New file. Contains declarations for cygwin heap. * cygheap.cc: New file. Implements cygwin heap functions. * dcrt0.cc (quoted): Simplify due to new method for passing arguments between cygwin programs. (alloc_stack_hard_way): Attempt to handle overlapped stack. (dll_crt0_1): Move child_info processing here. Accomodate new method for passing arguments between cygwin programs. Initialize cygwin heap. Establish __argc and __argv variables. (_dll_crt0): Move most of child_info processing to dll_crt0_1. (cygwin_dll_init): Remove duplication. * dtable.cc (dtable::extend): Allocate dtable using cygwin heap. (dtable::build_fhandler): Ditto for fhandler type being constructed. (dtable::dup_worker): Free new fhandler from cygwin heap on error. (dtable::select_*): Don't assume that this == fdtab. (dtable::linearize_fd_array): Delete. (dtable::delinearize_fd_array): Delete. (dtable::fixup_after_exec): New file. (dtable::vfork_child_dup): Use cygwin heap. (dtable::vfork_parent_restore): Ditto. * dtable.h: Remove obsolete methods. Add new method. * environ.cc (posify): Eliminate already_posix parameter and logic. (envsize): New function. (_addenv): Use envsize. (environ_init): Accept an argument pointing to an existing environment list. If supplied, allocate space for this in the the program's heap. * fhandler.cc (fhandler_base::operator =): Move here from fhandler.h. Use cygwin heap to allocate filenames. (fhandler_base::set_name): Allocate/free names from cygwin heap. (fhandler_base::linearize): Delete. (fhandler_base::de_linearize): Delete. (fhandler_base::operator delete): Free from cygwin heap. (fhandler_base::~fhandler_base): Ditto. * fhandler.h: Accomodate elimination of *linearize and other changes above. * fhandler_console.cc (fhandler_console::fixup_after_exec): Rename from de_linearize. * heap.h: New file. * fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Use cygwin heap for name. fhandler_tty::fixup_after_exec): Rename from de_linearize. * fork.cc (fork): Call cygheap_fixup_in_child. * heap.cc: Use declarations in heap.h. * malloc.cc: Sprinkle assertions throughout to catch attempts to free/realloc something from the cygwin heap. * path.cc: Throughout, eliminate use of per-thread cache for cwd. Use cwd_* functions rather than cwd_* variables to access cwd_win32 and cwd_posix. (cwd_win32): New function. (cwd_posix): New function. (cwd_hash): New function. (cwd_fixup_after_exec): New function. * path.h: Accomodate path.cc changes. * pinfo.cc (pinfo_init): Accept a pointer to an environment table. Pass this to environ_init. Eliminate old 'title' tests. * pinfo.h: Accomodate above change in argument. * spawn.cc (struct av): New method for building argv list. (av::unshift): New method. (spawn_guts): Allocate everything that the child process needs in the cygwin heap and pass a pointer to this to the child. Build argv list using new method. Eliminate delinearize stuff. * thread.h: Eliminate _cwd_win32 and _cwd_posix buffers. * winsup.h: Eliminate obsolete functions. Add envsize() declaration. --- winsup/cygwin/fhandler.cc | 85 ++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 46 deletions(-) (limited to 'winsup/cygwin/fhandler.cc') diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 6ce973667..c69d5f316 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -13,6 +13,7 @@ details. */ #include #include #include +#include "cygheap.h" #include #include "cygerrno.h" #include "fhandler.h" @@ -26,12 +27,26 @@ struct __cygwin_perfile *perfile_table = NULL; DWORD binmode = 0; +inline fhandler_base& +fhandler_base::operator =(fhandler_base &x) +{ + memcpy (this, &x, sizeof *this); + unix_path_name_ = x.unix_path_name_ ? cstrdup (x.unix_path_name_) : NULL; + win32_path_name_ = x.win32_path_name_ ? cstrdup (x.win32_path_name_) : NULL; + rabuf = NULL; + ralen = 0; + raixget = 0; + raixput = 0; + rabuflen = 0; + return *this; +} + int fhandler_base::puts_readahead (const char *s, size_t len = (size_t) -1) { int success = 1; while ((*s || (len != (size_t) -1 && len--)) - && (success = put_readahead (*s++) > 0)) + && (success = put_readahead (*s++) > 0)) continue; return success; } @@ -137,16 +152,16 @@ fhandler_base::set_name (const char *unix_path, const char *win32_path, int unit if (!no_free_names ()) { if (unix_path_name_ != NULL && unix_path_name_ != fhandler_disk_dummy_name) - free (unix_path_name_); + cfree (unix_path_name_); if (win32_path_name_ != NULL && unix_path_name_ != fhandler_disk_dummy_name) - free (win32_path_name_); + cfree (win32_path_name_); } unix_path_name_ = win32_path_name_ = NULL; if (unix_path == NULL || !*unix_path) return; - unix_path_name_ = strdup (unix_path); + unix_path_name_ = cstrdup (unix_path); if (unix_path_name_ == NULL) { system_printf ("fatal error. strdup failed"); @@ -154,11 +169,11 @@ fhandler_base::set_name (const char *unix_path, const char *win32_path, int unit } if (win32_path) - win32_path_name_ = strdup (win32_path); + win32_path_name_ = cstrdup (win32_path); else { const char *fmt = get_native_name (); - win32_path_name_ = (char *) malloc (strlen(fmt) + 16); + win32_path_name_ = (char *) cmalloc (HEAP_STR, strlen(fmt) + 16); __small_sprintf (win32_path_name_, fmt, unit); } @@ -196,7 +211,7 @@ fhandler_base::raw_read (void *ptr, size_t ulen) break; default: syscall_printf ("ReadFile %s failed, %E", unix_path_name_); - __seterrno_from_win_error (errcode); + __seterrno_from_win_error (errcode); return -1; break; } @@ -205,37 +220,6 @@ fhandler_base::raw_read (void *ptr, size_t ulen) return bytes_read; } -int -fhandler_base::linearize (unsigned char *buf) -{ - unsigned char *orig_buf = buf; -#define cbuf ((char *)buf) - strcpy (cbuf, get_name() ?: ""); - char *p = strcpy (strchr (cbuf, '\0') + 1, get_win32_name ()); - buf = (unsigned char *)memcpy (strchr (p, '\0') + 1, this, cb); - debug_printf ("access_ %p, status %p, io_handle %p, output_handle %p", - access_, status, get_io_handle (), get_output_handle ()); - return (buf + cb) - orig_buf; -#undef cbuf -} - -int -fhandler_base::de_linearize (const char *buf, const char *unix_name, - const char *win32_name) -{ - int thiscb = cb; - memcpy(this, buf, cb); - unix_path_name_ = win32_path_name_ = NULL; - set_name (unix_name, win32_name); - debug_printf ("access_ %p, status %p, io_handle %p, output_handle %p", - access_, status, get_io_handle (), get_output_handle ()); - if (thiscb != cb) - system_printf ("mismatch in linearize/delinearize %d != %d", thiscb, cb); - raixput = raixget = ralen = rabuflen = 0; - rabuf = NULL; - return cb; -} - /* Cover function to WriteFile to provide Posix interface and semantics (as much as possible). */ int @@ -954,11 +938,11 @@ fhandler_disk_file::fstat (struct stat *buf) directory. This is used, to set S_ISVTX, if needed. */ if (local.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) buf->st_mode |= S_IFDIR; - if (! get_file_attribute (has_acls (), - get_win32_name (), - &buf->st_mode, - &buf->st_uid, - &buf->st_gid)) + if (!get_file_attribute (has_acls (), + get_win32_name (), + &buf->st_mode, + &buf->st_uid, + &buf->st_gid)) { /* If read-only attribute is set, modify ntsec return value */ if (local.dwFileAttributes & FILE_ATTRIBUTE_READONLY) @@ -979,7 +963,7 @@ fhandler_disk_file::fstat (struct stat *buf) buf->st_mode = 0; buf->st_mode |= STD_RBITS; - if (! (local.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + if (!(local.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) buf->st_mode |= STD_WBITS; /* | S_IWGRP | S_IWOTH; we don't give write to group etc */ @@ -1124,6 +1108,13 @@ fhandler_base::tcgetpgrp (void) return -1; } +void +fhandler_base::operator delete (void *p) +{ + cfree (p); + return; +} + /* Normal I/O constructor */ fhandler_base::fhandler_base (DWORD devtype, const char *name, int unit): access_ (0), @@ -1157,10 +1148,12 @@ fhandler_base::~fhandler_base (void) if (!no_free_names ()) { if (unix_path_name_ != NULL && unix_path_name_ != fhandler_disk_dummy_name) - free (unix_path_name_); + cfree (unix_path_name_); if (win32_path_name_ != NULL && win32_path_name_ != fhandler_disk_dummy_name) - free (win32_path_name_); + cfree (win32_path_name_); } + if (rabuf) + free (rabuf); unix_path_name_ = win32_path_name_ = NULL; } -- cgit v1.2.3