diff options
Diffstat (limited to 'winsup/cygwin/fhandler.cc')
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 6c284a596..920ab7f49 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -1076,32 +1076,30 @@ fhandler_base::close_with_arch () fhandler_base *fh; if (usecount) { - if (!--usecount) - debug_printf ("closing passed in archetype, usecount %d", usecount); - else + /* This was the archetype itself. */ + if (--usecount) { - debug_printf ("not closing passed in archetype, usecount %d", usecount); + debug_printf ("not closing passed in archetype %p, usecount %d", archetype, usecount); return 0; } - fh = this; + debug_printf ("closing passed in archetype %p, usecount %d", archetype, usecount); + /* Set archetype temporarily so that it will eventually be deleted. */ + archetype = fh = this; } else if (!archetype) fh = this; + else if (archetype_usecount (-1) == 0) + { + debug_printf ("closing archetype"); + fh = archetype; + } else { - cleanup (); - if (archetype_usecount (-1) == 0) - { - debug_printf ("closing archetype"); - fh = archetype; - } - else - { - debug_printf ("not closing archetype"); - return 0; - } + debug_printf ("not closing archetype"); + return 0; } + cleanup (); res = fh->close (); if (archetype) { |