Commit 2df600a6 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist
Browse files

[Win32] call rmdir() only if remove() fails with errno set to ENOENT, to

2006-03-30  Tor Lillqvist  <tml@novell.com>

	* glib/gstdio.c (g_remove): [Win32] call rmdir() only if remove()
	fails with errno set to ENOENT, to leave errno set to EACCESS if
	that is the problem. (#334799, Yevgen Muntyan)
parent d616680f
2006-03-30 Tor Lillqvist <tml@novell.com>
* glib/gstdio.c (g_remove): [Win32] call rmdir() only if remove()
fails with errno set to ENOENT, to leave errno set to EACCESS if
that is the problem. (#334799, Yevgen Muntyan)
2006-03-30 Matthias Clasen <mclasen@redhat.com>
* glib/gbookmarkfile.c (g_bookmark_file_get_app_info): Sync
......
2006-03-30 Tor Lillqvist <tml@novell.com>
* glib/gstdio.c (g_remove): [Win32] call rmdir() only if remove()
fails with errno set to ENOENT, to leave errno set to EACCESS if
that is the problem. (#334799, Yevgen Muntyan)
2006-03-30 Matthias Clasen <mclasen@redhat.com>
* glib/gbookmarkfile.c (g_bookmark_file_get_app_info): Sync
......
......@@ -780,7 +780,7 @@ g_remove (const gchar *filename)
}
retval = _wremove (wfilename);
if (retval == -1)
if (retval == -1 && errno == ENOENT)
retval = _wrmdir (wfilename);
save_errno = errno;
......@@ -802,7 +802,7 @@ g_remove (const gchar *filename)
}
retval = remove (cp_filename);
if (retval == -1)
if (retval == -1 && errno == ENOENT)
retval = rmdir (cp_filename);
save_errno = errno;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment