From: Earnie B. <ea...@us...> - 2004-04-30 22:42:43
|
Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26607 Modified Files: ChangeLog.MSYS path.cc Log Message: * path.cc (msys_p2w): Add recognition of path after comma in switch. Index: ChangeLog.MSYS =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** ChangeLog.MSYS 30 Apr 2004 12:42:49 -0000 1.67 --- ChangeLog.MSYS 30 Apr 2004 22:42:33 -0000 1.68 *************** *** 4,7 **** --- 4,8 ---- * window.cc: Add TRACE_IN throughout. (Winmain): Revert the changes from 04-22. Add a FIXME MessageBox. + * path.cc (msys_p2w): Add recognition of path after comma in switch. 2004-04-22 Earnie Boyd <ea...@us...> Index: path.cc =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/path.cc,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** path.cc 30 Mar 2004 12:31:56 -0000 1.44 --- path.cc 30 Apr 2004 22:42:33 -0000 1.45 *************** *** 2976,2979 **** --- 2976,3000 ---- } // + // Check for paths after commas, if string begins with a '-' character. + // + else if ((sspath = strchr(spath, ',')) && spath[0] == '-') + { + if (IsAbsWin32Path (sspath + 1)) { + debug_printf("returning: %s", path); + return (char *)path; + } + char *swin32_path = msys_p2w(sspath + 1); + if (swin32_path == (sspath + 1)) { + debug_printf("returning: %s", path); + return (char *)path; + } + *sspath = '\0'; + retpathcpy (spath); + retpathcat (","); + retpathcat (swin32_path); + free (swin32_path); + return ScrubRetpath (retpath); + } + // // Check for POSIX path lists. // But we have to allow processing of quoted strings and switches first |