Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory usw-pr-cvs1:/tmp/cvs-serv2003
Modified Files:
ChangeLog.MSYS dcrt0.cc path.cc
Log Message:
* dcrt0.cc: Add TRACE_IN throughout.
* path.cc (cygwin_conv_to_win32_path): Add comments. Add logic to
default case to handle argument of var_foo=/path/bar.
Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ChangeLog.MSYS 29 Aug 2002 22:12:00 -0000 1.22
--- ChangeLog.MSYS 7 Sep 2002 19:40:20 -0000 1.23
***************
*** 1,2 ****
--- 1,8 ----
+ 2002-09-07 Earnie Boyd <earnie@...>
+
+ * dcrt0.cc: Add TRACE_IN throughout.
+ * path.cc (cygwin_conv_to_win32_path): Add comments. Add logic to
+ default case to handle argument of var_foo=/path/bar.
+
2002-08-30 Earnie Boyd <earnie@...>
Index: dcrt0.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/dcrt0.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dcrt0.cc 13 Jun 2002 21:54:21 -0000 1.5
--- dcrt0.cc 7 Sep 2002 19:40:20 -0000 1.6
***************
*** 125,128 ****
--- 125,129 ----
do_global_dtors (void)
{
+ TRACE_IN;
if (user_data->dtors)
{
***************
*** 136,139 ****
--- 137,141 ----
do_global_ctors (void (**in_pfunc)(), int force)
{
+ TRACE_IN;
if (!force)
{
***************
*** 169,172 ****
--- 171,175 ----
set_os_type ()
{
+ TRACE_IN;
OSVERSIONINFO os_version_info;
const char *os;
***************
*** 217,220 ****
--- 220,224 ----
host_dependent_constants::init ()
{
+ TRACE_IN;
extern DWORD chunksize;
/* fhandler_disk_file::lock needs a platform specific upper word
***************
*** 254,257 ****
--- 258,262 ----
insert_file (char *name, char *&cmd)
{
+ TRACE_IN;
HANDLE f;
DWORD size;
***************
*** 309,312 ****
--- 314,318 ----
isquote (char c)
{
+ TRACE_IN;
char ch = c;
return ch == '"' || ch == '\'';
***************
*** 317,320 ****
--- 323,327 ----
quoted (char *cmd, int winshell)
{
+ TRACE_IN;
char *p;
char quote = *cmd;
***************
*** 362,365 ****
--- 369,373 ----
globify (char *word, char **&argv, int &argc, int &argvlen)
{
+ TRACE_IN;
if (*word != '~' && strpbrk (word, "?*[\"\'(){}") == NULL)
return 0;
***************
*** 441,444 ****
--- 449,453 ----
build_argv (char *cmd, char **&argv, int &argc, int winshell)
{
+ TRACE_IN;
int argvlen = 0;
int nesting = 0; // monitor "nesting" from insert_file
***************
*** 511,514 ****
--- 520,524 ----
check_sanity_and_sync (per_process *p)
{
+ TRACE_IN;
/* Sanity check to make sure developers didn't change the per_process */
/* struct without updating SIZEOF_PER_PROCESS [it makes them think twice */
***************
*** 553,556 ****
--- 563,567 ----
alloc_stack_hard_way (child_info_fork *ci, volatile char *b)
{
+ TRACE_IN;
void *new_stack_pointer;
MEMORY_BASIC_INFORMATION m;
***************
*** 603,606 ****
--- 614,618 ----
alloc_stack (child_info_fork *ci)
{
+ TRACE_IN;
/* FIXME: adding 16384 seems to avoid a stack copy problem during
fork on Win95, but I don't know exactly why yet. DJ */
***************
*** 630,633 ****
--- 642,646 ----
sigthread::init (const char *s)
{
+ TRACE_IN;
InitializeCriticalSection (&lock);
id = GetCurrentThreadId ();
***************
*** 641,644 ****
--- 654,658 ----
dll_crt0_1 ()
{
+ TRACE_IN;
/* According to onno@..., the exception handler record must
be on the stack. */
***************
*** 874,877 ****
--- 888,892 ----
_dll_crt0 ()
{
+ TRACE_IN;
char envbuf[8];
#ifdef DEBUGGING
***************
*** 942,945 ****
--- 957,961 ----
dll_crt0 (per_process *uptr)
{
+ TRACE_IN;
/* Set the local copy of the pointer into the user space. */
if (uptr && uptr != user_data)
***************
*** 955,958 ****
--- 971,975 ----
msys_dll_init ()
{
+ TRACE_IN;
static char **envp;
static int _fmode;
***************
*** 976,979 ****
--- 993,997 ----
__main (void)
{
+ TRACE_IN;
do_global_ctors (user_data->ctors, FALSE);
}
***************
*** 989,992 ****
--- 1007,1011 ----
do_exit (int status)
{
+ TRACE_IN;
UINT n = (UINT) status;
static int NO_COPY exit_state = 0;
***************
*** 1069,1072 ****
--- 1088,1092 ----
_exit (int n)
{
+ TRACE_IN;
do_exit ((DWORD) n & 0xffff);
}
***************
*** 1075,1078 ****
--- 1095,1099 ----
__api_fatal (const char *fmt, ...)
{
+ TRACE_IN;
char buf[4096];
va_list ap;
***************
*** 1110,1113 ****
--- 1131,1135 ----
cygbench (const char *s)
{
+ TRACE_IN;
char buf[1024];
if (GetEnvironmentVariable ("CYGWIN_BENCH", buf, sizeof (buf)))
Index: path.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/path.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** path.cc 29 Aug 2002 22:12:00 -0000 1.18
--- path.cc 7 Sep 2002 19:40:20 -0000 1.19
***************
*** 3309,3312 ****
--- 3309,3313 ----
break;
case '"':
+ // Handle a double quote case.
if (spath[1] == '/')
{
***************
*** 3326,3329 ****
--- 3327,3331 ----
break;
case '\'':
+ // Handle a single quote case.
if (spath[1] == '/')
{
***************
*** 3343,3346 ****
--- 3345,3365 ----
break;
default:
+ // This takes care of variable_foo=/bar/baz
+ if ((sspath = strchr(spath, '=')) && (sspath[1] == '/'))
+ {
+ sspath[1] = '\0';
+ retpathcpy (spath);
+ sspath[1] = '/';
+ sret = cygwin_conv_to_win32_path (&sspath[1], swin32_path);
+ if (sret)
+ {
+ retpathcpy (path);
+ retval = -1;
+ break;
+ }
+ retpathcat (swin32_path);
+ break;
+ }
+ // Oh well, nothing special found, set win32_path same as path.
retpathcpy (path);
break;
|
