GreekStapler
/
libvieter
forked from vieter-v/libvieter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: GreekStapler:655daff4851acd04c1d1d9e48b0bb8f3b1e21d95
Branches Tags
GreekStapler:package
GreekStapler:dev
GreekStapler:main
vieter-v:dev
vieter-v:main
..
compare: GreekStapler:031e28ed33e63c695ac1bfb5d65df57120469026
Branches Tags
GreekStapler:package
GreekStapler:dev
GreekStapler:main
vieter-v:dev
vieter-v:main

No commits in common. "655daff4851acd04c1d1d9e48b0bb8f3b1e21d95" and "031e28ed33e63c695ac1bfb5d65df57120469026" have entirely different histories.
655daff485 ... 031e28ed33

7 changed files with 294 additions and 313 deletions
Show Stats Expand all files Collapse all files

14
Makefile
View File

@ -6,20 +6,15 @@ LIB_FILENAME ?= libvieter.a
BUILD_DIR ?= build
SRC_DIR ?= src
TEST_DIR ?= test
3RDPARTY_DIR ?= thirdparty
INCLUDE_DIR ?= include
INC_DIRS ?= include
INC_DIRS ?= $(INCLUDE_DIR) $(3RDPARTY_DIR)/include
LIB := $(BUILD_DIR)/$(LIB_FILENAME)
SRCS != find '$(SRC_DIR)' -iname '*.c'
SRCS_H != find $(INCLUDE_DIR) -iname '*.h'
SRCS_H != find $(INC_DIRS) -iname '*.h'
SRCS_TEST != find '$(TEST_DIR)' -iname '*.c'
SRCS_3RDPARTY != find '$(3RDPARTY_DIR)/src' -iname '*.c'
$(info ${SRCS})
OBJS := $(SRCS:%=$(BUILD_DIR)/%.o) $(SRCS_3RDPARTY:%=$(BUILD_DIR)/%.o)
OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
OBJS_TEST := $(SRCS_TEST:%=$(BUILD_DIR)/%.o)
DEPS := $(SRCS:%=$(BUILD_DIR)/%.d) $(SRCS_TEST:%=$(BUILD_DIR)/%.d)
@ -56,9 +51,6 @@ $(BUILD_DIR)/$(SRC_DIR)/%.c.o: $(SRC_DIR)/%.c
mkdir -p $(dir $@)
$(CC) $(VIETERCFLAGS) -c $< -o $@
$(BUILD_DIR)/$(3RDPARTY_DIR)/src/%.c.o: $(3RDPARTY_DIR)/src/%.c
mkdir -p $(dir $@)
$(CC) $(VIETERCFLAGS) -c $< -o $@
# =====TESTING=====
.PHONY: test

5
include/vieter_package.h
View File

@ -17,13 +17,12 @@ vieter_package *vieter_package_init();
/*
* Parse package file into something usable by libvieter.
*/
vieter_package_error vieter_package_read_archive(vieter_package *pkg,
const char *pkg_path);
vieter_package_error vieter_package_read_archive(vieter_package *pkg, const char *pkg_path);
/*
* Deallocate a package.
*/
void vieter_package_free(vieter_package **ptp);
void vieter_package_free(vieter_package ** ptp);
/*
* Create string that will become the package's desc file.

0
thirdparty/src/sha256.c → src/package/sha256.c
View File

0
thirdparty/include/sha256.h → src/package/sha256.h
View File

65
src/package/vieter_package.c
View File

@ -1,15 +1,13 @@
#include <stdlib.h>
#include <stdbool.h>
#include <archive.h>
#include <archive_entry.h>
#include <stdbool.h>
#include <stdlib.h>
#include "sha256.h"
#include "vieter_package_internal.h"
#include "sha256.h"
#define ADD_STRING(section, field) \
if (pkg_info->field != 0) { \
size_to_be_written = \
snprintf(aux, small_buff_size, section, pkg_info->field); \
#define ADD_STRING(section, field) if (pkg_info->field != 0) { \
size_to_be_written = snprintf(aux, small_buff_size, section, pkg_info->field); \
if (size_to_be_written > small_buff_size) { \
aux = realloc(aux, size_to_be_written + 1); \
small_buff_size = size_to_be_written + 1; \
@ -20,29 +18,29 @@
buff_size *= 2; \
} \
strcat(description, aux); \
}
}
#define ADD_ARRAY(section, field) \
i = 0; \
if (pkg_info->field != NULL) { \
ADD_STRING(section, field->array[i]); \
i++; \
#define ADD_ARRAY(section, field) i = 0; if (pkg_info->field != NULL) { \
ADD_STRING(section, field->array[i]); i++; \
while (pkg_info->field->array[i] != NULL) { \
ADD_STRING("\n%s", field->array[i]); \
i++; \
ADD_STRING("\n%s", field->array[i]); i++; \
} \
}
}
static char *ignored_names[5] = {".BUILDINFO", ".INSTALL", ".MTREE", ".PKGINFO",
".CHANGELOG"};
static char *ignored_names[5] = {
".BUILDINFO",
".INSTALL",
".MTREE",
".PKGINFO",
".CHANGELOG"
};
static size_t ignored_words_len = sizeof(ignored_names) / sizeof(char *);
vieter_package *vieter_package_init() {
return calloc(sizeof(vieter_package_info), 1);
}
vieter_package_error vieter_package_read_archive(vieter_package *pkg,
const char *pkg_path) {
vieter_package_error vieter_package_read_archive(vieter_package *pkg, const char *pkg_path) {
struct archive *a = archive_read_new();
struct archive_entry *entry = archive_entry_new();
@ -143,10 +141,10 @@ void vieter_package_sha256sum(vieter_package *pkg, char *res) {
free(in);
free(ctx);
// We need to convert the bytes in the hash to get a string representation of
// its hex values i.e. turn 1001 1111 into the string "9f" Each byte of the
// hash is going to turn into two bytes in the final string so we are going to
// convert each half byte into a char
// We need to convert the bytes in the hash to get a string representation of its hex values
// i.e. turn 1001 1111 into the string "9f"
// Each byte of the hash is going to turn into two bytes in the final string
// so we are going to convert each half byte into a char
unsigned int half_byte = 0;
int j = 0;
@ -156,9 +154,9 @@ void vieter_package_sha256sum(vieter_package *pkg, char *res) {
// each byte from becoming reversed in the final string
half_byte = hash[i] & 0b1111;
if (half_byte < 10) {
res[j + 1] = half_byte + 48;
res[j+1] = half_byte + 48;
} else {
res[j + 1] = half_byte + 87;
res[j+1] = half_byte + 87;
}
hash[i] = hash[i] >> 4;
half_byte = hash[i] & 0b1111;
@ -173,6 +171,8 @@ void vieter_package_sha256sum(vieter_package *pkg, char *res) {
res[j] = '\0';
}
char *vieter_package_to_description(vieter_package *pkg) {
vieter_package_info *pkg_info = pkg->info;
@ -185,19 +185,17 @@ char *vieter_package_to_description(vieter_package *pkg) {
int i;
// special case for FILENAME
// assuming .pkg.tar.zst; other formats are valid, this should account for
// that
size_to_be_written =
snprintf(aux, small_buff_size, "%%FILENAME%%\n%s-%s-%s.pkg.tar.zst",
pkg_info->name, pkg_info->version, pkg_info->arch);
// assuming .pkg.tar.zst; other formats are valid, this should account for that
size_to_be_written = snprintf(aux, small_buff_size, "%%FILENAME%%\n%s-%s-%s.pkg.tar.zst", pkg_info->name,
pkg_info->version, pkg_info->arch);
// We neither want to let an arbritrarily long input to overflow the buffer
// nor to truncate perfectly valid inputs
if (size_to_be_written > small_buff_size) {
aux = realloc(aux, size_to_be_written + 1);
small_buff_size = size_to_be_written + 1;
snprintf(aux, small_buff_size, "%%FILENAME%%\n%s-%s-%s.pkg.tar.zst",
pkg_info->name, pkg_info->version, pkg_info->arch);
snprintf(aux, small_buff_size, "%%FILENAME%%\n%s-%s-%s.pkg.tar.zst", pkg_info->name,
pkg_info->version, pkg_info->arch);
}
strcpy(description, aux);
@ -243,4 +241,5 @@ void vieter_package_free(vieter_package **ptp) {
vieter_package_dynarray_free((*ptp)->files);
free(*ptp);
*ptp = NULL;
}

14
src/package/vieter_package_dynarray.c
View File

@ -9,23 +9,21 @@ vieter_package_dynarray *vieter_package_dynarray_init(size_t initial_capacity) {
}
void vieter_package_dynarray_add(vieter_package_dynarray *da, const char *s) {
// An empty vieter_package_dynarray does not have an allocated internal array
// yet
// An empty vieter_package_dynarray does not have an allocated internal array yet
if (da->size == 0) {
da->array = malloc(sizeof(char *) * da->capacity);
da->array = malloc(sizeof(char*) * da->capacity);
// Initialise all char*'s to 0 so array[i] == NULL can be used to see if
// field is empty
memset(da->array, 0, sizeof(char *) * da->capacity);
// Initialise all char*'s to 0 so array[i] == NULL can be used to see if field is empty
memset(da->array, 0, sizeof(char*) * da->capacity);
}
// Double array size if it's full
else if (da->size == da->capacity) {
// if the realloc fails, access to memory in da->array is lost
da->array = realloc(da->array, sizeof(char *) * da->capacity * 2);
da->array = realloc(da->array, sizeof(char*) * da->capacity * 2);
da->capacity *= 2;
// Same as the previous memset, but only for newly allocated pointers
memset(da->array + da->size, 0, sizeof(char *) * da->capacity / 2);
memset(da->array + da->size, 0, sizeof(char*) * da->capacity / 2);
}
da->array[da->size] = strdup(s);

33
src/package/vieter_package_info.c
View File

@ -2,37 +2,30 @@
#include "vieter_package_info.h"
#define PKG_INFO_STRING(key_ptr, field) \
if ((value_ptr = strstr(value_ptr, key_ptr)) != NULL) { \
value_ptr += strlen(key_ptr); \
tail_ptr = strchr(value_ptr, '\n'); \
#define PKG_INFO_STRING(key_ptr, field) if ((value_ptr = strstr(value_ptr, key_ptr)) != NULL) { \
value_ptr += strlen(key_ptr);\
tail_ptr = strchr(value_ptr, '\n');\
tail_ptr[0] = '\0'; \
pkg_info->field = strdup(value_ptr); \
tail_ptr[0] = '\n'; \
} \
value_ptr = tail_ptr;
} value_ptr = tail_ptr;
#define PKG_INFO_INT(key_ptr, field) \
value_ptr = strstr(value_ptr, key_ptr) + strlen(key_ptr); \
tail_ptr = strchr(value_ptr, '\n'); \
#define PKG_INFO_INT(key_ptr, field) value_ptr = strstr(value_ptr, key_ptr) + strlen(key_ptr);\
tail_ptr = strchr(value_ptr, '\n');\
tail_ptr[0] = '\0'; \
pkg_info->field = atoi(value_ptr); \
tail_ptr[0] = '\n'; \
value_ptr = tail_ptr;
#define PKG_INFO_ARRAY(key_ptr, field) \
while ((value_ptr = strstr(value_ptr, key_ptr)) != NULL) { \
value_ptr = value_ptr + strlen(key_ptr); \
#define PKG_INFO_ARRAY(key_ptr, field) while((value_ptr = strstr(value_ptr, key_ptr)) != NULL){ \
value_ptr = value_ptr + strlen(key_ptr);\
tail_ptr = strchr(value_ptr, '\n'); \
tail_ptr[0] = '\0'; \
if (pkg_info->field == NULL) { \
pkg_info->field = vieter_package_dynarray_init(4); \
} \
if(pkg_info->field == NULL) { pkg_info->field = vieter_package_dynarray_init(4); } \
vieter_package_dynarray_add(pkg_info->field, value_ptr); \
tail_ptr[0] = '\n'; \
value_ptr = tail_ptr; \
} \
value_ptr = tail_ptr;
value_ptr = tail_ptr;\
} value_ptr = tail_ptr;
vieter_package_info *vieter_package_info_init() {
return calloc(1, sizeof(vieter_package_info));
@ -61,8 +54,7 @@ void vieter_package_info_free(vieter_package_info *pkg_info) {
free(pkg_info);
}
void vieter_package_info_parse(vieter_package_info *pkg_info,
char *pkg_info_str) {
void vieter_package_info_parse(vieter_package_info *pkg_info, char *pkg_info_str) {
char *value_ptr = pkg_info_str, *tail_ptr;
PKG_INFO_STRING("\npkgname = ", name);
@ -83,4 +75,5 @@ void vieter_package_info_parse(vieter_package_info *pkg_info,
PKG_INFO_ARRAY("\noptdepend = ", optdepends);
PKG_INFO_ARRAY("\nmakedepend = ", makedepends);
PKG_INFO_ARRAY("\ncheckdepend = ", checkdepends);
}