mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-10-02 17:01:19 +02:00
Code

+ Changed histreduceblanks() to preserve spaces at the start of the

Browse Source 
line when HISTIGNORESPACE is set.
+ Flag a history entry with HIST_TMPSTORE when should_ignore_line()
  returns true (instead of dropping it from the history immediately).
+ Get rid of old HIST_TMPSTORE entries when a new command is entered.
+ The hist-file-reading code now handles destroying a foreign
  duplicate (when marked as duplicate by addhistnode()).
This commit is contained in:
Wayne Davison 2001-05-15 16:32:25 +00:00
parent eb71464b09
commit 9f9ced8c62
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Src/hist.c
View File

@ -794,16 +794,19 @@ hbegin(int dohist)
void void
histreduceblanks(void) histreduceblanks(void)
{ {
int i, len, pos, needblank; int i, len, pos, needblank, spacecount = 0;
for (i = 0, len = 0; i < chwordpos; i += 2) { if (isset(HISTIGNORESPACE))
while (chline[spacecount] == ' ') spacecount++;
for (i = 0, len = spacecount; i < chwordpos; i += 2) {
len += chwords[i+1] - chwords[i] len += chwords[i+1] - chwords[i]
+ (i > 0 && chwords[i] > chwords[i-1]); + (i > 0 && chwords[i] > chwords[i-1]);
} }
if (chline[len] == '\0') if (chline[len] == '\0')
return; return;
for (i = 0, pos = 0; i < chwordpos; i += 2) { for (i = 0, pos = spacecount; i < chwordpos; i += 2) {
len = chwords[i+1] - chwords[i]; len = chwords[i+1] - chwords[i];
needblank = (i < chwordpos-2 && chwords[i+2] > chwords[i+1]); needblank = (i < chwordpos-2 && chwords[i+2] > chwords[i+1]);
if (pos != chwords[i]) { if (pos != chwords[i]) {
@ -1044,8 +1047,10 @@ hend(Eprog prog)
} else } else
save = 0; save = 0;
} }
if (chwordpos <= 2 || should_ignore_line(prog)) if (chwordpos <= 2)
save = 0; save = 0;
else if (should_ignore_line(prog))
save = -1;
} }
if (flag & (HISTFLAG_DONE | HISTFLAG_RECALL)) { if (flag & (HISTFLAG_DONE | HISTFLAG_RECALL)) {
char *ptr; char *ptr;
@ -1058,14 +1063,23 @@ hend(Eprog prog)
} }
if (flag & HISTFLAG_RECALL) { if (flag & HISTFLAG_RECALL) {
zpushnode(bufstack, ptr); zpushnode(bufstack, ptr);
save = 0; save = 0;
} else } else
zsfree(ptr); zsfree(ptr);
} }
if (save || *chline == ' ') {
Histent he;
for (he = hist_ring; he && he->flags & HIST_FOREIGN;
he = up_histent(he)) ;
if (he && he->flags & HIST_TMPSTORE) {
if (he == hist_ring)
curline.histnum = curhist--;
freehistnode((HashNode)he);
}
}
if (save) { if (save) {
Histent he; Histent he;
int keepflags; int newflags;
#ifdef DEBUG #ifdef DEBUG
/* debugging only */ /* debugging only */
@ -1081,6 +1095,7 @@ hend(Eprog prog)
if (isset(HISTREDUCEBLANKS)) if (isset(HISTREDUCEBLANKS))
histreduceblanks(); histreduceblanks();
} }
newflags = save > 0? 0 : HIST_OLD | HIST_TMPSTORE;
if ((isset(HISTIGNOREDUPS) || isset(HISTIGNOREALLDUPS)) && hist_ring if ((isset(HISTIGNOREDUPS) || isset(HISTIGNOREALLDUPS)) && hist_ring
&& histstrcmp(chline, hist_ring->text) == 0) { && histstrcmp(chline, hist_ring->text) == 0) {
/* This history entry compares the same as the previous. /* This history entry compares the same as the previous.
@ -1089,18 +1104,16 @@ hend(Eprog prog)
* timestamp right. Perhaps, preserve the HIST_OLD flag. * timestamp right. Perhaps, preserve the HIST_OLD flag.
*/ */
he = hist_ring; he = hist_ring;
keepflags = he->flags & HIST_OLD; /* Avoid re-saving */ newflags |= he->flags & HIST_OLD; /* Avoid re-saving */
freehistdata(he, 0); freehistdata(he, 0);
curline.histnum = curhist; curline.histnum = curhist;
} else { } else
keepflags = 0;
he = prepnexthistent(); he = prepnexthistent();
}
he->text = ztrdup(chline); he->text = ztrdup(chline);
he->stim = time(NULL); he->stim = time(NULL);
he->ftim = 0L; he->ftim = 0L;
he->flags = keepflags; he->flags = newflags;
if ((he->nwords = chwordpos/2)) { if ((he->nwords = chwordpos/2)) {
he->words = (short *)zalloc(chwordpos * sizeof(short)); he->words = (short *)zalloc(chwordpos * sizeof(short));
@ -1893,8 +1906,10 @@ readhistfile(char *fn, int err, int readflags)
} else } else
he->words = (short *)NULL; he->words = (short *)NULL;
addhistnode(histtab, he->text, he); addhistnode(histtab, he->text, he);
if (hist_ring != he) if (he->flags & HIST_DUP) {
curhist--; /* We discarded a foreign duplicate */ freehistnode((HashNode)he);
curhist--;
}
} }
if (start && readflags & HFILE_USE_OPTIONS) { if (start && readflags & HFILE_USE_OPTIONS) {
zsfree(lasthist.text); zsfree(lasthist.text);
@ -1962,7 +1977,8 @@ savehistfile(char *fn, int err, int writeflags)
if (out) { if (out) {
for (; he && he->histnum <= xcurhist; he = down_histent(he)) { for (; he && he->histnum <= xcurhist; he = down_histent(he)) {
if ((writeflags & HFILE_SKIPDUPS && he->flags & HIST_DUP) if ((writeflags & HFILE_SKIPDUPS && he->flags & HIST_DUP)
|| (writeflags & HFILE_SKIPFOREIGN && he->flags & HIST_FOREIGN)) || (writeflags & HFILE_SKIPFOREIGN && he->flags & HIST_FOREIGN)
|| he->flags & HIST_TMPSTORE)
continue; continue;
if (writeflags & HFILE_SKIPOLD) { if (writeflags & HFILE_SKIPOLD) {
if (he->flags & HIST_OLD) if (he->flags & HIST_OLD)