* 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.
This commit is contained in:
@ -21,7 +21,6 @@ details. */
|
||||
#include <sys/uio.h>
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <unistd.h>
|
||||
#include <winnls.h>
|
||||
#include <lmcons.h> /* for UNLEN */
|
||||
#include "cygerrno.h"
|
||||
@ -32,6 +31,7 @@ details. */
|
||||
#include "sync.h"
|
||||
#include "sigproc.h"
|
||||
#include "pinfo.h"
|
||||
#include <unistd.h>
|
||||
|
||||
extern BOOL allow_ntsec;
|
||||
|
||||
@ -1015,8 +1015,8 @@ stat_worker (const char *caller, const char *name, struct stat *buf,
|
||||
|
||||
debug_printf ("%s (%s, %p)", caller, name, buf);
|
||||
|
||||
path_conv real_path (name, (nofollow ? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW) | PC_FULL,
|
||||
stat_suffixes);
|
||||
path_conv real_path (name, (nofollow ? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW) |
|
||||
PC_FULL, stat_suffixes);
|
||||
|
||||
if (real_path.error)
|
||||
{
|
||||
@ -1421,6 +1421,16 @@ pathconf (const char *file, int v)
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" char *
|
||||
ttyname (int fd)
|
||||
{
|
||||
if (fdtab.not_open (fd) || !fdtab[fd]->is_tty ())
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
return (char *)(fdtab[fd]->ttyname ());
|
||||
}
|
||||
|
||||
extern "C" char *
|
||||
ctermid (char *str)
|
||||
{
|
||||
@ -1434,20 +1444,8 @@ ctermid (char *str)
|
||||
return str;
|
||||
}
|
||||
|
||||
extern "C"
|
||||
char *
|
||||
ttyname (int fd)
|
||||
{
|
||||
if (fdtab.not_open (fd) || !fdtab[fd]->is_tty ())
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
return (char *)(fdtab[fd]->ttyname ());
|
||||
}
|
||||
|
||||
/* Tells stdio if it should do the cr/lf conversion for this file */
|
||||
extern "C" int _cygwin_istext_for_stdio (int fd);
|
||||
int
|
||||
extern "C" int
|
||||
_cygwin_istext_for_stdio (int fd)
|
||||
{
|
||||
syscall_printf("_cygwin_istext_for_stdio (%d)\n", fd);
|
||||
@ -1570,8 +1568,7 @@ setmode (int fd, int mode)
|
||||
}
|
||||
|
||||
/* ftruncate: P96 5.6.7.1 */
|
||||
extern "C"
|
||||
int
|
||||
extern "C" int
|
||||
ftruncate (int fd, off_t length)
|
||||
{
|
||||
int res = -1;
|
||||
@ -1609,8 +1606,7 @@ ftruncate (int fd, off_t length)
|
||||
|
||||
/* truncate: Provided by SVR4 and 4.3+BSD. Not part of POSIX.1 or XPG3 */
|
||||
/* FIXME: untested */
|
||||
extern "C"
|
||||
int
|
||||
extern "C" int
|
||||
truncate (const char *pathname, off_t length)
|
||||
{
|
||||
int fd;
|
||||
@ -1632,8 +1628,7 @@ truncate (const char *pathname, off_t length)
|
||||
return res;
|
||||
}
|
||||
|
||||
extern "C"
|
||||
long
|
||||
extern "C" long
|
||||
get_osfhandle (int fd)
|
||||
{
|
||||
long res = -1;
|
||||
@ -1651,8 +1646,7 @@ get_osfhandle (int fd)
|
||||
return res;
|
||||
}
|
||||
|
||||
extern "C"
|
||||
int
|
||||
extern "C" int
|
||||
statfs (const char *fname, struct statfs *sfs)
|
||||
{
|
||||
if (!sfs)
|
||||
@ -1692,8 +1686,7 @@ statfs (const char *fname, struct statfs *sfs)
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern "C"
|
||||
int
|
||||
extern "C" int
|
||||
fstatfs (int fd, struct statfs *sfs)
|
||||
{
|
||||
if (fdtab.not_open (fd))
|
||||
@ -1706,8 +1699,7 @@ fstatfs (int fd, struct statfs *sfs)
|
||||
}
|
||||
|
||||
/* setpgid: POSIX 4.3.3.1 */
|
||||
extern "C"
|
||||
int
|
||||
extern "C" int
|
||||
setpgid (pid_t pid, pid_t pgid)
|
||||
{
|
||||
int res = -1;
|
||||
@ -1746,8 +1738,7 @@ out:
|
||||
return res;
|
||||
}
|
||||
|
||||
extern "C"
|
||||
pid_t
|
||||
extern "C" pid_t
|
||||
getpgid (pid_t pid)
|
||||
{
|
||||
if (pid == 0)
|
||||
@ -1762,22 +1753,19 @@ getpgid (pid_t pid)
|
||||
return p->pgid;
|
||||
}
|
||||
|
||||
extern "C"
|
||||
int
|
||||
extern "C" int
|
||||
setpgrp (void)
|
||||
{
|
||||
return setpgid (0, 0);
|
||||
}
|
||||
|
||||
extern "C"
|
||||
pid_t
|
||||
extern "C" pid_t
|
||||
getpgrp (void)
|
||||
{
|
||||
return getpgid (0);
|
||||
}
|
||||
|
||||
extern "C"
|
||||
char *
|
||||
extern "C" char *
|
||||
ptsname (int fd)
|
||||
{
|
||||
if (fdtab.not_open (fd))
|
||||
@ -1789,8 +1777,7 @@ ptsname (int fd)
|
||||
}
|
||||
|
||||
/* FIXME: what is this? */
|
||||
extern "C"
|
||||
int
|
||||
extern "C" int
|
||||
regfree ()
|
||||
{
|
||||
return 0;
|
||||
@ -1802,8 +1789,7 @@ regfree ()
|
||||
Although mknod hasn't been implemented yet, some GNU tools (e.g. the
|
||||
fileutils) assume its existence so we must provide a stub that always
|
||||
fails. */
|
||||
extern "C"
|
||||
int
|
||||
extern "C" int
|
||||
mknod ()
|
||||
{
|
||||
set_errno (ENOSYS);
|
||||
@ -1811,8 +1797,7 @@ mknod ()
|
||||
}
|
||||
|
||||
/* setgid: POSIX 4.2.2.1 */
|
||||
extern "C"
|
||||
int
|
||||
extern "C" int
|
||||
setgid (gid_t gid)
|
||||
{
|
||||
int ret = setegid (gid);
|
||||
@ -1822,8 +1807,7 @@ setgid (gid_t gid)
|
||||
}
|
||||
|
||||
/* setuid: POSIX 4.2.2.1 */
|
||||
extern "C"
|
||||
int
|
||||
extern "C" int
|
||||
setuid (uid_t uid)
|
||||
{
|
||||
int ret = seteuid (uid);
|
||||
@ -1836,8 +1820,7 @@ setuid (uid_t uid)
|
||||
extern char *internal_getlogin (_pinfo *pi);
|
||||
|
||||
/* seteuid: standards? */
|
||||
extern "C"
|
||||
int
|
||||
extern "C" int
|
||||
seteuid (uid_t uid)
|
||||
{
|
||||
if (os_being_run == winNT)
|
||||
|
Reference in New Issue
Block a user