H1K0-dev/tanabata
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(lib): fix sasa add and remove functions

Browse Source
This commit is contained in:
Masahiko AMANO 2022-12-29 17:32:00 +03:00
parent 12424fb995
commit 60f44fb82f
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/sasa.c
View File

@ -7,19 +7,19 @@ int tanabata_sasa_add(Tanabata *tanabata, const char *path) {
if (path == NULL || tanabata->sasahyou.size == -1 && tanabata->sasahyou.hole_cnt == 0) { if (path == NULL || tanabata->sasahyou.size == -1 && tanabata->sasahyou.hole_cnt == 0) {
return 1; return 1;
} }
char *abspath = NULL;
abspath = realpath(path, abspath);
if (abspath == NULL) {
return 1;
}
Sasa *current_sasa = tanabata->sasahyou.database; Sasa *current_sasa = tanabata->sasahyou.database;
for (uint64_t i = 0; i < tanabata->sasahyou.size; i++) { for (uint64_t i = 0; i < tanabata->sasahyou.size; i++) {
if (current_sasa->id != HOLE_ID && strcmp(current_sasa->path, path) == 0) { if (current_sasa->id != HOLE_ID && strcmp(current_sasa->path, abspath) == 0) {
return 1; return 1;
} }
current_sasa++; current_sasa++;
} }
char *abspath = NULL; return sasa_add(&tanabata->sasahyou, abspath);
abspath = realpath(path, abspath);
if (abspath != NULL) {
return sasa_add(&tanabata->sasahyou, abspath);
}
return 1;
} }
int tanabata_sasa_rem_by_id(Tanabata *tanabata, uint64_t sasa_id) { int tanabata_sasa_rem_by_id(Tanabata *tanabata, uint64_t sasa_id) {
@ -37,9 +37,14 @@ int tanabata_sasa_rem_by_path(Tanabata *tanabata, const char *path) {
if (path == NULL) { if (path == NULL) {
return 1; return 1;
} }
char *abspath = NULL;
abspath = realpath(path, abspath);
if (abspath == NULL) {
return 1;
}
Sasa *current_sasa = tanabata->sasahyou.database; Sasa *current_sasa = tanabata->sasahyou.database;
for (uint64_t i = 0; i < tanabata->sasahyou.size; i++) { for (uint64_t i = 0; i < tanabata->sasahyou.size; i++) {
if (current_sasa->id != HOLE_ID && strcmp(current_sasa->path, path) == 0) { if (current_sasa->id != HOLE_ID && strcmp(current_sasa->path, abspath) == 0) {
if (sasa_rem(&tanabata->sasahyou, current_sasa->id) == 0 && if (sasa_rem(&tanabata->sasahyou, current_sasa->id) == 0 &&
kazari_rem_by_sasa(&tanabata->shoppyou, current_sasa->id) == 0) { kazari_rem_by_sasa(&tanabata->shoppyou, current_sasa->id) == 0) {
return 0; return 0;