History log of /freebsd-10.0-release/usr.bin/printf/printf.c
Revision Date Author Comments
(<<< Hide modified files)
(Show modified files >>>)
# 259065 07-Dec-2013 gjb

- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

# 256281 10-Oct-2013 gjb

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation


# 244407 18-Dec-2012 eadler

POSIX requires that non-existent or null arguments be treated as if a
zero argument were supplied.

Add a regression test to catch this case as well.

PR: bin/174521
Submitted by: Daniel Shahaf <danielsh@elego.de> (pr)
Submitted by: Mark Johnston <markjdb@gmail.com> (initial patch)
Reviewed by: jilles
Approved by: cperciva (implicit)
MFC after: 3 weeks


# 240541 15-Sep-2012 jilles

sh: Prefer internal nextopt() to libc getopt().

This reduces code duplication and code size.

/usr/bin/printf is not affected.

Side effect: different error messages when certain builtins are passed
invalid options.


# 230027 12-Jan-2012 pfg

Style cleanups for printf.

PR: bin/152934
Approved by: jhb (mentor)
Obtained from: Illumos
MFC after: 2 weeks


# 222418 28-May-2011 jilles

printf: Allow multibyte characters for '<char> form, avoid negative codes.

Examples:
LC_ALL=en_US.UTF-8 printf '%d\n' $(printf \'\\303\\244)
LC_ALL=en_US.ISO8859-1 printf '%d\n' $(printf \'\\344)
Both of these should print 228.

Like some other shells, incomplete or invalid multibyte characters yield the
value of the first byte without a warning.

Note that there is no general way to go back from the character code to the
character.


# 219153 01-Mar-2011 jilles

printf: Note that this is used both as a normal program and a shell builtin.


# 216809 29-Dec-2010 jilles

printf: Do not use sh memory functions in sh builtin.

These functions throw exceptions if they fail, possibly causing memory
leaks. The normal out-of-memory handling suffices. The INTOFF around almost
all of printf prevents memory leaks due to SIGINT.


# 216606 20-Dec-2010 jilles

sh: Make warnings in the printf builtin non-fatal, like in the program.

The #define for warnx now behaves much like the libc function (except that
it uses sh command name and output).

Also, it now uses C99 __VA_ARGS__ so there is no need for three different
macros for 0, 1 or 2 parameters.


# 216447 14-Dec-2010 delphij

Revert r216423 per request from Jilles.

The new behavior prevents us from being able to bail out explicitly
on unknown options that we have not implemented. BASH for instance
have introduced a '-v' for printf(1) builtin and it seems to be bad
to pretend that we supported it and have a script break silently.


# 216439 14-Dec-2010 delphij

When printf is being used as a sh(1) builtin, it can not call
exit(3) as pointed out by jilles@ so revert to using return(),
also change the return value back to 1 as requested by bde@.

This is logically a revert of revision 216422.


# 216424 13-Dec-2010 delphij

We work on ctype's and not only on numbers so set LC_ALL instead of
LC_NUMERIC.

PR: bin/152934
Submitted by: Pedro F. Giffuni <giffunip tutopia.com>
Obtained from: Illumos


# 216423 13-Dec-2010 delphij

IEEE Std 1003.1-2008, Section 1.4, Utility Description Defaults says
that when the options section is listed as "None", utility shall
recognize "--" as a first argument to be discarded.

This implementation is largely based on OpenBSD implementation but
we do slightly differently:

a) We skip argv[0] as the first step;
b) We test whether the next argument is "--" and ignore it.

With this change one will get:

%printf
usage: printf format [arguments ...]
%printf -v
-v%printf -- -v
-v%
%printf --
usage: printf format [arguments ...]

Which matches the behavior observed on a Debian system but different
from the Illumos change.


# 216422 13-Dec-2010 delphij

Make use of EX_USAGE for usage().


# 216418 13-Dec-2010 delphij

The only caller of mknum() provides a char instead of an int, so make it
match the definition.

PR: bin/152934
Submitted by: Pedro F. Giffuni <giffunip tutopia.com>
Obtained from: Illumos


# 216417 13-Dec-2010 delphij

Move locale.h include to the beginning header section as pointed out by
style(9)

Submitted by: Pedro F. Giffuni <giffunip tutopia.com>


# 216370 11-Dec-2010 joel

Remove the advertising clause from UCB copyrighted files in usr.bin. This
is in accordance with the information provided at
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

Also add $FreeBSD$ to a few files to keep svn happy.

Discussed with: imp, rwatson


# 216310 08-Dec-2010 jilles

printf: Remove support for building as a csh builtin.

The #define BUILTIN was for building as a csh (not tcsh) builtin.
Given that csh was replaced by tcsh years ago there is no point in keeping
this.

The #define SHELL is for building as an sh builtin and is in active use.

This commit does not change the /bin/sh and /usr/bin/printf binaries.


# 215520 19-Nov-2010 jilles

sh: Add printf builtin.

This was removed in 2001 but I think it is appropriate to add it back:
* I do not want to encourage people to write fragile and non-portable echo
commands by making printf much slower than echo.
* Recent versions of Autoconf use it a lot.
* Almost no software still wants to support systems that do not have
printf(1) at all.
* In many other shells printf is already a builtin.

Side effect: printf is now always the builtin version (which behaves
identically to /usr/bin/printf) and cannot be overridden via PATH (except
via the undocumented %builtin mechanism).

Code size increases about 5K on i386. Embedded folks might want to replace
/usr/bin/printf with a hard link to /usr/bin/alias.


# 181153 02-Aug-2008 das

POSIX says that octal escapes have the format \ddd in the format string,
but \0ddd in a %b argument, with a length restriction of 3 octal digits
in either case. This seems silly, but it needs to be right so it's possible
to write an octal escape followed by an ordinary digit. Solaris printf(1)
and GNU printf(1) also behave this way.

Example: "printf '\0752'" now produces "=2" instead of garbage.


# 148721 05-Aug-2005 stefanf

Prefer {u,}intmax_t over the deprecated {u_,}quad_t.


# 146466 21-May-2005 ru

Sync program's usage() with manpage's SYNOPSIS.


# 145078 14-Apr-2005 stefanf

Handle null characters in the format string. A \0 in the argument passed to %b
still results in trucation but this is be much harder to fix.


# 145074 14-Apr-2005 stefanf

No reason to write \a and \v as octal escape sequences.


# 145061 14-Apr-2005 stefanf

- Move parts of the long main() function into a new function doformat().
- Rewrite the loop in main() to be more understandable.


# 145027 13-Apr-2005 stefanf

Assign 0.0 to the variable passed to getfloating() if the argument is missing.

MFC after: 1 week


# 144902 11-Apr-2005 stefanf

Replace buggy for-loops to skip certain character with strspn(). If *fmt was
'\0' (eg in the invocation 'printf %'), the for-loop would miss the terminating
null character.

MFC after: 1 week


# 143906 21-Mar-2005 das

Support the L modifier for floating-point values as an extension.
When L is omitted, double precision is used, so printf(1) gives
reproducable results. When L is specified, long double precision is
used, which may improve precision, depending on the machine.


# 135751 24-Sep-2004 keramida

Allow %' to be used as a format flag by printf(1). This makes it
possible to print the thousands separator in the locale setups that
have one, by something like this:

$ env -i LC_NUMERIC=en_US.ISO8859-1 ./printf "%'0.2f\n" 12345
12,345.00

Reviewed by: das


# 130115 05-Jun-2004 das

Enable support for the %a, %A, and %F format specifiers.


# 126729 07-Mar-2004 cperciva

Make it possible for the %[eEfgG] formats to not result in an error
being reported by /usr/bin/printf.

This bug has been around for 22 months... either nobody uses printf
with floating-point values, or people are forgetting to check their
return codes.

Approved by: rwatson (mentor)


# 102944 04-Sep-2002 dwmalone

ANSIify function definitions.
Add some constness to avoid some warnings.
Remove use register keyword.
Deal with missing/unneeded extern/prototypes.
Some minor type changes/casts to avoid warnings.

Reviewed by: md5


# 98426 19-Jun-2002 tjr

Fix duplicate % in %b format introduced in rev 1.22.


# 98424 19-Jun-2002 tjr

Let printf(1) tell the difference between zero width/precision and
unspecified width/precision.

PR: 39116
Submitted by: Egil Brendsdal <egilb@ife.no>
MFC after: 1 week


# 98420 19-Jun-2002 tjr

Allow format strings containing "%%" to be reused.

PR: 39116
Submitted by: Egil Brendsdal <egilb@ife.no>
MFC after: 1 week


# 98419 19-Jun-2002 tjr

Allow `%' to be written out with an octal escape (\45 or \045).

PR: 39116
Submitted by: Egil Brendsdal <egilb@ife.no>
MFC after: 1 week


# 95409 24-Apr-2002 tjr

Handle numbers larger than QUAD_MAX for unsigned conversions correctly.
Exit with nonzero status if a conversion failed.
Play nice if used as a shell builtin (currently disabled).

Submitted by: bde (partially)
Approved by: mike


# 95300 23-Apr-2002 jmallett

- printf shouldn't bail out if a conversion fails, it should just keep
processing them.
- \c escape to immediately stop output (similar to echo's \c)
- \0NNN should be allowed for octal character escapes (instead of just \NNN)
- %b conversion, which is like %s but interprets \n \t etc. inside the
string is missing.

And I may not be any poet, but in lieu of an in-tree regression test:
ref5% ./printf '%s%b%b%c%s%d\n' 'PR' '\0072' '\t' '3' '56' 0x10
PR: 35616

Submitted by: tjr
MFC after: 1 week


# 92921 21-Mar-2002 imp

remove __P


# 87298 03-Dec-2001 dwmalone

Warns cleanups.


# 72304 10-Feb-2001 ache

Localize it (LC_NUMERIC)


# 70256 21-Dec-2000 ben

Fix printf(1) for cases where a long string with no format specifiers is
followed by a %d (probably others too) format specifier.

Reviewed by: audit


# 65429 04-Sep-2000 imp

When we have both a rcsid and sccsid, ifdef 0 the sccsid. This
appears to be the standard FreeBSD way to do this. style(9) is silent
about this, however.


# 62928 10-Jul-2000 se

Extend to deal with 64 bit numeric arguments.


# 59435 20-Apr-2000 cracauer

Remove redundat extern declaration


# 41582 07-Dec-1998 bde

Fixed warnx format errors in printf and csh, and snprintf format errors
in sh, by using separate macros for the 1, 2 and 3-arg calls to warnx.
(The 3-arg warnx macro in sh/bltin/bltin.h used to require bogus dummy
args.)


# 31277 18-Nov-1997 jdp

Back out revision 1.10. It broke the build of sh, which compiles
this file with warnx() defined as a macro.


# 31224 18-Nov-1997 jdp

Fix: too many arguments for format string in 4 calls to warnx().


# 27966 07-Aug-1997 steve

#include <unistd.h> for getopt(3) call.


# 24360 29-Mar-1997 imp

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.


# 20409 14-Dec-1996 steve

-Wall cleaning.


# 18732 06-Oct-1996 steve

Remove annoying -Wall warning.


# 18613 01-Oct-1996 peter

When used as a shell builtin, this program decoded a subset of arguments
known to printf(3) and then used printf() to format it... The only
problem what the #define printf out1fmt. The code was behaving differently
when run as a shell builtin since out1fmt() isn't printf(3).

Simple hack. Print to a buffer and fputs (also #defined for sh) the
result. This should fix the printf builtin problem in PR#1673, rather
than leaving the call commented out. (printf.o was being statically linked
in anyway, we might as well use it)


# 12730 10-Dec-1995 joerg

Move out some of the shell builtin bogosity from printf's source to
sh's builtin/bltin.h.


# 8874 30-May-1995 rgrimes

Remove trailing whitespace.


# 8323 07-May-1995 joerg

Make the syntax checks for the format string more strict. The string
"%8*s" is no longer considered to be a valid format description.

This closes PR bin/386.


# 1591 27-May-1994 rgrimes

This commit was generated by cvs2svn to compensate for changes in r1590,
which included commits to RCS files with non-trunk default branches.


# 1590 27-May-1994 rgrimes

BSD 4.4 Lite Usr.bin Sources