From 166b2571ce446b4085d4c2067b0d0d36c608f131 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 16 Oct 2000 23:55:58 +0000
Subject: * Makefile.in: Remove some obsolete stuff. * dcrt0.cc (dll_crt0_1):
 Call signal_fixup_after_exec where appropriate.  Set myself->uid from parent
 version.  Just use ThreadItem Init method.  Close or store hexec_proc as
 appropriate. (_dll_crt0): Store user_data->forkee here so that proper tests
 can be made subsequently. (do_exit): Remove hExeced stuff. * environ.cc
 (environ_init): Accept environ count as well as environ pointer. * environ.h:
 Reflect above change. * pinfo.cc (pinfo_init): Ditto.  Accept environ count.
 (fixup_in_spawned_child): Remove. * spawn.cc (spawn_guts): Move signal code
 to dll_crt0_1.  Don't suspend execing process since it is no longer
 necessary.  Store envc. * exceptions.cc (signal_fixup_after_exec): New
 function. (call_handler): Remove hExeced test. * child_info.h
 (cygheap_exec_info): Store envc as well as envp. (child_info_spawn): Store
 hexec_proc so that it can be closed in child. * path.cc
 (normalize_posix_path): Avoid intermediate use of temporary cwd buf.
 (normalize_win32_path): Ditto. (cwdstuff::get_initial): Always set lock. *
 sigproc.h: Remove hExeced. * strace.cc (strace::vsprntf): Modify to
 accomodate for lack of hExeced. * thread.cc (MTinterface::Init): Merge Init1
 and ClearReent into this method. (MTinterface::Init1): Eliminate.
 (MTinterface::ClearReent): Eliminate. * thread.h: Reflect above changes. *
 include/sys/strace.h (strace): Make microseconds() public.  Make various
 functions 'regparm', throughout. * pinfo.h (_pinfo): Inline simple signal
 manipulation functions.  Requires inclusion of thread.h which was removed
 from .cc files, where appropriate. throughout. * pinfo.cc: Eliminate signal
 manipulation functions. (_pinfo::exit): Calculate total rusage for exiting
 process here. * cygheap.cc (size2bucket): Eliminate. (init_buckets): Ditto.
 (_cmalloc): Calculate size and bits in a loop rather than going through a
 function call. (_crealloc): Use stored array index to calculate allocated
 size. * spawn.cc (spawn_guts): Use _pinfo exit method to exit, calculating
 cpu usage.

---
 winsup/cygwin/path.cc | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'winsup/cygwin/path.cc')

diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index cfc81263a..cbd6e5493 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -62,7 +62,6 @@ details. */
 #include "cygerrno.h"
 #include "fhandler.h"
 #include "path.h"
-#include "thread.h"
 #include "sync.h"
 #include "sigproc.h"
 #include "pinfo.h"
@@ -574,15 +573,13 @@ normalize_posix_path (const char *src, char *dst)
     }
   if (!isslash (src[0]))
     {
-      char cwd[MAX_PATH];
-      if (!cygcwd.get (cwd))
+      if (!cygcwd.get (dst))
 	return get_errno ();
-      if (strlen (cwd) + 1 + strlen (src) >= MAX_PATH)
+      if (strlen (dst) + 1 + strlen (src) >= MAX_PATH)
 	{
 	  debug_printf ("ENAMETOOLONG = normalize_posix_path (%s)", src);
 	  return ENAMETOOLONG;
 	}
-      strcpy (dst, cwd);
       dst = strchr (dst, '\0');
       if (*src == '.')
 	goto sawdot;
@@ -681,17 +678,15 @@ normalize_win32_path (const char *src, char *dst)
 
   if (!SLASH_P (src[0]) && strchr (src, ':') == NULL)
     {
-      char cwd[MAX_PATH];
-      if (!cygcwd.get (cwd, 0))
+      if (!cygcwd.get (dst, 0))
 	return get_errno ();
-      if (strlen (cwd) + 1 + strlen (src) >= MAX_PATH)
+      if (strlen (dst) + 1 + strlen (src) >= MAX_PATH)
 	{
 	  debug_printf ("ENAMETOOLONG = normalize_win32_path (%s)", src);
 	  return ENAMETOOLONG;
 	}
-      strcpy (dst, cwd);
       dst += strlen (dst);
-      if (!*cwd || !SLASH_P (dst[-1]))
+      if (!SLASH_P (dst[-1]))
 	*dst++ = '\\';
     }
   /* Two leading \'s?  If so, preserve them.  */
@@ -2775,7 +2770,7 @@ cygwin_split_path (const char *path, char *dir, char *file)
     })
 
 /* Return TRUE if two strings match up to length n */
-int __stdcall
+extern "C" int __stdcall
 strncasematch (const char *s1, const char *s2, size_t n)
 {
   if (s1 == s2)
@@ -2792,7 +2787,7 @@ strncasematch (const char *s1, const char *s2, size_t n)
 }
 
 /* Return TRUE if two strings match */
-int __stdcall
+extern "C" int __stdcall
 strcasematch (const char *s1, const char *s2)
 {
   if (s1 == s2)
@@ -2807,7 +2802,7 @@ strcasematch (const char *s1, const char *s2)
   return *s2 == '\0';
 }
 
-char * __stdcall
+extern "C" char * __stdcall
 strcasestr (const char *searchee, const char *lookfor)
 {
   if (*searchee == 0)
@@ -2881,10 +2876,11 @@ cwdstuff::fixup_after_exec (char *win32_cwd, char *posix_cwd, DWORD hash_cwd)
 bool
 cwdstuff::get_initial ()
 {
+  lock->acquire ();
+
   if (win32)
     return 1;
 
-  lock->acquire ();
   int i;
   DWORD len, dlen;
   for (i = 0, dlen = MAX_PATH, len = 0; i < 3; dlen *= 2, i++)
@@ -2899,6 +2895,7 @@ cwdstuff::get_initial ()
       __seterrno ();
       lock->release ();
       debug_printf ("get_initial_cwd failed, %E");
+      lock->release ();
       return 0;
     }
   set (NULL);
-- 
cgit v1.2.3