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

44307: allow for atoi() returning a negative number

Browse source
This commit is contained in:
Oliver Kiddle 2019-05-20 00:14:01 +02:00
parent 09917e558b
commit 3de2333b08
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2019-05-20 Oliver Kiddle <okiddle@yahoo.co.uk> 2019-05-20 Oliver Kiddle <okiddle@yahoo.co.uk>
* 44307: Src/exec.c, Src/init.c, Src/params.c, Src/utils.c:
allow for atoi() returning a negative number
* 44308: Completion/Linux/Command/_modutils: update Linux * 44308: Completion/Linux/Command/_modutils: update Linux
modutils completion modutils completion

2
Src/exec.c
View file

@ -2535,7 +2535,7 @@ setunderscore(char *str)
{ {
queue_signals(); queue_signals();
if (str && *str) { if (str && *str) {
int l = strlen(str) + 1, nl = (l + 31) & ~31; size_t l = strlen(str) + 1, nl = (l + 31) & ~31;
if (nl > underscorelen || (underscorelen - nl) > 64) { if (nl > underscorelen || (underscorelen - nl) > 64) {
zfree(zunderscore, underscorelen); zfree(zunderscore, underscorelen);

5
Src/init.c
View file

@ -45,7 +45,10 @@ int noexitct = 0;
char *zunderscore; char *zunderscore;
/**/ /**/
int underscorelen, underscoreused; size_t underscorelen;
/**/
int underscoreused;
/* what level of sourcing we are at */ /* what level of sourcing we are at */

6
Src/params.c
View file

@ -2201,10 +2201,10 @@ getstrvalue(Value v)
if (v->flags & VALFLAG_SUBST) { if (v->flags & VALFLAG_SUBST) {
if (v->pm->node.flags & (PM_LEFT|PM_RIGHT_B|PM_RIGHT_Z)) { if (v->pm->node.flags & (PM_LEFT|PM_RIGHT_B|PM_RIGHT_Z)) {
unsigned int fwidth = v->pm->width ? v->pm->width : MB_METASTRLEN(s); size_t fwidth = v->pm->width ? (unsigned int)v->pm->width : MB_METASTRLEN(s);
switch (v->pm->node.flags & (PM_LEFT | PM_RIGHT_B | PM_RIGHT_Z)) { switch (v->pm->node.flags & (PM_LEFT | PM_RIGHT_B | PM_RIGHT_Z)) {
char *t, *tend; char *t, *tend;
unsigned int t0; size_t t0;
case PM_LEFT: case PM_LEFT:
case PM_LEFT | PM_RIGHT_Z: case PM_LEFT | PM_RIGHT_Z:
@ -5858,7 +5858,7 @@ printparamnode(HashNode hn, int printflags)
doneminus = 0; doneminus = 0;
} }
if ((pmptr->flags & PMTF_USE_WIDTH) && p->width) { if ((pmptr->flags & PMTF_USE_WIDTH) && p->width) {
printf("%d ", p->width); printf("%u ", p->width);
doneminus = 0; doneminus = 0;
} }
} }

2
Src/utils.c
View file

@ -3336,7 +3336,7 @@ morefmt:
case '.': case '.':
{ {
long fnsec = nsec; long fnsec = nsec;
if (digs > 9) if (digs < 0 || digs > 9)
digs = 9; digs = 9;
if (ztrftimebuf(&bufsize, digs)) if (ztrftimebuf(&bufsize, digs))
return -1; return -1;