d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When printf is being used as a sh(1) builtin, it can not call

Browse Source 
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.
This commit is contained in:
Xin LI 2010-12-14 18:23:15 +00:00
parent e23559db8e
commit 5eccc0009b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=216439
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/printf/printf.c
View File

@ -53,7 +53,6 @@ static const char rcsid[] =
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sysexits.h>
#include <unistd.h> #include <unistd.h>
#ifdef SHELL #ifdef SHELL
@ -123,7 +122,7 @@ main(int argc, char *argv[])
if (argc < 1) { if (argc < 1) {
usage(); usage();
/* NOTREACHED */ return (1);
} }
#ifdef SHELL #ifdef SHELL
@ -563,5 +562,4 @@ static void
usage(void) usage(void)
{ {
(void)fprintf(stderr, "usage: printf format [arguments ...]\n"); (void)fprintf(stderr, "usage: printf format [arguments ...]\n");
exit(EX_USAGE);
} }