From 20651164621dc1889d32073345faa79b81962179 Mon Sep 17 00:00:00 2001 From: zegonix Date: Sun, 4 Oct 2026 23:05:27 +0200 Subject: [PATCH] implemented short option for help --- inc/arguments.h | 1 + src/arguments.c | 19 +++++++++++++++++++ src/main.c | 3 +++ 3 files changed, 23 insertions(+) diff --git a/inc/arguments.h b/inc/arguments.h index 8297314..4604734 100644 --- a/inc/arguments.h +++ b/inc/arguments.h @@ -30,6 +30,7 @@ typedef struct { size_t depth; bool no_colour; bool group_directories; + bool display_help; bool long_view; bool reverse_order; bool tree_view; diff --git a/src/arguments.c b/src/arguments.c index bd35b7f..8b81b0c 100644 --- a/src/arguments.c +++ b/src/arguments.c @@ -14,6 +14,7 @@ #define KEY_CASE_SENSITIVE ( ( int )'c' ) #define KEY_DEPTH ( ( int )'d' ) #define KEY_GROUP_DIRECTORIES ( ( int )'g' ) +#define KEY_HELP ( ( int )'h' ) #define KEY_LONG_VIEW ( ( int )'l' ) #define KEY_PERMISSIONS ( ( int )'p' ) #define KEY_REVERSE_ORDER ( ( int )'r' ) @@ -83,6 +84,14 @@ static struct argp_option options[] = .doc = "group directories at the top", .group = 0 }, + { + .name = NULL, + .key = KEY_HELP, + .arg = NULL, + .flags = 0, + .doc = "display help", + .group = 0 + }, { .name = "long", .key = KEY_LONG_VIEW, @@ -147,6 +156,7 @@ void initialise_args( arguments_t* arguments ) arguments->depth = MAX_TREE_DEPTH; arguments->no_colour = false; arguments->group_directories = false; + arguments->display_help = false; arguments->long_view = false; arguments->reverse_order = false; arguments->tree_view = false; @@ -155,6 +165,7 @@ void initialise_args( arguments_t* arguments ) arguments->path = "."; } + error_t parse_args( int argc, char** argv, arguments_t* arguments ) { int arg_index = 0; @@ -164,6 +175,11 @@ error_t parse_args( int argc, char** argv, arguments_t* arguments ) log_error( "error! arg_index = %d;", arg_index ); } + if ( arguments->display_help ) + { + argp_help( &parser, stdout, ARGP_HELP_STD_HELP, argv[ 0 ] ); + } + return 0; } @@ -200,6 +216,9 @@ static error_t arg_parser( int key, char* arg, struct argp_state* state ) case KEY_GROUP_DIRECTORIES: arguments->group_directories = true; break; + case KEY_HELP: + arguments->display_help = true; + break; case KEY_LONG_VIEW: arguments->long_view = true; break; diff --git a/src/main.c b/src/main.c index 2114a80..e0ac8a5 100644 --- a/src/main.c +++ b/src/main.c @@ -62,6 +62,9 @@ int main( int argc, char** argv ) initialise_args( &args ); parse_args( argc, argv, &args ); + if ( args.display_help ) + return SUCCESS; + DIR* directory = opendir( args.path ); if ( !directory )