G
YouTube TikTok Games
Skip to content

printf(1): consume argument for float conversions using the 'c syntax #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FermiHart wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

printf(1): consume argument for float conversions using the 'c syntax #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions tests/usr.bin/printf/printf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,6 +1561,12 @@ NetBSD_extensions()
expect 99.000000 '%f' '"c'
expect 97 '%g' '"a'

# arguments using the 'c syntax must be consumed exactly once,
# including for floating point conversions
expect '65 66' '%g %g' "'A" "'B"
expect '65.000000 66.000000' '%f %f' "'A" "'B"
expect '6.500000e+01 6.600000e+01' '%e %e' "'A" "'B"

# NetBSD (non-POSIX) format escape extensions
expect '' '\e'
expect '' '\E'
Expand Down
4 changes: 3 additions & 1 deletion usr.bin/printf/printf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,8 +766,10 @@ getdouble(void)
return 0.0;

/* This is a NetBSD extension, not required by POSIX (it is useless) */
if (*(ep = *gargv) == '\"' || *ep == '\'')
if (*(ep = *gargv) == '\"' || *ep == '\'') {
gargv++;
return (long double)wide_char(ep, 1);
}

errno = 0;
val = strtold(*gargv, &ep);
Expand Down