commit b428386
Yonle
·
2023-07-12 04:29:01 +0000 UTC
parent 5291bb8
utils.c: Prompt does not need \n
1 files changed,
+7,
-7
M
utils.c
M
utils.c
+7,
-7
1@@ -85,7 +85,7 @@ int snac_init(const char *basedir)
2 FILE *f;
3
4 if (basedir == NULL) {
5- printf("Base directory:\n");
6+ printf("Base directory: ");
7 srv_basedir = xs_strip_i(xs_readline(stdin));
8 }
9 else
10@@ -98,7 +98,7 @@ int snac_init(const char *basedir)
11 srv_basedir = xs_crop_i(srv_basedir, 0, -1);
12
13 if (mtime(srv_basedir) != 0.0) {
14- printf("ERROR: directory '%s' must not exist\n", srv_basedir);
15+ printf("ERROR: directory '%s' must not exist.\n", srv_basedir);
16 return 1;
17 }
18
19@@ -107,14 +107,14 @@ int snac_init(const char *basedir)
20 xs *layout = xs_number_new(disk_layout);
21 srv_config = xs_dict_set(srv_config, "layout", layout);
22
23- printf("Network address [%s]:\n", xs_dict_get(srv_config, "address"));
24+ printf("Network address [%s]: ", xs_dict_get(srv_config, "address"));
25 {
26 xs *i = xs_strip_i(xs_readline(stdin));
27 if (*i)
28 srv_config = xs_dict_set(srv_config, "address", i);
29 }
30
31- printf("Network port [%d]:\n", (int)xs_number_get(xs_dict_get(srv_config, "port")));
32+ printf("Network port [%d]: ", (int)xs_number_get(xs_dict_get(srv_config, "port")));
33 {
34 xs *i = xs_strip_i(xs_readline(stdin));
35 if (*i) {
36@@ -123,7 +123,7 @@ int snac_init(const char *basedir)
37 }
38 }
39
40- printf("Host name:\n");
41+ printf("Host name: ");
42 {
43 xs *i = xs_strip_i(xs_readline(stdin));
44 if (*i == '\0')
45@@ -132,7 +132,7 @@ int snac_init(const char *basedir)
46 srv_config = xs_dict_set(srv_config, "host", i);
47 }
48
49- printf("URL prefix:\n");
50+ printf("URL prefix: ");
51 {
52 xs *i = xs_strip_i(xs_readline(stdin));
53
54@@ -144,7 +144,7 @@ int snac_init(const char *basedir)
55 }
56 }
57
58- printf("Admin email address (optional):\n");
59+ printf("Admin email address (optional): ");
60 {
61 xs *i = xs_strip_i(xs_readline(stdin));
62