|
From: <ea...@us...> - 2002-05-28 13:34:05
|
Update of /cvsroot/mingw/runtime
In directory usw-pr-cvs1:/tmp/cvs-serv25604
Modified Files:
ChangeLog dirent.c
Log Message:
Merging Cygwin changes
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/runtime/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ChangeLog 20 May 2002 19:16:44 -0000 1.27
--- ChangeLog 28 May 2002 13:06:46 -0000 1.28
***************
*** 1,2 ****
--- 1,25 ----
+ 2002-04-20 Danny Smith <dan...@us...>
+
+ * include/mbstring.h: New file.
+ * include/mbctype.h: New file.
+
+ 2002-04-20 Danny Smith <dan...@us...>
+
+ * include/tchar.h (__TEXT): Make same as define in
+ w32api/include/winnt.h.
+
+ 2002-04-20 Danny Smith <dan...@us...>
+
+ * include/tchar.h (_tputenv): Add UNICODE mappings.
+ (_tsearchenv): Likewise.
+ (_tmakepath): Likewise.
+ (_tsplitpath): Likewise.
+ (_tfullpath): Likewise.
+
+ 2002-04-18 Pascal Obry <ob...@gn...>
+
+ * dirent.c (opendir): Convert given pathname to
+ absolute pathname.
+
2002-04-09 Earnie Boyd <ea...@us...>
***************
*** 23,27 ****
(_vsnwprintf): Likewise.
! 2002-03-26 Danny Smith <dan...@so...>
* moldname.def.in (__MSVCRT__): Replace with !(__CRTDLL__).
--- 46,50 ----
(_vsnwprintf): Likewise.
! 2002-03-26 Danny Smith <dan...@us...>
* moldname.def.in (__MSVCRT__): Replace with !(__CRTDLL__).
Index: dirent.c
===================================================================
RCS file: /cvsroot/mingw/runtime/dirent.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dirent.c 9 Sep 2001 21:20:07 -0000 1.3
--- dirent.c 28 May 2002 13:06:46 -0000 1.4
***************
*** 41,44 ****
--- 41,45 ----
DIR *nd;
unsigned int rc;
+ char szFullPath[MAX_PATH];
errno = 0;
***************
*** 57,61 ****
/* Attempt to determine if the given path really is a directory. */
! rc = GetFileAttributes(szPath);
if (rc == -1)
{
--- 58,62 ----
/* Attempt to determine if the given path really is a directory. */
! rc = GetFileAttributes (szPath);
if (rc == -1)
{
***************
*** 71,77 ****
}
/* Allocate enough space to store DIR structure and the complete
* directory path given. */
! nd = (DIR *) malloc (sizeof (DIR) + strlen (szPath) + strlen (SLASH) +
strlen (SUFFIX));
--- 72,81 ----
}
+ /* Make an absolute pathname. */
+ _fullpath (szFullPath, szPath, MAX_PATH);
+
/* Allocate enough space to store DIR structure and the complete
* directory path given. */
! nd = (DIR *) malloc (sizeof (DIR) + strlen (szFullPath) + strlen (SLASH) +
strlen (SUFFIX));
***************
*** 84,88 ****
/* Create the search expression. */
! strcpy (nd->dd_name, szPath);
/* Add on a slash if the path does not end with one. */
--- 88,92 ----
/* Create the search expression. */
! strcpy (nd->dd_name, szFullPath);
/* Add on a slash if the path does not end with one. */
|