diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/include/unistd.h | 5 | ||||
| -rw-r--r-- | lib/libc/src/main.c | 2 | ||||
| -rw-r--r-- | lib/libc/src/posix/getopt.c | 100 | ||||
| -rw-r--r-- | lib/libgfx/include/libgfx/draw.h | 3 | ||||
| -rw-r--r-- | lib/libgfx/src/draw.c | 57 |
5 files changed, 166 insertions, 1 deletions
diff --git a/lib/libc/include/unistd.h b/lib/libc/include/unistd.h index b9c9f5e..8b03b81 100644 --- a/lib/libc/include/unistd.h +++ b/lib/libc/include/unistd.h @@ -60,6 +60,11 @@ off_t lseek(int fildes, off_t offset, int whence); pid_t getpid(void); pid_t getppid(void); +extern char *optarg; +extern int optind, opterr, optopt; + +int getopt(int argc, char *argv[], const char *optstring); + __END_DECLS #endif /* !_UNISTD_H */ diff --git a/lib/libc/src/main.c b/lib/libc/src/main.c index 02a648b..68f9bdb 100644 --- a/lib/libc/src/main.c +++ b/lib/libc/src/main.c @@ -30,6 +30,7 @@ #include <sys/exec.h> #include <stdint.h> #include <stddef.h> +#include <unistd.h> extern int __libc_stdio_init(void); extern int __malloc_mem_init(void); @@ -51,6 +52,7 @@ __libc_entry(uint64_t *ctx) char **argv; char **envp; + optind = 1; argc = *ctx; argv = (char **)(ctx + 1); envp = (char **)(argv + argc + 1); diff --git a/lib/libc/src/posix/getopt.c b/lib/libc/src/posix/getopt.c new file mode 100644 index 0000000..d3cd530 --- /dev/null +++ b/lib/libc/src/posix/getopt.c @@ -0,0 +1,100 @@ +/* + * 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 <sys/errno.h> +#include <unistd.h> +#include <stdbool.h> +#include <string.h> +#include <stdio.h> + +char *optarg; +int optind, opterr, optopt; + +int +getopt(int argc, char *argv[], const char *optstring) +{ + size_t optstr_len; + char *arg; + bool has_arg = false; + + if (argc == 0 || optstring == NULL) { + opterr = -EINVAL; + return -1; + } + + if (optind >= argc) { + return -1; + } + + arg = argv[optind]; + optstr_len = strlen(optstring); + + /* Non option argument? */ + if (arg[0] != '-') { + return -1; + } + + /* + * We will look through each possible flag/option + * in the optstring and match it against our arg. + */ + for (size_t i = 0; i < optstr_len; ++i) { + if (arg[1] != optstring[i]) { + continue; + } + + /* + * If this option has a ':' right next to it, + * it also has an argument. + */ + if (i < optstr_len - 1) { + if (optstring[i + 1] == ':') { + has_arg = true; + } + } + + break; + } + + /* + * Handle cases where the option has an argument + * with it (-opt=arg) + */ + if (has_arg && optind < argc ) { + if (arg[2] != '=') { + opterr = -EINVAL; + return -1; + } + optarg = &arg[3]; + ++optind; + } + + ++optind; + return arg[1]; +} diff --git a/lib/libgfx/include/libgfx/draw.h b/lib/libgfx/include/libgfx/draw.h index 8efd986..4140593 100644 --- a/lib/libgfx/include/libgfx/draw.h +++ b/lib/libgfx/include/libgfx/draw.h @@ -34,7 +34,8 @@ #include <libgfx/gfx.h> /* Shape types */ -#define SHAPE_SQUARE 0x00000000 +#define SHAPE_SQUARE 0x00000000 +#define SHAPE_SQUARE_BORDER 0x00000001 /* Basic color defines */ #define GFX_BLACK 0x000000 diff --git a/lib/libgfx/src/draw.c b/lib/libgfx/src/draw.c index 870b543..4df64a8 100644 --- a/lib/libgfx/src/draw.c +++ b/lib/libgfx/src/draw.c @@ -95,6 +95,61 @@ gfx_draw_square(struct gfx_ctx *ctx, const struct gfx_shape *shape) } /* + * Draw a bordered square onto the screen. + * + * @ctx: Graphics context pointer + * @shape: Bordered square to draw + */ +static int +gfx_draw_bsquare(struct gfx_ctx *ctx, const struct gfx_shape *shape) +{ + struct gfx_point p; + scrpos_t x_i, y_i; + scrpos_t x_f, y_f; + scrpos_t x, y; + + if (ctx == NULL || shape == NULL) { + return -EINVAL; + } + + x_i = shape->x; + y_i = shape->y; + x_f = shape->x + shape->width; + y_f = shape->y + shape->height; + + /* + * Draw an unfilled square. + * + * If we are at the `y_i' or `y_f' position, draw + * pixels from 'x_i' to 'x_f'. If we are away + * from the `y_i' position, draw two pixels, + * one at `x_i' and the other at `x_f' for that + * current 'y' value. + */ + for (y = y_i; y < y_f; ++y) { + for (x = x_i; x < x_f; ++x) { + p.x = x; + p.y = y; + p.rgb = shape->color; + + /* Origin y, draw entire width */ + if (y == y_i || y == y_f - 1) { + gfx_plot_point(ctx, &p); + continue; + } + + p.x = x_i; + gfx_plot_point(ctx, &p); + + p.x = x_f - 1; + gfx_plot_point(ctx, &p); + } + } + + return 0; +} + +/* * Plot a single pixel (aka point) onto * the screen. * @@ -177,6 +232,8 @@ gfx_draw_shape(struct gfx_ctx *ctx, const struct gfx_shape *shape) switch (shape->type) { case SHAPE_SQUARE: return gfx_draw_square(ctx, shape); + case SHAPE_SQUARE_BORDER: + return gfx_draw_bsquare(ctx, shape); } return -1; |