tAdd proper support for RedType '+' items. - sacc - sacc(omys), simple console gopher client (mirror)
HTML git clone https://git.parazyd.org/sacc
DIR Log
DIR Files
DIR Refs
DIR LICENSE
---
DIR commit 711ff51a2e198b5471b9f372127119530f6bef70
DIR parent 3e0b5be80fdfac3c1ef3ed2e9df4bdbdea5e0091
HTML Author: Quentin Rameau <quinq@fifth.space>
Date: Sun, 25 Mar 2018 19:55:32 +0200
Add proper support for RedType '+' items.
Thanks to tomasino for the suggestion.
Diffstat:
M common.h | 1 +
M sacc.c | 26 +++++++++++++++++---------
2 files changed, 18 insertions(+), 9 deletions(-)
---
DIR diff --git a/common.h b/common.h
t@@ -5,6 +5,7 @@ typedef struct dir Dir;
struct item {
char type;
+ char redtype;
char *username;
char *selector;
char *host;
DIR diff --git a/sacc.c b/sacc.c
t@@ -315,10 +315,10 @@ molditem(Item *item, char **raw)
static Dir *
molddiritem(char *raw)
{
- Item *items = NULL;
+ Item *item, *items = NULL;
char *s, *nl, *p;
Dir *dir;
- size_t i, nitems;
+ size_t i, n, nitems;
for (s = nl = raw, nitems = 0; p = strchr(nl, '\n'); ++nitems) {
s = nl;
t@@ -335,8 +335,18 @@ molddiritem(char *raw)
items = xreallocarray(items, nitems, sizeof(Item));
memset(items, 0, nitems * sizeof(Item));
- for (i = 0; i < nitems; ++i)
- molditem(&items[i], &raw);
+ for (i = 0; i < nitems; ++i) {
+ item = &items[i];
+ molditem(item, &raw);
+ if (item->type == '+') {
+ for (n = i - 1; n < (size_t)-1; --n) {
+ if (items[n].type != '+') {
+ item->redtype = items[n].type;
+ break;
+ }
+ }
+ }
+ }
dir->items = items;
dir->nitems = nitems;
t@@ -622,7 +632,7 @@ dig(Item *entry, Item *item)
if (!item->entry)
item->entry = entry ? entry : item;
- switch (item->type) {
+ switch (item->redtype ? item->redtype : item->type) {
case 'h': /* fallthrough */
if (!strncmp(item->selector, "URL:", 4)) {
plumb(item->selector+4);
t@@ -633,7 +643,6 @@ dig(Item *entry, Item *item)
return 0;
break;
case '1':
- case '+':
case '7':
if (!fetchitem(item) || !(item->dat = molddiritem(item->raw)))
return 0;
t@@ -719,13 +728,12 @@ printout(Item *hole)
if (!hole)
return;
- switch (hole->type) {
+ switch (hole->redtype ? hole->redtype : hole->type) {
case '0':
if (dig(hole, hole))
fputs(hole->raw, stdout);
return;
case '1':
- case '+':
if (dig(hole, hole))
printdir(hole);
default:
t@@ -739,7 +747,7 @@ delve(Item *hole)
Item *entry = NULL;
while (hole) {
- switch (hole->type) {
+ switch (hole->redtype ? hole->redtype : hole->type) {
case 'h':
case '0':
if (dig(entry, hole))