summaryrefslogtreecommitdiff
path: root/utils.c
diff options
context:
space:
mode:
Diffstat (limited to 'utils.c')
-rw-r--r--utils.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/utils.c b/utils.c
index 14b4816..2ae0c63 100644
--- a/utils.c
+++ b/utils.c
@@ -85,7 +85,7 @@ int initdb(const char *basedir)
85 85
86 if (basedir == NULL) { 86 if (basedir == NULL) {
87 printf("Base directory:\n"); 87 printf("Base directory:\n");
88 srv_basedir = xs_strip(xs_readline(stdin)); 88 srv_basedir = xs_strip_i(xs_readline(stdin));
89 } 89 }
90 else 90 else
91 srv_basedir = xs_str_new(basedir); 91 srv_basedir = xs_str_new(basedir);
@@ -94,7 +94,7 @@ int initdb(const char *basedir)
94 return 1; 94 return 1;
95 95
96 if (xs_endswith(srv_basedir, "/")) 96 if (xs_endswith(srv_basedir, "/"))
97 srv_basedir = xs_crop(srv_basedir, 0, -1); 97 srv_basedir = xs_crop_i(srv_basedir, 0, -1);
98 98
99 if (mtime(srv_basedir) != 0.0) { 99 if (mtime(srv_basedir) != 0.0) {
100 printf("ERROR: directory '%s' must not exist\n", srv_basedir); 100 printf("ERROR: directory '%s' must not exist\n", srv_basedir);
@@ -108,14 +108,14 @@ int initdb(const char *basedir)
108 108
109 printf("Network address [%s]:\n", xs_dict_get(srv_config, "address")); 109 printf("Network address [%s]:\n", xs_dict_get(srv_config, "address"));
110 { 110 {
111 xs *i = xs_strip(xs_readline(stdin)); 111 xs *i = xs_strip_i(xs_readline(stdin));
112 if (*i) 112 if (*i)
113 srv_config = xs_dict_set(srv_config, "address", i); 113 srv_config = xs_dict_set(srv_config, "address", i);
114 } 114 }
115 115
116 printf("Network port [%d]:\n", (int)xs_number_get(xs_dict_get(srv_config, "port"))); 116 printf("Network port [%d]:\n", (int)xs_number_get(xs_dict_get(srv_config, "port")));
117 { 117 {
118 xs *i = xs_strip(xs_readline(stdin)); 118 xs *i = xs_strip_i(xs_readline(stdin));
119 if (*i) { 119 if (*i) {
120 xs *n = xs_number_new(atoi(i)); 120 xs *n = xs_number_new(atoi(i));
121 srv_config = xs_dict_set(srv_config, "port", n); 121 srv_config = xs_dict_set(srv_config, "port", n);
@@ -124,7 +124,7 @@ int initdb(const char *basedir)
124 124
125 printf("Host name:\n"); 125 printf("Host name:\n");
126 { 126 {
127 xs *i = xs_strip(xs_readline(stdin)); 127 xs *i = xs_strip_i(xs_readline(stdin));
128 if (*i == '\0') 128 if (*i == '\0')
129 return 1; 129 return 1;
130 130
@@ -133,11 +133,11 @@ int initdb(const char *basedir)
133 133
134 printf("URL prefix:\n"); 134 printf("URL prefix:\n");
135 { 135 {
136 xs *i = xs_strip(xs_readline(stdin)); 136 xs *i = xs_strip_i(xs_readline(stdin));
137 137
138 if (*i) { 138 if (*i) {
139 if (xs_endswith(i, "/")) 139 if (xs_endswith(i, "/"))
140 i = xs_crop(i, 0, -1); 140 i = xs_crop_i(i, 0, -1);
141 141
142 srv_config = xs_dict_set(srv_config, "prefix", i); 142 srv_config = xs_dict_set(srv_config, "prefix", i);
143 } 143 }
@@ -215,7 +215,7 @@ int adduser(const char *uid)
215 215
216 if (uid == NULL) { 216 if (uid == NULL) {
217 printf("User id:\n"); 217 printf("User id:\n");
218 uid = xs_strip(xs_readline(stdin)); 218 uid = xs_strip_i(xs_readline(stdin));
219 } 219 }
220 220
221 if (!validate_uid(uid)) { 221 if (!validate_uid(uid)) {