From 9903a0c6e567f2cc3426475d7ecd70a3a6b7c21b Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 4 Jun 2025 15:04:37 +0200 Subject: [PATCH] add version --- src/args.c | 9 +++++++-- src/const.h | 7 +++++++ src/generator.c | 23 ++++++++++++++--------- 3 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 src/const.h diff --git a/src/args.c b/src/args.c index 1626d87..2425852 100644 --- a/src/args.c +++ b/src/args.c @@ -1,4 +1,5 @@ #include "args.h" +#include "const.h" #include "rand.h" #include #include @@ -6,8 +7,9 @@ #include void print_help(int status_code) { - puts("usage: margen " + puts("usage: " NAME " " "[--help] " + "[-v] " "[-q] " "[-w=WIDTH] " "[-h=HEIGHT] " @@ -16,7 +18,7 @@ void print_help(int status_code) { "[-p=PIXEL_SIZE] " "[-s=SLOPE] " "[-c=R,G,B] " - "[-v=R,G,B] " + "[--var=R,G,B] " "[-m]\n\n" "generates a marble-like pattern bitmap image.\n\n" "options:\n" @@ -132,6 +134,9 @@ parameters parse_args(int argc, char **argv) { print_help(0); } else if (is_arg(arg, "-q") || is_arg(arg, "--quiet")) { params.quiet = true; + } else if (is_arg(arg, "-v") || is_arg(arg, "--version")) { + puts(NAME " " VERSION); + exit(0); } else if (is_arg(arg, "-w") || is_arg(arg, "--width")) { params.width = parse_ushort(arg, value); if (params.width == 0) { diff --git a/src/const.h b/src/const.h new file mode 100644 index 0000000..23200a9 --- /dev/null +++ b/src/const.h @@ -0,0 +1,7 @@ +#ifndef CONST_H +#define CONST_H + +#define NAME "margen" +#define VERSION "v1.0.0" + +#endif \ No newline at end of file diff --git a/src/generator.c b/src/generator.c index c14d5c2..7d81593 100644 --- a/src/generator.c +++ b/src/generator.c @@ -1,5 +1,6 @@ #include "args.h" #include "bmp.h" +#include "const.h" #include "rand.h" #include #include @@ -52,18 +53,19 @@ void generate_bmp_line(unsigned short y, unsigned char *data_buffer, void debug_parameters(parameters params) { if (!params.quiet) { - printf("output %s\n", params.file_path); - printf("seed %ld\n", params.seed); - printf("width %d\n", params.width); - printf("height %d\n", params.height); - printf("pixel %d\n", params.size); + printf(" output %s\n", params.file_path); + printf(" seed %ld\n", params.seed); + printf(" width %d\n", params.width); + printf(" height %d\n", params.height); + printf(" pixel %d\n", params.size); if (params.monochrome) { - printf("color %u\n", params.start[0]); - printf("var. %u\n", params.var[0]); + printf(" color %u\n", params.start[0]); + printf(" var. %u\n", params.var[0]); } else { - printf("color %u,%u,%u\n", params.start[0], params.start[1], + printf(" color %u,%u,%u\n", params.start[0], params.start[1], params.start[2]); - printf("var. %u,%u,%u\n", params.var[0], params.var[1], params.var[2]); + printf(" var. %u,%u,%u\n", params.var[0], params.var[1], + params.var[2]); } } } @@ -90,6 +92,9 @@ void clean() { } void generate(parameters params) { + if (!params.quiet) { + puts(NAME " " VERSION); + } init(params); bmp_generate(params.width, params.height, color_depth, params.file_path, generate_bmp_line);