From 8d74263c408f3ad68eda24796b5b8c843104480d Mon Sep 17 00:00:00 2001
From: Timo Sirainen <tss@iki.fi>
Date: Thu, 8 Oct 2009 18:33:50 -0400
Subject: [PATCH] Moved askpass() from master/ to lib/. Added t_askpass().

--HG--
branch : HEAD
---
 src/lib/Makefile.am           | 2 ++
 src/{master => lib}/askpass.c | 8 ++++++++
 src/{master => lib}/askpass.h | 1 +
 src/master/Makefile.am        | 2 --
 4 files changed, 11 insertions(+), 2 deletions(-)
 rename src/{master => lib}/askpass.c (89%)
 rename src/{master => lib}/askpass.h (71%)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 8c724fb325..9e88563e08 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -11,6 +11,7 @@ $(srcdir)/unicodemap.c: unicodemap.pl
 liblib_la_SOURCES = \
 	array.c \
 	aqueue.c \
+	askpass.c \
 	backtrace-string.c \
 	base64.c \
 	bsearch-insert-pos.c \
@@ -115,6 +116,7 @@ headers = \
 	aqueue.h \
 	array.h \
 	array-decl.h \
+	askpass.h \
 	backtrace-string.h \
 	base64.h \
 	bsearch-insert-pos.h \
diff --git a/src/master/askpass.c b/src/lib/askpass.c
similarity index 89%
rename from src/master/askpass.c
rename to src/lib/askpass.c
index 22e675572b..6c378c0b6c 100644
--- a/src/master/askpass.c
+++ b/src/lib/askpass.c
@@ -52,3 +52,11 @@ void askpass(const char *prompt, char *buf, size_t buf_size)
 	fputs("\n", stderr); fflush(stderr);
 	(void)close(fd);
 }
+
+const char *t_askpass(const char *prompt)
+{
+	char buf[1024];
+
+	askpass(prompt, buf, sizeof(buf));
+	return t_strdup(buf);
+}
diff --git a/src/master/askpass.h b/src/lib/askpass.h
similarity index 71%
rename from src/master/askpass.h
rename to src/lib/askpass.h
index 7e89b9f70f..59ceb75c34 100644
--- a/src/master/askpass.h
+++ b/src/lib/askpass.h
@@ -2,5 +2,6 @@
 #define ASKPASS_H
 
 void askpass(const char *prompt, char *buf, size_t buf_size);
+const char *t_askpass(const char *prompt);
 
 #endif
diff --git a/src/master/Makefile.am b/src/master/Makefile.am
index 3ef5beb2a1..7de02b3963 100644
--- a/src/master/Makefile.am
+++ b/src/master/Makefile.am
@@ -19,7 +19,6 @@ dovecot_LDADD = $(libs)
 dovecot_DEPENDENCIES = $(libs)
 
 dovecot_SOURCES = \
-	askpass.c \
 	capabilities-posix.c \
 	dup2-array.c \
 	main.c \
@@ -35,7 +34,6 @@ dovecot_SOURCES = \
 	service.c
 
 noinst_HEADERS = \
-	askpass.h \
 	capabilities.h \
 	common.h \
 	dup2-array.h \
-- 
2.47.3