apio/minitar
1
1
Fork 0
Code Issues Pull Requests Releases 15 Activity

Add .clang-format

Browse Source
This commit is contained in:
apio 2022-11-06 11:02:26 +01:00
parent 6e0b65aaa8
commit 6c916ad861
4 changed files with 69 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.clang-format Normal file
View File

@ -0,0 +1,12 @@
---
BasedOnStyle: Microsoft
CompactNamespaces: 'false'
FixNamespaceComments: 'false'
NamespaceIndentation: All
AllowShortBlocksOnASingleLine: 'true'
AllowShortCaseLabelsOnASingleLine: 'true'
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: Always
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: 'true'
PointerAlignment: Left

10
src/tar.c
View File

@ -1,6 +1,6 @@
#include <stdlib.h>
#include "minitar.h"
#include "tar.h" #include "tar.h"
#include "minitar.h"
#include <stdlib.h>
int minitar_read_header(struct minitar* mp, struct tar_header* hdr); int minitar_read_header(struct minitar* mp, struct tar_header* hdr);
int minitar_validate_header(struct tar_header* hdr); int minitar_validate_header(struct tar_header* hdr);
@ -13,7 +13,11 @@ struct minitar* minitar_open(const char* path)
FILE* fp = fopen(path, "rb"); // On some systems, this might be necessary to read the file properly. FILE* fp = fopen(path, "rb"); // On some systems, this might be necessary to read the file properly.
if (!fp) return NULL; if (!fp) return NULL;
struct minitar* mp = malloc(sizeof(struct minitar)); struct minitar* mp = malloc(sizeof(struct minitar));
if(!mp) { fclose(fp); return NULL; } if (!mp)
{
fclose(fp);
return NULL;
}
mp->stream = fp; mp->stream = fp;
return mp; return mp;
} }

3
src/tar.h
View File

@ -1,7 +1,8 @@
#ifndef MINITAR_TAR_H #ifndef MINITAR_TAR_H
#define MINITAR_TAR_H #define MINITAR_TAR_H
struct tar_header { struct tar_header
{
char name[100]; char name[100];
char mode[8]; char mode[8];
char uid[8]; char uid[8];

38
src/util.c
View File

@ -1,11 +1,11 @@
#define _POSIX_C_SOURCE 200809L #define _POSIX_C_SOURCE 200809L
#include "minitar.h"
#include "tar.h"
#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdnoreturn.h> #include <stdnoreturn.h>
#include <stdarg.h>
#include <string.h> #include <string.h>
#include "minitar.h"
#include "tar.h"
noreturn void minitar_panic(const char* message) noreturn void minitar_panic(const char* message)
{ {
@ -19,7 +19,9 @@ void minitar_parse_tar_header(struct tar_header* hdr, struct minitar_entry_metad
{ {
strncpy(metadata->name, hdr->name, 100); strncpy(metadata->name, hdr->name, 100);
metadata->name[100] = '\0'; metadata->name[100] = '\0';
} else { }
else
{
strcpy(metadata->name, hdr->prefix); strcpy(metadata->name, hdr->prefix);
strcat(metadata->name, "/"); strcat(metadata->name, "/");
strncat(metadata->name, hdr->name, 100); strncat(metadata->name, hdr->name, 100);
@ -43,26 +45,14 @@ void minitar_parse_tar_header(struct tar_header* hdr, struct minitar_entry_metad
switch (hdr->typeflag) switch (hdr->typeflag)
{ {
case '\0': case '\0':
case '0': case '0': metadata->type = MTAR_REGULAR; break;
metadata->type = MTAR_REGULAR; case '1': minitar_panic("Links to other files within a tar archive are unsupported");
break; case '2': minitar_panic("Symbolic links are unsupported");
case '1': case '3': metadata->type = MTAR_CHRDEV; break;
minitar_panic("Links to other files within a tar archive are unsupported"); case '4': metadata->type = MTAR_BLKDEV; break;
case '2': case '5': metadata->type = MTAR_DIRECTORY; break;
minitar_panic("Symbolic links are unsupported"); case '6': minitar_panic("FIFOs are unsupported");
case '3': default: minitar_panic("Unknown entry type in tar header");
metadata->type = MTAR_CHRDEV;
break;
case '4':
metadata->type = MTAR_BLKDEV;
break;
case '5':
metadata->type = MTAR_DIRECTORY;
break;
case '6':
minitar_panic("FIFOs are unsupported");
default:
minitar_panic("Unknown entry type in tar header");
} }
strcpy(metadata->uname, hdr->uname); strcpy(metadata->uname, hdr->uname);