commit e788a5b

Some prototype tweaks.

 1@@ -22,9 +22,9 @@
 2 #include <sys/time.h>
 3 #include <sys/stat.h>
 4 
 5-d_char *srv_basedir = NULL;
 6-d_char *srv_config  = NULL;
 7-d_char *srv_baseurl = NULL;
 8+xs_str *srv_basedir = NULL;
 9+xs_dict *srv_config = NULL;
10+xs_str *srv_baseurl = NULL;
11 
12 int dbglevel = 0;
13 
14@@ -48,7 +48,7 @@ int valid_status(int status)
15 }
16 
17 
18-d_char *tid(int offset)
19+xs_str *tid(int offset)
20 /* returns a time-based Id */
21 {
22     struct timeval tv;
23@@ -82,7 +82,7 @@ int validate_uid(const char *uid)
24 }
25 
26 
27-void srv_debug(int level, d_char *str)
28+void srv_debug(int level, xs_str *str)
29 /* logs a debug message */
30 {
31     if (xs_str_in(str, srv_basedir) != -1) {
32@@ -99,11 +99,11 @@ void srv_debug(int level, d_char *str)
33 }
34 
35 
36-void snac_debug(snac *snac, int level, d_char *str)
37+void snac_debug(snac *snac, int level, xs_str *str)
38 /* prints a user debugging information */
39 {
40     xs *o_str = str;
41-    d_char *msg = xs_fmt("[%s] %s", snac->uid, o_str);
42+    xs_str *msg = xs_fmt("[%s] %s", snac->uid, o_str);
43 
44     if (xs_str_in(msg, snac->basedir) != -1) {
45         /* replace long basedir references with ~ */
46@@ -114,7 +114,7 @@ void snac_debug(snac *snac, int level, d_char *str)
47 }
48 
49 
50-d_char *hash_password(const char *uid, const char *passwd, const char *nonce)
51+xs_str *hash_password(const char *uid, const char *passwd, const char *nonce)
52 /* hashes a password */
53 {
54     xs *d_nonce = NULL;

 1@@ -12,9 +12,9 @@
 2 #define ISO_DATE_SPEC "%Y-%m-%dT%H:%M:%SZ"
 3 
 4 extern double disk_layout;
 5-extern d_char *srv_basedir;
 6-extern d_char *srv_config;
 7-extern d_char *srv_baseurl;
 8+extern xs_str *srv_basedir;
 9+extern xs_dict *srv_config;
10+extern xs_str *srv_baseurl;
11 
12 extern int dbglevel;
13 
14@@ -23,10 +23,10 @@ extern int dbglevel;
15 int mkdirx(const char *pathname);
16 
17 int valid_status(int status);
18-d_char *tid(int offset);
19+xs_str *tid(int offset);
20 double ftime(void);
21 
22-void srv_debug(int level, d_char *str);
23+void srv_debug(int level, xs_str *str);
24 #define srv_log(str) srv_debug(0, str)
25 
26 int srv_open(char *basedir, int auto_upgrade);
27@@ -47,12 +47,12 @@ void user_free(snac *snac);
28 xs_list *user_list(void);
29 int user_open_by_md5(snac *snac, const char *md5);
30 
31-void snac_debug(snac *snac, int level, d_char *str);
32+void snac_debug(snac *snac, int level, xs_str *str);
33 #define snac_log(snac, str) snac_debug(snac, 0, str)
34 
35 int validate_uid(const char *uid);
36 
37-d_char *hash_password(const char *uid, const char *passwd, const char *nonce);
38+xs_str *hash_password(const char *uid, const char *passwd, const char *nonce);
39 int check_password(const char *uid, const char *passwd, const char *hash);
40 
41 void srv_archive(const char *direction, const char *url, xs_dict *req,