implemented sorting by extension

This commit is contained in:
root committed 2026-07-21 23:04:43 +02:00
1 parent cdfa9fec4e
commit b81dcc10ac
4 files changed
+134 -78

No files matched your search

+87 -34
View File
@@ -19,8 +19,13 @@
#include "type_definitions.h"
#include "sorting.h"
// macro definitions
#define LENGTH_PERMISSIONS ( ( size_t )11 )
#define LENGTH_SIZE ( ( size_t )9 )
// constant declarations
char permission_characters[3] = { 'x', 'w', 'r' };
char permission_characters[] = { 'x', 'w', 'r' };
char size_characters[] = { 'B', 'k', 'M', 'G', 'T', 'P' };
// function prototypes
int permissions_to_string( mode_t permissions, char* string );
@@ -38,8 +43,10 @@ int is_entry_visible( arguments_t* args, char* entry_name );
int main( int argc, char** argv )
{
arguments_t args;
char file_type;
int permissions;
char permissions_string[10];
char file_permissions[LENGTH_PERMISSIONS];
char file_size[LENGTH_SIZE];
int ret;
// TODO: free memory before exiting on error!
@@ -86,65 +93,111 @@ int main( int argc, char** argv )
for ( int n = 0; n < num_entries; n++ )
{
char* file_type;
switch ( entry_table[ n ]->stats.st_mode & S_IFMT )
directory_entry_t* entry = entry_table[ n ];
switch ( entry->stats.st_mode & S_IFMT )
{
case S_IFBLK:
file_type = "b";
file_type = 'b';
break;
case S_IFCHR:
file_type = "c";
file_type = 'c';
break;
case S_IFDIR:
file_type = "d";
file_type = 'd';
break;
case S_IFIFO:
file_type = "f";
file_type = 'f';
break;
case S_IFLNK:
file_type = "l";
file_type = 'l';
break;
case S_IFREG:
file_type = " ";
file_type = ' ';
break;
case S_IFSOCK:
file_type = "s";
file_type = 's';
break;
}
switch ( args.permission_mode )
{
case no_permissions:
log_info(
"%s %s",
file_type,
entry_table[ n ]->name
);
file_permissions[0] = '\0';
break;
case char_permissions:
file_permissions[0] = ' ';
permissions_to_string(
entry_table[ n ]->stats.st_mode,
permissions_string
);
log_info(
"%s %s %s",
file_type,
permissions_string,
entry_table[ n ]->name
);
entry->stats.st_mode,
&file_permissions[1]
);
break;
case octal_permissions:
permissions =
mask_permissions( entry_table[ n ]->stats.st_mode );
log_info(
"%s %o %s",
file_type,
permissions,
entry_table[ n ]->name
);
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,
" -"
);
}
log_info(
"%c%s%s %s",
file_type,
file_permissions,
file_size,
entry->name
);
}
// free all allocated elements/entries
@@ -224,7 +277,7 @@ int get_entries(
if ( lstat( full_path, &file_stats ) ) return -EIO;
strncpy( new_entry->name, entry->d_name, NAME_MAX );
new_entry->stats.st_mode = file_stats.st_mode;
new_entry->stats = file_stats;
entry_table[entry_count] = new_entry;