Moved askpass() from master/ to lib/. Added t_askpass().

--HG--
branch : HEAD

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 8c724fb3251874cfea16f28a1da2778c850b428e..9e88563e0820d5e303f80dded8600e921818a26c 100644 (file)
--- 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 22e675572bcb5093c6fe038cb4a43ea1d5b5e1fb..6c378c0b6c3f3c64dabf6bca4fac5c6f8407a8c1 100644 (file)
--- 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 7e89b9f70f0eff15b0bfcf6ba2ee15da55b231bd..59ceb75c34fa9aa5683f7ea885b2699ce4c3cd5e 100644 (file)
--- 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 3ef5beb2a1596140f670af26e71dd20e9db7ea57..7de02b3963ad24d095deba93a8bc91a6e279449b 100644 (file)
--- 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 \