Add egidingroups sysdeps, change fd_close() to void and saving errno, propagate changes

1 files changed, 9 insertions, 13 deletions

diff --git a/src/libunixonacid/open2_at.c b/src/libunixonacid/open2_at.c
index 6b581e4..023c038 100644
--- a/src/libunixonacid/open2_at.c
+++ b/src/libunixonacid/open2_at.c
@@ -30,30 +30,26 @@ int open2_at (int dirfd, char const *file, int flags)
   int fd ;
   int fdhere = open_read(".") ;
   if (fdhere < 0) return -1 ;
-  if (fd_chdir(dirfd) < 0)
-  {
-    int e = errno ;
-    fd_close(fdhere) ;
-    errno = e ;
-    return -1 ;
-  }
+  if (fd_chdir(dirfd) < 0) goto errclose ;
   fd = open2(file, flags) ;
   if (fd < 0)
   {
     int e = errno ;
     fd_chdir(fdhere) ;
-    fd_close(fdhere) ;
     errno = e ;
-    return -1 ;
+    goto errclose ;
   }
   if (fd_chdir(fdhere) < 0)
   {
-    int e = errno ;
-    fd_close(fdhere) ;
-    errno = e ;
-    return -1 ;
+    fd_close(fd) ;
+    goto errclose ;
   }
+  fd_close(fdhere) ;
   return fd ;
+
+ errclose:
+  fd_close(fdhere) ;
+  return -1 ;
 }
 
 #endif