* Set up the framework for different "views" of a room

[citadel.git] / citadel / serv_vandelay.c

diff --git a/citadel/serv_vandelay.c b/citadel/serv_vandelay.c
index 5c62567fad1d475fbea0a3f43e9b42fe17fa5c2e..0a15b9275359d57e40888c2a6e78c0b202e763a6 100644 (file)
--- a/citadel/serv_vandelay.c
+++ b/citadel/serv_vandelay.c
@@ -53,7 +53,7 @@ FILE *artv_global_message_list;
 void artv_export_users_backend(struct usersupp *usbuf, void *data) {
        cprintf("user\n");
        cprintf("%d\n", usbuf->version);
-       cprintf("%d\n", usbuf->uid);
+       cprintf("%ld\n", (long)usbuf->uid);
        cprintf("%s\n", usbuf->password);
        cprintf("%u\n", usbuf->flags);
        cprintf("%ld\n", usbuf->timescalled);
@@ -96,6 +96,8 @@ void artv_export_rooms_backend(struct quickroom *qrbuf, void *data) {
        cprintf("%d\n", qrbuf->QRep.expire_value);
        cprintf("%ld\n", qrbuf->QRnumber);
        cprintf("%d\n", qrbuf->QRorder);
+       cprintf("%u\n", qrbuf->QRflags2);
+       cprintf("%d\n", qrbuf->QRdefaultview);
 
        getroom(&CC->quickroom, qrbuf->QRname);
        /* format of message list export is all message numbers output
@@ -121,9 +123,9 @@ void artv_export_rooms(void) {
         * this will be handled by exporting the reference count, not by
         * exporting the message multiple times.)
         */
-       sprintf(cmd, "sort <%s >%s", artv_tempfilename1, artv_tempfilename2);
+       snprintf(cmd, sizeof cmd, "sort <%s >%s", artv_tempfilename1, artv_tempfilename2);
        system(cmd);
-       sprintf(cmd, "uniq <%s >%s", artv_tempfilename2, artv_tempfilename1);
+       snprintf(cmd, sizeof cmd, "uniq <%s >%s", artv_tempfilename2, artv_tempfilename1);
        system(cmd);
 }
 
@@ -177,6 +179,7 @@ void artv_export_visits(void) {
                }
 
                cprintf("%u\n", vbuf.v_flags);
+               cprintf("%d\n", vbuf.v_view);
        }
 }
 
@@ -204,7 +207,7 @@ void artv_export_message(long msgnum) {
 
        /* write it in base64 */
        strcpy(tempfile, tmpnam(NULL));
-       sprintf(buf, "./base64 -e >%s", tempfile);
+       snprintf(buf, sizeof buf, "./base64 -e >%s", tempfile);
        fp = popen(buf, "w");
        fwrite(smr.ser, smr.len, 1, fp);
        pclose(fp);
@@ -255,7 +258,7 @@ void artv_do_export(void) {
        cprintf("%s\n", config.c_fqdn);
        cprintf("%s\n", config.c_humannode);
        cprintf("%s\n", config.c_phonenum);
-       cprintf("%d\n", config.c_bbsuid);
+       cprintf("%ld\n", (long)config.c_bbsuid);
        cprintf("%d\n", config.c_creataide);
        cprintf("%d\n", config.c_sleeping);
        cprintf("%d\n", config.c_initax);
@@ -408,6 +411,8 @@ void artv_import_room(void) {
        client_gets(buf);       qrbuf.QRep.expire_value = atoi(buf);
        client_gets(buf);       qrbuf.QRnumber = atol(buf);
        client_gets(buf);       qrbuf.QRorder = atoi(buf);
+       client_gets(buf);       qrbuf.QRflags2 = atoi(buf);
+       client_gets(buf);       qrbuf.QRdefaultview = atoi(buf);
        putroom(&qrbuf);
        lprintf(7, "Imported room <%s>\n", qrbuf.QRname);
        /* format of message list export is all message numbers output
@@ -455,6 +460,7 @@ void artv_import_visit(void) {
        if (is_textual_seen)    strcpy(vbuf.v_seen, buf);
 
        client_gets(buf);       vbuf.v_flags = atoi(buf);
+       client_gets(buf);       vbuf.v_view = atoi(buf);
        put_visit(&vbuf);
        lprintf(7, "Imported visit %ld/%ld/%ld\n",
                vbuf.v_roomnum, vbuf.v_roomgen, vbuf.v_usernum);
@@ -482,7 +488,7 @@ void artv_import_message(void) {
 
        /* decode base64 message text */
        strcpy(tempfile, tmpnam(NULL));
-       sprintf(buf, "./base64 -d >%s", tempfile);
+       snprintf(buf, sizeof buf, "./base64 -d >%s", tempfile);
        fp = popen(buf, "w");
        while (client_gets(buf), strcasecmp(buf, END_OF_MESSAGE)) {
                fprintf(fp, "%s\n", buf);