[Fte-cvs] fte/src o_cvsbase.cpp, 1.3, 1.4 o_cvsbase.h, 1.1, 1.2 o_svn.cpp, 1.2, 1.3 o_svnbase.cpp, 1.1, 1.2 o_svnbase.h, 1.1, 1.2 o_cvs.cpp, 1.2, 1.3

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv2543/src

Modified Files:
	o_cvsbase.cpp o_cvsbase.h o_svn.cpp o_svnbase.cpp o_svnbase.h 
	o_cvs.cpp 
Log Message:
* avoid const type
* remove DOS EOL


Index: o_cvs.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/o_cvs.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- o_cvs.cpp	12 Jan 2007 18:23:41 -0000	1.2
+++ o_cvs.cpp	13 Feb 2007 00:26:30 -0000	1.3
@@ -125,7 +125,7 @@
     LogFile=strdup (cvslog->FileName);
     View->SwitchToModel (cvslog);
 
-    AddLine (LogFile,-1,(char *)"CVS commit start - enter message text",1);
+    AddLine (LogFile,-1,"CVS commit start - enter message text",1);
 
     return 0;
 }

Index: o_svnbase.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/o_svnbase.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- o_svnbase.cpp	19 Feb 2006 21:10:09 -0000	1.1
+++ o_svnbase.cpp	13 Feb 2007 00:26:30 -0000	1.2
@@ -1,433 +1,433 @@
-/*
- * o_svnbase.cpp
- *
- * S.Pinigin copy o_cvsbase.cpp and replace cvs/Cvs/CVS to svn/Svn/SVN.
- *
- * Base class for all other SVN-related classes. This is similar to EMessages
- * - starts SVN and shows its messages in list view.
- */
-
-#include "fte.h"
-#include "c_commands.h"
-#include "o_svnbase.h"
-
-#ifdef CONFIG_OBJ_SVN
-
-#define MAXREGEXP 32
-
-static int SvnIgnoreRegexpCount=0;
-static RxNode *SvnIgnoreRegexp[MAXREGEXP];
-
-int AddSvnIgnoreRegexp (const char *regexp) {
-    if (SvnIgnoreRegexpCount>=MAXREGEXP) return 0;
-    if ((SvnIgnoreRegexp[SvnIgnoreRegexpCount]=RxCompile (regexp))==NULL) return 0;
-    SvnIgnoreRegexpCount++;
-    return 1;
-}
-
-void FreeSvnIgnoreRegexp () {
-    while (SvnIgnoreRegexpCount--) {
-        RxFree (SvnIgnoreRegexp[SvnIgnoreRegexpCount]);
-    }
-}
-
-ESvnBase::ESvnBase (int createFlags,EModel **ARoot,const char *title):EList (createFlags,ARoot,title) {
-    LineCount=0;
-    Lines=0;
-    Running=0;
-    BufLen=0;
-    BufPos=0;
-    Command=0;
-    Directory=0;
-    OnFiles=0;
-    ReturnCode=-1;
-    PipeId=-1;
-}
-
-ESvnBase::~ESvnBase () {
-    gui->ClosePipe (PipeId);
-    FreeLines ();
-    free (Command);
-    free (Directory);
-    free (OnFiles);
-}
-
-void ESvnBase::FreeLines () {
-    if (Lines) {
-        for (int i=0;i<LineCount;i++) {
-            if (Lines[i]->Buf&&Lines[i]->Line>=0) {
-                // Has buffer and line == bookmark -> remove it
-                char book[16];
-                sprintf (book,"_SVN.%d",i);
-                Lines[i]->Buf->RemoveBookmark (book);
-            }
-            free (Lines[i]->Msg);
-            free (Lines[i]->File);
-            free (Lines[i]);
-        }
-        free (Lines);
-    }
-    LineCount=0;
-    Lines=0;
-    BufLen=BufPos=0;
-}
-
-void ESvnBase::AddLine (char *file,int line,char *msg,int status) {
-    SvnLine *l;
-
-    l=(SvnLine *)malloc (sizeof (SvnLine));
-    if (l!=0) {
-        l->File=file?strdup (file):0;
-        l->Line=line;
-        l->Msg=msg?strdup (msg):0;
-        l->Buf=0;
-        l->Status=status;
-
-        LineCount++;
-        Lines=(SvnLine **)realloc (Lines,sizeof (SvnLine *)*LineCount);
-        Lines[LineCount-1]=l;
-        FindBuffer (LineCount-1);
-
-        UpdateList ();
-    }
-}
-
-void ESvnBase::FindBuffer (int line) {
-    assert (line>=0&&line<LineCount);
-    if (Lines[line]->File!=0) {
-        EBuffer *B;
-        Lines[line]->Buf=0;
-        char path[MAXPATH];
-        strcpy (path,Directory);Slash (path,1);strcat (path,Lines[line]->File);
-        B=FindFile (path);
-        if (B!=0&&B->Loaded!=0) AssignBuffer (B,line);
-    }
-}
-
-void ESvnBase::AssignBuffer (EBuffer *B,int line) {
-    assert (line>=0&&line<LineCount);
-
-    char book[16];
-    EPoint P;
-
-    Lines[line]->Buf=B;
-    if (Lines[line]->Line>=0) {
-        sprintf (book,"_SVN.%d",line);
-        P.Col=0;
-        P.Row=Lines[line]->Line;
-        if (P.Row>=B->RCount)
-            P.Row=B->RCount-1;
-        B->PlaceBookmark (book,P);
-    }
-}
-
-void ESvnBase::FindFileLines (EBuffer *B) {
-    char path[MAXPATH];
-    char *pos;
-    strcpy (path,Directory);Slash (path,1);pos=path+strlen (path);
-    for (int i=0;i<LineCount;i++)
-        if (Lines[i]->Buf==0&&Lines[i]->File!=0) {
-            strcpy (pos,Lines[i]->File);
-            if (filecmp (B->FileName,path)==0) {
-                AssignBuffer (B,i);
-            }
-        }
-}
-
-void ESvnBase::NotifyDelete (EModel *Deleting) {
-    for (int i=0;i<LineCount;i++) {
-        if (Lines[i]->Buf==Deleting) {
-            Lines[i]->Buf=0;
-        }
-    }
-}
-
-int ESvnBase::GetLine(char *Line, int max) {
-    int rc;
-    char *p;
-    int l;
-
-    //fprintf(stderr, "GetLine: %d\n", Running);
-
-    *Line = 0;
-    if (Running && PipeId != -1) {
-        rc = gui->ReadPipe(PipeId, MsgBuf + BufLen, sizeof(MsgBuf) - BufLen);
-        //fprintf(stderr, "GetLine: ReadPipe rc = %d\n", rc);
-        if (rc == -1) {
-            ContinuePipe ();
-        }
-        if (rc > 0)
-            BufLen += rc;
-    }
-    l = max - 1;
-    if (BufLen - BufPos < l)
-        l = BufLen - BufPos;
-    //fprintf(stderr, "GetLine: Data %d\n", l);
-    p = (char *)memchr(MsgBuf + BufPos, '\n', l);
-    if (p) {
-        *p = 0;
-        strcpy(Line, MsgBuf + BufPos);
-        l = strlen(Line);
-        if (l > 0 && Line[l - 1] == '\r')
-            Line[l - 1] = 0;
-        BufPos = p + 1 - MsgBuf;
-        //fprintf(stderr, "GetLine: Line %d\n", strlen(Line));
-    } else if (Running && sizeof(MsgBuf) != BufLen) {
-        memmove(MsgBuf, MsgBuf + BufPos, BufLen - BufPos);
-        BufLen -= BufPos;
-        BufPos = 0;
-        //fprintf(stderr, "GetLine: Line Incomplete\n");
-        return 0;
-    } else {
-        if (l == 0)
-            return 0;
-        memcpy(Line, MsgBuf + BufPos, l);
-        Line[l] = 0;
-        if (l > 0 && Line[l - 1] == '\r')
-            Line[l - 1] = 0;
-        BufPos += l;
-        //fprintf(stderr, "GetLine: Line Last %d\n", l);
-    }
-    memmove(MsgBuf, MsgBuf + BufPos, BufLen - BufPos);
-    BufLen -= BufPos;
-    BufPos = 0;
-    //fprintf(stderr, "GetLine: Got Line\n");
-    return 1;
-}
-
-void ESvnBase::ParseLine (char *line,int) {
-    AddLine (0,-1,line);
-}
-
-void ESvnBase::NotifyPipe (int APipeId) {
-    if (APipeId==PipeId) {
-        char line[1024];
-        RxMatchRes RM;
-        int i;
-
-        while (GetLine((char *)line, sizeof(line))) {
-            int len=strlen (line);
-            if (len>0&&line[len-1]=='\n') line[--len]=0;
-            for (i=0;i<SvnIgnoreRegexpCount;i++)
-                if (RxExec (SvnIgnoreRegexp[i],line,len,line,&RM)==1) break;
-            if (i==SvnIgnoreRegexpCount) ParseLine (line,len);
-        }
-        if (!Running) {
-            char s[30];
-
-            sprintf (s,"[done, status=%d]",ReturnCode);
-            AddLine (0,-1,s);
-        }
-    }
-}
-
-int ESvnBase::RunPipe (char *ADir,char *ACommand,char *AOnFiles) {
-    free (Command);
-    free (Directory);
-    free (OnFiles);
-
-    Command=strdup (ACommand);
-    Directory=strdup (ADir);
-    OnFiles=strdup (AOnFiles);
-
-    ReturnCode=-1;
-    Row=LineCount-1;
-    OnFilesPos=OnFiles;
-
-    {
-        char s[2*MAXPATH*4];
-
-        sprintf (s,"[running svn in '%s']",Directory);
-        AddLine (0,-1,s);
-    }
-
-    ChangeDir (Directory);
-    return ContinuePipe ();
-}
-
-int ESvnBase::ContinuePipe () {
-    char RealCommand[2048];
-    size_t space;
-
-    if (!OnFilesPos) {
-        // At the end of all files, terminate
-        ClosePipe ();
-        return 0;
-    } else if (Running) {
-        // Already running, close the pipe and continue
-        ReturnCode=gui->ClosePipe (PipeId);
-    } else {
-        // Not running -> set to Running mode
-        Running=1;
-    }
-
-    // Make real command with some files from OnFiles, update OnFilesPos
-    strcat (strcpy (RealCommand,Command)," ");
-    space=sizeof (RealCommand)-strlen (RealCommand)-1;
-    if (space>=strlen (OnFilesPos)) {
-        strcat (RealCommand,OnFilesPos);
-        OnFilesPos=NULL;
-    } else {
-        char c=OnFilesPos[space];
-        OnFilesPos[space]=0;
-        char *s=strrchr (OnFilesPos,' ');
-        OnFilesPos[space]=c;
-        if (!s) {
-            ClosePipe ();
-            return 0;
-        }
-        *s=0;
-        strcat (RealCommand,OnFilesPos);
-        OnFilesPos=s+1;
-        while (*OnFilesPos==' ') OnFilesPos++;
-        if (!*OnFilesPos) OnFilesPos=NULL;
-    }
-
-    BufLen=BufPos=0;
-
-    {
-        char s[sizeof (RealCommand)+32];
-
-        sprintf (s,"[continuing: '%s']",RealCommand);
-        AddLine (0,-1,s);
-    }
-
-    PipeId=gui->OpenPipe (RealCommand,this);
-    return 0;
-}
-
-void ESvnBase::ClosePipe () {
-    ReturnCode = gui->ClosePipe(PipeId);
-    PipeId = -1;
-    Running = 0;
-}
-
-void ESvnBase::DrawLine (PCell B,int Line,int Col,ChColor color,int Width) {
-    if (Line<LineCount)
-        if (Col<(int)strlen (Lines[Line]->Msg)) {
-            char str[1024];
-            int len;
-
-            len=UnTabStr (str,sizeof (str),Lines[Line]->Msg,strlen (Lines[Line]->Msg));
-            if (len>Col) MoveStr (B,0,Width,str+Col,color,Width);
-        }
-}
-
-char *ESvnBase::FormatLine (int Line) {
-    if (Line<LineCount) return strdup (Lines[Line]->Msg);else return 0;
-}
-
-void ESvnBase::UpdateList () {
-    if (LineCount<=Row||Row>=Count-1) Row=LineCount-1;
-    Count=LineCount;
-    EList::UpdateList ();
-}
-
-int ESvnBase::Activate (int No) {
-    ShowLine (View,No);
-    return 1;
-}
-
-int ESvnBase::CanActivate(int Line) {
-    return Line<LineCount&&Lines[Line]->File;
-}
-
-int ESvnBase::IsHilited (int Line) {
-    return Line<LineCount&&(Lines[Line]->Status&1);
-}
-
-int ESvnBase::IsMarked (int Line) {
-    return Line<LineCount&&(Lines[Line]->Status&2);
-}
-
-int ESvnBase::Mark (int Line) {
-    if (Line<LineCount) {
-        if (Lines[Line]->Status&4) Lines[Line]->Status|=2;
-        return 1;
-    } else return 0;
-}
-
-int ESvnBase::Unmark (int Line) {
-    if (Line<LineCount) {
-        if (Lines[Line]->Status&4) Lines[Line]->Status&=~2;
-        return 1;
-    } else return 0;
-}
-
-int ESvnBase::ExecCommand(int Command, ExState &State) {
-    switch (Command) {
-        case ExChildClose:
-            if (Running == 0 || PipeId == -1)
-                break;
-            ClosePipe ();
-            {
-                char s[30];
-
-                sprintf(s, "[aborted, status=%d]", ReturnCode);
-                AddLine(0, -1, s);
-            }
-            return ErOK;
-
-        case ExActivateInOtherWindow:
-            ShowLine(View->Next, Row);
-            return ErOK;
-    }
-    return EList::ExecCommand(Command, State);
-}
-
-void ESvnBase::ShowLine (EView *V,int line) {
-    if (line>=0&&line<LineCount&&Lines[line]->File) {
-        if (Lines[line]->Buf!=0) {
-            V->SwitchToModel (Lines[line]->Buf);
-            if (Lines[line]->Line!=-1) {
-                char book[16];
-                sprintf(book,"_SVN.%d",line);
-                Lines[line]->Buf->GotoBookmark (book);
-            }
-        } else {
-            char path[MAXPATH];
-            strcpy (path,Directory);Slash (path,1);strcat (path,Lines[line]->File);
-            if (FileLoad (0,path,0,V)==1) {
-                V->SwitchToModel (ActiveModel);
-                if (Lines[line]->Line!=-1) ((EBuffer *)ActiveModel)->CenterNearPosR (0,Lines[line]->Line);
-            }
-        }
-    }
-}
-
-// Event map - this name is used in config files when defining eventmap
-EEventMap *ESvnBase::GetEventMap () {
-    return FindEventMap ("SVNBASE");
-}
-
-// Shown in "Closing xxx..." message when closing model
-void ESvnBase::GetName (char *AName,int MaxLen) {
-    strncpy (AName,Title,MaxLen);
-}
-
-// Shown in buffer list
-void ESvnBase::GetInfo (char *AInfo,int MaxLen) {
-    char format[128];
-
-    sprintf (format,"%2d %04d/%03d %s (%%.%is) ",ModelNo,Row,Count,Title,MaxLen-24-strlen (Title));
-    sprintf (AInfo,format,Command);
-}
-
-// Used to get default directory of model
-void ESvnBase::GetPath (char *APath,int MaxLen) {
-    strncpy (APath,Directory,MaxLen);
-    APath[MaxLen-1]=0;
-    Slash (APath,0);
-}
-
-// Normal and short title (normal for window, short for icon in X)
-void ESvnBase::GetTitle(char *ATitle, int MaxLen, char *ASTitle, int SMaxLen) {
-    char format[128];
-
-    sprintf (format,"%s: %%.%is",Title,MaxLen-4-strlen (Title));
-    sprintf (ATitle,format,Command);
-    strncpy (ASTitle,Title,SMaxLen);
-    ASTitle[SMaxLen-1]=0;
-}
-
-#endif
+/*
+ * o_svnbase.cpp
+ *
+ * S.Pinigin copy o_cvsbase.cpp and replace cvs/Cvs/CVS to svn/Svn/SVN.
+ *
+ * Base class for all other SVN-related classes. This is similar to EMessages
+ * - starts SVN and shows its messages in list view.
+ */
+
+#include "fte.h"
+#include "c_commands.h"
+#include "o_svnbase.h"
+
+#ifdef CONFIG_OBJ_SVN
+
+#define MAXREGEXP 32
+
+static int SvnIgnoreRegexpCount=0;
+static RxNode *SvnIgnoreRegexp[MAXREGEXP];
+
+int AddSvnIgnoreRegexp (const char *regexp) {
+    if (SvnIgnoreRegexpCount>=MAXREGEXP) return 0;
+    if ((SvnIgnoreRegexp[SvnIgnoreRegexpCount]=RxCompile (regexp))==NULL) return 0;
+    SvnIgnoreRegexpCount++;
+    return 1;
+}
+
+void FreeSvnIgnoreRegexp () {
+    while (SvnIgnoreRegexpCount--) {
+        RxFree (SvnIgnoreRegexp[SvnIgnoreRegexpCount]);
+    }
+}
+
+ESvnBase::ESvnBase (int createFlags,EModel **ARoot,const char *title):EList (createFlags,ARoot,title) {
+    LineCount=0;
+    Lines=0;
+    Running=0;
+    BufLen=0;
+    BufPos=0;
+    Command=0;
+    Directory=0;
+    OnFiles=0;
+    ReturnCode=-1;
+    PipeId=-1;
+}
+
+ESvnBase::~ESvnBase () {
+    gui->ClosePipe (PipeId);
+    FreeLines ();
+    free (Command);
+    free (Directory);
+    free (OnFiles);
+}
+
+void ESvnBase::FreeLines () {
+    if (Lines) {
+        for (int i=0;i<LineCount;i++) {
+            if (Lines[i]->Buf&&Lines[i]->Line>=0) {
+                // Has buffer and line == bookmark -> remove it
+                char book[16];
+                sprintf (book,"_SVN.%d",i);
+                Lines[i]->Buf->RemoveBookmark (book);
+            }
+            free (Lines[i]->Msg);
+            free (Lines[i]->File);
+            free (Lines[i]);
+        }
+        free (Lines);
+    }
+    LineCount=0;
+    Lines=0;
+    BufLen=BufPos=0;
+}
+
+void ESvnBase::AddLine (char *file,int line, const char* msg,int status) {
+    SvnLine *l;
+
+    l=(SvnLine *)malloc (sizeof (SvnLine));
+    if (l!=0) {
+        l->File=file?strdup (file):0;
+        l->Line=line;
+        l->Msg=msg?strdup (msg):0;
+        l->Buf=0;
+        l->Status=status;
+
+        LineCount++;
+        Lines=(SvnLine **)realloc (Lines,sizeof (SvnLine *)*LineCount);
+        Lines[LineCount-1]=l;
+        FindBuffer (LineCount-1);
+
+        UpdateList ();
+    }
+}
+
+void ESvnBase::FindBuffer (int line) {
+    assert (line>=0&&line<LineCount);
+    if (Lines[line]->File!=0) {
+        EBuffer *B;
+        Lines[line]->Buf=0;
+        char path[MAXPATH];
+        strcpy (path,Directory);Slash (path,1);strcat (path,Lines[line]->File);
+        B=FindFile (path);
+        if (B!=0&&B->Loaded!=0) AssignBuffer (B,line);
+    }
+}
+
+void ESvnBase::AssignBuffer (EBuffer *B,int line) {
+    assert (line>=0&&line<LineCount);
+
+    char book[16];
+    EPoint P;
+
+    Lines[line]->Buf=B;
+    if (Lines[line]->Line>=0) {
+        sprintf (book,"_SVN.%d",line);
+        P.Col=0;
+        P.Row=Lines[line]->Line;
+        if (P.Row>=B->RCount)
+            P.Row=B->RCount-1;
+        B->PlaceBookmark (book,P);
+    }
+}
+
+void ESvnBase::FindFileLines (EBuffer *B) {
+    char path[MAXPATH];
+    char *pos;
+    strcpy (path,Directory);Slash (path,1);pos=path+strlen (path);
+    for (int i=0;i<LineCount;i++)
+        if (Lines[i]->Buf==0&&Lines[i]->File!=0) {
+            strcpy (pos,Lines[i]->File);
+            if (filecmp (B->FileName,path)==0) {
+                AssignBuffer (B,i);
+            }
+        }
+}
+
+void ESvnBase::NotifyDelete (EModel *Deleting) {
+    for (int i=0;i<LineCount;i++) {
+        if (Lines[i]->Buf==Deleting) {
+            Lines[i]->Buf=0;
+        }
+    }
+}
+
+int ESvnBase::GetLine(char *Line, int max) {
+    int rc;
+    char *p;
+    int l;
+
+    //fprintf(stderr, "GetLine: %d\n", Running);
+
+    *Line = 0;
+    if (Running && PipeId != -1) {
+        rc = gui->ReadPipe(PipeId, MsgBuf + BufLen, sizeof(MsgBuf) - BufLen);
+        //fprintf(stderr, "GetLine: ReadPipe rc = %d\n", rc);
+        if (rc == -1) {
+            ContinuePipe ();
+        }
+        if (rc > 0)
+            BufLen += rc;
+    }
+    l = max - 1;
+    if (BufLen - BufPos < l)
+        l = BufLen - BufPos;
+    //fprintf(stderr, "GetLine: Data %d\n", l);
+    p = (char *)memchr(MsgBuf + BufPos, '\n', l);
+    if (p) {
+        *p = 0;
+        strcpy(Line, MsgBuf + BufPos);
+        l = strlen(Line);
+        if (l > 0 && Line[l - 1] == '\r')
+            Line[l - 1] = 0;
+        BufPos = p + 1 - MsgBuf;
+        //fprintf(stderr, "GetLine: Line %d\n", strlen(Line));
+    } else if (Running && sizeof(MsgBuf) != BufLen) {
+        memmove(MsgBuf, MsgBuf + BufPos, BufLen - BufPos);
+        BufLen -= BufPos;
+        BufPos = 0;
+        //fprintf(stderr, "GetLine: Line Incomplete\n");
+        return 0;
+    } else {
+        if (l == 0)
+            return 0;
+        memcpy(Line, MsgBuf + BufPos, l);
+        Line[l] = 0;
+        if (l > 0 && Line[l - 1] == '\r')
+            Line[l - 1] = 0;
+        BufPos += l;
+        //fprintf(stderr, "GetLine: Line Last %d\n", l);
+    }
+    memmove(MsgBuf, MsgBuf + BufPos, BufLen - BufPos);
+    BufLen -= BufPos;
+    BufPos = 0;
+    //fprintf(stderr, "GetLine: Got Line\n");
+    return 1;
+}
+
+void ESvnBase::ParseLine (char *line,int) {
+    AddLine (0,-1,line);
+}
+
+void ESvnBase::NotifyPipe (int APipeId) {
+    if (APipeId==PipeId) {
+        char line[1024];
+        RxMatchRes RM;
+        int i;
+
+        while (GetLine((char *)line, sizeof(line))) {
+            int len=strlen (line);
+            if (len>0&&line[len-1]=='\n') line[--len]=0;
+            for (i=0;i<SvnIgnoreRegexpCount;i++)
+                if (RxExec (SvnIgnoreRegexp[i],line,len,line,&RM)==1) break;
+            if (i==SvnIgnoreRegexpCount) ParseLine (line,len);
+        }
+        if (!Running) {
+            char s[30];
+
+            sprintf (s,"[done, status=%d]",ReturnCode);
+            AddLine (0,-1,s);
+        }
+    }
+}
+
+int ESvnBase::RunPipe (char *ADir,char *ACommand,char *AOnFiles) {
+    free (Command);
+    free (Directory);
+    free (OnFiles);
+
+    Command=strdup (ACommand);
+    Directory=strdup (ADir);
+    OnFiles=strdup (AOnFiles);
+
+    ReturnCode=-1;
+    Row=LineCount-1;
+    OnFilesPos=OnFiles;
+
+    {
+        char s[2*MAXPATH*4];
+
+        sprintf (s,"[running svn in '%s']",Directory);
+        AddLine (0,-1,s);
+    }
+
+    ChangeDir (Directory);
+    return ContinuePipe ();
+}
+
+int ESvnBase::ContinuePipe () {
+    char RealCommand[2048];
+    size_t space;
+
+    if (!OnFilesPos) {
+        // At the end of all files, terminate
+        ClosePipe ();
+        return 0;
+    } else if (Running) {
+        // Already running, close the pipe and continue
+        ReturnCode=gui->ClosePipe (PipeId);
+    } else {
+        // Not running -> set to Running mode
+        Running=1;
+    }
+
+    // Make real command with some files from OnFiles, update OnFilesPos
+    strcat (strcpy (RealCommand,Command)," ");
+    space=sizeof (RealCommand)-strlen (RealCommand)-1;
+    if (space>=strlen (OnFilesPos)) {
+        strcat (RealCommand,OnFilesPos);
+        OnFilesPos=NULL;
+    } else {
+        char c=OnFilesPos[space];
+        OnFilesPos[space]=0;
+        char *s=strrchr (OnFilesPos,' ');
+        OnFilesPos[space]=c;
+        if (!s) {
+            ClosePipe ();
+            return 0;
+        }
+        *s=0;
+        strcat (RealCommand,OnFilesPos);
+        OnFilesPos=s+1;
+        while (*OnFilesPos==' ') OnFilesPos++;
+        if (!*OnFilesPos) OnFilesPos=NULL;
+    }
+
+    BufLen=BufPos=0;
+
+    {
+        char s[sizeof (RealCommand)+32];
+
+        sprintf (s,"[continuing: '%s']",RealCommand);
+        AddLine (0,-1,s);
+    }
+
+    PipeId=gui->OpenPipe (RealCommand,this);
+    return 0;
+}
+
+void ESvnBase::ClosePipe () {
+    ReturnCode = gui->ClosePipe(PipeId);
+    PipeId = -1;
+    Running = 0;
+}
+
+void ESvnBase::DrawLine (PCell B,int Line,int Col,ChColor color,int Width) {
+    if (Line<LineCount)
+        if (Col<(int)strlen (Lines[Line]->Msg)) {
+            char str[1024];
+            int len;
+
+            len=UnTabStr (str,sizeof (str),Lines[Line]->Msg,strlen (Lines[Line]->Msg));
+            if (len>Col) MoveStr (B,0,Width,str+Col,color,Width);
+        }
+}
+
+char *ESvnBase::FormatLine (int Line) {
+    if (Line<LineCount) return strdup (Lines[Line]->Msg);else return 0;
+}
+
+void ESvnBase::UpdateList () {
+    if (LineCount<=Row||Row>=Count-1) Row=LineCount-1;
+    Count=LineCount;
+    EList::UpdateList ();
+}
+
+int ESvnBase::Activate (int No) {
+    ShowLine (View,No);
+    return 1;
+}
+
+int ESvnBase::CanActivate(int Line) {
+    return Line<LineCount&&Lines[Line]->File;
+}
+
+int ESvnBase::IsHilited (int Line) {
+    return Line<LineCount&&(Lines[Line]->Status&1);
+}
+
+int ESvnBase::IsMarked (int Line) {
+    return Line<LineCount&&(Lines[Line]->Status&2);
+}
+
+int ESvnBase::Mark (int Line) {
+    if (Line<LineCount) {
+        if (Lines[Line]->Status&4) Lines[Line]->Status|=2;
+        return 1;
+    } else return 0;
+}
+
+int ESvnBase::Unmark (int Line) {
+    if (Line<LineCount) {
+        if (Lines[Line]->Status&4) Lines[Line]->Status&=~2;
+        return 1;
+    } else return 0;
+}
+
+int ESvnBase::ExecCommand(int Command, ExState &State) {
+    switch (Command) {
+        case ExChildClose:
+            if (Running == 0 || PipeId == -1)
+                break;
+            ClosePipe ();
+            {
+                char s[30];
+
+                sprintf(s, "[aborted, status=%d]", ReturnCode);
+                AddLine(0, -1, s);
+            }
+            return ErOK;
+
+        case ExActivateInOtherWindow:
+            ShowLine(View->Next, Row);
+            return ErOK;
+    }
+    return EList::ExecCommand(Command, State);
+}
+
+void ESvnBase::ShowLine (EView *V,int line) {
+    if (line>=0&&line<LineCount&&Lines[line]->File) {
+        if (Lines[line]->Buf!=0) {
+            V->SwitchToModel (Lines[line]->Buf);
+            if (Lines[line]->Line!=-1) {
+                char book[16];
+                sprintf(book,"_SVN.%d",line);
+                Lines[line]->Buf->GotoBookmark (book);
+            }
+        } else {
+            char path[MAXPATH];
+            strcpy (path,Directory);Slash (path,1);strcat (path,Lines[line]->File);
+            if (FileLoad (0,path,0,V)==1) {
+                V->SwitchToModel (ActiveModel);
+                if (Lines[line]->Line!=-1) ((EBuffer *)ActiveModel)->CenterNearPosR (0,Lines[line]->Line);
+            }
+        }
+    }
+}
+
+// Event map - this name is used in config files when defining eventmap
+EEventMap *ESvnBase::GetEventMap () {
+    return FindEventMap ("SVNBASE");
+}
+
+// Shown in "Closing xxx..." message when closing model
+void ESvnBase::GetName (char *AName,int MaxLen) {
+    strncpy (AName,Title,MaxLen);
+}
+
+// Shown in buffer list
+void ESvnBase::GetInfo (char *AInfo,int MaxLen) {
+    char format[128];
+
+    sprintf (format,"%2d %04d/%03d %s (%%.%is) ",ModelNo,Row,Count,Title,MaxLen-24-strlen (Title));
+    sprintf (AInfo,format,Command);
+}
+
+// Used to get default directory of model
+void ESvnBase::GetPath (char *APath,int MaxLen) {
+    strncpy (APath,Directory,MaxLen);
+    APath[MaxLen-1]=0;
+    Slash (APath,0);
+}
+
+// Normal and short title (normal for window, short for icon in X)
+void ESvnBase::GetTitle(char *ATitle, int MaxLen, char *ASTitle, int SMaxLen) {
+    char format[128];
+
+    sprintf (format,"%s: %%.%is",Title,MaxLen-4-strlen (Title));
+    sprintf (ATitle,format,Command);
+    strncpy (ASTitle,Title,SMaxLen);
+    ASTitle[SMaxLen-1]=0;
+}
+
+#endif

Index: o_cvsbase.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/o_cvsbase.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- o_cvsbase.cpp	28 Dec 2002 20:36:50 -0000	1.3
+++ o_cvsbase.cpp	13 Feb 2007 00:26:30 -0000	1.4
@@ -72,7 +72,7 @@
     BufLen=BufPos=0;
 }
 
-void ECvsBase::AddLine (char *file,int line,char *msg,int status) {
+void ECvsBase::AddLine (char *file,int line,const char* msg,int status) {
     CvsLine *l;
 
     l=(CvsLine *)malloc (sizeof (CvsLine));

Index: o_svn.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/o_svn.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- o_svn.cpp	6 Sep 2006 20:26:47 -0000	1.2
+++ o_svn.cpp	13 Feb 2007 00:26:30 -0000	1.3
@@ -116,7 +116,7 @@
     LogFile=strdup (svnlog->FileName);
     View->SwitchToModel (svnlog);
 
-    AddLine (LogFile,-1,(char *)"SVN commit start - enter message text",1);
+    AddLine (LogFile, -1, "SVN commit start - enter message text", 1);
 
     return 0;
 }

Index: o_svnbase.h
===================================================================
RCS file: /cvsroot/fte/fte/src/o_svnbase.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- o_svnbase.h	19 Feb 2006 21:10:09 -0000	1.1
+++ o_svnbase.h	13 Feb 2007 00:26:30 -0000	1.2
@@ -1,89 +1,89 @@
-/*
- * o_svnbase.h
- *
- * S.Pinigin copy o_cvsbase.h and replace cvs/Cvs/CVS to svn/Svn/SVN.
- *
- * Base class for all other SVN-related classes. This is similar to EMessages
- * - starts SVN and shows its messages in list view.
- */
-
-#ifndef __SVNBASE_H__
-#define __SVNBASE_H__
-
-#ifdef CONFIG_OBJ_SVN
-
-typedef struct {
-    char *File; // Relative to view's directory
-    int Line;
-    char *Msg;
-    EBuffer *Buf;
-    char Status;
-    // bit 0 - hilited
-    // bit 1 - marked
-    // bit 2 - markable
-} SvnLine;
-
-class ESvnBase:public EList {
-    public:
-        char *Command;
-        char *Directory;
-        char *OnFiles;
-        char *OnFilesPos;
-
-        int LineCount;
-        SvnLine **Lines;
-        int Running;
-
-        int BufLen;
-        int BufPos;
-        int PipeId;
-        int ReturnCode;
-        char MsgBuf[4096];
-
-        ESvnBase (int createFlags,EModel **ARoot,const char *ATitle);
-        ~ESvnBase ();
-
-        void FreeLines ();
-        void AddLine (char *file,int line,char *msg,int hilit=0);
-        void FindBuffer (int line);
-        void AssignBuffer (EBuffer *B,int line);
-        void FindFileLines (EBuffer *B);
-        virtual void NotifyDelete (EModel *Deleting);
-
-        int GetLine (char *Line,int max);
-        virtual void ParseLine (char *line,int len);
-        void NotifyPipe (int APipeId);
-        // Returns 0 if OK - calls ContinuePipe() several times to complete command for all files
-        virtual int RunPipe (char *Dir,char *Command,char *OnFiles);
-        // Returns 0 if OK - continue with next files in queue
-        virtual int ContinuePipe ();
-        // Reads ReturnCode, sets Running to 0, PipeId to -1
-        virtual void ClosePipe ();
-
-        void DrawLine (PCell B,int Line,int Col,ChColor color,int Width);
-        char *FormatLine (int Line);
-        void UpdateList ();
-        int Activate (int No);
-        int CanActivate (int Line);
-        virtual int IsHilited (int Line);
-        virtual int IsMarked (int Line);
-        virtual int Mark (int Line);
-        virtual int Unmark (int Line);
-
-        virtual int ExecCommand(int Command, ExState &State);
-        void ShowLine (EView *V,int err);
-
-        virtual int GetContext () {return CONTEXT_SVNBASE;}
-        virtual EEventMap *GetEventMap ();
-        virtual void GetName (char *AName,int MaxLen);
-        virtual void GetInfo (char *AInfo,int MaxLen);
-        virtual void GetPath (char *APath,int MaxLen);
-        virtual void GetTitle (char *ATitle,int MaxLen,char *ASTitle,int SMaxLen);
-};
-
-int AddSvnIgnoreRegexp (const char *);
-void FreeSvnIgnoreRegexp ();
-
-#endif
-
-#endif
+/*
+ * o_svnbase.h
+ *
+ * S.Pinigin copy o_cvsbase.h and replace cvs/Cvs/CVS to svn/Svn/SVN.
+ *
+ * Base class for all other SVN-related classes. This is similar to EMessages
+ * - starts SVN and shows its messages in list view.
+ */
+
+#ifndef __SVNBASE_H__
+#define __SVNBASE_H__
+
+#ifdef CONFIG_OBJ_SVN
+
+typedef struct {
+    char *File; // Relative to view's directory
+    int Line;
+    char *Msg;
+    EBuffer *Buf;
+    char Status;
+    // bit 0 - hilited
+    // bit 1 - marked
+    // bit 2 - markable
+} SvnLine;
+
+class ESvnBase:public EList {
+    public:
+        char *Command;
+        char *Directory;
+        char *OnFiles;
+        char *OnFilesPos;
+
+        int LineCount;
+        SvnLine **Lines;
+        int Running;
+
+        int BufLen;
+        int BufPos;
+        int PipeId;
+        int ReturnCode;
+        char MsgBuf[4096];
+
+        ESvnBase (int createFlags,EModel **ARoot,const char *ATitle);
+        ~ESvnBase ();
+
+        void FreeLines ();
+        void AddLine(char* file, int line, const char* msg, int hilit=0);
+        void FindBuffer (int line);
+        void AssignBuffer (EBuffer *B,int line);
+        void FindFileLines (EBuffer *B);
+        virtual void NotifyDelete (EModel *Deleting);
+
+        int GetLine (char *Line,int max);
+        virtual void ParseLine (char *line,int len);
+        void NotifyPipe (int APipeId);
+        // Returns 0 if OK - calls ContinuePipe() several times to complete command for all files
+        virtual int RunPipe (char *Dir,char *Command,char *OnFiles);
+        // Returns 0 if OK - continue with next files in queue
+        virtual int ContinuePipe ();
+        // Reads ReturnCode, sets Running to 0, PipeId to -1
+        virtual void ClosePipe ();
+
+        void DrawLine (PCell B,int Line,int Col,ChColor color,int Width);
+        char *FormatLine (int Line);
+        void UpdateList ();
+        int Activate (int No);
+        int CanActivate (int Line);
+        virtual int IsHilited (int Line);
+        virtual int IsMarked (int Line);
+        virtual int Mark (int Line);
+        virtual int Unmark (int Line);
+
+        virtual int ExecCommand(int Command, ExState &State);
+        void ShowLine (EView *V,int err);
+
+        virtual int GetContext () {return CONTEXT_SVNBASE;}
+        virtual EEventMap *GetEventMap ();
+        virtual void GetName (char *AName,int MaxLen);
+        virtual void GetInfo (char *AInfo,int MaxLen);
+        virtual void GetPath (char *APath,int MaxLen);
+        virtual void GetTitle (char *ATitle,int MaxLen,char *ASTitle,int SMaxLen);
+};
+
+int AddSvnIgnoreRegexp (const char *);
+void FreeSvnIgnoreRegexp ();
+
+#endif
+
+#endif

Index: o_cvsbase.h
===================================================================
RCS file: /cvsroot/fte/fte/src/o_cvsbase.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- o_cvsbase.h	22 Mar 2002 17:26:34 -0000	1.1
+++ o_cvsbase.h	13 Feb 2007 00:26:30 -0000	1.2
@@ -44,7 +44,7 @@
         ~ECvsBase ();
 
         void FreeLines ();
-        void AddLine (char *file,int line,char *msg,int hilit=0);
+        void AddLine (char *file,int line,const char *msg,int hilit=0);
         void FindBuffer (int line);
         void AssignBuffer (EBuffer *B,int line);
         void FindFileLines (EBuffer *B);