summary refs log tree commit diff
path: root/tab.c
blob: 9a1e478254ea698bffed170ab1981cd94cbb851e (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
/* Copyright (C) 2018  Curtis McEnroe <june@causal.agency>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

#include <err.h>
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>

#include "chat.h"

static struct Entry {
	struct Tag tag;
	char *word;
	struct Entry *prev;
	struct Entry *next;
} *head;

static void prepend(struct Entry *entry) {
	entry->prev = NULL;
	entry->next = head;
	if (head) head->prev = entry;
	head = entry;
}

static void unlink(struct Entry *entry) {
	if (entry->prev) entry->prev->next = entry->next;
	if (entry->next) entry->next->prev = entry->prev;
	if (head == entry) head = entry->next;
}

static void touch(struct Entry *entry) {
	if (head == entry) return;
	unlink(entry);
	prepend(entry);
}

static struct Entry *find(struct Tag tag, const char *word) {
	for (struct Entry *entry = head; entry; entry = entry->next) {
		if (entry->tag.id != tag.id) continue;
		if (strcmp(entry->word, word)) continue;
		return entry;
	}
	return NULL;
}

static void add(struct Tag tag, const char *word) {
	struct Entry *entry = malloc(sizeof(*entry));
	if (!entry) err(EX_OSERR, "malloc");

	entry->tag = tag;
	entry->word = strdup(word);
	if (!entry->word) err(EX_OSERR, "strdup");

	prepend(entry);
}

void tabTouch(struct Tag tag, const char *word) {
	struct Entry *entry = find(tag, word);
	if (entry) {
		touch(entry);
	} else {
		add(tag, word);
	}
}

void tabAdd(struct Tag tag, const char *word) {
	if (!find(tag, word)) add(tag, word);
}

void tabReplace(struct Tag tag, const char *prev, const char *next) {
	struct Entry *entry = find(tag, prev);
	if (!entry) return;
	touch(entry);
	free(entry->word);
	entry->word = strdup(next);
	if (!entry->word) err(EX_OSERR, "strdup");
}

static struct Entry *iter;

void tabRemove(struct Tag tag, const char *word) {
	for (struct Entry *entry = head; entry; entry = entry->next) {
		if (entry->tag.id != tag.id) continue;
		if (strcmp(entry->word, word)) continue;
		if (iter == entry) iter = entry->prev;
		unlink(entry);
		free(entry->word);
		free(entry);
		return;
	}
}

void tabClear(struct Tag tag) {
	for (struct Entry *entry = head; entry; entry = entry->next) {
		if (entry->tag.id != tag.id) continue;
		if (iter == entry) iter = entry->prev;
		unlink(entry);
		free(entry->word);
		free(entry);
	}
}

struct Tag tabTag(const char *word) {
	struct Entry *start = (iter ? iter->next : head);
	for (struct Entry *entry = start; entry; entry = entry->next) {
		if (strcmp(entry->word, word)) continue;
		iter = entry;
		return entry->tag;
	}
	iter = NULL;
	return TagNone;
}

const char *tabNext(struct Tag tag, const char *prefix) {
	size_t len = strlen(prefix);
	struct Entry *start = (iter ? iter->next : head);
	for (struct Entry *entry = start; entry; entry = entry->next) {
		if (entry->tag.id != TagNone.id && entry->tag.id != tag.id) continue;
		if (strncasecmp(entry->word, prefix, len)) continue;
		iter = entry;
		return entry->word;
	}
	if (!iter) return NULL;
	iter = NULL;
	return tabNext(tag, prefix);
}

void tabAccept(void) {
	if (iter) touch(iter);
	iter = NULL;
}

void tabReject(void) {
	iter = NULL;
}
having an > additional zero-length region with nulonly enabled causes confusion. > > Passing quoted by value to varvalue() and not attempting to modify it > should therefore, and in my quick testing does, also work to fix the > original $@ bug. You're right. The proper fix to this is to ensure that nulonly is not set in varvalue for $*. It should only be set for $@ when it's inside double quotes. In fact there is another bug while we're playing with $@/$*. When IFS is set to a non-whitespace character such as :, $* outside quotes won't remove empty fields as it should. This patch fixes both problems. Reported-by: Martijn Dekker <martijn@inlv.org> Suggested-by: Harald van Dijk <harald@gigawatt.nl> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 2018-04-02parser: Allow newlines within parameter substitutionHerbert Xu On Fri, Mar 16, 2018 at 11:27:22AM +0800, Herbert Xu wrote: > On Thu, Mar 15, 2018 at 10:49:15PM +0100, Harald van Dijk wrote: > > > > Okay, it can be trivially modified to something that does work in other > > shells (even if it were actually executed), but gets rejected at parse time > > by dash: > > > > if false; then > > : ${$+ > > } > > fi > > That's just a bug in dash's parser with ${} in general, because > it bombs out without the if clause too: > > : ${$+ > } This patch fixes the parsing of newlines with parameter substitution. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 2018-04-02expand: Fix bugs with words connected to the right of $@Herbert Xu On Sun, Mar 04, 2018 at 12:44:59PM +0100, Harald van Dijk wrote: > > command: set -- a ""; space=" "; printf "<%s>" "$@"$space > bash: <a><> > dash 0.5.8: <a>< > > dash 0.5.9.1: <a>< > > dash patched: <a><> This is actually composed of two bugs. First of all our tracking of quotemark is wrong so anything after "$@" becomes quoted. Once we fix that then the problem is that the first space character after "$@" is not recognised as an IFS. This patch fixes both. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 2018-03-25Revert "[BUILTIN] Remove unnecessary restoration of format string in printf"Herbert Xu This reverts commit 7bb413255368e94395237d789f522891093c5774. The commit breaks printf with more than argument. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 2018-03-22parser: Fix backquote support in here-document EOF markHerbert Xu