tech/tanabata
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): some significant fixes

Browse Source
This commit is contained in:
Masahiko AMANO
2022-12-22 17:02:23 +03:00
parent 4b6c328198
commit 3660e2eb44
4 changed files with 68 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/sasahyou.c
+28 -50
View File
@@ -1,13 +1,12 @@
#include <malloc.h>
#include <string.h>
#include <time.h>
#include <sys/stat.h>
#include <stdio.h>
#include "../../include/core.h"
int sasahyou_init(Sasahyou *sasahyou) {
sasahyou->created_ts = time(NULL);;
sasahyou->created_ts = time(NULL);
sasahyou->modified_ts = sasahyou->created_ts;
sasahyou->size = 0;
sasahyou->removed_cnt = 0;
@@ -27,24 +26,6 @@ int sasahyou_free(Sasahyou *sasahyou) {
return 0;
}
int sasahyou_weed(Sasahyou *sasahyou) {
if (sasahyou->removed_cnt == 0) {
return 0;
}
uint64_t weeded_size = sasahyou->size - sasahyou->removed_cnt;
for (uint64_t i = 0, count = 0; i < sasahyou->size; i++) {
if (sasahyou->contents[i].id != 0) {
sasahyou->contents[i - count] = sasahyou->contents[i];
} else {
count++;
}
}
sasahyou->size = weeded_size;
sasahyou->removed_cnt = 0;
sasahyou->contents = realloc(sasahyou->contents, sasahyou->size * sizeof(Sasa));
return 0;
}
int sasahyou_load(Sasahyou *sasahyou) {
if (sasahyou->file == NULL) {
fprintf(stderr, "Failed to load sasahyou: file not specified\n");
@@ -64,9 +45,14 @@ int sasahyou_load(Sasahyou *sasahyou) {
sasahyou->contents = malloc(sasahyou->size * sizeof(Sasa));
size_t max_path_len = SIZE_MAX;
for (uint64_t i = 0; i < sasahyou->size; i++) {
fread(&sasahyou->contents[i].id, 8, 1, sasahyou->file);
fread(&sasahyou->contents[i].created_ts, 8, 1, sasahyou->file);
getdelim(&sasahyou->contents[i].path, &max_path_len, 0, sasahyou->file);
if (fgetc(sasahyou->file) != 0) {
sasahyou->contents[i].id = i + 1;
fread(&sasahyou->contents[i].created_ts, 8, 1, sasahyou->file);
getdelim(&sasahyou->contents[i].path, &max_path_len, 0, sasahyou->file);
} else {
sasahyou->contents[i].id = 0;
sasahyou->removed_cnt++;
}
}
return 0;
}
@@ -76,10 +62,6 @@ int sasahyou_save(Sasahyou *sasahyou) {
fprintf(stderr, "Failed to save sasahyou: file not specified\n");
return 1;
}
if (sasahyou_weed(sasahyou) != 0) {
fprintf(stderr, "Failed to save sasahyou: failed to weed sasahyou\n");
return 1;
}
rewind(sasahyou->file);
fwrite(SASAHYOU_SIG, 2, 4, sasahyou->file);
fwrite(&sasahyou->created_ts, 8, 1, sasahyou->file);
@@ -87,9 +69,14 @@ int sasahyou_save(Sasahyou *sasahyou) {
fwrite(&sasahyou->size, 8, 1, sasahyou->file);
fflush(sasahyou->file);
for (uint64_t i = 0; i < sasahyou->size; i++) {
fwrite(&sasahyou->contents[i].id, 8, 1, sasahyou->file);
fwrite(&sasahyou->contents[i].created_ts, 8, 1, sasahyou->file);
fwrite(sasahyou->contents[i].path, 1, strlen(sasahyou->contents[i].path) + 1, sasahyou->file);
if (sasahyou->contents[i].id != 0) {
fputc(-1, sasahyou->file);
fwrite(&sasahyou->contents[i].created_ts, 8, 1, sasahyou->file);
fputs(sasahyou->contents[i].path, sasahyou->file);
fputc(0, sasahyou->file);
} else {
fputc(0, sasahyou->file);
}
}
fflush(sasahyou->file);
return 0;
@@ -118,17 +105,6 @@ int sasa_add(Sasahyou *sasahyou, const char *path) {
fprintf(stderr, "Failed to add sasa: sasahyou is full\n");
return 1;
}
for (uint64_t i = 0; i < sasahyou->size; i++) {
if (strcmp(path, sasahyou->contents[i].path) == 0) {
fprintf(stderr, "Failed to add sasa: file '%s' is already listed\n", path);
return 1;
}
}
struct stat st;
if (stat(path, &st) != 0) {
fprintf(stderr, "Failed to add sasa: invalid path '%s'\n", path);
return 1;
}
Sasa newbie;
newbie.created_ts = (uint64_t) time(NULL);
size_t path_size = strlen(path);
@@ -144,18 +120,20 @@ int sasa_add(Sasahyou *sasahyou, const char *path) {
}
int sasa_rem_by_id(Sasahyou *sasahyou, uint64_t sasa_id) {
if (sasa_id > sasahyou->size) {
fprintf(stderr, "Failed to remove sasa: target sasa does not exist\n");
if (sasa_id == 0) {
fprintf(stderr, "Failed to remove sasa: got zero ID\n");
return 1;
}
if (sasahyou->contents[sasa_id - 1].id == 0) {
fprintf(stderr, "Failed to remove sasa: target sasa is already removed\n");
return 1;
for (uint64_t i = 0; i < sasahyou->size; i++) {
if (sasahyou->contents[i].id == sasa_id) {
sasahyou->modified_ts = time(NULL);
sasahyou->contents[i].id = 0;
sasahyou->removed_cnt++;
return 0;
}
}
sasahyou->contents[sasa_id - 1].id = 0;
sasahyou->removed_cnt++;
sasahyou->modified_ts = time(NULL);
return 0;
fprintf(stderr, "Failed to remove sasa: target sasa does not exist\n");
return 1;
}
int sasa_rem_by_path(Sasahyou *sasahyou, const char *path) {