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);
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
* 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);
}
}
cprintf("%u\n", vbuf.v_flags);
+ cprintf("%d\n", vbuf.v_view);
}
}
void artv_export_message(long msgnum) {
- struct SuppMsgInfo smi;
+ struct MetaData smi;
struct CtdlMessage *msg;
struct ser_ret smr;
FILE *fp;
if (msg == NULL) return; /* fail silently */
cprintf("message\n");
- GetSuppMsgInfo(&smi, msgnum);
+ GetMetaData(&smi, msgnum);
cprintf("%ld\n", msgnum);
- cprintf("%d\n", smi.smi_refcount);
- cprintf("%s\n", smi.smi_content_type);
- cprintf("%d\n", smi.smi_mod);
+ cprintf("%d\n", smi.meta_refcount);
+ cprintf("%s\n", smi.meta_content_type);
+ cprintf("%d\n", smi.meta_mod);
serialize_message(&smr, msg);
CtdlFreeMessage(msg);
/* 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);
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);
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
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);
void artv_import_message(void) {
- struct SuppMsgInfo smi;
+ struct MetaData smi;
long msgnum;
long msglen;
FILE *fp;
char tempfile[SIZ];
char *mbuf;
- memset(&smi, 0, sizeof(struct SuppMsgInfo));
+ memset(&smi, 0, sizeof(struct MetaData));
client_gets(buf); msgnum = atol(buf);
- smi.smi_msgnum = msgnum;
- client_gets(buf); smi.smi_refcount = atoi(buf);
- client_gets(smi.smi_content_type);
- client_gets(buf); smi.smi_mod = atoi(buf);
+ smi.meta_msgnum = msgnum;
+ client_gets(buf); smi.meta_refcount = atoi(buf);
+ client_gets(smi.meta_content_type);
+ client_gets(buf); smi.meta_mod = atoi(buf);
lprintf(7, "message #%ld\n", msgnum);
/* 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);
phree(mbuf);
unlink(tempfile);
- PutSuppMsgInfo(&smi);
+ PutMetaData(&smi);
lprintf(7, "Imported message %ld\n", msgnum);
}