From 44161afdb82c792be739fa2e5fb0d5c6394634d7 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Sat, 21 Jun 2025 15:07:05 -0400 Subject: usr: usr.bin/time -> usr.bin/date Change the 'time' binary to be called 'date' as it is more fitting for the type of program it is. Signed-off-by: Ian Moffett --- usr.bin/Makefile | 2 +- usr.bin/date/Makefile | 6 ++++++ usr.bin/date/date.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ usr.bin/osh/osh.c | 2 +- usr.bin/time/Makefile | 6 ------ usr.bin/time/time.c | 53 --------------------------------------------------- 6 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 usr.bin/date/Makefile create mode 100644 usr.bin/date/date.c delete mode 100644 usr.bin/time/Makefile delete mode 100644 usr.bin/time/time.c (limited to 'usr.bin') diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 8b22b73..9b241d8 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -9,7 +9,7 @@ all: make -C kmsg/ $(ARGS) make -C fetch/ $(ARGS) make -C kfgwm/ $(ARGS) - make -C time/ $(ARGS) + make -C date/ $(ARGS) make -C mex/ $(ARGS) make -C beep/ $(ARGS) make -C mrow/ $(ARGS) diff --git a/usr.bin/date/Makefile b/usr.bin/date/Makefile new file mode 100644 index 0000000..09ff299 --- /dev/null +++ b/usr.bin/date/Makefile @@ -0,0 +1,6 @@ +include user.mk + +CFILES = $(shell find . -name "*.c") + +$(ROOT)/base/usr/bin/date: + gcc $(CFILES) -Iinclude/ -o $@ $(INTERNAL_CFLAGS) diff --git a/usr.bin/date/date.c b/usr.bin/date/date.c new file mode 100644 index 0000000..2f3b11f --- /dev/null +++ b/usr.bin/date/date.c @@ -0,0 +1,53 @@ +/* + * 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 +#include +#include +#include + +int +main(void) +{ + char date_str[16]; + struct date d; + int rtc_fd; + + if ((rtc_fd = open("/dev/rtc", O_RDONLY)) < 0) { + return rtc_fd; + } + + read(rtc_fd, &d, sizeof(d)); + close(rtc_fd); + + snprintf(date_str, sizeof(date_str), "%02d:%02d:%02d\n", + d.hour, d.min, d.sec); + fputs(date_str, stdout); + return 0; +} diff --git a/usr.bin/osh/osh.c b/usr.bin/osh/osh.c index db8865d..efb159e 100644 --- a/usr.bin/osh/osh.c +++ b/usr.bin/osh/osh.c @@ -55,7 +55,7 @@ "fetch - System information\n" \ "kfg - Start up kfgwm\n" \ "bell - Toggle backspace bell\n" \ - "time - Get the current time\n" \ + "date - Get the current date\n" \ "clear - Clear the screen\n" \ "exit - Exit the shell" diff --git a/usr.bin/time/Makefile b/usr.bin/time/Makefile deleted file mode 100644 index 9ac98b4..0000000 --- a/usr.bin/time/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -include user.mk - -CFILES = $(shell find . -name "*.c") - -$(ROOT)/base/usr/bin/time: - gcc $(CFILES) -Iinclude/ -o $@ $(INTERNAL_CFLAGS) diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c deleted file mode 100644 index 2f3b11f..0000000 --- a/usr.bin/time/time.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 -#include -#include -#include - -int -main(void) -{ - char date_str[16]; - struct date d; - int rtc_fd; - - if ((rtc_fd = open("/dev/rtc", O_RDONLY)) < 0) { - return rtc_fd; - } - - read(rtc_fd, &d, sizeof(d)); - close(rtc_fd); - - snprintf(date_str, sizeof(date_str), "%02d:%02d:%02d\n", - d.hour, d.min, d.sec); - fputs(date_str, stdout); - return 0; -} -- cgit v1.2.3