From bb0072a6f68bffb4b78f95eb9688c4e8dcbb775c Mon Sep 17 00:00:00 2001 From: zegonix Date: Tue, 6 Oct 2026 22:23:35 +0200 Subject: [PATCH] config config config --- inc/config.h | 6 +++- inc/format.h | 4 +-- src/format.c | 12 ++++--- src/main.c | 90 +++++++++++++++++++++++++++------------------------- 4 files changed, 62 insertions(+), 50 deletions(-) diff --git a/inc/config.h b/inc/config.h index 0498dbb..f0a098d 100644 --- a/inc/config.h +++ b/inc/config.h @@ -10,8 +10,12 @@ #include "format.h" /* -- colour and style configuration */ -#define DIR_STYLE_NUM ( ( int )1 ) +#define DIR_STYLE_NUM ( ( int )1 ) const style_t directory_style[DIR_STYLE_NUM] = { style_bold }; const uint32_t directory_colour = 0x6CA05C; +#define EXEC_STYLE_NUM ( ( int )1 ) +const style_t exec_style[EXEC_STYLE_NUM] = { style_none }; +const uint32_t exec_colour = 0x34AD1F; + #endif diff --git a/inc/format.h b/inc/format.h index 2eb104a..d26bbb6 100644 --- a/inc/format.h +++ b/inc/format.h @@ -18,7 +18,7 @@ /* -- type definitions */ typedef enum { - style_bold = 0u, + style_bold = 0u, style_dim, style_italic, style_underlined, @@ -26,7 +26,7 @@ typedef enum { style_reversed, style_invisible, style_strikethrough, - style_end = NUMBER_STYLES + style_none = NUMBER_STYLES } style_t; diff --git a/src/format.c b/src/format.c index ade72e5..fb95206 100644 --- a/src/format.c +++ b/src/format.c @@ -15,13 +15,17 @@ void format_clear( void ) void format_set_style( const style_t* const styles, uint8_t number ) { - if ( NUMBER_STYLES < number ) - return; + if ( NUMBER_STYLES < number ) return; + if ( style_none == styles[ 0 ] ) return; fprintf( stdout, SEQUENCE_PREFIX ); for ( int n = 0; n < number; n++ ) { style_t style = styles[ n ]; + + if ( style_none <= style ) + continue; + if ( n >= number - 1 ) { fprintf( stdout, "%d", STYLE_SET[ style ] ); @@ -36,8 +40,8 @@ void format_set_style( const style_t* const styles, uint8_t number ) void format_reset_style( const style_t* const styles, uint8_t number ) { - if ( NUMBER_STYLES < number ) - return; + if ( NUMBER_STYLES < number ) return; + if ( style_none == styles[ 0 ] ) return; fprintf( stdout, SEQUENCE_PREFIX ); for ( int n = 0; n < number; n++ ) diff --git a/src/main.c b/src/main.c index d2c1b23..983616e 100644 --- a/src/main.c +++ b/src/main.c @@ -335,25 +335,16 @@ int display_directory_contents( } ( void )permissions_to_string( - args, - entry->stats.st_mode, - file_permissions - ); + args, + entry->stats.st_mode, + file_permissions + ); size_to_string( entry, &file_size[ 0 ], LENGTH_SIZE ); - if ( !args->tree_view ) - { - log_info( - "%c%s%s %s", - file_type, - file_permissions, - file_size, - entry->name - ); - } - else + if ( args->tree_view ) { char tree[ NAME_MAX ] = ""; + for ( size_t k = 0; k < recursion_level; k++ ) { if ( !( is_last & 1 << k ) ) @@ -381,41 +372,54 @@ int display_directory_contents( tree[ 4 * recursion_level + 3 ] = ' '; fprintf( stdout, "%s", tree ); + } - if ( entry->type == type_directory ) - { - format_set_style( directory_style, DIR_STYLE_NUM ); - format_set_fg_colour( directory_colour ); - } - fprintf( stdout, "%s", entry->name ); - if ( entry->type == type_directory ) - { - format_reset_style( directory_style, DIR_STYLE_NUM ); - format_clear_fg_colour(); - } - fprintf( stdout, "\n" ); + if ( entry->type == type_directory ) + { + format_set_style( directory_style, DIR_STYLE_NUM ); + format_set_fg_colour( directory_colour ); + } + fprintf( stdout, "%s", entry->name ); + if ( entry->type == type_directory ) + { + format_reset_style( directory_style, DIR_STYLE_NUM ); + format_clear_fg_colour(); + } + fprintf( stdout, "\n" ); - if ( recursion_level < args->depth - && entry->type == type_directory ) + // if ( !args->tree_view ) + // { + // log_info( + // "%c%s%s %s", + // file_type, + // file_permissions, + // file_size, + // entry->name + // ); + // } + // else + // { + + if ( recursion_level < args->depth + && entry->type == type_directory ) + { + DIR* subdirectory = opendir(entry->name); + if ( !subdirectory ) { - DIR* subdirectory = opendir(entry->name); - if ( !subdirectory ) - { - log_error( "failed to open directory `%s`", entry->name ); - } - else - { - chdir( entry->name ); - // TODO: handle return code - display_directory_contents( + log_error( "failed to open directory `%s`", entry->name ); + } + else + { + chdir( entry->name ); + // TODO: handle return code + display_directory_contents( args, subdirectory, recursion_level + 1, is_last | (size_t)( num_entries == n + 1 ) << recursion_level - ); - closedir( subdirectory ); - chdir( ".." ); - } + ); + closedir( subdirectory ); + chdir( ".." ); } } }