* More license declarations

[citadel.git] / citadel / modules / wiki / serv_wiki.c

diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c
index 871650691a698e6f8e207fa8c20bda1b45ccd1db..034fff3044fa336f176f17ad8482acdbcd7c6cd2 100644 (file)
--- a/citadel/modules/wiki/serv_wiki.c
+++ b/citadel/modules/wiki/serv_wiki.c
@@ -3,7 +3,21 @@
  *
  * Server-side module for Wiki rooms.  This will handle things like version control. 
  * 
- * Copyright (c) 2009 / released under the GNU General Public License v3
+ * Copyright (c) 2009-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -60,11 +74,12 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        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];
+       int nbytes = 0;
+       char *diffbuf = NULL;
+       size_t diffbuf_len = 0;
 
        if (!CCC->logged_in) return(0); /* Only do this if logged in. */
 
@@ -116,19 +131,35 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        rv = fwrite(msg->cm_fields['M'], strlen(msg->cm_fields['M']), 1, fp);
        fclose(fp);
 
+       diffbuf_len = 0;
+       diffbuf = 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 {
+                       diffbuf = realloc(diffbuf, diffbuf_len + 1025);
+                       nbytes = fread(&diffbuf[diffbuf_len], 1, 1024, fp);
+                       diffbuf_len += nbytes;
+               } while (nbytes == 1024);
+               diffbuf[diffbuf_len] = 0;
                pclose(fp);
        }
+       CtdlLogPrintf(CTDL_DEBUG, "diff length is %d bytes\n", diffbuf_len);
 
        unlink(diff_old_filename);
        unlink(diff_new_filename);
 
+       /* Determine whether this was a bogus (empty) edit */
+       if ((diffbuf_len = 0) && (diffbuf != NULL)) {
+               free(diffbuf);
+               diffbuf = NULL;
+       }
+       if (diffbuf == NULL) {
+               return(1);              /* No changes at all?  Abandon the post entirely! */
+       }
+
+       free(diffbuf);  /* FIXME do something with it */
+
        /* Now look for the existing edit history */
 
        history_msgnum = locate_message_by_euid(history_page, &CCC->room);
@@ -149,7 +180,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,
-                       "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"
                        ,
@@ -158,6 +189,8 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        }
 
        /* 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 */