Fix double close of the lock file

According to FOPEN(3), using fclose on an fdopen'd file stream also
closes the underlying file descriptor. This happened in _alpm_lckmk
(util.c), which meant that when alpm_trans_release closed it again, the
log file (which reused the original file descriptor) was closed instead.

Signed-off-by: Jonathan Conder <jonno.conder@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 5 insertions, 8 deletions

diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 9d582df3..9f617967 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -73,8 +73,8 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
 
 	/* lock db */
 	if(!(flags & PM_TRANS_FLAG_NOLOCK)) {
-		handle->lckfd = _alpm_lckmk();
-		if(handle->lckfd == -1) {
+		handle->lckstream = _alpm_lckmk();
+		if(handle->lckstream == NULL) {
 			RET_ERR(PM_ERR_HANDLE_LOCK, -1);
 		}
 	}
@@ -260,12 +260,9 @@ int SYMEXPORT alpm_trans_release()
 
 	/* unlock db */
 	if(!nolock_flag) {
-		if(handle->lckfd != -1) {
-			int fd;
-			do {
-				fd = close(handle->lckfd);
-			} while(fd == -1 && errno == EINTR);
-			handle->lckfd = -1;
+		if(handle->lckstream != NULL) {
+			fclose(handle->lckstream);
+			handle->lckstream = NULL;
 		}
 		if(_alpm_lckrm()) {
 			_alpm_log(PM_LOG_WARNING, _("could not remove lock file %s\n"),