aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2017-01-23 13:33:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-23 13:33:35 +0000
commitcb732f6ab1d3259e37de10ee3769bc17fbb53ad3 (patch)
tree5cee19d5618b77811b8449865a2cb1654dc6ab0b
parent12846fada94a801302584f944345151a492564f3 (diff)
parent9e64672c23ea8a3b89d12a78e19be9241d511759 (diff)
downloadiptables-cb732f6ab1d3259e37de10ee3769bc17fbb53ad3.tar.gz
Merge "iptables: flush stdout after every verbose log." am: ab2b45c965 am: 199fce0118
am: 9e64672c23 Change-Id: I136550003073991b99d50e0cdcbce32edd86bfb2
-rw-r--r--iptables/ip6tables-restore.c4
-rw-r--r--iptables/iptables-restore.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/iptables/ip6tables-restore.c b/iptables/ip6tables-restore.c
index 31bc502f..e17ad9d2 100644
--- a/iptables/ip6tables-restore.c
+++ b/iptables/ip6tables-restore.c
@@ -268,8 +268,10 @@ int ip6tables_restore_main(int argc, char *argv[])
if (buffer[0] == '\n')
continue;
else if (buffer[0] == '#') {
- if (verbose)
+ if (verbose) {
fputs(buffer, stdout);
+ fflush(stdout);
+ }
continue;
} else if ((strcmp(buffer, "COMMIT\n") == 0) && (in_table)) {
if (!testing) {
diff --git a/iptables/iptables-restore.c b/iptables/iptables-restore.c
index 2009f732..4d49b3c9 100644
--- a/iptables/iptables-restore.c
+++ b/iptables/iptables-restore.c
@@ -268,8 +268,10 @@ iptables_restore_main(int argc, char *argv[])
if (buffer[0] == '\n')
continue;
else if (buffer[0] == '#') {
- if (verbose)
+ if (verbose) {
fputs(buffer, stdout);
+ fflush(stdout);
+ }
continue;
} else if ((strcmp(buffer, "COMMIT\n") == 0) && (in_table)) {
if (!testing) {