rc

commit 8ca9f57a797e425205e08bce8355cf953d6be16b
parent fbeb8501cdbf8f640605e3c05551fd71e5cc33a3
Author: Toby Goodwin <toby@paccrat.org>
Date:   Tue,  7 Apr 2015 22:22:56 +0100

edit shims: better naming, editline and vrl added

Diffstat:
R
edit-bsd.c -> edit-edit.c
 | 
0

A
edit-editline.c
 | 
100
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
edit-gnu.c -> edit-readline.c
 | 
0

A
edit-vrl.c
 | 
104
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

4 files changed, 204 insertions(+), 0 deletions(-)
diff --git a/edit-bsd.c b/edit-edit.c
diff --git a/edit-editline.c b/edit-editline.c
@@ -0,0 +1,100 @@
+#include "rc.h"
+
+#include <errno.h>
+#include <stdio.h>
+
+#include "editline.h"
+
+bool editing = 1;
+
+struct cookie {
+	char *buffer;
+};
+
+static char *prompt;
+
+void *edit_begin(int fd) {
+	List *hist;
+	struct cookie *c;
+
+        hist = varlookup("history");
+        if (hist != NULL)
+                if (read_history(hist->w) != 0 &&
+				errno != ENOENT) /* ignore if missing */
+                        uerror(hist->w);
+
+	c = ealloc(sizeof *c);
+	c->buffer = NULL;
+	return c;
+}
+
+/*
+static void edit_catcher(int sig) {
+	write(2, "\n", 1);
+	rc_raise(eError);
+}
+
+*/
+
+char *edit_alloc(void *cookie, size_t *count) {
+	struct cookie *c = cookie;
+/*
+	const char *r;
+	HistEvent he;
+	struct cookie *c = cookie;
+	void (*oldint)(int), (*oldquit)(int);
+
+	oldint = sys_signal(SIGINT, edit_catcher);
+	oldquit = sys_signal(SIGQUIT, edit_catcher);
+
+	r = el_gets(c->el, count);
+
+	sys_signal(SIGINT, oldint);
+	sys_signal(SIGQUIT, oldquit);
+
+	if (r)
+		history(c->hist, &he, H_ENTER, r);
+*/
+
+	c->buffer = readline(prompt);
+	if (c->buffer) {
+		*count = strlen(c->buffer);
+		c->buffer[*count] = '\n';
+		++*count;
+	}
+	return c->buffer;
+}
+
+/*
+static char *edit_prompter(ne *e) {
+	return prompt;
+}
+*/
+
+void edit_prompt(void *cookie, char *pr) {
+	//struct cookie *c = cookie;
+
+	prompt = pr;
+	//el_set(c->el, EL_PROMPT, edit_prompter);
+}
+
+void edit_free(void *cookie) {
+	struct cookie *c = cookie;
+
+	efree(c->buffer);
+	c->buffer = NULL; /* allow "overfrees" */
+}
+
+void edit_end(void *cookie) {
+	//struct cookie *c = cookie;
+
+	//el_end(c->el);
+	//history_end(c->hist);
+	//efree(c);
+}
+
+void edit_reset(void *cookie) {
+	//struct cookie *c = cookie;
+
+	//el_set(c->el, EL_TERMINAL, NULL);
+}
diff --git a/edit-gnu.c b/edit-readline.c
diff --git a/edit-vrl.c b/edit-vrl.c
@@ -0,0 +1,104 @@
+#include "rc.h"
+
+#include <errno.h>
+#include <stdio.h>
+
+#include "edit.h"
+
+extern char *readline(char *);
+extern void add_history(char *);
+
+bool editing = 1;
+
+struct cookie {
+	char *buffer;
+};
+
+static char *prompt;
+
+void *edit_begin(int fd) {
+	List *hist;
+	struct cookie *c;
+
+
+        hist = varlookup("history");
+        if (hist != NULL)
+		;
+		/* XXX will need to loop calling add_history() */
+
+	c = ealloc(sizeof *c);
+	c->buffer = NULL;
+	return c;
+}
+
+/*
+static void edit_catcher(int sig) {
+	write(2, "\n", 1);
+	rc_raise(eError);
+}
+
+*/
+
+char *edit_alloc(void *cookie, size_t *count) {
+	struct cookie *c = cookie;
+/*
+	const char *r;
+	HistEvent he;
+	struct cookie *c = cookie;
+	void (*oldint)(int), (*oldquit)(int);
+
+	oldint = sys_signal(SIGINT, edit_catcher);
+	oldquit = sys_signal(SIGQUIT, edit_catcher);
+
+	r = el_gets(c->el, count);
+
+	sys_signal(SIGINT, oldint);
+	sys_signal(SIGQUIT, oldquit);
+
+	if (r)
+		history(c->hist, &he, H_ENTER, r);
+*/
+
+	c->buffer = readline(prompt);
+	if (c->buffer) {
+		add_history(c->buffer);
+		*count = strlen(c->buffer);
+		c->buffer[*count] = '\n';
+		++*count;
+	}
+	return c->buffer;
+}
+
+/*
+static char *edit_prompter(ne *e) {
+	return prompt;
+}
+*/
+
+void edit_prompt(void *cookie, char *pr) {
+	//struct cookie *c = cookie;
+
+	prompt = pr;
+	//el_set(c->el, EL_PROMPT, edit_prompter);
+}
+
+void edit_free(void *cookie) {
+	struct cookie *c = cookie;
+
+	efree(c->buffer);
+	c->buffer = NULL; /* allow "overfrees" */
+}
+
+void edit_end(void *cookie) {
+	//struct cookie *c = cookie;
+
+	//el_end(c->el);
+	//history_end(c->hist);
+	//efree(c);
+}
+
+void edit_reset(void *cookie) {
+	//struct cookie *c = cookie;
+
+	//el_set(c->el, EL_TERMINAL, NULL);
+}