diff options
author | Christopher Faylor <me@cgf.cx> | 2009-01-03 05:12:22 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2009-01-03 05:12:22 +0000 |
commit | 66a83f3eac1c9c8ad575c117b7c49995dc549d26 (patch) | |
tree | 6e90eaba6b684c97697863e52e2381e66b15033c /winsup/cygwin/dcrt0.cc | |
parent | 258776ce913426b424f1cf395f418b98628fb2a7 (diff) | |
download | cygnal-66a83f3eac1c9c8ad575c117b7c49995dc549d26.tar.gz cygnal-66a83f3eac1c9c8ad575c117b7c49995dc549d26.tar.bz2 cygnal-66a83f3eac1c9c8ad575c117b7c49995dc549d26.zip |
Remove unneeded header files from source files throughout. Update copyrights
where appropriate.
* globals.cc: New file for generic global variables.
* mkglobals_h: New file to generate globals.h.
* mkstatic: New Script used to build a (currently non-working) static
libcygwin_s.a.
* Makefile.in: Add unused rule to build a non-working libcygwin_s.a.
(DLL_OFILES): Add globals.o. Make all objects rely on globals.h.
(globals.h): New target. Generate globals.h.
* cygtls.h: Honor new CYGTLS_HANDLE define to control when the HANDLE operator
is allowed in _cygtls.
* dcrt0.cc: Move most globals to globals.cc.
* init.cc: Ditto.
* environ.cc (strip_title_path): Remove now-unneeded extern.
* fhandler_serial.cc (fhandler_serial::open): Ditto.
* pinfo.cc: Ditto.
(commune_process): Ditto.
* shared.cc: Ditto.
* glob.cc: Ditto.
* strace.cc: Ditto.
* exceptions.cc: Define CYGTLS_HANDLE before including winsup.h.
* path.cc (stat_suffixes): Move here.
* security.h: Add forward class path_conv declaration.
* smallprint.cc (__small_vsprintf): Make a true c++ function.
(__small_sprintf): Ditto.
(small_printf): Ditto.
(console_printf): Ditto.
(__small_vswprintf): Ditto.
(__small_swprintf): Ditto.
* spawn.cc (spawn_guts): Remove _stdcall decoration in favor of regparm.
(hExeced): Move to globals.cc
* strfuncs.cc (current_codepage): Ditto.
(active_codepage): Ditto.
* sync.cc (lock_process::locker): Move here from dcrt0.cc.
* syscalls.cc (stat_suffixes): Move to path.cc.
* tty.cc (tty::create_master): Uncapitalize fatal warning for consistency.
* winsup.h: Include globals.h to declare most of the grab bag list of globals
which were previously defined here.
* mount.h: Move USER_* defines back to shared_info.h.
* speclib: Force temporary directory cleanup.
Diffstat (limited to 'winsup/cygwin/dcrt0.cc')
-rw-r--r-- | winsup/cygwin/dcrt0.cc | 81 |
1 files changed, 8 insertions, 73 deletions
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 961e60567..9ffbd72ff 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -1,7 +1,8 @@ /* dcrt0.cc -- essentially the main() for the Cygwin dll - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008 Red Hat, Inc. + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009 + Red Hat, Inc. This file is part of Cygwin. @@ -15,6 +16,7 @@ details. */ #include <stdlib.h> #include "glob.h" #include <ctype.h> +#include "environ.h" #include "sigproc.h" #include "pinfo.h" #include "cygerrno.h" @@ -36,79 +38,14 @@ details. */ #define PREMAIN_LEN (sizeof (user_data->premain) / sizeof (user_data->premain[0])) -extern "C" void cygwin_exit (int) __attribute__ ((noreturn)); - -HANDLE NO_COPY hMainProc = (HANDLE) -1; -HANDLE NO_COPY hMainThread; -HANDLE NO_COPY hProcToken; -HANDLE NO_COPY hProcImpToken; - -muto NO_COPY lock_process::locker; - -bool display_title; -bool strip_title_path; -bool allow_glob = true; -bool NO_COPY in_forkee; - -int __argc_safe; -int __argc; -char **__argv; -#ifdef NEWVFORK -vfork_save NO_COPY *main_vfork; -#endif - -static int NO_COPY envc; -char NO_COPY **envp; +extern "C" void cygwin_exit (int) __attribute__ ((noreturn)); extern "C" void __sinit (_reent *); -_cygtls NO_COPY *_main_tls; - -bool NO_COPY cygwin_finished_initializing; - -MTinterface _mtinterf; - -bool NO_COPY _cygwin_testing; - -char NO_COPY almost_null[1]; +static int NO_COPY envc; +static char NO_COPY **envp; -extern "C" -{ - /* This is an exported copy of environ which can be used by DLLs - which use cygwin.dll. */ - char **__cygwin_environ; - char ***main_environ = &__cygwin_environ; - /* __progname used in getopt error message */ - char *__progname; - struct per_process __cygwin_user_data = - {/* initial_sp */ 0, /* magic_biscuit */ 0, - /* dll_major */ CYGWIN_VERSION_DLL_MAJOR, - /* dll_major */ CYGWIN_VERSION_DLL_MINOR, - /* impure_ptr_ptr */ NULL, /* envptr */ NULL, - /* malloc */ malloc, /* free */ free, - /* realloc */ realloc, - /* fmode_ptr */ NULL, /* main */ NULL, /* ctors */ NULL, - /* dtors */ NULL, /* data_start */ NULL, /* data_end */ NULL, - /* bss_start */ NULL, /* bss_end */ NULL, - /* calloc */ calloc, - /* premain */ {NULL, NULL, NULL, NULL}, - /* run_ctors_p */ 0, - /* unused */ {0, 0, 0, 0, 0, 0, 0}, - /* UNUSED forkee */ 0, - /* hmodule */ NULL, - /* api_major */ CYGWIN_VERSION_API_MAJOR, - /* api_minor */ CYGWIN_VERSION_API_MINOR, - /* unused2 */ {0, 0, 0, 0, 0, 0}, - /* threadinterface */ &_mtinterf, - /* impure_ptr */ _GLOBAL_REENT, - }; - bool ignore_case_with_glob; - int _check_for_executable = true; -}; - -int NO_COPY __api_fatal_exit_val = 1; -char *old_title; -char title_buf[TITLESIZE + 1]; +static char title_buf[TITLESIZE + 1]; static void do_global_dtors () @@ -1039,8 +976,6 @@ __main (void) atexit (do_global_dtors); } -exit_states NO_COPY exit_state; - void __stdcall do_exit (int status) { |