summaryrefslogtreecommitdiffstats
path: root/winsup
diff options
context:
space:
mode:
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/ChangeLog6
-rw-r--r--winsup/cygwin/dcrt0.cc2
-rw-r--r--winsup/cygwin/fork.cc1
-rw-r--r--winsup/cygwin/winsup.h4
4 files changed, 11 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 6b2c38eb0..a25faa53c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,11 @@
2005-08-11 Christopher Faylor <cgf@timesys.com>
+ * dcrt0.cc: Remove ld_preload declaration.
+ * winsup.h: Move ld_preload declaration here.
+ * fork.cc (fork_child): Call ld_preload() before returning.
+
+2005-08-11 Christopher Faylor <cgf@timesys.com>
+
* child_info. (CURR_CHILD_INFO_MAGIC): Refresh.
(child_info::child_info()): New constructor.
(child_info_spawn::child_info_spawn()): Ditto.
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 7cc3ea968..e25e844c4 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -43,8 +43,6 @@ details. */
extern "C" void cygwin_exit (int) __attribute__ ((noreturn));
-void ld_preload ();
-
HANDLE NO_COPY hMainProc = (HANDLE) -1;
HANDLE NO_COPY hMainThread;
HANDLE NO_COPY hProcToken;
diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
index 6ed515b64..785aabd4f 100644
--- a/winsup/cygwin/fork.cc
+++ b/winsup/cygwin/fork.cc
@@ -242,6 +242,7 @@ fork_child (HANDLE& hParent, dll *&first_dll, bool& load_dlls)
fixup_timers_after_fork ();
fixup_hooks_after_fork ();
cygbench ("fork-child");
+ ld_preload ();
cygwin_finished_initializing = true;
return 0;
}
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
index 3c289685b..fdc8566d7 100644
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/winsup.h
@@ -236,6 +236,8 @@ extern HANDLE netapi32_handle;
extern "C" void error_start_init (const char*);
extern "C" int try_to_debug (bool waitloop = 1);
+extern void ld_preload ();
+
void set_file_api_mode (codepage_type);
extern bool cygwin_finished_initializing;
@@ -264,8 +266,10 @@ void __stdcall to_timestruc_t (FILETIME *, timestruc_t *);
void __stdcall time_as_timestruc_t (timestruc_t *);
void __stdcall timeval_to_filetime (const struct timeval *, FILETIME *);
+/* Console related */
void __stdcall set_console_title (char *);
void init_console_handler (BOOL);
+
void init_global_security ();
int __stdcall check_invalid_virtual_addr (const void *s, unsigned sz) __attribute__ ((regparm(2)));