felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-17 23:08:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use cached results of commands.

Browse Source
This commit is contained in:
Dianne Skoll
2021-09-04 23:25:37 -04:00
parent bd6f4e1b43
commit c65fd826a5
1 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/files.c
View File

@@ -571,7 +571,6 @@ int DoIncludeCmd(ParsePtr p)
DBufFree(&buf); DBufFree(&buf);
return E_NO_MEM; return E_NO_MEM;
} }
} }
done = 1; done = 1;
if (DBufPuts(&buf, DBufValue(&token)) != OK) { if (DBufPuts(&buf, DBufValue(&token)) != OK) {
@@ -581,7 +580,7 @@ int DoIncludeCmd(ParsePtr p)
DBufFree(&token); DBufFree(&token);
DBufInit(&token); DBufInit(&token);
} }
if ( (r=IncludeCmd(DBufValue(&buf))) ) { if ( (r=IncludeCmd(DBufValue(&buf))) ) {
DBufFree(&buf); DBufFree(&buf);
return r; return r;
@@ -727,7 +726,10 @@ static int IncludeCmd(char const *cmd)
char line_no[64]; char line_no[64];
FILE *fp2; FILE *fp2;
int r; int r;
CachedFile *h;
char const *fname;
int old_flag;
FreshLine = 1; FreshLine = 1;
if (IStackPtr+1 >= INCLUDE_NEST) return E_NESTED_INCLUDE; if (IStackPtr+1 >= INCLUDE_NEST) return E_NESTED_INCLUDE;
i = &IStack[IStackPtr]; i = &IStack[IStackPtr];
@@ -746,7 +748,31 @@ static int IncludeCmd(char const *cmd)
DBufFree(&buf); DBufFree(&buf);
return E_NO_MEM; return E_NO_MEM;
} }
fname = DBufValue(&buf);
/* If the file is cached, use it */
h = CachedFiles;
while(h) {
if (!strcmp(fname, h->filename)) {
if (DebugFlag & DB_TRACE_FILES) {
fprintf(ErrFp, "Reading command `%s': Found in cache\n", fname);
}
CLine = h->cache;
STRSET(FileName, fname);
LineNo = 0;
if (!h->ownedByMe) {
RunDisabled |= RUN_NOTOWNER;
}
if (FileName) return OK; else return E_NO_MEM;
}
h = h->next;
}
if (DebugFlag & DB_TRACE_FILES) {
fprintf(ErrFp, "Executing `%s' for INCLUDECMD and caching as `%s'\n",
cmd, fname);
}
/* Not found in cache */
fp2 = popen(cmd, "r"); fp2 = popen(cmd, "r");
if (!fp2) { if (!fp2) {
DBufFree(&buf); DBufFree(&buf);
@@ -779,12 +805,16 @@ static int IncludeCmd(char const *cmd)
fp = fp2; fp = fp2;
IStackPtr++; IStackPtr++;
LineNo = 0; LineNo = 0;
r = CacheFile(DBufValue(&buf)); /* Temporarily turn of file tracing */
old_flag = DebugFlag;
DebugFlag &= (~DB_TRACE_FILES);
r = CacheFile(fname);
DebugFlag = old_flag;
if (r == OK) { if (r == OK) {
fp = NULL; fp = NULL;
CLine = CachedFiles->cache; CLine = CachedFiles->cache;
LineNo = 0; LineNo = 0;
STRSET(FileName, DBufValue(&buf)); STRSET(FileName, fname);
DBufFree(&buf); DBufFree(&buf);
return OK; return OK;
} }