comparison: dav/assistant.c
dav/assistant.c
- changeset 267
- 171498cb2137
- parent 200
- cc474cf2c2f5
- child 364
- 3769ba002fd1
equal
deleted
inserted
replaced
| 266:8c44c5919691 | 267:171498cb2137 |
|---|---|
| 39 char* assistant_getcfg(char *cfgname) { | 39 char* assistant_getcfg(char *cfgname) { |
| 40 sstr_t line; | 40 sstr_t line; |
| 41 char *value = NULL; | 41 char *value = NULL; |
| 42 while(!value) { | 42 while(!value) { |
| 43 printf("%s: ", cfgname); | 43 printf("%s: ", cfgname); |
| 44 fflush(stdout); | |
| 44 line = util_readline(stdin); | 45 line = util_readline(stdin); |
| 45 if(line.length == 0 || !line.ptr) { | 46 if(line.length == 0 || !line.ptr) { |
| 46 fprintf(stderr, "%s must be not empty\n", cfgname); | 47 fprintf(stderr, "%s must be not empty\n", cfgname); |
| 47 continue; | 48 continue; |
| 48 } | 49 } |
| 56 char* assistant_getoptcfg(char *cfgname) { | 57 char* assistant_getoptcfg(char *cfgname) { |
| 57 sstr_t line; | 58 sstr_t line; |
| 58 char *value = NULL; | 59 char *value = NULL; |
| 59 while(!value) { | 60 while(!value) { |
| 60 printf("%s (optional): ", cfgname); | 61 printf("%s (optional): ", cfgname); |
| 62 fflush(stdout); | |
| 61 line = util_readline(stdin); | 63 line = util_readline(stdin); |
| 62 if(line.length == 0 || !line.ptr) { | 64 if(line.length == 0 || !line.ptr) { |
| 63 if(line.ptr) { | 65 if(line.ptr) { |
| 64 free(line.ptr); | 66 free(line.ptr); |
| 65 } | 67 } |
| 72 return value; | 74 return value; |
| 73 } | 75 } |
| 74 | 76 |
| 75 char* assistant_gethiddenoptcfg(char *cfgname) { | 77 char* assistant_gethiddenoptcfg(char *cfgname) { |
| 76 printf("%s (optional): ", cfgname); | 78 printf("%s (optional): ", cfgname); |
| 79 fflush(stdout); | |
| 77 char *pw = util_password_input(""); | 80 char *pw = util_password_input(""); |
| 78 if(pw[0] == 0) { | 81 if(pw[0] == 0) { |
| 79 free(pw); | 82 free(pw); |
| 80 pw = NULL; | 83 pw = NULL; |
| 81 } | 84 } |
| 86 char* assistant_getdefcfg(char *cfgname, char *defval) { | 89 char* assistant_getdefcfg(char *cfgname, char *defval) { |
| 87 sstr_t line; | 90 sstr_t line; |
| 88 char *value = NULL; | 91 char *value = NULL; |
| 89 while(!value) { | 92 while(!value) { |
| 90 printf("%s (default: %s): ", cfgname, defval); | 93 printf("%s (default: %s): ", cfgname, defval); |
| 94 fflush(stdout); | |
| 91 line = util_readline(stdin); | 95 line = util_readline(stdin); |
| 92 if(line.length == 0 || !line.ptr) { | 96 if(line.length == 0 || !line.ptr) { |
| 93 if(line.ptr) { | 97 if(line.ptr) { |
| 94 free(line.ptr); | 98 free(line.ptr); |
| 95 } | 99 } |
