Changeset 1fe89bbf2c59cbd0895409389eb9df047e96d692

Timestamp:

02/10/08 16:20:40 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[efa89659d10da4930e2af74b0d0a6ca18c4c74b2]

git-author:

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

Message:

userdata for states, track a path and prompt

Files:

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

src/noit_conf.c

@@ -274 +274 @@
-}
-
-
+
+
+
+
+
+
+
+
-static int
-noit_console_state_conf_terminal(noit_console_closure_t ncct,
-                                 int argc, char **argv, void *state) {
+  noit_conf_t_userdata_t *info;
-  if(argc) {
-    nc_printf(ncct, "extra arguments not expected.\n");
-    return -1;
-  }
+  info = calloc(1, sizeof(*info));
+  info->path = strdup("/");
+  noit_console_userdata_set(ncct, NOIT_CONF_T_USERDATA, info,
+                            conf_t_userdata_free);
-  noit_console_state_push_state(ncct, state);
-  noit_console_state_init(ncct);
@@ -289 +301 @@
-static char *
-conf_t_prompt(EditLine *el) {
+  noit_console_closure_t ncct;
+  noit_conf_t_userdata_t *info;
-  static char *tl = "noit(conf)# ";
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

src/noit_conf.h

@@ -12 +12 @@
-typedef enum { noit_true, noit_false } noit_conf_boolean;
-typedef void * noit_conf_section_t;
+
+#define NOIT_CONF_T_USERDATA "noit::state::conf_t"
+typedef struct {
+  char *path;
+  char prompt[40];
+} noit_conf_t_userdata_t;
-
-API_EXPORT(void) noit_conf_init();

src/noit_console.c

@@ -131 +131 @@
-}
-
+static void
+noit_console_userdata_free(void *data) {
+  noit_console_userdata_t *userdata = data;
+  if(userdata) {
+    if(userdata->name) free(userdata->name);
+    if(userdata->freefunc)
+      userdata->freefunc(userdata->data);
+    free(userdata);
+  }
+}
-void
-noit_console_closure_free(noit_console_closure_t ncct) {
@@ -139 +149 @@
-  if(ncct->outbuf) free(ncct->outbuf);
-  if(ncct->telnet) noit_console_telnet_free(ncct->telnet);
+  noit_hash_destroy(&ncct->userdata, NULL, noit_console_userdata_free);
-  while(ncct->state_stack) {
-    noit_console_state_stack_t *tmp;
@@ -152 +163 @@
-  noit_console_closure_t new_ncct;
-  new_ncct = calloc(1, sizeof(*new_ncct));
+  noit_hash_init(&new_ncct->userdata);
-  noit_console_state_push_state(new_ncct, noit_console_state_initial());
-  new_ncct->pty_master = -1;
@@ -157 +169 @@
-  return new_ncct;
-}
+
+void
+noit_console_userdata_set(struct __noit_console_closure *ncct,
+                          const char *name, void *data,
+                          state_userdata_free_func_t freefunc) {
+  noit_console_userdata_t *item;
+  item = calloc(1, sizeof(*item));
+  item->name = strdup(name);
+  item->data = data;
+  item->freefunc = freefunc;
+  noit_hash_replace(&ncct->userdata, item->name, strlen(item->name),
+                    item, free, noit_console_userdata_free);
+}
+  
+void *
+noit_console_userdata_get(struct __noit_console_closure *ncct,
+                          const char *name) {
+  noit_console_userdata_t *item;
+  if(noit_hash_retrieve(&ncct->userdata, name, strlen(name),
+                        (void **)&item))
+    return item->data;
+  return NULL;
+}
+
-
-int
@@ -237 +273 @@
-      history(ncct->hist, &ev, H_SETSIZE, 500);
-      ncct->el = el_init("noitd", ncct->pty_master, e->fd, e->fd);
+      el_set(ncct->el, EL_USERDATA, ncct);
-      el_set(ncct->el, EL_EDITOR, "emacs");
-      el_set(ncct->el, EL_HIST, history, ncct->hist);

src/noit_console.h

@@ -21 +21 @@
-typedef char *(*console_prompt_func_t)(EditLine *);
-typedef void (*state_free_func_t)(struct _console_state *);
+typedef void (*state_userdata_free_func_t)(void *);
-
-cmd_info 
+
-  const char          *name;
-  console_cmd_func_t   func;
@@ -31 +32 @@
-extern cmd_info_t console_command_exit;
-
+typedef struct {
+  char                      *name;
+  void                      *data;
+  state_userdata_free_func_t freefunc;
+} noit_console_userdata_t;
+
+API_EXPORT(void)
+  noit_console_userdata_set(struct __noit_console_closure *,
+                            const char *name, void *data,
+                            state_userdata_free_func_t freefunc);
+API_EXPORT(void *)
+  noit_console_userdata_get(struct __noit_console_closure *,
+                            const char *name);
+
-typedef struct _console_state {
-
-
-
+    
+    
+    
-} noit_console_state_t;
-
-typedef struct _console_state_stack {
-  noit_console_state_t *state;
+  void *userdata;
-  struct _console_state_stack *last;
-} noit_console_state_stack_t;
@@ -50 +66 @@
-  EditLine *el;
-  History *hist;
+  noit_hash_table userdata;
-
-  noit_console_state_stack_t *state_stack;