From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 11 Apr 2008 20:15:29 +0000 (-0400)
Subject: move code into a function
X-Git-Tag: 0.29~10
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcb580b3998a19b112004f23298490a34af59fc8;p=moreutils

move code into a function
---

diff --git a/sponge.c b/sponge.c
index 948edf0..df1b7a1 100644
--- a/sponge.c
+++ b/sponge.c
@@ -218,6 +218,29 @@ static void copy_tmpfile(FILE *tmpfile, FILE *outfd) {
 	fclose(outfd);
 }
 
+FILE *open_tmpfile(void) {
+	/* umask(077); FIXME: Should we be setting umask, or using default?  */
+	struct cs_status cs;
+	int tmpfd;
+	FILE *tmpfile;
+
+	trapsignals();
+	cs = cs_enter();
+	tmpfd = mkstemp(tmpname);
+	atexit(onexit_cleanup); // solaris on_exit(onexit_cleanup, 0);
+	cs_leave(cs);
+	if (tmpfd < 0) {
+		perror("mkstemp failed");
+		exit(1);
+	}
+	tmpfile = fdopen(tmpfd, "w+");
+	if (! tmpfile) {
+		perror("fdopen");
+		exit(1);
+	}
+	return tmpfile;
+}
+
 int main (int argc, char **argv) {
 	char *buf, *bufstart, *outname = NULL;
 	size_t bufsize = BUFF_SIZE;
@@ -239,20 +262,7 @@ int main (int argc, char **argv) {
 		if (bufused == bufsize) {
 			if ((bufsize*2) >= mem_available) {
 				if (!tmpfile) {
-					/* umask(077); FIXME: Should we be setting umask, or using default?  */
-					struct cs_status cs;
-					int tmpfd;
-
-					trapsignals();
-					cs = cs_enter();
-					tmpfd = mkstemp(tmpname);
-					atexit(onexit_cleanup); // solaris on_exit(onexit_cleanup, 0);
-					cs_leave(cs);
-					if (tmpfd < 0) {
-						perror("mkstemp failed");
-						exit(1);
-					}
-					tmpfile = fdopen(tmpfd, "w+");
+					tmpfile=open_tmpfile();
 				}
 				write_buff_tmp(bufstart, bufused, tmpfile);
 				bufused = 0;