diff -r cd30c7a7baf8 -r 1950f483d3c4 dav/assistant.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dav/assistant.c Sat Feb 27 19:39:55 2016 +0100 @@ -0,0 +1,92 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2016 Olaf Wintermann. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +#include +#include + +#include + +#include "assistant.h" + +char* assistant_getcfg(char *cfgname) { + sstr_t line; + char *value = NULL; + while(!value) { + printf("%s: ", cfgname); + line = util_readline(stdin); + if(line.length == 0 || !line.ptr) { + fprintf(stderr, "%s must be not empty\n", cfgname); + continue; + } + + value = line.ptr; + break; + } + return value; +} + +char* assistant_getoptcfg(char *cfgname) { + sstr_t line; + char *value = NULL; + while(!value) { + printf("%s (optional): ", cfgname); + line = util_readline(stdin); + if(line.length == 0 || !line.ptr) { + if(line.ptr) { + free(line.ptr); + } + break; + } + + value = line.ptr; + break; + } + return value; +} + +char* assistant_gethiddenoptcfg(char *cfgname) { + printf("%s (optional): ", cfgname); + char *pw = util_password_input(""); + if(pw[0] == 0) { + free(pw); + pw = NULL; + } + return pw; +} + + +char* assistant_getdefcfg(char *cfgname, char *defval) { + char *value = assistant_getoptcfg(cfgname); + if(!value) { + value = strdup(defval); + } + return value; +}