@@ -4,7 +4,7 @@

  * Posts management

  *

  * Author: Dario Rodriguez dario@softhome.net

- * This progran is licensed under the terms of the Affero GPL v1+

+ * This program is licensed under the terms of the Affero GPL v1+

  */

 #include <stdio.h>

@@ -35,8 +35,8 @@ post_new(kakumei *ka, char *user, char *title, char *text)

                 return(-1);

         }

         last=post_last(ka);

-	if(last==-1)

-		last=0; /* post number starts on 1 (last+1)*/

+        if(last==-1)

+                last=0; /* post number starts on 1 (last+1)*/

         filename[0]='\0';

         for(num=last+1;num<MAXPOSTS;num++) {

                 snprintf(filename,sizeof(filename),"%s/%04i/%04i.json",POSTSDIR,num/10000,num%10000);

@@ -35,6 +35,8 @@ post_new(kakumei *ka, char *user, char *title, char *text)

                 return(-1);

         }

         last=post_last(ka);

+	if(last==-1)

+		last=0; /* post number starts on 1 (last+1)*/

         filename[0]='\0';

         for(num=last+1;num<MAXPOSTS;num++) {

                 snprintf(filename,sizeof(filename),"%s/%04i/%04i.json",POSTSDIR,num/10000,num%10000);

@@ -114,6 +114,7 @@ post_addcomment(kakumei *ka, int postnum, char *user, char *text)

         char filename[1024];

         char buf[16];

         FILE *f;

+        int off;

         if(ka==NULL || postnum<0 || user==NULL || text==NULL) {

                 log_write("POST","Sanity check error\n");

                 return(-1);

@@ -121,17 +122,25 @@ post_addcomment(kakumei *ka, int postnum, char *user, char *text)

         if(post_get(ka,postnum,filename,sizeof(filename))!=0)

                 return(-1);

         if((f=fopen(filename,"r+"))==NULL) {

-                log_write("POST","Couldn't open post file fot appending\n");

+                log_write("POST","Couldn't open post file for appending\n");

                 return(-1);

         }

-        fseek(f,-2,SEEK_END);

-        if(fread(buf,1,2,f)!=2 || buf[0]!=']' ||  buf[1]!='}') {

+        fseek(f,-5,SEEK_END);

+        if(fread(buf,1,5,f)!=5) {

+                fclose(f),f=NULL;

+                log_write("POST","Post file contents are too small\n");

+                return(-1);

+        }

+        off=(buf[4]=='\n')?1:0;

+        if(buf[4-off]!='}' || buf[3-off]!=']' || buf[2-off]!='\n') {

                 fclose(f),f=NULL;

                 log_write("POST","Post file contents are corrupted\n");

                 return(-1);

         }

-        fseek(f,-2,SEEK_END);

-        fprintf(f,"    { \"author\":\"%s\",\"date\":%li,\"text\":\"%s\"},\n]}",user,(long)time(NULL),text);

+        fseek(f,-4-off,SEEK_END);

+        fprintf(f,"%c%s\n    { \"author\":\"%s\",\"date\":%li,\"text\":\"%s\"}\n]}",

+          buf[1-off],(buf[1-off]!='[')?",":"",

+          user,(long)time(NULL),text);

         fclose(f),f=NULL;

         return(0);

 }

@@ -22,7 +22,7 @@

 #define MAXPOSTS 2000000

 int

-post_new(kakumei *ka, char *user, char *text)

+post_new(kakumei *ka, char *user, char *title, char *text)

 {

         int last;

         int num;

@@ -31,9 +31,9 @@ post_new(kakumei *ka, char *user, char *text)

         FILE *f;

         struct stat st;

         if(ka==NULL || user==NULL || user[0]=='\0' || text==NULL || text[0]=='\0') {

-		log_write("POST","sanity check error\n");

+                log_write("POST","sanity check error\n");

                 return(-1);

-	}

+        }

         last=post_last(ka);

         filename[0]='\0';

         for(num=last+1;num<MAXPOSTS;num++) {

@@ -43,9 +43,9 @@ post_new(kakumei *ka, char *user, char *text)

                         break; /* this one is ok: file doesn't exist */

         }

         if(filename[0]=='\0' || num>=MAXPOSTS) {

-		log_write("POST","couldn't generate filename or too many posts\n");

+                log_write("POST","couldn't generate filename or too many posts\n");

                 return(-1);

-	}

+        }

         /* create dir structure */

         mkdir(DATADIR,0700);

         mkdir(POSTSDIR,0700);

@@ -54,11 +54,12 @@ post_new(kakumei *ka, char *user, char *text)

         mkdir(dirname,0700);

         /* save the new post */

         if((f=fopen(filename,"w"))==NULL) {

-		log_write("POST","couldn't save post\n");

+                log_write("POST","couldn't save post\n");

                 return(-1);

-	}

+        }

         fprintf(f,"{\n  \"author\":\"%s\",\n",user);

         fprintf(f,"  \"date\":%li,\n",(long)time(NULL));

+        fprintf(f,"  \"title\":\"%s\",\n",title);

         fprintf(f,"  \"text\":\"%s\",\n",text);

         fprintf(f,"  \"comments\":[\n]}\n");

         fclose(f),f=NULL;

@@ -81,9 +82,9 @@ post_last(kakumei *ka)

         snprintf(filename,sizeof(filename)-1,"%s/%s",POSTSDIR,"last");

         filename[sizeof(filename)-1]='\0';

         if((fd=open(filename,O_RDONLY))==-1) {

-		log_write("POST","couldn't get last post number\n");

+                log_write("POST","couldn't get last post number\n");

                 return(-1);

-	}

+        }

         memset(readbuf,0,sizeof(readbuf));

         read(fd,readbuf,sizeof(readbuf)-1);

         close(fd),fd=-1;

@@ -95,15 +96,15 @@ post_get(kakumei *ka, int num, char *filename, int filenamesize)

 {

         struct stat st;

         if(ka==NULL || num<0 || filename==NULL || filenamesize<=0) {

-		log_write("POST","Sanity check error\n");

+                log_write("POST","Sanity check error\n");

                 return(-1);

-	}

+        }

         snprintf(filename,filenamesize,"%s/%04i/%04i.json",POSTSDIR,num/10000,num%10000);

         filename[filenamesize-1]='\0';

         if(stat(filename,&st)!=0) {

-		log_write("POST","Post file doesn't exist\n");

+                log_write("POST","Post file doesn't exist\n");

                 return(-1); /* file doesn't exist */

-	}

+        }

         return(0);

 }

@@ -114,19 +115,19 @@ post_addcomment(kakumei *ka, int postnum, char *user, char *text)

         char buf[16];

         FILE *f;

         if(ka==NULL || postnum<0 || user==NULL || text==NULL) {

-		log_write("POST","Sanity check error\n");

+                log_write("POST","Sanity check error\n");

                 return(-1);

-	}

-        if(post_get(ka,postnum,filename,sizeof(filename))!=0) 

+        }

+        if(post_get(ka,postnum,filename,sizeof(filename))!=0)

                 return(-1);

         if((f=fopen(filename,"r+"))==NULL) {

-		log_write("POST","Couldn't open post file fot appending\n");

+                log_write("POST","Couldn't open post file fot appending\n");

                 return(-1);

-	}

+        }

         fseek(f,-2,SEEK_END);

         if(fread(buf,1,2,f)!=2 || buf[0]!=']' ||  buf[1]!='}') {

                 fclose(f),f=NULL;

-		log_write("POST","Post file contents are corrupted\n");

+                log_write("POST","Post file contents are corrupted\n");

                 return(-1);

         }

         fseek(f,-2,SEEK_END);

@@ -15,6 +15,7 @@

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <time.h>

+#include "loglib.h"

 #include "kakumei.h"

 #include "kakumei_posts.h"

@@ -29,8 +30,10 @@ post_new(kakumei *ka, char *user, char *text)

         char dirname[1024];

         FILE *f;

         struct stat st;

-        if(ka==NULL || user==NULL || user[0]=='\0' || text==NULL || text[0]=='\0')

+        if(ka==NULL || user==NULL || user[0]=='\0' || text==NULL || text[0]=='\0') {

+		log_write("POST","sanity check error\n");

                 return(-1);

+	}

         last=post_last(ka);

         filename[0]='\0';

         for(num=last+1;num<MAXPOSTS;num++) {

@@ -39,8 +42,10 @@ post_new(kakumei *ka, char *user, char *text)

                 if(stat(filename,&st)!=0)

                         break; /* this one is ok: file doesn't exist */

         }

-        if(filename[0]=='\0' || num>=MAXPOSTS)

+        if(filename[0]=='\0' || num>=MAXPOSTS) {

+		log_write("POST","couldn't generate filename or too many posts\n");

                 return(-1);

+	}

         /* create dir structure */

         mkdir(DATADIR,0700);

         mkdir(POSTSDIR,0700);

@@ -48,12 +53,13 @@ post_new(kakumei *ka, char *user, char *text)

         dirname[sizeof(dirname)-1]='\0';

         mkdir(dirname,0700);

         /* save the new post */

-        if((f=fopen(filename,"w"))==NULL)

+        if((f=fopen(filename,"w"))==NULL) {

+		log_write("POST","couldn't save post\n");

                 return(-1);

+	}

         fprintf(f,"{\n  \"author\":\"%s\",\n",user);

         fprintf(f,"  \"date\":%li,\n",(long)time(NULL));

         fprintf(f,"  \"text\":\"%s\",\n",text);

-        fprintf(f,"  \"text\":\"%s\",\n",text);

         fprintf(f,"  \"comments\":[\n]}\n");

         fclose(f),f=NULL;

         /* save the "last" mark */

@@ -74,8 +80,10 @@ post_last(kakumei *ka)

         int fd;

         snprintf(filename,sizeof(filename)-1,"%s/%s",POSTSDIR,"last");

         filename[sizeof(filename)-1]='\0';

-        if((fd=open(filename,O_RDONLY))==-1)

+        if((fd=open(filename,O_RDONLY))==-1) {

+		log_write("POST","couldn't get last post number\n");

                 return(-1);

+	}

         memset(readbuf,0,sizeof(readbuf));

         read(fd,readbuf,sizeof(readbuf)-1);

         close(fd),fd=-1;

@@ -86,12 +94,16 @@ int

 post_get(kakumei *ka, int num, char *filename, int filenamesize)

 {

         struct stat st;

-        if(ka==NULL || num<0 || filename==NULL || filenamesize<=0)

+        if(ka==NULL || num<0 || filename==NULL || filenamesize<=0) {

+		log_write("POST","Sanity check error\n");

                 return(-1);

+	}

         snprintf(filename,filenamesize,"%s/%04i/%04i.json",POSTSDIR,num/10000,num%10000);

         filename[filenamesize-1]='\0';

-        if(stat(filename,&st)!=0)

+        if(stat(filename,&st)!=0) {

+		log_write("POST","Post file doesn't exist\n");

                 return(-1); /* file doesn't exist */

+	}

         return(0);

 }

@@ -101,15 +113,20 @@ post_addcomment(kakumei *ka, int postnum, char *user, char *text)

         char filename[1024];

         char buf[16];

         FILE *f;

-        if(ka==NULL || postnum<0 || user==NULL || text==NULL)

+        if(ka==NULL || postnum<0 || user==NULL || text==NULL) {

+		log_write("POST","Sanity check error\n");

                 return(-1);

-        if(post_get(ka,postnum,filename,sizeof(filename))!=0)

+	}

+        if(post_get(ka,postnum,filename,sizeof(filename))!=0) 

                 return(-1);

-        if((f=fopen(filename,"r+"))==NULL)

+        if((f=fopen(filename,"r+"))==NULL) {

+		log_write("POST","Couldn't open post file fot appending\n");

                 return(-1);

+	}

         fseek(f,-2,SEEK_END);

         if(fread(buf,1,2,f)!=2 || buf[0]!=']' ||  buf[1]!='}') {

                 fclose(f),f=NULL;

+		log_write("POST","Post file contents are corrupted\n");

                 return(-1);

         }

         fseek(f,-2,SEEK_END);

new file mode 100644

@@ -0,0 +1,120 @@

+/*

+ * kakumei_posts.c

+ *

+ * Posts management

+ *

+ * Author: Dario Rodriguez dario@softhome.net

+ * This progran is licensed under the terms of the Affero GPL v1+

+ */

+

+#include <stdio.h>

+#include <stdlib.h>

+#include <unistd.h>

+#include <string.h>

+#include <fcntl.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <time.h>

+#include "kakumei.h"

+#include "kakumei_posts.h"

+

+#define MAXPOSTS 2000000

+

+int

+post_new(kakumei *ka, char *user, char *text)

+{

+        int last;

+        int num;

+        char filename[1024];

+        char dirname[1024];

+        FILE *f;

+        struct stat st;

+        if(ka==NULL || user==NULL || user[0]=='\0' || text==NULL || text[0]=='\0')

+                return(-1);

+        last=post_last(ka);

+        filename[0]='\0';

+        for(num=last+1;num<MAXPOSTS;num++) {

+                snprintf(filename,sizeof(filename),"%s/%04i/%04i.json",POSTSDIR,num/10000,num%10000);

+                filename[sizeof(filename)-1]='\0';

+                if(stat(filename,&st)!=0)

+                        break; /* this one is ok: file doesn't exist */

+        }

+        if(filename[0]=='\0' || num>=MAXPOSTS)

+                return(-1);

+        /* create dir structure */

+        mkdir(DATADIR,0700);

+        mkdir(POSTSDIR,0700);

+        snprintf(dirname,sizeof(dirname),"%s/%04i",POSTSDIR,num/10000);

+        dirname[sizeof(dirname)-1]='\0';

+        mkdir(dirname,0700);

+        /* save the new post */

+        if((f=fopen(filename,"w"))==NULL)

+                return(-1);

+        fprintf(f,"{\n  \"author\":\"%s\",\n",user);

+        fprintf(f,"  \"date\":%li,\n",(long)time(NULL));

+        fprintf(f,"  \"text\":\"%s\",\n",text);

+        fprintf(f,"  \"text\":\"%s\",\n",text);

+        fprintf(f,"  \"comments\":[\n]}\n");

+        fclose(f),f=NULL;

+        /* save the "last" mark */

+        snprintf(filename,sizeof(filename)-1,"%s/%s",POSTSDIR,"last");

+        filename[sizeof(filename)-1]='\0';

+        if((f=fopen(filename,"w"))!=NULL) {

+                fprintf(f,"%i",num);

+                fclose(f),f=NULL;

+        }

+        return(0);

+}

+

+int

+post_last(kakumei *ka)

+{

+        char readbuf[128];

+        char filename[1024];

+        int fd;

+        snprintf(filename,sizeof(filename)-1,"%s/%s",POSTSDIR,"last");

+        filename[sizeof(filename)-1]='\0';

+        if((fd=open(filename,O_RDONLY))==-1)

+                return(-1);

+        memset(readbuf,0,sizeof(readbuf));

+        read(fd,readbuf,sizeof(readbuf)-1);

+        close(fd),fd=-1;

+        return(atoi(readbuf));

+}

+

+int

+post_get(kakumei *ka, int num, char *filename, int filenamesize)

+{

+        struct stat st;

+        if(ka==NULL || num<0 || filename==NULL || filenamesize<=0)

+                return(-1);

+        snprintf(filename,filenamesize,"%s/%04i/%04i.json",POSTSDIR,num/10000,num%10000);

+        filename[filenamesize-1]='\0';

+        if(stat(filename,&st)!=0)

+                return(-1); /* file doesn't exist */

+        return(0);

+}

+

+int

+post_addcomment(kakumei *ka, int postnum, char *user, char *text)

+{

+        char filename[1024];

+        char buf[16];

+        FILE *f;

+        if(ka==NULL || postnum<0 || user==NULL || text==NULL)

+                return(-1);

+        if(post_get(ka,postnum,filename,sizeof(filename))!=0)

+                return(-1);

+        if((f=fopen(filename,"r+"))==NULL)

+                return(-1);

+        fseek(f,-2,SEEK_END);

+        if(fread(buf,1,2,f)!=2 || buf[0]!=']' ||  buf[1]!='}') {

+                fclose(f),f=NULL;

+                return(-1);

+        }

+        fseek(f,-2,SEEK_END);

+        fprintf(f,"    { \"author\":\"%s\",\"date\":%li,\"text\":\"%s\"},\n]}",user,(long)time(NULL),text);

+        fclose(f),f=NULL;

+        return(0);

+}

+