mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-11 13:01:28 +02:00
Code Releases Activity

zsh-workers/7950

Browse source
This commit is contained in:
Tanaka Akira 1999-09-21 01:37:26 +00:00
parent d18c1b3ac8
commit 1b60571be1
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Src/Zle/complist.c
View file

@ -217,6 +217,10 @@ getcols(Listcols c)
c->cols[COL_MA] = ""; c->cols[COL_MA] = "";
else else
c->cols[COL_EC] = tcstr[TCSTANDOUTEND]; c->cols[COL_EC] = tcstr[TCSTANDOUTEND];
lr_caplen = 0;
if ((max_caplen = strlen(c->cols[COL_MA])) <
(l = strlen(c->cols[COL_EC])))
max_caplen = l;
return; return;
} }
/* We have one of the parameters, use it. */ /* We have one of the parameters, use it. */
@ -230,7 +234,7 @@ getcols(Listcols c)
for (i = 0; i < NUM_COLS; i++) { for (i = 0; i < NUM_COLS; i++) {
if (!c->cols[i]) if (!c->cols[i])
c->cols[i] = defcols[i]; c->cols[i] = defcols[i];
if ((l = (c->cols[i] ? strlen(c->cols[i]) : 0)) > max_caplen) if (c->cols[i] && (l = strlen(c->cols[i])) > max_caplen)
max_caplen = l; max_caplen = l;
} }
lr_caplen = strlen(c->cols[COL_LC]) + strlen(c->cols[COL_RC]); lr_caplen = strlen(c->cols[COL_LC]) + strlen(c->cols[COL_RC]);

11
Src/utils.c
View file

@ -752,9 +752,14 @@ checkmailpath(char **s)
fprintf(shout, "You have new mail.\n"); fprintf(shout, "You have new mail.\n");
fflush(shout); fflush(shout);
} else { } else {
char *usav = underscore; VARARR(char, usav, underscorelen);
int sl = strlen(*s);
underscore = *s; if (sl >= underscorelen) {
zfree(underscore, underscorelen);
underscore = (char *) zalloc(underscorelen = sl + 32);
}
strcpy(underscore, *s);
HEAPALLOC { HEAPALLOC {
u = dupstring(u); u = dupstring(u);
if (! parsestr(u)) { if (! parsestr(u)) {
@ -763,8 +768,8 @@ checkmailpath(char **s)
fputc('\n', shout); fputc('\n', shout);
fflush(shout); fflush(shout);
} }
underscore = usav;
} LASTALLOC; } LASTALLOC;
strcpy(underscore, usav);
} }
} }
if (isset(MAILWARNING) && st.st_atime > st.st_mtime && if (isset(MAILWARNING) && st.st_atime > st.st_mtime &&