libaitcli/src/aitcli.c - diff

Return to aitcli.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitcli / src

Diff for /libaitcli/src/aitcli.c between versions 1.1.1.1.2.3 and 1.1.1.1.2.5

-version 1.1.1.1.2.3, 2010/04/19 23:02:47
+version 1.1.1.1.2.5, 2010/04/20 12:09:48
  Line 27  char cli_Error[STRSIZ];
  #pragma GCC visibility pop
+ static void cli_Null_Prep_Term(int meta)
+ {
+ }
+ static void cli_Null_Deprep_Term()
+ {
+ }
+ static int cli_Pre_Input_Change_Mode()
+ {
+         return 0;
+ }
+ static int cli_GetC(FILE *dummy)
+ {
+         int ch = rl_getc(stdin);
+         /*
+         if (is_special_char(ch)) {
+                 pending_special_char = ch;
+                 return '\r';
+         }
+         */
+         return ch;
+ }
  // cli_GetErrno() Get error code of last operation
  inline int cli_GetErrno()
  {
- Line 57  inline void cli_SetErr(int eno, char *estr, ...)
+ Line 85  inline void cli_SetErr(int eno, char *estr, ...)
   * cli_Printf() Printf CLI features
   * @out = Output stream
   * @csFormat = Printf format string
- * return: none
+ * return: -1 error, != -1 printed chars
  */
  inline int cli_Printf(FILE *out, const char *csFormat, ...)
  {
- Line 93  inline void cliComp(cli_Completion_t *cmdComplete, cli
+ Line 121  inline void cliComp(cli_Completion_t *cmdComplete, cli
   * @term = terminal name
   * @inp = input handle
   * @out = output handle
+  * @win = window size
+  * return: -1 error, != -1 ok
+ */
+ inline int cliTTY(const char *term, FILE *inp, FILE *out, struct winsize *win)
+ {
+         if (term)
+                 rl_terminal_name = term;
+         if (inp)
+                 rl_instream = inp;
+         if (out)
+                 rl_outstream = out;
+         if (win)
+                if (ioctl(!rl_outstream ? STDOUT_FILENO : fileno(rl_outstream), TIOCSWINSZ, win) == -1) {
+                        LOGERR;
+                        return -1;
+                }
+         return 0;
+ }
+ /*
+  * cli_ReadHistory() Read CLI History from file
+  * @csFile = history file name, if NULL default history name is ".aitcli.history"
+  * return: -1 error; != -1 readed ok
+ */
+ inline int cli_ReadHistory(const char *csFile)
+ {
+         return read_history(!csFile ? ".aitcli.history" : csFile);
+ }
+ /*
+  * cli_WriteHistory() Write CLI History to file
+  * @csFile = history file name, if NULL default history name is ".aitcli.history"
+  * return: -1 error; != -1 readed ok
+ */
+ inline int cli_WriteHistory(const char *csFile)
+ {
+         return write_history(!csFile ? ".aitcli.history" : csFile);
+ }
+ /*
+  * cliInit() Initialize Readline
+  * @csProg = program name
   * return: none
  */
-inline void cliTTY(const char *term, FILE *inp, FILE *out)
+inline void cliInit(const char *csProg)
  {
-        rl_terminal_name = term;
+        rl_readline_name = csProg;
-        rl_outstream = inp;
-        rl_outstream = out;
+        rl_variable_bind("editing-mode", "emacs");
+}
+/*
+ * cliNetInit() Initialize Readline if CLI bind to socket
+ * @csProg = program name
+ * @pty = Master pty
+ * @term = stdin termios
+ * return: none
+*/
+void cliNetInit(const char *csProg, int pty, struct termios *term)
+{
+        struct termios t;
+        if (term) {
+                t = *term;
+                t.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOCTL | ECHOE | ECHOK | ECHOKE | ECHONL | ECHOPRT);
+                t.c_iflag &= ~ICRNL;
+                t.c_iflag |= IGNBRK;
+                t.c_cc[VMIN] = 1;
+                t.c_cc[VTIME] = 0;
+                tcsetattr(pty, TCSANOW, &t);
+        }
+        cliInit(csProg);
+        rl_instream = fdopen(pty, "r");
+        rl_prep_term_function = cli_Null_Prep_Term;
+        rl_deprep_term_function = cli_Null_Deprep_Term;
+        rl_pre_input_hook = cli_Pre_Input_Change_Mode;
+        rl_getc_function = cli_GetC;
  }
  /*

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1.2.3
changed lines
	Added in v.1.1.1.1.2.5