From: Timo Sirainen <tss@iki.fi>
Date: Sun, 11 Jul 2010 19:26:15 +0000 (+0100)
Subject: doveadm director status: Print output using the print API, not printf.
X-Git-Tag: 2.0.rc3~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68787d48554f497e711ff66a087ab31f990a11e9;p=thirdparty%2Fdovecot%2Fcore.git

doveadm director status: Print output using the print API, not printf.
---

diff --git a/src/doveadm/doveadm-director.c b/src/doveadm/doveadm-director.c
index fbd8aeb81e..c86c245cf9 100644
--- a/src/doveadm/doveadm-director.c
+++ b/src/doveadm/doveadm-director.c
@@ -6,6 +6,7 @@
 #include "write-full.h"
 #include "master-service.h"
 #include "doveadm.h"
+#include "doveadm-print.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -120,7 +121,13 @@ static void cmd_director_status(int argc, char *argv[])
 		return;
 	}
 
-	fprintf(stderr, "%-20s vhosts  users\n", "mail server ip");
+	doveadm_print_init(DOVEADM_PRINT_TYPE_TABLE);
+	doveadm_print_header_simple("mail server ip");
+	doveadm_print_header("vhosts", "vhosts",
+			     DOVEADM_PRINT_HEADER_FLAG_RIGHT_JUSTIFY);
+	doveadm_print_header("users", "vhosts",
+			     DOVEADM_PRINT_HEADER_FLAG_RIGHT_JUSTIFY);
+
 	director_send(ctx, "HOST-LIST\n");
 	while ((line = i_stream_read_next_line(ctx->input)) != NULL) {
 		if (*line == '\0')
@@ -128,8 +135,9 @@ static void cmd_director_status(int argc, char *argv[])
 		T_BEGIN {
 			args = t_strsplit(line, "\t");
 			if (str_array_length(args) >= 3) {
-				printf("%-20s %6s %6s\n",
-				       args[0], args[1], args[2]);
+				doveadm_print(args[0]);
+				doveadm_print(args[1]);
+				doveadm_print(args[2]);
 			}
 		} T_END;
 	}