monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-25 14:35:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some tweaks to the new listfile functions.

Browse source
This commit is contained in:
default 2022-11-23 20:25:57 +01:00
parent 7f458f4fd6
commit 1bd69bc611
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
data.c
View file

@ -324,17 +324,18 @@ int listfile_del_md5(const char *fn, const char *md5)
flock(fileno(i), LOCK_EX); flock(fileno(i), LOCK_EX);
xs *nfn = xs_fmt("%s.new", fn); xs *nfn = xs_fmt("%s.new", fn);
char line[32 + 1]; char line[256];
if ((o = fopen(nfn, "w")) != NULL) { if ((o = fopen(nfn, "w")) != NULL) {
while (fgets(line, sizeof(line), i) != NULL) { while (fgets(line, sizeof(line), i) != NULL) {
line[32] = '\0';
if (memcmp(line, md5, 32) != 0) if (memcmp(line, md5, 32) != 0)
fwrite(line, sizeof(line), 1, o); fprintf(o, "%s\n", line);
} }
fclose(o); fclose(o);
xs *ofn = xs_fmt("%s.old", fn); xs *ofn = xs_fmt("%s.bak", fn);
link(fn, ofn); link(fn, ofn);
rename(nfn, fn); rename(nfn, fn);
@ -354,14 +355,14 @@ int listfile_del_md5(const char *fn, const char *md5)
d_char *listfile_get_n(const char *fn, int max) d_char *listfile_get_n(const char *fn, int max)
/* returns a list */ /* returns a list */
{ {
xs *list = NULL; d_char *list = NULL;
FILE *f; FILE *f;
int n = 0; int n = 0;
if ((f = fopen(fn, "r")) != NULL) { if ((f = fopen(fn, "r")) != NULL) {
flock(fileno(f), LOCK_SH); flock(fileno(f), LOCK_SH);
char line[32 + 1]; char line[256];
list = xs_list_new(); list = xs_list_new();
while (n < max && fgets(line, sizeof(line), f) != NULL) { while (n < max && fgets(line, sizeof(line), f) != NULL) {
@ -380,25 +381,25 @@ d_char *listfile_get_n(const char *fn, int max)
d_char *listfile_get_inv_n(const char *fn, int max) d_char *listfile_get_inv_n(const char *fn, int max)
/* returns a list, inversely */ /* returns a list, inversely */
{ {
xs *list = NULL; d_char *list = NULL;
FILE *f; FILE *f;
int n = 0; int n = 0;
if ((f = fopen(fn, "r")) != NULL) { if ((f = fopen(fn, "r")) != NULL) {
flock(fileno(f), LOCK_SH); flock(fileno(f), LOCK_SH);
char line[32 + 1]; char line[256];
list = xs_list_new(); list = xs_list_new();
/* move to the end minus one entry */ /* move to the end minus one entry */
if (!fseek(f, 0, SEEK_END) && !fseek(f, -sizeof(line), SEEK_SET)) { if (!fseek(f, 0, SEEK_END) && !fseek(f, -33, SEEK_CUR)) {
while (n < max && fgets(line, sizeof(line), f) != NULL) { while (n < max && fgets(line, sizeof(line), f) != NULL) {
line[32] = '\0'; line[32] = '\0';
list = xs_list_append(list, line); list = xs_list_append(list, line);
n++; n++;
/* move backwards 2 entries */ /* move backwards 2 entries */
if (fseek(f, -sizeof(line) * 2, SEEK_SET) == -1) if (fseek(f, -66, SEEK_CUR) == -1)
break; break;
} }
} }