mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/doc
In directory usw-pr-cvs1:/tmp/cvs-serv23286/doc

Log Message:
Directory /cvsroot/mingw/doc added to the repository

Update of /cvsroot/mingw/utils
In directory usw-pr-cvs1:/tmp/cvs-serv19134/utils

Log Message:
Directory /cvsroot/mingw/utils added to the repository

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory usw-pr-cvs1:/tmp/cvs-serv8570

Modified Files:
	ChangeLog.MSYS path.cc spawn.cc 
Log Message:

	* path.cc (QuotedRelativePath): New function.
	(cygwin_conv_to_win32_path): Use QuotedRelativePath to filter out
	conversion.
	(cygwin_conv_to_win32_path): Modify all \\ to / in the win32_path.
	* spawn.cc (dup_maybe): Remove extraneous debug strings.



Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog.MSYS	6 Feb 2002 23:41:18 -0000	1.4
--- ChangeLog.MSYS	20 Feb 2002 21:56:27 -0000	1.5
***************
*** 1,2 ****
--- 1,10 ----
+ 2001-02-20  Earnie Boyd  <ea...@us...>
+ 
+ 	* path.cc (QuotedRelativePath): New function.
+ 	(cygwin_conv_to_win32_path): Use QuotedRelativePath to filter out
+ 	conversion.
+ 	(cygwin_conv_to_win32_path): Modify all \\ to / in the win32_path.
+ 	* spawn.cc (dup_maybe): Remove extraneous debug strings.
+ 
  2001-02-06  Earnie Boyd  <ea...@us...>
  

Index: path.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/path.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** path.cc	4 Feb 2002 15:35:29 -0000	1.5
--- path.cc	20 Feb 2002 21:56:27 -0000	1.6
***************
*** 3197,3200 ****
--- 3197,3220 ----
  }
  
+ static bool
+ QuotedRelativePath (const char *Path)
+ {
+     if (Path[0] == '"' || Path[0] == '\'')
+       {
+ 	if (Path[1] == '/')
+ 	  {
+ 	    return false;
+ 	  }
+ 	else
+ 	  {
+ 	    return true;
+ 	  }
+       }
+     else
+       {
+ 	return false;
+       }
+ }
+ 
  /******************** Exported Path Routines *********************/
  
***************
*** 3208,3211 ****
--- 3228,3232 ----
    bool found_path = true;
    const char *spath = path;
+   char *sptr;
    debug_printf("path: %s", path);
  
***************
*** 3222,3227 ****
  	  spath = strchr(spath, '=');
  	  spath++;
! 	  if (*spath) 
  	      found_path = true;
  	}
        else
--- 3243,3253 ----
  	  spath = strchr(spath, '=');
  	  spath++;
! 	  if (QuotedRelativePath (spath))
! 	    found_path = false;
! 	  else
! 	    {
! 	      spath++;
  	      found_path = true;
+ 	    }
  	}
        else
***************
*** 3231,3237 ****
      {
        spath++;
!       if (spath[0] )
  	{
! 	  found_path = true;
  	}
        else
--- 3257,3269 ----
      {
        spath++;
!       if (spath[0])
  	{
! 	  if (QuotedRelativePath (spath))
! 	      found_path = false;
! 	  else
! 	    {
! 	      spath++;
! 	      found_path = true;
! 	    }
  	}
        else
***************
*** 3268,3271 ****
--- 3300,3305 ----
  	}
        strcat (win32_path, p.get_win32 ());
+       while (sptr = strchr(win32_path, '\\'))
+ 	  sptr[0] = '/';
        return 0;
      }

Index: spawn.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/spawn.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** spawn.cc	6 Feb 2002 23:41:18 -0000	1.5
--- spawn.cc	20 Feb 2002 21:56:27 -0000	1.6
***************
*** 256,265 ****
    void dup_maybe (int i)
    {
-     HMMM(i);
-     HMMM(calloced);
-     HMMM(argv[i]);
      if (i >= calloced)
        argv[i] = cstrdup1 (argv[i]);
-     HMMM(argv[i]);
    }
    void dup_all ()
--- 256,261 ----

Update of /cvsroot/mingw/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv24186

Modified Files:
	msys.shtml mingwfaq.shtml 
Log Message:
Fixed two cosmetic typos

Index: msys.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/msys.shtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** msys.shtml	26 Jan 2002 18:13:43 -0000	1.5
--- msys.shtml	15 Feb 2002 20:45:42 -0000	1.6
***************
*** 47,51 ****
              "msys\1.0\msys.bat", and set the "Start In:" field of the shortcut 
              to "msys\1.0\bin".  More information about using MinGW with 
!             MSYS can be found in the <a href="http://localhost/mingw/mingwfaq.shtml#faq-usingwithmsys">FAQ</a>, 
              and the current MSYS documentation can be found in the &quot;\msys\1.0\doc\msys&quot; 
              subdirectory within the binary distribution.
--- 47,51 ----
              &quot;msys\1.0\msys.bat&quot;, and set the &quot;Start In:&quot; field of the shortcut 
              to &quot;msys\1.0\bin&quot;.  More information about using MinGW with 
!             MSYS can be found in the <a href="mingwfaq.shtml#faq-usingwithmsys">FAQ</a>, 
              and the current MSYS documentation can be found in the &quot;\msys\1.0\doc\msys&quot; 
              subdirectory within the binary distribution.

Index: mingwfaq.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/mingwfaq.shtml,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** mingwfaq.shtml	6 Feb 2002 17:00:39 -0000	1.32
--- mingwfaq.shtml	15 Feb 2002 20:45:42 -0000	1.33
***************
*** 91,95 ****
           The project was originally started by Colin Peters, who created headers and import 
           definitions for Microsoft's crtdll C runtime in an effort to remove the dependancy of 
!          the Cygwin1.dll from applications built by Cygwin's implemtation of GCC.  It is that 
           set of headers and import definitions that constitute what MinGW is and is interchangeably 
           refered to as the MinGW runtime.  
--- 91,95 ----
           The project was originally started by Colin Peters, who created headers and import 
           definitions for Microsoft's crtdll C runtime in an effort to remove the dependancy of 
!          the Cygwin1.dll from applications built by Cygwin's implementation of GCC.  It is that 
           set of headers and import definitions that constitute what MinGW is and is interchangeably 
           refered to as the MinGW runtime.  

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/cygwin
In directory usw-pr-cvs1:/tmp/cvs-serv8782/include/cygwin

Modified Files:
	version.h 
Log Message:

2001-02-06  Earnie Boyd  <ea...@us...>

	* strace.cc (spawn_guts):  Filter against MAX_PATH overrun.
	* include/cygwin/version.h: Increment to version 1.0.5



Index: version.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/cygwin/version.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** version.h	2002/02/04 15:35:30	1.5
--- version.h	2002/02/06 23:41:18	1.6
***************
*** 43,50 ****
  
    /* The current cygwin version is 1.3.3 */
!   /* The current msys version is 1.0.2 */
  
  #define CYGWIN_VERSION_DLL_MAJOR 1000
! #define CYGWIN_VERSION_DLL_MINOR 4
  
        /* Major numbers before CYGWIN_VERSION_DLL_EPOCH are
--- 43,50 ----
  
    /* The current cygwin version is 1.3.3 */
!   /* The current msys version is 1.0.5 */
  
  #define CYGWIN_VERSION_DLL_MAJOR 1000
! #define CYGWIN_VERSION_DLL_MINOR 5
  
        /* Major numbers before CYGWIN_VERSION_DLL_EPOCH are

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory usw-pr-cvs1:/tmp/cvs-serv8782

Modified Files:
	ChangeLog.MSYS spawn.cc 
Log Message:

2001-02-06  Earnie Boyd  <ea...@us...>

	* strace.cc (spawn_guts):  Filter against MAX_PATH overrun.
	* include/cygwin/version.h: Increment to version 1.0.5



Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChangeLog.MSYS	2002/02/04 15:35:29	1.3
--- ChangeLog.MSYS	2002/02/06 23:41:18	1.4
***************
*** 1,2 ****
--- 1,7 ----
+ 2001-02-06  Earnie Boyd  <ea...@us...>
+ 
+ 	* strace.cc (spawn_guts):  Filter against MAX_PATH overrun.
+ 	* include/cygwin/version.h: Increment to version 1.0.5
+ 
  2001-01-25  Earnie Boyd  <ea...@us...>
  

Index: spawn.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/spawn.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** spawn.cc	2002/02/04 15:35:29	1.4
--- spawn.cc	2002/02/06 23:41:18	1.5
***************
*** 493,499 ****
  	  char tmpbuf[MAX_PATH];
  
! 	  cygwin_conv_to_win32_path(newargv[i], tmpbuf);
! 	  debug_printf("%d of %d, %s, %s", i, ac, newargv[i], tmpbuf);
! 	  newargv.replace (i, tmpbuf);
  	}
        for (int i = 0; i < newargv.argc; i++)
--- 493,502 ----
  	  char tmpbuf[MAX_PATH];
  
! 	  if (strlen(newargv[i]) < MAX_PATH)
! 	    {
! 	      cygwin_conv_to_win32_path(newargv[i], tmpbuf);
! 	      debug_printf("%d of %d, %s, %s", i, ac, newargv[i], tmpbuf);
! 	      newargv.replace (i, tmpbuf);
! 	    }
  	}
        for (int i = 0; i < newargv.argc; i++)

Update of /cvsroot/mingw/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv3246

Modified Files:
	mingwfaq.shtml 
Log Message:
Altered "objectionable" phrasing about Cygwin in the FAQ answer 
dealing with "-mno-cygwin"

Index: mingwfaq.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/mingwfaq.shtml,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** mingwfaq.shtml	2002/01/26 18:14:48	1.31
--- mingwfaq.shtml	2002/02/06 17:00:39	1.32
***************
*** 342,363 ****
        </p>
        <p>
!          There is command-line option that can be passed to Cygwin's GCC, "-mno-cygwin", 
!          that was intended to address these concerns.  When Cygwin's GCC is invoked with 
!          the "-mno-cygwin" option, executables are built without a dependency on the 
!          Cygwin DLL.  Instead, the "-mno-cygwin" option instructs GCC to use the MinGW 
!          headers and libraries (which must be located in a particular location within 
!          the Cygwin directory structure).  However, support for "-mno-cygwin" has 
!          been weak and flaky... the location at which it searches for MinGW headers 
!          has changed a time or two (with poor documentation), bugs have crept in, and 
!          maintainence of the option has NOT be a priority in development.  There is a
!          distinct possibility that "-mno-cygwin" will become depreciated in future 
!          releases of Cygwin.  If you would like to experiment with &quot;-mno-cygwin"&quot;,
!          the most intuitive documentation can be found 
           <a href="http://www.colomsat.net.co/freehost/ngiraldo/cppcygwin.html">here</a>.
!       </p>
        <p>
!          For those who would like to use a Cygwin environment for development, yet 
!          generate non-Cygwin-dependant executables, a much easier option to 
!          "-mno-cygwin" exists.  Simply install Cygwin and the MinGW distribution 
           in seperate directories (i.e. &quot;C:\CYGWIN&quot; and &quot;C:\MINGW&quot;), and make sure 
           that the &quot;/bin&quot; subdirectory beneath your MinGW installation comes before 
--- 342,358 ----
        </p>
        <p>
!          There is command-line option that can be passed to Cygwin's GCC,
!          "-mno-cygwin", that was intended to address these concerns. When Cygwin's
!          GCC is invoked with the "-mno-cygwin" option, executables are built without
!          a dependency on the Cygwin DLL.  However, while this works effortlessly for
!          C applications, using "-mno-cygwin" to compile C++ applications requires
!          additional configuration work up-front.  A large amount of documentation on
!          this is in circulation, but the most up-to-date can be found 
           <a href="http://www.colomsat.net.co/freehost/ngiraldo/cppcygwin.html">here</a>.
!       </p>         
        <p>
!          For those who would like to use the Cygwin environment for development, yet
!          generate non-Cygwin-dependant executables, a much easier option to "-mno-cygwin"
!          does exist.  Simply install Cygwin and the MinGW distribution 
           in seperate directories (i.e. &quot;C:\CYGWIN&quot; and &quot;C:\MINGW&quot;), and make sure 
           that the &quot;/bin&quot; subdirectory beneath your MinGW installation comes before 

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory usw-pr-cvs1:/tmp/cvs-serv12339/src/winsup/cygwin

Modified Files:
	ChangeLog.MSYS path.cc pinfo.cc spawn.cc uname.cc winsup.h 
Log Message:
Bring HEAD to msys-1_0_4

Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog.MSYS	2001/11/30 16:41:08	1.2
--- ChangeLog.MSYS	2002/02/04 15:35:29	1.3
***************
*** 1,2 ****
--- 1,22 ----
+ 2001-01-25  Earnie Boyd  <ea...@us...>
+ 
+ 	* spawn.cc (spawn_guts): Move path/switch filter code to
+ 	cygwin_conv_to_win32_path.  Call cygwin_conv_to_win32_path for all
+ 	command line arguments.
+ 	* path.cc (cygwin_conv_to_win32_path): Move path/switch filter code
+ 	from spawn_guts to here.  Pass back input if path not found.
+ 	(class av::replace): New function.
+ 	* uname.cc (uname): Change default system to MINGW32.
+ 	* pinfo.cc (set_myself): Don't OuputDebugString unless strace.active.
+ 	* include/cygwin/version.h: Increment to version 1.0.4.
+ 	* include/sys/strace.h (_STRACE_ON): New macro.
+ 	(_STRACE_OFF): Ditto.
+ 	(MDEBUG): Ditto.
+ 
+ 2002-01-08  Earnie Boyd  <ea...@us...>
+ 
+ 	* spawn.cc (spawn_guts): Enhance path name translation filter.
+ 	* include/cygwin/version.h: Increment to version 1.0.3.
+ 
  2001-11-30  Earnie Boyd  <ea...@us...>
  

Index: path.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/path.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** path.cc	2001/11/30 16:41:09	1.4
--- path.cc	2002/02/04 15:35:29	1.5
***************
*** 180,183 ****
--- 180,184 ----
  
    syscall_printf ("src %s", src);
+   syscall_printf ("dst %s", dst);
    if (isdrive (src) || strpbrk (src, "\\:"))
      {
***************
*** 189,192 ****
--- 190,195 ----
        if (!cygheap->cwd.get (dst))
  	return get_errno ();
+       syscall_printf("src %s", src);
+       syscall_printf("dst %s", dst);
        dst = strchr (dst, '\0');
        if (*src == '.')
***************
*** 198,201 ****
--- 201,205 ----
        if (dst > dst_start && !isslash (dst[-1]))
  	*dst++ = '/';
+       syscall_printf("dst %s", dst);
      }
    /* Two leading /'s?  If so, preserve them.  */
***************
*** 3202,3214 ****
  cygwin_conv_to_win32_path (const char *path, char *win32_path)
  {
!   path_conv p (path, PC_SYM_FOLLOW);
!   if (p.error)
      {
!       set_errno (p.error);
!       return -1;
      }
  
!   strcpy (win32_path, p.get_win32 ());
!   return 0;
  }
  
--- 3206,3278 ----
  cygwin_conv_to_win32_path (const char *path, char *win32_path)
  {
!   bool found_path = true;
!   const char *spath = path;
!   debug_printf("path: %s", path);
! 
!   if (spath[0] == '/' && strlen(spath) == 2)
!       found_path = false;
!   else if (spath[0] == '-' &&
! 	   spath[1] &&
! 	   spath[1] != '-' &&
! 	   spath[2])
      {
!       spath += 2;
!       if (strchr(spath, '='))
! 	{
! 	  spath = strchr(spath, '=');
! 	  spath++;
! 	  if (*spath) 
! 	      found_path = true;
! 	}
!       else
! 	  found_path = true;
!     }
!   else if ((spath = strchr(spath, '=')))
!     {
!       spath++;
!       if (spath[0] )
! 	{
! 	  found_path = true;
! 	}
!       else
! 	{
! 	  spath = path;
! 	}
!     }
!   else
!     {
!       spath = path;
      }
  
!   if (found_path)
!     {
!       path_conv p (spath, PC_SYM_FOLLOW);
!       if (p.error)
! 	{
! 	  set_errno (p.error);
! 	  debug_printf("path_conv ERROR: %d", p.error);
! 	  return -1;
! 	}
!       strcpy(win32_path, p.get_win32());
!       if (win32_path[1] != ':' || win32_path[2] != '\\')
! 	{
! 	  strcpy(win32_path, path);
! 	  return 0;
! 	}
! 
!       *win32_path = '\0';
!       if (spath - path)
! 	{
! 	  strncpy (win32_path, path, spath - path);
! 	  *(win32_path + (spath - path)) = '\0';
! 	}
!       strcat (win32_path, p.get_win32 ());
!       return 0;
!     }
!   else
!     {
!       strcpy (win32_path, path);
!       return 0;
!     }
  }
  

Index: pinfo.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/pinfo.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pinfo.cc	2001/10/15 22:22:33	1.2
--- pinfo.cc	2002/02/04 15:35:29	1.3
***************
*** 65,69 ****
    __small_sprintf (buf, "cYg%8x %x", _STRACE_INTERFACE_ACTIVATE_ADDR,
  		   &strace.active);
!   OutputDebugString (buf);
  
    (void) GetModuleFileName (NULL, myself->progname,
--- 65,70 ----
    __small_sprintf (buf, "cYg%8x %x", _STRACE_INTERFACE_ACTIVATE_ADDR,
  		   &strace.active);
!   if (strace.active)
!     OutputDebugString (buf);
  
    (void) GetModuleFileName (NULL, myself->progname,

Index: spawn.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/spawn.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spawn.cc	2001/11/30 16:41:15	1.3
--- spawn.cc	2002/02/04 15:35:29	1.4
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "winsup.h"
+ #include <stdio.h>
  #include <stdlib.h>
  #include <stdarg.h>
***************
*** 38,43 ****
  #include "environ.h"
  
- #define LINE_BUF_CHUNK (MAX_PATH * 2)
- 
  static suffix_info std_suffixes[] =
  {
--- 39,42 ----
***************
*** 176,188 ****
  class linebuf
  {
   public:
-   size_t ix;
    char *buf;
!   size_t alloced;
!   linebuf () : ix (0), buf (NULL), alloced (0) {}
    ~linebuf () {/* if (buf) free (buf);*/}
    void add (const char *what, int len);
    void add (const char *what) {add (what, strlen (what));}
    void prepend (const char *what, int len);
  };
  
--- 175,189 ----
  class linebuf
  {
+  private:
+   size_t bufidx;
+   size_t alloced;
   public:
    char *buf;
!   linebuf () : bufidx (0), alloced (0), buf (NULL) {}
    ~linebuf () {/* if (buf) free (buf);*/}
    void add (const char *what, int len);
    void add (const char *what) {add (what, strlen (what));}
    void prepend (const char *what, int len);
+   size_t idx() {return bufidx;}
  };
  
***************
*** 190,202 ****
  linebuf::add (const char *what, int len)
  {
!   size_t newix;
!   if ((newix = ix + len) >= alloced || !buf)
      {
!       alloced += LINE_BUF_CHUNK + newix;
        buf = (char *) realloc (buf, alloced + 1);
      }
!   memcpy (buf + ix, what, len);
!   ix = newix;
!   buf[ix] = '\0';
  }
  
--- 191,203 ----
  linebuf::add (const char *what, int len)
  {
!   size_t nbufidx;
!   if ((nbufidx = bufidx + len) >= alloced || !buf)
      {
!       alloced += (MAX_PATH * 2) + nbufidx;
        buf = (char *) realloc (buf, alloced + 1);
      }
!   memcpy (buf + bufidx, what, len);
!   bufidx = nbufidx;
!   buf[bufidx] = '\0';
  }
  
***************
*** 205,221 ****
  {
    int buflen;
!   size_t newix;
!   if ((newix = ix + len) >= alloced)
      {
!       alloced += LINE_BUF_CHUNK + newix;
        buf = (char *) realloc (buf, alloced + 1);
!       buf[ix] = '\0';
      }
    if ((buflen = strlen (buf)))
        memmove (buf + len, buf, buflen + 1);
    else
!       buf[newix] = '\0';
    memcpy (buf, what, len);
!   ix = newix;
  }
  
--- 206,222 ----
  {
    int buflen;
!   size_t nbufidx;
!   if ((nbufidx = bufidx + len) >= alloced)
      {
!       alloced += (MAX_PATH * 2) + nbufidx;
        buf = (char *) realloc (buf, alloced + 1);
!       buf[bufidx] = '\0';
      }
    if ((buflen = strlen (buf)))
        memmove (buf + len, buf, buflen + 1);
    else
!       buf[nbufidx] = '\0';
    memcpy (buf, what, len);
!   bufidx = nbufidx;
  }
  
***************
*** 249,256 ****
--- 250,265 ----
        }
    }
+   void replace (int i, const char *arg)
+     {
+       argv[i] = cstrdup1 (arg);
+     }
    void dup_maybe (int i)
    {
+     HMMM(i);
+     HMMM(calloced);
+     HMMM(argv[i]);
      if (i >= calloced)
        argv[i] = cstrdup1 (argv[i]);
+     HMMM(argv[i]);
    }
    void dup_all ()
***************
*** 314,318 ****
    path_conv real_path;
  
!   linebuf one_line;
  
    STARTUPINFO si = {0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL};
--- 323,327 ----
    path_conv real_path;
  
!   class linebuf one_line;
  
    STARTUPINFO si = {0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL};
***************
*** 355,359 ****
      /* nothing */;
  
!   av newargv (ac, argv);
  
    int null_app_name = 0;
--- 364,368 ----
      /* nothing */;
  
!   class av newargv (ac, argv);
  
    int null_app_name = 0;
***************
*** 374,377 ****
--- 383,387 ----
        strcpy (real_path, argv[0]);
        null_app_name = 1;
+       HMMM("skip_arg_parsing");
        goto skip_arg_parsing;
      }
***************
*** 388,391 ****
--- 398,402 ----
    /* If the file name ends in either .exe, .com, .bat, or .cmd we assume
       that it is NOT a script file */
+   HMMM(ext);
    while (*ext == '\0')
      {
***************
*** 468,509 ****
        find_exec (pgm, real_path, "PATH=", 0, &ext);
        newargv.unshift (real_path, 1);
      }
  
    if (real_path.iscygexec ())
      newargv.dup_all ();
    else
      {
-       // FIXME-1.0:
-       //	When iscygexec is fixed to truely identify an msys executable
-       //	the filter coding for an occurance of .*/bin.* needs to be 
-       //	removed.
        for (int i = 0; i < newargv.argc; i++)
  	{
  	  //convert argv to win32
  	  char tmpbuf[MAX_PATH];
! 	  // FIXME-0.1:
! 	  //	    Need to add a filter so that if newargv[0] contains
! 	  //	    .*/bin.* it doesn't convert to a win32 path.
! 	  //	    NOTE: This is a temporary work around until the FIXME-1.0
! 	  //		  can be developed.
! 	  //
! 	  // FIXME-0.2
! 	  //	    Need to filter win32 one character switches of the type /x
! 	  //	    where / switch indicator and x is the switch operator.  The
! 	  //	    condition for this is that the string length is exactly 2.
! 	  if (strchr(newargv[i], '/'))
! 	    {
! 	      if (strstr (newargv[i], "/bin") == 0 &&
! 		  strstr (newargv[i], "/sbin") == 0 &&
! 		  strlen (newargv[i]) != 2
! 		  )
! 		{
! 		  cygwin_conv_to_win32_path(newargv[i], tmpbuf);
! 		  debug_printf("%d of %d, %s, %s", i, ac, newargv[i], tmpbuf);
! 		  {
! 		    strcpy(newargv[i], tmpbuf);
! 		  }
! 		}
! 	    }
  	}
        for (int i = 0; i < newargv.argc; i++)
--- 479,499 ----
        find_exec (pgm, real_path, "PATH=", 0, &ext);
        newargv.unshift (real_path, 1);
+       HMMM(ext);
      }
  
+   FIXME(1.0);
+   // iscygexec needs adjusted so that it truely identifies an MSYS executable.
    if (real_path.iscygexec ())
      newargv.dup_all ();
    else
      {
        for (int i = 0; i < newargv.argc; i++)
  	{
  	  //convert argv to win32
  	  char tmpbuf[MAX_PATH];
! 
! 	  cygwin_conv_to_win32_path(newargv[i], tmpbuf);
! 	  debug_printf("%d of %d, %s, %s", i, ac, newargv[i], tmpbuf);
! 	  newargv.replace (i, tmpbuf);
  	}
        for (int i = 0; i < newargv.argc; i++)
***************
*** 514,517 ****
--- 504,508 ----
  	  newargv.dup_maybe (i);
  	  a = i ? newargv[i] : (char *) real_path;
+ 	  HMMM(a);
  	  int len = strlen (a);
  	  if (len != 0 && !strpbrk (a, " \t\n\r\""))
***************
*** 533,539 ****
  		  /* Find length of string of backslashes */
  		  int n = strspn (p, "\\");
  		  if (!n)
! 		    one_line.add ("\\\"", 2);	/* No backslashes, so it must be a ".
! 						   The " has to be protected with a backslash. */
  		  else
  		    {
--- 524,531 ----
  		  /* Find length of string of backslashes */
  		  int n = strspn (p, "\\");
+ 		   /* No backslashes, so it must be a ".
+ 		      The " has to be protected with a backslash. */
  		  if (!n)
! 		    one_line.add ("\\\"", 2);	
  		  else
  		    {
***************
*** 555,564 ****
  	}
  
        MALLOC_CHECK;
!       if (one_line.ix)
! 	one_line.buf[one_line.ix - 1] = '\0';
        else
  	one_line.add ("", 1);
        MALLOC_CHECK;
      }
  
--- 547,563 ----
  	}
  
+ #if 0
+       FIXME(1.1);
+       //    I renamed ix to bufidx and made it private.
+       //    This is the only public place it's used.
+       //    Null endings are handled by the linbuf class so I don't see this
+       //      need.  If argv is funky in children then this is the culprit.
        MALLOC_CHECK;
!       if (one_line.idx())
! 	one_line.buf[one_line.idx() - 1] = '\0';
        else
  	one_line.add ("", 1);
        MALLOC_CHECK;
+ #endif
      }
  

Index: uname.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/uname.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** uname.cc	2001/10/15 22:22:33	1.2
--- uname.cc	2002/02/04 15:35:29	1.3
***************
*** 28,32 ****
    memset (name, 0, sizeof (*name));
    if (! GetEnvironmentVariable("MSYSTEM", msystem, sizeof (msystem)))
!       strcpy (msystem, "MSYS");
    __small_sprintf (name->sysname, "%s_%s", msystem, osname);
  
--- 28,32 ----
    memset (name, 0, sizeof (*name));
    if (! GetEnvironmentVariable("MSYSTEM", msystem, sizeof (msystem)))
!       strcpy (msystem, "MINGW32");
    __small_sprintf (name->sysname, "%s_%s", msystem, osname);
  

Index: winsup.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/winsup.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** winsup.h	2001/10/15 22:22:33	1.4
--- winsup.h	2002/02/04 15:35:29	1.5
***************
*** 21,24 ****
--- 21,28 ----
  #endif
  
+ #define FIXME(FIXNO) debug_printf("%s-%s", "FIXME", (FIXNO))
+ static int HMMMcnt = 0;
+ #define HMMM(HUM) debug_printf("%s-%d: %s", "HMMM", HMMMcnt++, (HUM))
+ 
  #define alloca __builtin_alloca
  #define strlen __builtin_strlen

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/sys
In directory usw-pr-cvs1:/tmp/cvs-serv12339/src/winsup/cygwin/include/sys

Modified Files:
	strace.h 
Log Message:
Bring HEAD to msys-1_0_4

Index: strace.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/sys/strace.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** strace.h	2001/08/07 17:51:16	1.1.1.1
--- strace.h	2002/02/04 15:35:30	1.2
***************
*** 78,81 ****
--- 78,88 ----
  #define _STRACE_THREAD	 0x40000 // thread-locking calls
  #define _STRACE_NOTALL	 0x80000 // don't include if _STRACE_ALL
+ #if defined (DEBUGGING)
+ #define _STRACE_ON strace.active = 1;
+ #define _STRACE_OFF strace.active = 0;
+ #else
+ #define _STRACE_ON
+ #define _STRACE_OFF
+ #endif
  
  #ifdef __cplusplus
***************
*** 135,138 ****
--- 142,156 ----
  
  #define debug_printf(fmt, args...) strace_printf_wrap(DEBUG, fmt , ## args)
+ #if defined (DEBUGGING)
+ #define mdebug(mdebug_active, mdebug_function, mdebug_string) \
+   do { \
+       char mdebug_buf[2048]; \
+       sprintf (mdebug_buf, "%s [%d]: %s", mdebug_function, mdebug_active, mdebug_string); \
+       OutputDebugString (mdebug_buf); \
+      } \
+   while (0)
+ #else
+ #define mdebug(mdebug_active, mdebug_function, mdebug_string)
+ #endif
  #define paranoid_printf(fmt, args...) strace_printf_wrap(PARANOID, fmt , ## args)
  #define select_printf(fmt, args...) strace_printf_wrap(SELECT, fmt , ## args)

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/cygwin
In directory usw-pr-cvs1:/tmp/cvs-serv12339/src/winsup/cygwin/include/cygwin

Modified Files:
	version.h 
Log Message:
Bring HEAD to msys-1_0_4

Index: version.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/cygwin/version.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** version.h	2001/11/30 16:41:25	1.4
--- version.h	2002/02/04 15:35:30	1.5
***************
*** 46,50 ****
  
  #define CYGWIN_VERSION_DLL_MAJOR 1000
! #define CYGWIN_VERSION_DLL_MINOR 2
  
        /* Major numbers before CYGWIN_VERSION_DLL_EPOCH are
--- 46,50 ----
  
  #define CYGWIN_VERSION_DLL_MAJOR 1000
! #define CYGWIN_VERSION_DLL_MINOR 4
  
        /* Major numbers before CYGWIN_VERSION_DLL_EPOCH are

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory usw-pr-cvs1:/tmp/cvs-serv2282

Modified Files:
      Tag: msys-1_0_4
	winsup.h 
Log Message:
Correction of file

Index: winsup.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/winsup.h,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** winsup.h	2001/10/15 22:22:33	1.4
--- winsup.h	2002/02/04 14:59:17	1.4.4.1
***************
*** 21,24 ****
--- 21,28 ----
  #endif
  
+ #define FIXME(FIXNO) debug_printf("%s-%s", "FIXME", (FIXNO))
+ static int HMMMcnt = 0;
+ #define HMMM(HUM) debug_printf("%s-%d: %s", "HMMM", HMMMcnt++, (HUM))
+ 
  #define alloca __builtin_alloca
  #define strlen __builtin_strlen