projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a075d95
)
* more work on the wiki revision control engine
author
Art Cancro
<ajc@citadel.org>
Thu, 15 Oct 2009 14:33:21 +0000
(14:33 +0000)
committer
Art Cancro
<ajc@citadel.org>
Thu, 15 Oct 2009 14:33:21 +0000
(14:33 +0000)
citadel/modules/wiki/serv_wiki.c
patch
|
blob
|
history
diff --git
a/citadel/modules/wiki/serv_wiki.c
b/citadel/modules/wiki/serv_wiki.c
index 871650691a698e6f8e207fa8c20bda1b45ccd1db..52ce1282177b1f738256cd81b42bc629d6f268e2 100644
(file)
--- a/
citadel/modules/wiki/serv_wiki.c
+++ b/
citadel/modules/wiki/serv_wiki.c
@@
-60,11
+60,11
@@
int wiki_upload_beforesave(struct CtdlMessage *msg) {
char diff_new_filename[PATH_MAX];
char diff_cmd[PATH_MAX];
FILE *fp;
char diff_new_filename[PATH_MAX];
char diff_cmd[PATH_MAX];
FILE *fp;
- char *s;
char buf[1024];
int rv;
char history_page[1024];
char boundary[256];
char buf[1024];
int rv;
char history_page[1024];
char boundary[256];
+ int nbytes;
if (!CCC->logged_in) return(0); /* Only do this if logged in. */
if (!CCC->logged_in) return(0); /* Only do this if logged in. */
@@
-119,10
+119,13
@@
int wiki_upload_beforesave(struct CtdlMessage *msg) {
snprintf(diff_cmd, sizeof diff_cmd, "diff -u %s %s", diff_old_filename, diff_new_filename);
fp = popen(diff_cmd, "r");
if (fp != NULL) {
snprintf(diff_cmd, sizeof diff_cmd, "diff -u %s %s", diff_old_filename, diff_new_filename);
fp = popen(diff_cmd, "r");
if (fp != NULL) {
- while (s = fgets(buf, sizeof buf, fp), (s != NULL)) {
- /* FIXME now do something with it */
- CtdlLogPrintf(CTDL_DEBUG, "\033[32m%s\033[0m", s);
- }
+ do {
+ nbytes = fread(buf, 1, sizeof buf, fp);
+ if (nbytes > 0) {
+ /* FIXME now do something with it */
+ CtdlLogPrintf(CTDL_DEBUG, "\033[32mREAD %d BYTES\033[0m\n", nbytes);
+ }
+ } while (nbytes == sizeof(buf));
pclose(fp);
}
pclose(fp);
}
@@
-149,7
+152,7
@@
int wiki_upload_beforesave(struct CtdlMessage *msg) {
snprintf(boundary, sizeof boundary, "Citadel--Multipart--%04x--%08lx", getpid(), time(NULL));
history_msg->cm_fields['M'] = malloc(1024);
snprintf(history_msg->cm_fields['M'], 1024,
snprintf(boundary, sizeof boundary, "Citadel--Multipart--%04x--%08lx", getpid(), time(NULL));
history_msg->cm_fields['M'] = malloc(1024);
snprintf(history_msg->cm_fields['M'], 1024,
- "Content-type: multipart/mixed; boundary=\"%s\"\n"
+ "Content-type: multipart/mixed; boundary=\"%s\"\n
\n
"
"This is a Citadel wiki history encoded as multipart MIME.\n"
"--%s--\n"
,
"This is a Citadel wiki history encoded as multipart MIME.\n"
"--%s--\n"
,
@@
-158,6
+161,8
@@
int wiki_upload_beforesave(struct CtdlMessage *msg) {
}
/* Update the history message (regardless of whether it's new or existing) */
}
/* Update the history message (regardless of whether it's new or existing) */
+ /* FIXME now do something with it */
+ CtdlLogPrintf(CTDL_DEBUG, "\033[31m%s\033[0m", history_msg->cm_fields['M']);
/* FIXME */
/* FIXME */