mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
The format patch included in PR ports/32017 is breaks formats such as
"0.000", trimming trailing non-zeros and adding back trailing zeros. Fix both the original bug, which was caused by walking off the beginning of the fractional part of the value and into the integer part, as well as the new bug, by terminating the trailing zero stripping when the first non-zero character is encountered. Also, correctly calculate the number number of trailing zeros that should potentially be removed if the format contains trailing text characters. Bump PORTREVISION. Reviewed by: send-pr@oldach.net (Helge Oldach)
This commit is contained in:
parent
d4698d4f14
commit
4e71fe0a81
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=62166
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= sc
|
||||
PORTVERSION= 6.21
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= ftp://gatekeeper.dec.com/pub/misc/
|
||||
EXTRACT_SUFX= .tar.Z
|
||||
|
@ -1,6 +1,15 @@
|
||||
--- format.c.orig Mon May 11 20:43:34 1992
|
||||
+++ format.c Sat Dec 9 21:24:41 2000
|
||||
@@ -263,7 +263,6 @@
|
||||
--- format.c.orig Mon May 11 11:43:34 1992
|
||||
+++ format.c Sun Jun 23 19:38:37 2002
|
||||
@@ -256,14 +256,14 @@
|
||||
|
||||
case '#':
|
||||
width++;
|
||||
+ zero_pad++;
|
||||
break;
|
||||
|
||||
case '0':
|
||||
- zero_pad = ++width;
|
||||
+ width++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -8,3 +17,12 @@
|
||||
}
|
||||
(void) sprintf(prtfmt, "%%.%dlf", width);
|
||||
(void) sprintf(mantissa, prtfmt, val);
|
||||
@@ -281,6 +281,8 @@
|
||||
{
|
||||
if (*cp == '0')
|
||||
*cp = EOS;
|
||||
+ else
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user