diff --git a/src/main.c b/src/main.c index 6b04ab1..9045983 100644 --- a/src/main.c +++ b/src/main.c @@ -25,12 +25,20 @@ #define LENGTH_SIZE ( ( size_t )9 ) // constant declarations -char permission_characters[] = { 'x', 'w', 'r' }; -char size_characters[] = { 'B', 'k', 'M', 'G', 'T', 'P' }; +static char permission_characters[] = { 'x', 'w', 'r' }; +static char size_characters[] = { 'B', 'k', 'M', 'G', 'T', 'P' }; // function prototypes -static int permissions_to_string( mode_t permissions, char* string ); -static int mask_permissions( mode_t file_mode ); +static int permissions_to_string( + const arguments_t* const args, + mode_t permissions, + char* string +); +static void size_to_string( + directory_entry_t* entry, + char* file_size, + size_t length +); static int count_entries( DIR* directory, const arguments_t* const args ); static int get_entries( DIR* directory, @@ -173,32 +181,52 @@ int get_entries( return ( int )entry_count; } -int mask_permissions( mode_t file_mode ) -{ - return file_mode & ( S_IRWXU | S_IRWXG | S_IRWXO ); -} - -int permissions_to_string( mode_t file_mode, char* string ) +int permissions_to_string( + const arguments_t* const args, + mode_t file_mode, + char* string +) { if ( !string ) return -EINVAL; + if ( !string ) return -EINVAL; - int n; - int permissions = mask_permissions( file_mode ); + mode_t permissions = file_mode & ( S_IRWXU | S_IRWXG | S_IRWXO ); - for ( n = 0; n < 9; n++ ) + switch ( args->permission_mode ) { - if ( permissions & ( 1 << n ) ) - { - string[ 8 - n ] = permission_characters[ n % 3 ]; - } - else - { - string[ 8 - n ] = '-'; - } + case no_permissions: + string[0] = '\0'; + break; + + case char_permissions: + string[ 0 ] = ' '; + for ( int n = 0; n < 9; n++ ) + { + if ( permissions & ( 1 << n ) ) + { + string[ 9 - n ] = permission_characters[ n % 3 ]; + } + else + { + string[ 9 - n ] = '-'; + } + } + string[ 10 ] = '\0'; + + break; + + case octal_permissions: + snprintf( + &string[ 0 ], + 10, + " %3o", + permissions + ); + break; } - string[ 9 ] = '\0'; return SUCCESS; + } /* check if entry should be displayed @@ -240,7 +268,6 @@ int display_directory_contents( if ( recursion_level > args->depth ) return -EINVAL; char file_type; - int permissions; char file_permissions[LENGTH_PERMISSIONS]; char file_size[LENGTH_SIZE]; int ret; @@ -301,77 +328,13 @@ int display_directory_contents( file_type = 's'; break; } - switch ( args->permission_mode ) - { - case no_permissions: - file_permissions[0] = '\0'; - break; - case char_permissions: - file_permissions[0] = ' '; - permissions_to_string( - entry->stats.st_mode, - &file_permissions[1] - ); - break; - - case octal_permissions: - permissions = mask_permissions( - entry->stats.st_mode - ); - snprintf( - &file_permissions[ 0 ], - 10, - " %3o", - permissions - ); - break; - } - - char size_quantifier = '\0'; - double size_format = ( float )entry->stats.st_size; - if ( entry->stats.st_mode & S_IFREG - || entry->stats.st_mode & S_IFCHR ) - { - for ( int k = 0; k < ( int )sizeof( size_characters ); k++ ) - { - if ( 1000.0f > size_format ) - { - size_quantifier = size_characters[ k ]; - break; - } - size_format /= 1000.0f; - } - - if ( 10.0 > size_format ) - { - snprintf( - &file_size[ 0 ], - LENGTH_SIZE, - " %1.1f%c", - size_format, - size_quantifier - ); - } - else - { - snprintf( - &file_size[ 0 ], - LENGTH_SIZE, - " %3.0f%c", - size_format, - size_quantifier - ); - } - } - else - { - snprintf( - &file_size[ 0 ], - LENGTH_SIZE, - " -" - ); - } + ( void )permissions_to_string( + args, + entry->stats.st_mode, + file_permissions + ); + size_to_string( entry, &file_size[ 0 ], LENGTH_SIZE ); if ( !args->tree_view ) { @@ -452,3 +415,55 @@ int display_directory_contents( return SUCCESS; } + +void size_to_string( + directory_entry_t* entry, + char* file_size, + size_t length +) +{ + char size_quantifier = '\0'; + double size_format = ( float )entry->stats.st_size; + if ( entry->stats.st_mode & S_IFREG + || entry->stats.st_mode & S_IFCHR ) + { + for ( int k = 0; k < ( int )sizeof( size_characters ); k++ ) + { + if ( 1000.0f > size_format ) + { + size_quantifier = size_characters[ k ]; + break; + } + size_format /= 1000.0f; + } + + if ( 10.0 > size_format ) + { + snprintf( + &file_size[ 0 ], + length, + " %1.1f%c", + size_format, + size_quantifier + ); + } + else + { + snprintf( + &file_size[ 0 ], + length, + " %3.0f%c", + size_format, + size_quantifier + ); + } + } + else + { + snprintf( + &file_size[ 0 ], + length, + " -" + ); + } +}