From b2088cf0ab3ae23c855392309e54d5666633b3f1 Mon Sep 17 00:00:00 2001
From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sat, 25 Feb 2012 20:51:24 +0900
Subject: [PATCH] Fix build failure with -Wunreachable-code compile option; use
 a for loop statement instead of a goto statement.

---
 libarchive/archive_write_add_filter_program.c | 98 ++++++++++---------
 1 file changed, 50 insertions(+), 48 deletions(-)

diff --git a/libarchive/archive_write_add_filter_program.c b/libarchive/archive_write_add_filter_program.c
index 3dcc9df7b..d7d38f707 100644
--- a/libarchive/archive_write_add_filter_program.c
+++ b/libarchive/archive_write_add_filter_program.c
@@ -171,60 +171,62 @@ child_write(struct archive_write_filter *f, const char *buf, size_t buf_len)
 	if (buf_len == 0)
 		return (-1);
 
-restart_write:
-	do {
-		ret = write(data->child_stdin, buf, buf_len);
-	} while (ret == -1 && errno == EINTR);
-
-	if (ret > 0)
-		return (ret);
-	if (ret == 0) {
-		close(data->child_stdin);
-		data->child_stdin = -1;
-		fcntl(data->child_stdout, F_SETFL, 0);
-		return (0);
-	}
-	if (ret == -1 && errno != EAGAIN)
-		return (-1);
-
-	if (data->child_stdout == -1) {
-		fcntl(data->child_stdin, F_SETFL, 0);
-		__archive_check_child(data->child_stdin, data->child_stdout);
-		goto restart_write;
-	}
+	for (;;) {
+		do {
+			ret = write(data->child_stdin, buf, buf_len);
+		} while (ret == -1 && errno == EINTR);
+
+		if (ret > 0)
+			return (ret);
+		if (ret == 0) {
+			close(data->child_stdin);
+			data->child_stdin = -1;
+			fcntl(data->child_stdout, F_SETFL, 0);
+			return (0);
+		}
+		if (ret == -1 && errno != EAGAIN)
+			return (-1);
+
+		if (data->child_stdout == -1) {
+			fcntl(data->child_stdin, F_SETFL, 0);
+			__archive_check_child(data->child_stdin,
+				data->child_stdout);
+			continue;
+		}
 
-	do {
-		ret = read(data->child_stdout,
-		    data->child_buf + data->child_buf_avail,
-		    data->child_buf_len - data->child_buf_avail);
-	} while (ret == -1 && errno == EINTR);
+		do {
+			ret = read(data->child_stdout,
+			    data->child_buf + data->child_buf_avail,
+			    data->child_buf_len - data->child_buf_avail);
+		} while (ret == -1 && errno == EINTR);
 
-	if (ret == 0 || (ret == -1 && errno == EPIPE)) {
-		close(data->child_stdout);
-		data->child_stdout = -1;
-		fcntl(data->child_stdin, F_SETFL, 0);
-		goto restart_write;
-	}
-	if (ret == -1 && errno == EAGAIN) {
-		__archive_check_child(data->child_stdin, data->child_stdout);
-		goto restart_write;
-	}
-	if (ret == -1)
-		return (-1);
+		if (ret == 0 || (ret == -1 && errno == EPIPE)) {
+			close(data->child_stdout);
+			data->child_stdout = -1;
+			fcntl(data->child_stdin, F_SETFL, 0);
+			continue;
+		}
+		if (ret == -1 && errno == EAGAIN) {
+			__archive_check_child(data->child_stdin,
+				data->child_stdout);
+			continue;
+		}
+		if (ret == -1)
+			return (-1);
 
-	data->child_buf_avail += ret;
+		data->child_buf_avail += ret;
 
-	ret = __archive_write_filter(f->next_filter,
-	    data->child_buf, data->child_buf_avail);
-	if (ret <= 0)
-		return (-1);
+		ret = __archive_write_filter(f->next_filter,
+		    data->child_buf, data->child_buf_avail);
+		if (ret <= 0)
+			return (-1);
 
-	if ((size_t)ret < data->child_buf_avail) {
-		memmove(data->child_buf, data->child_buf + ret,
-		    data->child_buf_avail - ret);
+		if ((size_t)ret < data->child_buf_avail) {
+			memmove(data->child_buf, data->child_buf + ret,
+			    data->child_buf_avail - ret);
+		}
+		data->child_buf_avail -= ret;
 	}
-	data->child_buf_avail -= ret;
-	goto restart_write;
 }
 
 /*
-- 
2.47.3