fix clang tidy et format

This commit is contained in:
Gu://em_ 2026-04-08 20:09:28 +02:00
parent 1e79def699
commit 8ec0d9a4ee
7 changed files with 59 additions and 58 deletions

View file

@ -3,6 +3,52 @@
#include "utils/config.h" #include "utils/config.h"
#include "utils/errors.h" #include "utils/errors.h"
static int handle_err_code(enum error_code err, struct config *config)
{
int ret_code = 0;
switch (err)
{
case SUCCESS:
ret_code = 0;
break;
// case UNKNOWN_ERROR:
// printf("epitar: error extracting tarball %s\n",
// config.archive_file); ret_code = 3; break;
case BAD_CHECKSUM:
puts("epitar: bad checksum");
ret_code = 2;
break;
case NOT_IMPLEMENTED:
puts("epitar: Function not implemented");
ret_code = 2;
break;
case FILE_NOT_FOUND:
if (config->mode == ARCHIVE)
{
// Rest of code should have printed the first part of the line
printf(" to tarball %s\n", config->archive_file);
ret_code = 3;
break;
}
__attribute__((fallthrough));
case EMPTY_ARCHIVE:
puts("epitar: cowardly refusing to create an empty archive");
ret_code = 1;
break;
default:
printf("epitar: error extracting tarball %s\n", config->archive_file);
ret_code = 3;
break;
}
return ret_code;
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
// Handle args // Handle args
@ -32,48 +78,7 @@ int main(int argc, char **argv)
err = archive(config.archive_file, config.input_files, config.verbose); err = archive(config.archive_file, config.input_files, config.verbose);
} }
int ret_code = 0; int ret_code = handle_err_code(err, &config);
switch (err)
{
case SUCCESS:
ret_code = 0;
break;
// case UNKNOWN_ERROR:
// printf("epitar: error extracting tarball %s\n",
// config.archive_file); ret_code = 3; break;
case BAD_CHECKSUM:
puts("epitar: bad checksum");
ret_code = 2;
break;
case NOT_IMPLEMENTED:
puts("epitar: Function not implemented");
ret_code = 2;
break;
case FILE_NOT_FOUND:
if (config.mode == ARCHIVE)
{
// Rest of code should have printed the first part of the line
printf(" to tarball %s\n", config.archive_file);
ret_code = 3;
break;
}
__attribute__((fallthrough));
case EMPTY_ARCHIVE:
puts("epitar: cowardly refusing to create an empty archive");
ret_code = 1;
break;
default:
printf("epitar: error extracting tarball %s\n", config.archive_file);
ret_code = 3;
break;
}
destroy_config(&config); destroy_config(&config);
return ret_code; return ret_code;
} }

View file

@ -1,10 +1,10 @@
#ifndef ARCHIVE_H #ifndef ARCHIVE_H
#define ARCHIVE_H #define ARCHIVE_H
#include "../utils/errors.h"
#include <stdbool.h> #include <stdbool.h>
#include "../utils/errors.h"
/* @brief Archives the listed `files` into `archive_name` /* @brief Archives the listed `files` into `archive_name`
* @return 0 on success, the corresponding error code otherwise * @return 0 on success, the corresponding error code otherwise
*/ */

View file

@ -49,9 +49,14 @@ static enum error_code extract_ustar(FILE *stream, struct ustar_header *header)
static enum error_code extract_unixtar(FILE *stream, static enum error_code extract_unixtar(FILE *stream,
struct unixtar_header *header) struct unixtar_header *header)
{ {
(void)stream; struct file_stats stats = { .name = header->name,
(void)header; .length = strtol(header->size, NULL, 8),
return NOT_IMPLEMENTED; .content_stream = stream,
.mode = header->mode,
.uid = header->uid,
.gid = header->gid,
.mtime = header->mtime };
return create_file(&stats);
} }
/** /**

View file

@ -180,7 +180,7 @@ char *listdirectory(char *path)
return de->d_name; return de->d_name;
} }
void freedirectory() void freedirectory(void)
{ {
if (current_dir != NULL) if (current_dir != NULL)
{ {

View file

@ -59,6 +59,6 @@ char *listdirectory(char *path);
* related allocated memory * related allocated memory
* @warn Use this function if you only partially listed a directory previously. * @warn Use this function if you only partially listed a directory previously.
*/ */
void freedirectory(); void freedirectory(void);
#endif // FILESYSTEM_H #endif // FILESYSTEM_H

View file

@ -1,3 +0,0 @@
#include "utils.h"
#include <stdio.h>

View file

@ -1,6 +0,0 @@
#ifndef MISC_H
#define MISC_H
void print_str_array(const char **input_files);
#endif /* MISC_H */