dmesg,klogd: make code more readable

libbb: explain why we declare klogctl
libbb: move defs around so that order makes more sense

1 files changed, 34 insertions, 26 deletions

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 90b327b4c..cdd385ede 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -15,40 +15,48 @@
 int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dmesg_main(int argc, char **argv)
 {
+	int len;
+	char *buf;
 	char *size, *level;
 	int flags = getopt32(argv, "cs:n:", &size, &level);
 
 	if (flags & 4) {
 		if (klogctl(8, NULL, xatoul_range(level, 0, 10)))
 			bb_perror_msg_and_die("klogctl");
-	} else {
-		int len;
-		char *buf;
-
-		len = (flags & 2) ? xatoul_range(size, 2, INT_MAX) : 16384;
-		buf = xmalloc(len);
-		len = klogctl(3 + (flags & 1), buf, len);
-		if (len < 0)
-			bb_perror_msg_and_die("klogctl");
-
-		// Skip <#> at the start of lines, and make sure we end with a newline.
-
-		if (ENABLE_FEATURE_DMESG_PRETTY) {
-			int last = '\n';
-			int in;
+		return EXIT_SUCCESS;
+	}
 
-			for (in = 0; in<len;) {
-				if (last == '\n' && buf[in] == '<') in += 3;
-				else bb_putchar(last = buf[in++]);
+	len = (flags & 2) ? xatoul_range(size, 2, INT_MAX) : 16384;
+	buf = xmalloc(len);
+	len = klogctl(3 + (flags & 1), buf, len);
+	if (len < 0)
+		bb_perror_msg_and_die("klogctl");
+	if (len == 0)
+		return EXIT_SUCCESS;
+
+	/* Skip <#> at the start of lines, and make sure we end with a newline. */
+
+	if (ENABLE_FEATURE_DMESG_PRETTY) {
+		int last = '\n';
+		int in = 0;
+
+		do {
+			if (last == '\n' && buf[in] == '<')
+				in += 3;
+			else {
+				last = buf[in++];
+				bb_putchar(last);
 			}
-			if (last != '\n') bb_putchar('\n');
-		} else {
-			write(1,buf,len);
-			if (len && buf[len-1]!='\n') bb_putchar('\n');
-		}
-
-		if (ENABLE_FEATURE_CLEAN_UP) free(buf);
+		} while (in < len);
+		if (last != '\n')
+			bb_putchar('\n');
+	} else {
+		full_write(STDOUT_FILENO, buf, len);
+		if (buf[len-1] != '\n')
+			bb_putchar('\n');
 	}
 
-	return 0;
+	if (ENABLE_FEATURE_CLEAN_UP) free(buf);
+
+	return EXIT_SUCCESS;
 }