emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove echo_main -> bb_echo indirection

Browse Source
This commit is contained in:
Denis Vlasenko 2007-11-24 02:23:51 +00:00
parent c3c6659f12
commit fe5e23bf75
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
coreutils/echo.c
View File

@ -25,9 +25,13 @@
#include "libbb.h"
/* This is a NOFORK applet. Be very careful! */
/* argc is unused, but removing it precludes compiler from
* using call -> jump optimization */
int bb_echo(int argc, char **argv)
int echo_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int echo_main(int argc, char **argv)
{
const char *arg;
#if !ENABLE_FEATURE_FANCY_ECHO
@ -38,7 +42,7 @@ int bb_echo(int argc, char **argv)
/* We must check that stdout is not closed.
* The reason for this is highly non-obvious.
* bb_echo is used from shell. Shell must correctly handle "echo foo"
* echo_main is used from shell. Shell must correctly handle "echo foo"
* if stdout is closed. With stdio, output gets shoveled into
* stdout buffer, and even fflush cannot clear it out. It seems that
* even if libc receives EBADF on write attempts, it feels determined
@ -135,14 +139,6 @@ int bb_echo(int argc, char **argv)
return fflush(stdout);
}
/* This is a NOFORK applet. Be very careful! */
int echo_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int echo_main(int argc, char **argv)
{
return bb_echo(argc, argv);
}
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@ -185,7 +181,7 @@ int echo_main(int argc, char **argv)
#ifdef VERSION_WITH_WRITEV
/* We can't use stdio.
* The reason for this is highly non-obvious.
* bb_echo is used from shell. Shell must correctly handle "echo foo"
* echo_main is used from shell. Shell must correctly handle "echo foo"
* if stdout is closed. With stdio, output gets shoveled into
* stdout buffer, and even fflush cannot clear it out. It seems that
* even if libc receives EBADF on write attempts, it feels determined
@ -195,7 +191,7 @@ int echo_main(int argc, char **argv)
* Using writev instead, with 'direct' conversion of argv vector.
*/
int bb_echo(int argc, char **argv)
int echo_main(int argc, char **argv)
{
struct iovec io[argc];
struct iovec *cur_io = io;

2
include/libbb.h
View File

@ -728,7 +728,7 @@ extern void bb_verror_msg(const char *s, va_list p, const char *strerr);
/* applets which are useful from another applets */
int bb_cat(char** argv);
int bb_echo(int argc, char** argv);
int echo_main(int argc, char** argv) MAIN_EXTERNALLY_VISIBLE;
int test_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int kill_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
#if ENABLE_ROUTE

2
shell/ash.c
View File

@ -11003,7 +11003,7 @@ exitcmd(int argc, char **argv)
static int
echocmd(int argc, char **argv)
{
return bb_echo(argc, argv);
return echo_main(argc, argv);
}
#endif

2
shell/hush.c
View File

@ -853,7 +853,7 @@ static int builtin_echo(char **argv)
argc++;
argv++;
}
return bb_echo(argc, argv - argc);
return echo_main(argc, argv - argc);
}
/* built-in 'eval' handler */