Split off function wfd_open() to open a file

(cherry picked from commit 0afe0c3c6cba64d8b7adcdec6ed70f8d32961b58)

1 files changed, 25 insertions, 11 deletions

diff --git a/lib/fsm.c b/lib/fsm.c
index 24e79b40c..503177d80 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -227,36 +227,50 @@ static void wfd_close(FD_t *wfdp)
     }
 }
 
-/** \ingroup payload
- * Create file from payload stream.
- * @return		0 on success
- */
-static int expandRegular(rpmfi fi, const char *dest, rpmpsm psm, int exclusive, int nodigest, int nocontent)
+static int wfd_open(FD_t *wfdp, const char *dest, int exclusive)
 {
-    FD_t wfd = NULL;
     int rc = 0;
-
     /* Create the file with 0200 permissions (write by owner). */
     {
 	mode_t old_umask = umask(0577);
-	wfd = Fopen(dest, exclusive ? "wx.ufdio" : "a.ufdio");
+	*wfdp = Fopen(dest, exclusive ? "wx.ufdio" : "a.ufdio");
 	umask(old_umask);
 
 	/* If reopening, make sure the file is what we expect */
-	if (!exclusive && wfd != NULL && !linkSane(wfd, dest)) {
+	if (!exclusive && *wfdp != NULL && !linkSane(*wfdp, dest)) {
 	    rc = RPMERR_OPEN_FAILED;
 	    goto exit;
 	}
     }
-    if (Ferror(wfd)) {
+    if (Ferror(*wfdp)) {
 	rc = RPMERR_OPEN_FAILED;
 	goto exit;
     }
 
+    return 0;
+
+exit:
+    wfd_close(wfdp);
+    return rc;
+}
+
+/** \ingroup payload
+ * Create file from payload stream.
+ * @return		0 on success
+ */
+static int expandRegular(rpmfi fi, const char *dest, rpmpsm psm, int exclusive, int nodigest, int nocontent)
+{
+    FD_t wfd = NULL;
+    int rc;
+
+    rc = wfd_open(&wfd, dest, exclusive);
+    if (rc != 0)
+        goto exit;
+
     if (!nocontent)
 	rc = rpmfiArchiveReadToFilePsm(fi, wfd, nodigest, psm);
-exit:
     wfd_close(&wfd);
+exit:
     return rc;
 }