diff options
| author | delphij <delphij@FreeBSD.org> | 2010-12-14 18:23:15 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2010-12-14 18:23:15 +0000 |
| commit | b683a398af3500a579e31d0fc2e293dd936b2e8e (patch) | |
| tree | 1cf4b6fc8270e97a47db7092cea61a37885a3248 /usr.bin/printf | |
| parent | 76e60b09a3a0f0dcf07e45aec146d4f13f8434c0 (diff) | |
| download | FreeBSD-src-b683a398af3500a579e31d0fc2e293dd936b2e8e.zip FreeBSD-src-b683a398af3500a579e31d0fc2e293dd936b2e8e.tar.gz | |
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.
Diffstat (limited to 'usr.bin/printf')
| -rw-r--r-- | usr.bin/printf/printf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c index 451b15b..e646f5d 100644 --- a/usr.bin/printf/printf.c +++ b/usr.bin/printf/printf.c @@ -53,7 +53,6 @@ static const char rcsid[] = #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sysexits.h> #include <unistd.h> #ifdef SHELL @@ -123,7 +122,7 @@ main(int argc, char *argv[]) if (argc < 1) { usage(); - /* NOTREACHED */ + return (1); } #ifdef SHELL @@ -563,5 +562,4 @@ static void usage(void) { (void)fprintf(stderr, "usage: printf format [arguments ...]\n"); - exit(EX_USAGE); } |
