0b6215847
Paul Fox
2005-08-09
Subject
implemented a builtin echo command in ash. moved the guts of the echo applet into libbb, and now call bb_echo() from both echo.c and ash.c
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/Config.in +1 -0coreutils/echo.c +2 -138include/libbb.h +2 -0libbb/Makefile.in +2 -1libbb/bb_echo.c +163 -0shell/Config.in +15 -0shell/ash.c +19 -33
coreutils/Config.in+1 -0
| @@ -156,6 +156,7 @@ config CONFIG_ECHO | |
| help | |
| echo is used to print a specified string to stdout. | |
| + | # this entry also appears in shell/Config.in, next to the echo builtin |
| config CONFIG_FEATURE_FANCY_ECHO | |
| bool " Enable echo options (-n and -e)" | |
| default y | |
coreutils/echo.c+2 -138
| @@ -1,9 +1,5 @@ | |
| - | /* vi: set sw=4 ts=4: */ |
| /* | |
| - | * echo implementation for busybox |
| - | * |
| - | * Copyright (c) 1991, 1993 |
| - | * The Regents of the University of California. All rights reserved. |
| + | * echo applet implementation for busybox |
| * | |
| * This program is free software; you can redistribute it and/or modify | |
| * it under the terms of the GNU General Public License as published by | |
| @@ -19,20 +15,6 @@ | |
| * along with this program; if not, write to the Free Software | |
| * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| * | |
| - | * Original copyright notice is retained at the end of this file. |
| - | */ |
| - | |
| - | /* BB_AUDIT SUSv3 compliant -- unless configured as fancy echo. */ |
| - | /* http://www.opengroup.org/onlinepubs/007904975/utilities/echo.html */ |
| - | |
| - | /* Mar 16, 2003 Manuel Novoa III ([email protected]) |
| - | * |
| - | * Because of behavioral differences, implemented configurable SUSv3 |
| - | * or 'fancy' gnu-ish behaviors. Also, reduced size and fixed bugs. |
| - | * 1) In handling '\c' escape, the previous version only suppressed the |
| - | * trailing newline. SUSv3 specifies _no_ output after '\c'. |
| - | * 2) SUSv3 specifies that octal escapes are of the form \0{#{#{#}}}. |
| - | * The previous version version did not allow 4-digit octals. |
| */ | |
| #include <stdio.h> | |
| @@ -42,124 +24,6 @@ | |
| extern int echo_main(int argc, char** argv) | |
| { | |
| - | #ifndef CONFIG_FEATURE_FANCY_ECHO |
| - | #define eflag '\\' |
| - | ++argv; |
| - | #else |
| - | const char *p; |
| - | int nflag = 1; |
| - | int eflag = 0; |
| - | |
| - | while (*++argv && (**argv == '-')) { |
| - | /* If it appears that we are handling options, then make sure |
| - | * that all of the options specified are actually valid. |
| - | * Otherwise, the string should just be echoed. |
| - | */ |
| - | |
| - | if (!*(p = *argv + 1)) { /* A single '-', so echo it. */ |
| - | goto just_echo; |
| - | } |
| - | |
| - | do { |
| - | if (strrchr("neE", *p) == 0) { |
| - | goto just_echo; |
| - | } |
| - | } while (*++p); |
| - | |
| - | /* All of the options in this arg are valid, so handle them. */ |
| - | p = *argv + 1; |
| - | do { |
| - | if (*p == 'n') { |
| - | nflag = 0; |
| - | } else if (*p == 'e') { |
| - | eflag = '\\'; |
| - | } else { |
| - | eflag = 0; |
| - | } |
| - | } while (*++p); |
| - | } |
| - | |
| - | just_echo: |
| - | #endif |
| - | while (*argv) { |
| - | register int c; |
| - | |
| - | while ((c = *(*argv)++)) { |
| - | if (c == eflag) { /* Check for escape seq. */ |
| - | if (**argv == 'c') { |
| - | /* '\c' means cancel newline and |
| - | * ignore all subsequent chars. */ |
| - | goto DONE; |
| - | } |
| - | #ifndef CONFIG_FEATURE_FANCY_ECHO |
| - | /* SUSv3 specifies that octal escapes must begin with '0'. */ |
| - | if (((unsigned int)(**argv - '1')) >= 7) |
| - | #endif |
| - | { |
| - | /* Since SUSv3 mandates a first digit of 0, 4-digit octals |
| - | * of the form \0### are accepted. */ |
| - | if ((**argv == '0') && (((unsigned int)(argv[0][1] - '0')) < 8)) { |
| - | (*argv)++; |
| - | } |
| - | /* bb_process_escape_sequence can handle nul correctly */ |
| - | c = bb_process_escape_sequence((const char **) argv); |
| - | } |
| - | } |
| - | putchar(c); |
| - | } |
| - | |
| - | if (*++argv) { |
| - | putchar(' '); |
| - | } |
| - | } |
| - | |
| - | #ifdef CONFIG_FEATURE_FANCY_ECHO |
| - | if (nflag) { |
| - | putchar('\n'); |
| - | } |
| - | #else |
| - | putchar('\n'); |
| - | #endif |
| - | |
| - | DONE: |
| + | (void)bb_echo(argc, argv); |
| bb_fflush_stdout_and_exit(EXIT_SUCCESS); | |
| } | |
| - | |
| - | /*- |
| - | * Copyright (c) 1991, 1993 |
| - | * The Regents of the University of California. All rights reserved. |
| - | * |
| - | * This code is derived from software contributed to Berkeley by |
| - | * Kenneth Almquist. |
| - | * |
| - | * Redistribution and use in source and binary forms, with or without |
| - | * modification, are permitted provided that the following conditions |
| - | * are met: |
| - | * 1. Redistributions of source code must retain the above copyright |
| - | * notice, this list of conditions and the following disclaimer. |
| - | * 2. Redistributions in binary form must reproduce the above copyright |
| - | * notice, this list of conditions and the following disclaimer in the |
| - | * documentation and/or other materials provided with the distribution. |
| - | * |
| - | * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change |
| - | * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> |
| - | * |
| - | * California, Berkeley and its contributors. |
| - | * 4. Neither the name of the University nor the names of its contributors |
| - | * may be used to endorse or promote products derived from this software |
| - | * without specific prior written permission. |
| - | * |
| - | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND |
| - | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| - | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| - | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
| - | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
| - | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
| - | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
| - | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
| - | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
| - | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| - | * SUCH DAMAGE. |
| - | * |
| - | * @(#)echo.c 8.1 (Berkeley) 5/31/93 |
| - | */ |
include/libbb.h+2 -0
| @@ -105,6 +105,8 @@ extern void bb_perror_nomsg(void); | |
| extern void bb_verror_msg(const char *s, va_list p) __attribute__ ((format (printf, 1, 0))); | |
| extern void bb_vperror_msg(const char *s, va_list p) __attribute__ ((format (printf, 1, 0))); | |
| + | extern int bb_echo(int argc, char** argv); |
| + | |
| extern const char *bb_mode_string(int mode); | |
| extern int is_directory(const char *name, int followLinks, struct stat *statBuf); | |
libbb/Makefile.in+2 -1
| @@ -46,7 +46,8 @@ LIBBB_SRC:= \ | |
| get_terminal_width_height.c fclose_nonstdin.c fflush_stdout_and_exit.c \ | |
| getopt_ulflags.c default_error_retval.c wfopen_input.c speed_table.c \ | |
| perror_nomsg_and_die.c perror_nomsg.c skip_whitespace.c bb_askpass.c \ | |
| - | warn_ignoring_args.c concat_subpath_file.c vfork_daemon_rexec.c |
| + | warn_ignoring_args.c concat_subpath_file.c vfork_daemon_rexec.c \ |
| + | bb_echo.c |
| LIBBB_OBJS=$(patsubst %.c,$(LIBBB_DIR)%.o, $(LIBBB_SRC)) | |
libbb/bb_echo.c+163 -0
| @@ -0,0 +1,163 @@ | |
| + | /* vi: set sw=4 ts=4: */ |
| + | /* |
| + | * echo implementation for busybox |
| + | * |
| + | * Copyright (c) 1991, 1993 |
| + | * The Regents of the University of California. All rights reserved. |
| + | * |
| + | * This program is free software; you can redistribute it and/or modify |
| + | * it under the terms of the GNU General Public License as published by |
| + | * the Free Software Foundation; either version 2 of the License, or |
| + | * (at your option) any later version. |
| + | * |
| + | * This program is distributed in the hope that it will be useful, |
| + | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| + | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| + | * General Public License for more details. |
| + | * |
| + | * You should have received a copy of the GNU General Public License |
| + | * along with this program; if not, write to the Free Software |
| + | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| + | * |
| + | * Original copyright notice is retained at the end of this file. |
| + | */ |
| + | |
| + | /* BB_AUDIT SUSv3 compliant -- unless configured as fancy echo. */ |
| + | /* http://www.opengroup.org/onlinepubs/007904975/utilities/echo.html */ |
| + | |
| + | /* Mar 16, 2003 Manuel Novoa III ([email protected]) |
| + | * |
| + | * Because of behavioral differences, implemented configurable SUSv3 |
| + | * or 'fancy' gnu-ish behaviors. Also, reduced size and fixed bugs. |
| + | * 1) In handling '\c' escape, the previous version only suppressed the |
| + | * trailing newline. SUSv3 specifies _no_ output after '\c'. |
| + | * 2) SUSv3 specifies that octal escapes are of the form \0{#{#{#}}}. |
| + | * The previous version version did not allow 4-digit octals. |
| + | */ |
| + | |
| + | |
| + | #include <stdio.h> |
| + | #include <string.h> |
| + | #include "busybox.h" |
| + | |
| + | extern int bb_echo(int argc, char** argv) |
| + | { |
| + | #ifndef CONFIG_FEATURE_FANCY_ECHO |
| + | #define eflag '\\' |
| + | ++argv; |
| + | #else |
| + | const char *p; |
| + | int nflag = 1; |
| + | int eflag = 0; |
| + | |
| + | while (*++argv && (**argv == '-')) { |
| + | /* If it appears that we are handling options, then make sure |
| + | * that all of the options specified are actually valid. |
| + | * Otherwise, the string should just be echoed. |
| + | */ |
| + | |
| + | if (!*(p = *argv + 1)) { /* A single '-', so echo it. */ |
| + | goto just_echo; |
| + | } |
| + | |
| + | do { |
| + | if (strrchr("neE", *p) == 0) { |
| + | goto just_echo; |
| + | } |
| + | } while (*++p); |
| + | |
| + | /* All of the options in this arg are valid, so handle them. */ |
| + | p = *argv + 1; |
| + | do { |
| + | if (*p == 'n') { |
| + | nflag = 0; |
| + | } else if (*p == 'e') { |
| + | eflag = '\\'; |
| + | } else { |
| + | eflag = 0; |
| + | } |
| + | } while (*++p); |
| + | } |
| + | |
| + | just_echo: |
| + | #endif |
| + | while (*argv) { |
| + | register int c; |
| + | |
| + | while ((c = *(*argv)++)) { |
| + | if (c == eflag) { /* Check for escape seq. */ |
| + | if (**argv == 'c') { |
| + | /* '\c' means cancel newline and |
| + | * ignore all subsequent chars. */ |
| + | return 0; |
| + | } |
| + | #ifndef CONFIG_FEATURE_FANCY_ECHO |
| + | /* SUSv3 specifies that octal escapes must begin with '0'. */ |
| + | if (((unsigned int)(**argv - '1')) >= 7) |
| + | #endif |
| + | { |
| + | /* Since SUSv3 mandates a first digit of 0, 4-digit octals |
| + | * of the form \0### are accepted. */ |
| + | if ((**argv == '0') && (((unsigned int)(argv[0][1] - '0')) < 8)) { |
| + | (*argv)++; |
| + | } |
| + | /* bb_process_escape_sequence can handle nul correctly */ |
| + | c = bb_process_escape_sequence((const char **) argv); |
| + | } |
| + | } |
| + | putchar(c); |
| + | } |
| + | |
| + | if (*++argv) { |
| + | putchar(' '); |
| + | } |
| + | } |
| + | |
| + | #ifdef CONFIG_FEATURE_FANCY_ECHO |
| + | if (nflag) { |
| + | putchar('\n'); |
| + | } |
| + | #else |
| + | putchar('\n'); |
| + | #endif |
| + | return 0; |
| + | } |
| + | |
| + | /*- |
| + | * Copyright (c) 1991, 1993 |
| + | * The Regents of the University of California. All rights reserved. |
| + | * |
| + | * This code is derived from software contributed to Berkeley by |
| + | * Kenneth Almquist. |
| + | * |
| + | * Redistribution and use in source and binary forms, with or without |
| + | * modification, are permitted provided that the following conditions |
| + | * are met: |
| + | * 1. Redistributions of source code must retain the above copyright |
| + | * notice, this list of conditions and the following disclaimer. |
| + | * 2. Redistributions in binary form must reproduce the above copyright |
| + | * notice, this list of conditions and the following disclaimer in the |
| + | * documentation and/or other materials provided with the distribution. |
| + | * |
| + | * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change |
| + | * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> |
| + | * |
| + | * California, Berkeley and its contributors. |
| + | * 4. Neither the name of the University nor the names of its contributors |
| + | * may be used to endorse or promote products derived from this software |
| + | * without specific prior written permission. |
| + | * |
| + | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND |
| + | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| + | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| + | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
| + | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
| + | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
| + | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
| + | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
| + | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
| + | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| + | * SUCH DAMAGE. |
| + | * |
| + | * @(#)echo.c 8.1 (Berkeley) 5/31/93 |
| + | */ |
shell/Config.in+15 -0
| @@ -103,6 +103,21 @@ config CONFIG_ASH_CMDCMD | |
| you to run the specified command with the specified arguments, | |
| even when there is an ash builtin command with the same name. | |
| + | config CONFIG_ASH_BUILTIN_ECHO |
| + | bool " Enable builtin version of 'echo'" |
| + | default n |
| + | depends on CONFIG_ASH |
| + | help |
| + | Enable support for echo, built in to ash. |
| + | |
| + | # this entry also appears in coreutils/Config.in, next to the echo applet |
| + | config CONFIG_FEATURE_FANCY_ECHO |
| + | bool " Enable echo options (-n and -e)" |
| + | default y |
| + | depends on CONFIG_ASH_BUILTIN_ECHO |
| + | help |
| + | This adds options (-n and -e) to echo. |
| + | |
| config CONFIG_ASH_MAIL | |
| bool " Check for new mail on interactive shells" | |
| default y | |
shell/ash.c+19 -33
| @@ -1249,6 +1249,9 @@ static int commandcmd(int, char **); | |
| #endif | |
| static int dotcmd(int, char **); | |
| static int evalcmd(int, char **); | |
| + | #ifdef CONFIG_ASH_BUILTIN_ECHO |
| + | static int echocmd(int, char **); |
| + | #endif |
| static int execcmd(int, char **); | |
| static int exitcmd(int, char **); | |
| static int exportcmd(int, char **); | |
| @@ -1308,39 +1311,12 @@ struct builtincmd { | |
| /* unsigned flags; */ | |
| }; | |
| - | #ifdef CONFIG_ASH_CMDCMD |
| - | # ifdef JOBS |
| - | # ifdef CONFIG_ASH_ALIAS |
| - | # define COMMANDCMD (builtincmd + 7) |
| - | # define EXECCMD (builtincmd + 10) |
| - | # else |
| - | # define COMMANDCMD (builtincmd + 6) |
| - | # define EXECCMD (builtincmd + 9) |
| - | # endif |
| - | # else /* ! JOBS */ |
| - | # ifdef CONFIG_ASH_ALIAS |
| - | # define COMMANDCMD (builtincmd + 6) |
| - | # define EXECCMD (builtincmd + 9) |
| - | # else |
| - | # define COMMANDCMD (builtincmd + 5) |
| - | # define EXECCMD (builtincmd + 8) |
| - | # endif |
| - | # endif /* JOBS */ |
| - | #else /* ! CONFIG_ASH_CMDCMD */ |
| - | # ifdef JOBS |
| - | # ifdef CONFIG_ASH_ALIAS |
| - | # define EXECCMD (builtincmd + 9) |
| - | # else |
| - | # define EXECCMD (builtincmd + 8) |
| - | # endif |
| - | # else /* ! JOBS */ |
| - | # ifdef CONFIG_ASH_ALIAS |
| - | # define EXECCMD (builtincmd + 8) |
| - | # else |
| - | # define EXECCMD (builtincmd + 7) |
| - | # endif |
| - | # endif /* JOBS */ |
| - | #endif /* CONFIG_ASH_CMDCMD */ |
| + | |
| + | #define COMMANDCMD (builtincmd + 5 + \ |
| + | ENABLE_ASH_ALIAS + ENABLE_ASH_JOB_CONTROL) |
| + | #define EXECCMD (builtincmd + 7 + \ |
| + | ENABLE_ASH_CMDCMD + ENABLE_ASH_ALIAS + \ |
| + | ENABLE_ASH_BUILTIN_ECHO + ENABLE_ASH_JOB_CONTROL) |
| #define BUILTIN_NOSPEC "0" | |
| #define BUILTIN_SPECIAL "1" | |
| @@ -1371,6 +1347,9 @@ static const struct builtincmd builtincmd[] = { | |
| { BUILTIN_REGULAR "command", commandcmd }, | |
| #endif | |
| { BUILTIN_SPEC_REG "continue", breakcmd }, | |
| + | #ifdef CONFIG_ASH_BUILTIN_ECHO |
| + | { BUILTIN_REGULAR "echo", echocmd }, |
| + | #endif |
| { BUILTIN_SPEC_REG "eval", evalcmd }, | |
| { BUILTIN_SPEC_REG "exec", execcmd }, | |
| { BUILTIN_SPEC_REG "exit", exitcmd }, | |
| @@ -8200,6 +8179,13 @@ exitcmd(int argc, char **argv) | |
| /* NOTREACHED */ | |
| } | |
| + | #ifdef CONFIG_ASH_BUILTIN_ECHO |
| + | static int |
| + | echocmd(int argc, char **argv) |
| + | { |
| + | return bb_echo(argc, argv); |
| + | } |
| + | #endif |
| /* $NetBSD: memalloc.c,v 1.27 2003/01/22 20:36:04 dsl Exp $ */ | |
| /* | |