Changeset 3f67984922d5afe847ee425121ff553c9335e0aa

Timestamp:

02/08/08 05:31:31 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1202448691 +0000

git-parent:

[46304a4547d3e7cd3b7e98eaa2b8653034cd1c6b]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1202448691 +0000

Message:

libedit actually works now?

Files:

• src/noit_console.c (modified) (5 diffs)
• src/noit_console.h (modified) (1 diff)

src/noit_console.c

@@ -94 +94 @@
-noit_console_closure_free(noit_console_closure_t ncct) {
-  if(ncct->el) el_end(ncct->el);
+  if(ncct->hist) history_end(ncct->hist);
-  if(ncct->pty_master >= 0) close(ncct->pty_master);
-  if(ncct->pty_slave >= 0) close(ncct->pty_slave);
@@ -147 +148 @@
-  char *cmds[32];
-  int i, cnt = 32;
-
+\r\n
-  i = noit_tokenize(buffer, cmds, &cnt);
-  if(i>cnt) nc_printf(ncct, "Command length too long.\n");
-  if(i<0) nc_printf(ncct, "Error at offset: %d\n", 0-i);
-  for(i=0;i<cnt;i++) {
-
+r\
-    free(cmds[i]);
-  }
@@ -183 +184 @@
-    }
-    else {
+      HistEvent ev;
+      ncct->hist = history_init();
+      history(ncct->hist, &ev, H_SETSIZE, 500);
-      ncct->el = el_init("noitd", ncct->pty_master, e->fd, e->fd);
-      el_set(ncct->el, EL_EDITOR, "emacs");
+      el_set(ncct->el, EL_HIST, history, ncct->hist);
-      ncct->telnet = noit_console_telnet_alloc(ncct);
-    }
@@ -208 +213 @@
-
-    len = e->opset->read(e->fd, sbuf, sizeof(sbuf)-1, &newmask, e);
+noitL(noit_stderr, "opset->read => %d bytes\n", len);
-    if(len == 0 || (len < 0 && errno != EAGAIN)) {
-      eventer_remove_fd(e->fd);
@@ -225 +231 @@
-    }
-    if(buffer) {
-
-
+
+
+
+
+
+
+
+
+
+
+
-      if(noit_console_continue_sending(ncct, &newmask) == -1) {
-        if(errno != EAGAIN) goto socket_error;

src/noit_console.h

@@ -19 +19 @@
-  /* nice console support */
-  EditLine *el;
+  History *hist;
+
-  int   pty_master;
-  int   pty_slave;