setWindowTitleFormat: fix buffer overrun

[nedit-bw.git] / PrevOpenIgnoreMask.patch

From: Andrew Hood <ajhood@fl.net.au>
Subject: tmp-files in 'Open Previous'

This adds nedit.prevOpenFilesMask to the list of items which can be added to
.Xdefaults to enable you to stop files being added to the 'Open Previous'
menu. It also cleans up any files which have already made it into the list.

E.g.:

        nedit.prevOpenFilesMask: /tmp/junk/

The patch to doc/help.etx is included but not the files which would be
generated from it.

Original from here:

        http://sourceforge.net/tracker/index.php?func=detail&aid=506324&group_id=11005&atid=311005
        [ 506324 ] tmp-files in 'Open Previous'

Than integrated into this mess:

        http://sourceforge.net/tracker/index.php?func=detail&aid=1058246&group_id=11005&atid=311005
        [ 1058246 ] Patch Collection

2008-02-21 Bert Wesarg

        slightly extended and renamed to nedit.prevOpenIgnorePattern

---

 doc/help.etx                 |    7 +++
 source/Makefile.dependencies |    3 +
 source/menu.c                |   76 ++++++++++++++++++++++++++++++++++++++++---
 source/preferences.c         |    9 +++++
 source/preferences.h         |    1 
 5 files changed, 91 insertions(+), 5 deletions(-)

diff --quilt old/doc/help.etx new/doc/help.etx
--- old/doc/help.etx
+++ new/doc/help.etx
@@ -4336,6 +4336,13 @@ X Resources
   Setting this to zero disables the Open Previous menu item and maintenance of
   the NEdit file history file.
 
+**nedit.prevOpenIgnorePattern**: (not defined)
+
+  Files not to be listed in the Open Previous sub-menu of the File menu.
+  Setting this to a regular expression causes files matching the expression to
+  be omitted from the Open Previous menu item and the `nedit.history' file
+  (see Autoload_Files_).
+
 **nedit.printCommand**: (system specific)
 
   Command used by the print dialog to print a file, such as, lp, lpr, etc..
diff --quilt old/source/menu.c new/source/menu.c
--- old/source/menu.c
+++ new/source/menu.c
@@ -52,6 +52,7 @@ static const char CVSID[] = "$Id: menu.c
 #include "interpret.h"
 #include "smartIndent.h"
 #include "windowTitle.h"
+#include "regularExp.h"
 #include "../util/getfiles.h"
 #include "../util/DialogF.h"
 #include "../util/misc.h"
@@ -4592,12 +4593,34 @@ void AddToPrevOpenMenu(const char *filen
     int i;
     char *nameCopy;
     WindowInfo *w;
+    const char *ignorePattern;
+    regexp *ignorePatternRE = NULL;
 
     /* If the Open Previous command is disabled, just return */
     if (GetPrefMaxPrevOpenFiles() < 1) {
        return;
     }
 
+    /* check new filename against prevOpenIgnorePattern */
+    if ((ignorePattern = GetPrevOpenIgnorePattern()) && *ignorePattern) {
+        char *compileMsg;
+
+        ignorePatternRE = CompileRE(ignorePattern, &compileMsg,
+                REDFLT_STANDARD);
+        if (ignorePatternRE == NULL) {
+            fprintf(stderr, "NEdit: %s\n", compileMsg);
+        } else {
+            int matches = ExecRE(ignorePatternRE, filename, NULL, False,
+                    '\0', '\0', NULL, NULL, NULL);
+            free(ignorePatternRE);
+
+            /* omitting any files matching prevOpenIgnorePattern */
+            if (matches) {
+                return;
+            }
+        }
+    }
+
     /*  Refresh list of previously opened files to avoid Big Race Condition,
         where two sessions overwrite each other's changes in NEdit's
         history file.
@@ -4944,6 +4967,8 @@ void WriteNEditDB(void)
     const char* fullName = GetRCFileName(NEDIT_HISTORY);
     FILE *fp;
     int i;
+    const char *ignorePattern;
+    regexp *ignorePatternRE = NULL;
     static char fileHeader[] =
             "# File name database for NEdit Open Previous command\n";
 
@@ -4980,6 +5005,17 @@ void WriteNEditDB(void)
 #endif        
     }
 
+    /* set up removal of any files matching prevOpenIgnorePattern */
+    if ((ignorePattern = GetPrevOpenIgnorePattern()) && *ignorePattern) {
+        char *compileMsg;
+
+        ignorePatternRE = CompileRE(ignorePattern, &compileMsg,
+                REDFLT_STANDARD);
+        if (ignorePatternRE == NULL) {
+            fprintf(stderr, "NEdit: %s\n", compileMsg);
+        }
+    }
+
     /* write the file header text to the file */
     fprintf(fp, "%s", fileHeader);
 
@@ -4987,12 +5023,21 @@ void WriteNEditDB(void)
     for (i = 0; i < NPrevOpen; ++i) {
         size_t lineLen = strlen(PrevOpen[i]);
 
+        /* omitting any files matching prevOpenIgnorePattern */
+        if (ignorePatternRE
+                && ExecRE(ignorePatternRE, PrevOpen[i], NULL, False,
+                        '\0', '\0', NULL, NULL, NULL)) {
+            continue;
+        }
+
         if (lineLen > 0 && PrevOpen[i][0] != '#' &&
             strcspn(PrevOpen[i], neditDBBadFilenameChars) == lineLen) {
             fprintf(fp, "%s\n", PrevOpen[i]);
         }
     }
 
+    free(ignorePatternRE);
+
     fclose(fp);
 }
 
@@ -5016,6 +5061,8 @@ void ReadNEditDB(void)
     struct stat attribute;
     FILE *fp;
     size_t lineLen;
+    const char *ignorePattern;
+    regexp *ignorePatternRE = NULL;
     static time_t lastNeditdbModTime = 0;
 
     /*  If the Open Previous command is disabled or the user set the
@@ -5069,14 +5116,24 @@ void ReadNEditDB(void)
         XtFree(PrevOpen[--NPrevOpen]);
     }
 
+    /* set up removal of any files matching prevOpenIgnorePattern */
+    if ((ignorePattern = GetPrevOpenIgnorePattern()) && *ignorePattern) {
+        char *compileMsg;
+
+        ignorePatternRE = CompileRE(ignorePattern, &compileMsg,
+                REDFLT_STANDARD);
+        if (ignorePatternRE == NULL) {
+            fprintf(stderr, "NEdit: %s\n", compileMsg);
+        }
+    }
+
     /* read lines of the file, lines beginning with # are considered to be
        comments and are thrown away.  Lines are subject to cursory checking,
        then just copied to the Open Previous file menu list */
     while (True) {
         if (fgets(line, sizeof(line), fp) == NULL) {
             /* end of file */
-            fclose(fp);
-            return;
+            goto out;
         }
         if (line[0] == '#') {
             /* comment */
@@ -5104,15 +5161,26 @@ void ReadNEditDB(void)
             fprintf(stderr, "nedit: History file may be corrupted\n");
             continue;
         }
+
+        /* omitting any files matching prevOpenIgnorePattern */
+        if (ignorePatternRE
+                && ExecRE(ignorePatternRE, line, NULL, False, '\0', '\0',
+                        NULL, NULL, NULL)) {
+            continue;
+        }
+
         nameCopy = XtMalloc(lineLen + 1);
         strcpy(nameCopy, line);
         PrevOpen[NPrevOpen++] = nameCopy;
         if (NPrevOpen >= GetPrefMaxPrevOpenFiles()) {
             /* too many entries */
-            fclose(fp);
-            return;
+            goto out;
         }
     }
+
+out:
+    free(ignorePatternRE);
+    fclose(fp);
 }
 
 static void setWindowSizeDefault(int rows, int cols)
diff --quilt old/source/preferences.c new/source/preferences.c
--- old/source/preferences.c
+++ new/source/preferences.c
@@ -309,6 +309,7 @@ static struct prefData {
     int stdOpenDialog;         /* w. to retain redundant text field in Open */
     char tagFile[MAXPATHLEN];  /* name of tags file to look for at startup */
     int maxPrevOpenFiles;      /* limit to size of Open Previous menu */
+    char prevOpenIgnorePattern[MAXPATHLEN]; /* regex to omit from Open Previous menu */
     int typingHidesPointer;     /* hide mouse pointer when typing */
     char delimiters[MAX_WORD_DELIMITERS]; /* punctuation characters */
     char shell[MAXPATHLEN + 1]; /* shell to use for executing commands */
@@ -1061,6 +1062,9 @@ static PrefDescripRec PrefDescrip[] = {
       (void *)sizeof(PrefData.serverName), False},
     {"maxPrevOpenFiles", "MaxPrevOpenFiles", PREF_INT, "30",
        &PrefData.maxPrevOpenFiles, NULL, False},
+    {"prevOpenIgnorePattern", "PrevOpenIgnorePattern", PREF_STRING, "",
+            PrefData.prevOpenIgnorePattern,
+            (void *)sizeof(PrefData.prevOpenIgnorePattern), False},
     {"bgMenuButton", "BGMenuButton" , PREF_STRING,
        "~Shift~Ctrl~Meta~Alt<Btn3Down>", PrefData.bgMenuBtn,
       (void *)sizeof(PrefData.bgMenuBtn), False},
@@ -2156,6 +2160,11 @@ int GetPrefMaxPrevOpenFiles(void)
     return PrefData.maxPrevOpenFiles;
 }
 
+const char *GetPrevOpenIgnorePattern(void)
+{
+    return PrefData.prevOpenIgnorePattern;
+}
+
 int GetPrefTypingHidesPointer(void)
 {
     return(PrefData.typingHidesPointer);
diff --quilt old/source/preferences.h new/source/preferences.h
--- old/source/preferences.h
+++ new/source/preferences.h
@@ -164,6 +164,7 @@ int GetPrefMapDelete(void);
 int GetPrefStdOpenDialog(void);
 char *GetPrefDelimiters(void);
 int GetPrefMaxPrevOpenFiles(void);
+const char *GetPrevOpenIgnorePattern(void);
 int GetPrefTypingHidesPointer(void);
 #ifdef SGI_CUSTOM
 void SetPrefShortMenus(int state);
diff --quilt old/source/Makefile.dependencies new/source/Makefile.dependencies
--- old/source/Makefile.dependencies
+++ new/source/Makefile.dependencies
@@ -26,7 +26,8 @@ menu.o: menu.c menu.h nedit.h textBuf.h 
   selection.h undo.h shift.h help.h help_topic.h preferences.h tags.h \
   userCmds.h shell.h macro.h highlight.h highlightData.h interpret.h ops.h \
   rbTree.h smartIndent.h windowTitle.h ../util/getfiles.h \
-  ../util/DialogF.h ../util/misc.h ../util/fileUtils.h ../util/utils.h
+  ../util/DialogF.h ../util/misc.h ../util/fileUtils.h ../util/utils.h \
+  regularExp.h
 nc.o: nc.c server_common.h ../util/fileUtils.h ../util/utils.h \
   ../util/prefFile.h ../util/system.h ../util/clearcase.h
 nedit.o: nedit.c nedit.h textBuf.h file.h preferences.h regularExp.h \