b0e82b74fb
* 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.
130 lines
3.5 KiB
C++
130 lines
3.5 KiB
C++
/* path.h: path data structures
|
|
|
|
Copyright 1996, 1997, 1998, 2000 Cygnus Solutions.
|
|
|
|
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. */
|
|
|
|
struct suffix_info
|
|
{
|
|
const char *name;
|
|
int addon;
|
|
suffix_info (const char *s, int addit = 0) {name = s, addon = addit;}
|
|
};
|
|
|
|
enum pathconv_arg
|
|
{
|
|
PC_SYM_FOLLOW = 0x0001,
|
|
PC_SYM_NOFOLLOW = 0x0002,
|
|
PC_SYM_IGNORE = 0x0004,
|
|
PC_SYM_CONTENTS = 0x0008,
|
|
PC_FULL = 0x0010,
|
|
PC_NULLEMPTY = 0x0020
|
|
};
|
|
|
|
#define PC_NONULLEMPTY -1
|
|
|
|
#include <sys/mount.h>
|
|
|
|
enum path_types
|
|
{
|
|
PATH_NOTHING = 0,
|
|
PATH_SYMLINK = MOUNT_SYMLINK,
|
|
PATH_BINARY = MOUNT_BINARY,
|
|
PATH_EXEC = MOUNT_EXEC,
|
|
PATH_CYGWIN_EXEC = MOUNT_CYGWIN_EXEC,
|
|
PATH_SOCKET = 0x40000000,
|
|
PATH_HASACLS = 0x80000000
|
|
};
|
|
|
|
class path_conv
|
|
{
|
|
char path[MAX_PATH];
|
|
public:
|
|
|
|
unsigned path_flags;
|
|
|
|
int has_acls () {return path_flags & PATH_HASACLS;}
|
|
int hasgood_inode () {return path_flags & PATH_HASACLS;} // Not strictly correct
|
|
int isbinary () {return path_flags & PATH_BINARY;}
|
|
int issymlink () {return path_flags & PATH_SYMLINK;}
|
|
int issocket () {return path_flags & PATH_SOCKET;}
|
|
int isexec () {return path_flags & PATH_EXEC;}
|
|
int iscygexec () {return path_flags & PATH_CYGWIN_EXEC;}
|
|
|
|
void set_binary () {path_flags |= PATH_BINARY;}
|
|
void set_symlink () {path_flags |= PATH_SYMLINK;}
|
|
void set_exec (int x = 1) {path_flags |= x ? PATH_EXEC : PATH_NOTHING;}
|
|
void set_has_acls (int x = 1) {path_flags |= x ? PATH_HASACLS : PATH_NOTHING;}
|
|
|
|
char *known_suffix;
|
|
|
|
int error;
|
|
DWORD devn;
|
|
int unit;
|
|
|
|
DWORD fileattr;
|
|
|
|
void check (const char *src, unsigned opt = PC_SYM_FOLLOW,
|
|
const suffix_info *suffixes = NULL);
|
|
|
|
path_conv (int, const char *src, unsigned opt = PC_SYM_FOLLOW,
|
|
const suffix_info *suffixes = NULL)
|
|
{
|
|
check (src, opt, suffixes);
|
|
}
|
|
|
|
path_conv (const char *src, unsigned opt = PC_SYM_FOLLOW,
|
|
const suffix_info *suffixes = NULL)
|
|
{
|
|
check (src, opt | PC_NULLEMPTY, suffixes);
|
|
}
|
|
|
|
path_conv (): path_flags (0), known_suffix (NULL), error (0), devn (0), unit (0), fileattr (0xffffffff) {path[0] = '\0';}
|
|
|
|
inline char *get_win32 () { return path; }
|
|
operator char *() {return path; }
|
|
BOOL is_device () {return devn != FH_BAD;}
|
|
DWORD get_devn () {return devn == FH_BAD ? (DWORD) FH_DISK : devn;}
|
|
short get_unitn () {return devn == FH_BAD ? 0 : unit;}
|
|
DWORD file_attributes () {return fileattr;}
|
|
};
|
|
|
|
/* Symlink marker */
|
|
#define SYMLINK_COOKIE "!<symlink>"
|
|
|
|
/* Socket marker */
|
|
#define SOCKET_COOKIE "!<socket >"
|
|
|
|
/* Maximum depth of symlinks (after which ELOOP is issued). */
|
|
#define MAX_LINK_DEPTH 10
|
|
|
|
extern suffix_info std_suffixes[];
|
|
|
|
int __stdcall get_device_number (const char *name, int &unit, BOOL from_conv = FALSE);
|
|
int __stdcall slash_unc_prefix_p (const char *path);
|
|
int __stdcall check_null_empty_path (const char *name);
|
|
|
|
const char * __stdcall find_exec (const char *name, path_conv& buf, const char *winenv = "PATH=",
|
|
int null_if_notfound = 0, const char **known_suffix = NULL);
|
|
void __stdcall cwd_init ();
|
|
char * __stdcall cwd_posix (char *);
|
|
char * __stdcall cwd_win32 (char *);
|
|
DWORD __stdcall cwd_hash ();
|
|
void __stdcall cwd_fixup_after_exec (char *, char *, DWORD);
|
|
|
|
/* Common macros for checking for invalid path names */
|
|
|
|
#define check_null_empty_path_errno(src) \
|
|
({ \
|
|
int __err; \
|
|
if ((__err = check_null_empty_path(src))) \
|
|
set_errno (__err); \
|
|
__err; \
|
|
})
|
|
|
|
#define isdrive(s) (isalpha (*(s)) && (s)[1] == ':')
|