@@ -36,6 +36,9 @@ static int redata_unsaved_check_gen(redata_t *redata, char *filename);

 static char *unsaved_genname(char *filename, char *buf, int bufsize);

 static char *securesave_genname(char *filename, char *buf, int bufsize);

 static char *genname(char *filename,char *prefix, char *postfix, char *buf, int bufsize);

+static char *ptr_getlong(char *ptr,char *endptr,long *data);

+static char *ptr_getchar(char *ptr,char *endptr,char *data);

+static char *ptr_searchendchar(char *ptr, char *endptr, char endchar, char **endcharpos);

 redata_t *

 redata_init(void)

@@ -57,6 +60,8 @@ redata_init(void)

         /* unsaved */

         redata->filename[0]='\0';

         redata->unsavedfd=-1;

+        redata->unsaved.sizebuf=redata->unsaved.usedbuf=0;

+        redata->unsaved.lastsize=0;

         /* all done */

         return(redata);

 }

@@ -472,7 +477,7 @@ int

 redata_unsaved_check(redata_t *redata, char *filename)

 {

         int fd;

-        if((fd=redata_unsaved_check(redata,filename))==-1)

+        if((fd=redata_unsaved_check_gen(redata,filename))==-1)

                 return(-1); /* check failed */

         close(fd),fd=-1;

         return(0);

@@ -519,6 +524,7 @@ redata_unsaved_trunc(redata_t *redata)

         return(0);

 }

+

 int

 redata_unsaved_loadappend(redata_t *redata)

 {

@@ -528,7 +534,12 @@ redata_unsaved_loadappend(redata_t *redata)

         long headerhashsize;

         char *newptr;

         long nread,lim;

-        if((fd=redata_unsaved_check(redata,redata->filename))==-1)

+        char *ptr,*endptr,*aux,*bufptr;

+        char actioncode;

+        long pos;

+        char endcode;

+        int flag_multipart;

+        if((fd=redata_unsaved_check_gen(redata,redata->filename))==-1)

                 return(-1); /* check failed */

         if(fstat(fd,&statbuf)!=0 || !S_ISREG(statbuf.st_mode)) {

                 close(fd),fd=-1;

@@ -556,7 +567,50 @@ redata_unsaved_loadappend(redata_t *redata)

         }

         close(fd),fd=-1;

         /* process unsaved data */

+        endptr=redata->unsaved.buf+redata->unsaved.usedbuf;

+        for(ptr=redata->unsaved.buf;ptr<endptr;) {

+                if((ptr=ptr_getchar(ptr,endptr,&actioncode))==NULL)

+                        return(-1); /* no space for action char */

+                /* multipart example: A10+$aj$%$% >> insert "aj$" into pos 10 */

+                if(actioncode=='A') {

+                        ptr=ptr_getlong(ptr,endptr,&pos);

+                        do {

+                                flag_multipart=0;

+                                ptr=ptr_getchar(ptr,endptr,&endcode);

+                                if(ptr!=NULL && endcode=='+') {

+                                        flag_multipart=1;

+                                        ptr=ptr_getchar(ptr,endptr,&endcode);

+                                }

+                                bufptr=ptr;

+                                ptr=ptr_searchendchar(ptr,endptr,endcode,&aux);

+                                if(ptr==NULL || pos<0 || pos>redata_getused(redata))

+                                        return(-1); /* malformed register */

+                                redata_op_add(redata,pos,bufptr,aux-bufptr,NULL);

+                                pos+=aux-bufptr;

+                        } while(flag_multipart);

+                } else if(actioncode=='D') {

+                        ptr=ptr_getlong(ptr,endptr,&pos);

+                        do {

+                                flag_multipart=0;

+                                ptr=ptr_getchar(ptr,endptr,&endcode);

+                                if(ptr!=NULL && endcode=='+') {

+                                        flag_multipart=1;

+                                        ptr=ptr_getchar(ptr,endptr,&endcode);

+                                }

+                                bufptr=ptr;

+                                ptr=ptr_searchendchar(ptr,endptr,endcode,&aux);

+                                if(ptr==NULL || pos<0 || (pos+(aux-bufptr))>redata_getused(redata))

+                                        return(-1); /* malformed register */

+                                if(redata_data_compare(redata,pos,bufptr,aux-bufptr)!=0)

+                                        return(-1); /* corrupted data */

+                                redata_op_del(redata,pos,aux-bufptr,NULL);

+                        } while(flag_multipart);

+                } else if(actioncode=='M') {

 #warning TODO

+                } else {

+                        return(-1); /* corrupted undobuf */

+                }

+        }

         return(-1);

 }

@@ -1025,6 +1079,31 @@ redata_op_redo(redata_t *redata)

         return(-1);

 }

+int

+redata_data_compare(redata_t *redata, long cmppos, char *buf, long buflen)

+{

+        int chunkno;

+        long pos;

+        long compared;

+        long n;

+        int res;

+        if(redata==NULL || pos<0 || buf==NULL || buflen<0

+          || cmppos>redata_getused(redata)

+          || (cmppos+buflen)>redata_getused(redata))

+                return(-1); /* sanity check failed */

+        if(redata_getposptr(redata,cmppos,&chunkno,&pos)==-1)

+                return(-1); /* invalid pos */

+        for(compared=0,n=0;compared<buflen && chunkno<redata->sizechunks;chunkno++,pos=0,compared+=n) {

+                n=redata->chunks[chunkno]->useddata-pos;

+                n=(n<0)?0:((compared+n)>buflen)?(buflen-compared):n;

+                if((res=memcmp(redata->chunks[chunkno]->data+pos,buf+compared,n))!=0)

+                        return(res);

+        }

+        if(compared<buflen)

+                return(1);

+        return(0);

+}

+

 int

 redata_hash(redata_t *redata, char *resbuf129bytes)

 {

@@ -1159,4 +1238,49 @@ genname(char *filename,char *prefix, char *postfix, char *buf, int bufsize)

         return(name);

 }

+static char *

+ptr_getlong(char *ptr,char *endptr,long *data)

+{

+        long l,s;

+        if(ptr==NULL || endptr==NULL || ptr>endptr)

+                return(NULL);

+        s=1;

+        if(ptr<endptr && *ptr=='-') {

+                s=-1;

+                ptr++;

+        }

+        for(l=0;ptr<endptr && *ptr>='0' && *ptr<='9';ptr++) {

+                l*=10;

+                l+=(*ptr-'0');

+        }

+        l*=s;

+        if(data!=NULL)

+                *data=l;

+        return(ptr);

+}

+

+

+static char *

+ptr_getchar(char *ptr,char *endptr,char *data)

+{

+        if(ptr==NULL || endptr==NULL || ptr>endptr)

+                return(NULL);

+        if(data!=NULL)

+                *data=*ptr;

+        ptr++;

+        return(ptr);

+}

+

+static char *

+ptr_searchendchar(char *ptr, char *endptr, char endchar, char **endcharpos)

+{

+        char *aux;

+        if(ptr==NULL || endptr==NULL || ptr>endptr)

+                return(NULL);

+        if((aux=memchr(ptr,endchar,endptr-ptr))==NULL)

+                return(NULL);

+        if(endcharpos!=NULL)

+                *endcharpos=aux;

+        return(aux+1);

+}

@@ -114,6 +114,7 @@ int redata_op_move(redata_t *redata, long posorig, long size, long posdest, undo

 int redata_op_undo(redata_t *redata);

 int redata_op_redo(redata_t *redata);

+int redata_data_compare(redata_t *redata, long pos, char *buf, long buflen);

 int redata_hash(redata_t *redata, char *resbuf129bytes);

 int redata_filehash(redata_t *redata, char *filename, char *resbuf129bytes);

@@ -47,7 +47,7 @@ main(int argc, char *argv[])

                 {"newfile_32768",test_newfile,PREFIX "FILE", NULL, 32768, 0},

                 {"newfile_32769",test_newfile,PREFIX "FILE", NULL, 32769, 0},

                 {"newfile_131072",test_newfile,PREFIX "FILE", NULL, 131072, 0},

-                {"testedit_add",test_edit,PREFIX "EDIT", "A,0,$Testing add$",0,0},

+                {"testedit_add",test_edit,PREFIX "EDIT", "A0$Testing add$",0,0},

         };

         redata_t *redata;

         int i;

@@ -173,9 +173,8 @@ fprintf(stderr,"\ntest_edit(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)?"\

                         }

 if(k!=0) redata_save(redata,"test.pre");

                         if(*ptr=='A') {

-                                /* A,<insertpos>,<endchar>,<text><endchar> */

+                                /* A<insertpos><endchar><text><endchar> */

                                 ptr++;

-                                ptr+=(*ptr==',')?1:0;

                                 errno=0;

                                 l=(int)strtol(ptr,&ptr,10);

                                 if(errno!=0 || l<0 || l>cursize) {

@@ -183,7 +182,6 @@ if(k!=0) redata_save(redata,"test.pre");

                                                 free(mem),mem=NULL;

                                         return("test_edit(): error parsing position");

                                 }

-                                ptr+=(*ptr==',')?1:0;

                                 endcode=*ptr;

                                 ptr+=(*ptr!='\0')?1:0;

                                 ptrend=strchr(ptr,endcode);