diff options
| -rw-r--r-- | usr.bin/Makefile | 1 | ||||
| -rw-r--r-- | usr.bin/echo/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/echo/echo.c | 44 | ||||
| -rw-r--r-- | usr.bin/osh/osh.c | 11 |
4 files changed, 51 insertions, 11 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index f02e15b..5a931c8 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -16,3 +16,4 @@ all: make -C elfdump/ $(ARGS) make -C cat/ $(ARGS) make -C getconf/ $(ARGS) + make -C echo/ $(ARGS) diff --git a/usr.bin/echo/Makefile b/usr.bin/echo/Makefile new file mode 100644 index 0000000..296461b --- /dev/null +++ b/usr.bin/echo/Makefile @@ -0,0 +1,6 @@ +include user.mk + +CFILES = $(shell find . -name "*.c") + +$(ROOT)/base/usr/bin/echo: + gcc $(CFILES) -o $@ $(INTERNAL_CFLAGS) diff --git a/usr.bin/echo/echo.c b/usr.bin/echo/echo.c new file mode 100644 index 0000000..760c788 --- /dev/null +++ b/usr.bin/echo/echo.c @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * 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. Neither the name of Hyra 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. + */ + +#include <stdio.h> + +int +main(int argc, char **argv) +{ + for (int i = 1; i < argc; ++i) { + printf("%s ", argv[i]); + } + + if (argc > 1) { + printf("\n"); + } + + return 0; +} diff --git a/usr.bin/osh/osh.c b/usr.bin/osh/osh.c index 4f90d47..0cac664 100644 --- a/usr.bin/osh/osh.c +++ b/usr.bin/osh/osh.c @@ -83,7 +83,6 @@ struct builtin_cmd { static struct builtin_cmd cmds[] = { {"help",cmd_help}, - {"echo",cmd_echo}, {"exit",cmd_exit}, {"reboot",cmd_reboot}, {"shutdown", cmd_shutdown}, @@ -117,16 +116,6 @@ cmd_shutdown(int argc, char *argv[]) } static void -cmd_echo(int argc, char *argv[]) -{ - for (i = 1; i < argc; i++) { - fputs(argv[i], stdout); - putchar(' '); - } - putchar('\n'); -} - -static void cmd_clear(int argc, char *argv[]) { fputs("\033[H", stdout); |