From: <ea...@us...> - 2002-08-29 22:12:03
|
Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin In directory usw-pr-cvs1:/tmp/cvs-serv25526 Modified Files: ChangeLog.MSYS msys.cc path.cc shared.cc Log Message: * msys.cc (AbsDllPath): Add debugging. (__AbsDllPath): Ditto. * path.cc (cygwin_conv_to_win32_path): Use calloc instead of malloc. * shared.cc (shared_name): Add debugging. Remove conditionalized failing code to determine why it was failing. Index: ChangeLog.MSYS =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ChangeLog.MSYS 26 Aug 2002 01:07:37 -0000 1.21 --- ChangeLog.MSYS 29 Aug 2002 22:12:00 -0000 1.22 *************** *** 1,2 **** --- 1,10 ---- + 2002-08-30 Earnie Boyd <ea...@us...> + + * msys.cc (AbsDllPath): Add debugging. + (__AbsDllPath): Ditto. + * path.cc (cygwin_conv_to_win32_path): Use calloc instead of malloc. + * shared.cc (shared_name): Add debugging. Remove conditionalized + failing code to determine why it was failing. + 2002-08-25 Luke Dunstan <in...@us...> Index: msys.cc =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/msys.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** msys.cc 19 Jun 2002 12:23:00 -0000 1.3 --- msys.cc 29 Aug 2002 22:12:00 -0000 1.4 *************** *** 18,21 **** --- 18,22 ---- AbsDllPath (const char * DllName, char * AbsDllPath, int AbsDllPathLen) { + TRACE_IN; __AbsDllPath(DllName, AbsDllPath, AbsDllPathLen); } *************** *** 24,35 **** --- 25,39 ---- __AbsDllPath(const char * DllName, char * AbsDllPath, int AbsDllPathLen) { + TRACE_IN; HMODULE mn; mn = GetModuleHandle (DllName); if (GetModuleFileName (mn, AbsDllPath, AbsDllPathLen) == 0) { + debug_printf("%s", AbsDllPath); set_errno(EINVAL); } else { + debug_printf("%s", AbsDllPath); char *ptr = strrchr(AbsDllPath, '\\'); if (ptr) Index: path.cc =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/path.cc,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** path.cc 26 Aug 2002 01:07:37 -0000 1.17 --- path.cc 29 Aug 2002 22:12:00 -0000 1.18 *************** *** 3113,3117 **** char *swin32_path = new char [MAX_PATH * 4]; #else ! char *swin32_path = (char *)malloc (MAX_PATH * 4); #endif int swin32_pathlen; --- 3113,3117 ---- char *swin32_path = new char [MAX_PATH * 4]; #else ! char *swin32_path = (char *)calloc (1, MAX_PATH * 4); #endif int swin32_pathlen; *************** *** 3120,3127 **** char *retpath = new char [MAX_PATH * 4]; #else ! char *retpath = (char *)malloc (MAX_PATH * 4); #endif int retpath_len = 0; ! int retpath_buflen = MAX_PATH*4; int sret; int retval = 0; --- 3120,3127 ---- char *retpath = new char [MAX_PATH * 4]; #else ! char *retpath = (char *)calloc (1, MAX_PATH * 4); #endif int retpath_len = 0; ! int retpath_buflen = MAX_PATH * 4; int sret; int retval = 0; Index: shared.cc =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/shared.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shared.cc 17 Jul 2002 13:06:56 -0000 1.5 --- shared.cc 29 Aug 2002 22:12:00 -0000 1.6 *************** *** 44,47 **** --- 44,48 ---- shared_name (const char *str, int num) { + TRACE_IN; static NO_COPY char buf[MAX_PATH] = {0}; static NO_COPY char buf2[MAX_PATH] = {0}; *************** *** 50,54 **** //FIXME: This should be based on where the DLL actually is located. ! AbsDllPath("msys-1.0.dll", buf2, MAX_PATH); strcpy(buf2, &buf2[3]); tptr = strchr(buf2, '\\'); --- 51,56 ---- //FIXME: This should be based on where the DLL actually is located. ! AbsDllPath("msys-1.0.dll", buf2, sizeof (buf2)); ! debug_printf("buf2 = %s", buf2); strcpy(buf2, &buf2[3]); tptr = strchr(buf2, '\\'); *************** *** 57,62 **** debug_printf("buf2 = %s", buf2); __small_sprintf (buf, "%s.%s.%s.%d", buf2, cygwin_version.shared_id, str, num); if (!_cygwin_testing) ! strcat (buf, cygwin_version.dll_build_date); return buf; } --- 59,73 ---- debug_printf("buf2 = %s", buf2); __small_sprintf (buf, "%s.%s.%s.%d", buf2, cygwin_version.shared_id, str, num); + #if 0 + /* This code was removed because cygwin_version.dll_build_date is invalid. + * This should be put back into service once we discover the culprit. + */ if (!_cygwin_testing) ! { ! debug_printf("%s", buf); ! debug_printf("%s", cygwin_version.dll_build_date); ! strcat (buf, cygwin_version.dll_build_date); ! } ! #endif return buf; } |