import shell in help output

[nedit-bw.git] / PrevOpenIgnoreMask.patch

    'Open Previous' ignore pattern

    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
@@ -4334,10 +4334,17 @@ X Resources
 
   Number of files listed in the Open Previous sub-menu of the File menu.
   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..
   The command must be capable of accepting input via stdin (standard input).
 
diff --quilt old/source/menu.c new/source/menu.c
--- old/source/menu.c
+++ new/source/menu.c
@@ -50,10 +50,11 @@ static const char CVSID[] = "$Id: menu.c
 #include "highlight.h"
 #include "highlightData.h"
 #include "interpret.h"
 #include "smartIndent.h"
 #include "windowTitle.h"
+#include "regularExp.h"
 #include "../util/getfiles.h"
 #include "../util/DialogF.h"
 #include "../util/misc.h"
 #include "../util/fileUtils.h"
 #include "../util/utils.h"
@@ -4590,16 +4591,38 @@ static void invalidatePrevOpenMenus(void
 void AddToPrevOpenMenu(const char *filename)
 {
     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.
         Of course there is still Little Race Condition, which occurs if a
         Session A reads the list, then Session B reads the list and writes
@@ -4942,10 +4965,12 @@ static int cmpStrPtr(const void *strA, c
 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";
 
     if (fullName == NULL) {
         /*  GetRCFileName() might return NULL if an error occurs during
@@ -4978,23 +5003,43 @@ void WriteNEditDB(void)
 #else
         return;
 #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);
 
     /* Write the list of file names */
     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);
 }
 
 /*
 **  Read database of file names for 'Open Previous' submenu.
@@ -5014,10 +5059,12 @@ void ReadNEditDB(void)
     char line[MAXPATHLEN + 2];
     char *nameCopy;
     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
         resource to an (invalid) negative value, just return.  */
     if (GetPrefMaxPrevOpenFiles() < 1) {
@@ -5067,18 +5114,28 @@ void ReadNEditDB(void)
     /*  Clear previous list.  */
     while (0 != NPrevOpen) {
         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 */
             continue;
         }
@@ -5102,19 +5159,30 @@ void ReadNEditDB(void)
         if (strcspn(line, neditDBBadFilenameChars) != lineLen) {
             /* non-filename characters */
             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)
 {
     SetPrefRows(rows);
diff --quilt old/source/preferences.c new/source/preferences.c
--- old/source/preferences.c
+++ new/source/preferences.c
@@ -307,10 +307,11 @@ static struct prefData {
     int appendLF;       /* Whether to append LF at the end of each file */
     int mapDelete;             /* whether to map delete to backspace */
     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 */
     char geometry[MAX_GEOM_STRING_LEN];        /* per-application geometry string,
                                           only for the clueless */
@@ -1059,10 +1060,13 @@ static PrefDescripRec PrefDescrip[] = {
        PrefData.delimiters, (void *)sizeof(PrefData.delimiters), False},
     {"serverName", "ServerName", PREF_STRING, "", PrefData.serverName,
       (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},
     {"smartTags", "SmartTags", PREF_BOOLEAN, "True",
        &PrefData.smartTags, NULL, True},
@@ -2155,10 +2159,15 @@ char *GetPrefBGMenuBtn(void)
 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
@@ -162,10 +162,11 @@ void TabsPrefDialog(Widget parent, Windo
 void WrapMarginDialog(Widget parent, WindowInfo *forWindow);
 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);
 int GetPrefShortMenus(void);
 #endif
diff --quilt old/source/Makefile.dependencies new/source/Makefile.dependencies
--- old/source/Makefile.dependencies
+++ new/source/Makefile.dependencies
@@ -24,11 +24,12 @@ macro.o: macro.c macro.h nedit.h textBuf
   highlightData.h rangeset.h
 menu.o: menu.c menu.h nedit.h textBuf.h text.h file.h window.h search.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 \
   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 \
   selection.h tags.h menu.h macro.h server.h window.h interpret.h \
   rbTree.h parse.h help.h help_topic.h ../util/misc.h \