From 79ba927ea0d883d505f6f7aa5aed6f7fa902d19d Mon Sep 17 00:00:00 2001 From: james <> Date: Fri, 7 Mar 2008 14:13:40 +0000 Subject: *** empty log message *** --- apps/clients.c | 9 ++ apps/expand.c | 26 +++- apps/sympathy.c | 22 +++- src/ipc.c | 12 ++ src/ipc.h | 12 ++ src/keys.h | 177 ++++++++++++++------------- src/lockfile.c | 33 ++--- src/prototypes.h | 323 +++++++++++++++++++++++++------------------------ src/slide.c | 5 +- src/sympathy.h.head.in | 9 +- src/symsocket.c | 4 +- src/terminal.c | 4 + 12 files changed, 361 insertions(+), 275 deletions(-) diff --git a/apps/clients.c b/apps/clients.c index 346439e..b8d1a4e 100644 --- a/apps/clients.c +++ b/apps/clients.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.21 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.20 2008/03/07 13:56:39 james * *** empty log message *** * @@ -130,6 +133,10 @@ client_execute_message (Client * client, IPC_Msg * m, Context * c) case IPC_MSG_TYPE_INITIALIZE: client_initialize (client, c); break; + case IPC_MSG_TYPE_KILLME: + client->dead++; + break; + default: log_f (c->l, "", m->hdr.type); } @@ -230,6 +237,8 @@ clients_post_select (Clients * cs, Context * ctx, fd_set * rfds, if (c->s->msg) { client_execute_message (c, c->s->msg, ctx); socket_consume_msg (c->s); + if (c->dead) + deaded++; } } diff --git a/apps/expand.c b/apps/expand.c index 2c07ca1..a0ce888 100644 --- a/apps/expand.c +++ b/apps/expand.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.2 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.1 2008/03/07 13:56:39 james * *** empty log message *** * @@ -108,7 +111,7 @@ hex (const char **in) } char * -expand (const char *in) +expand (const char *in,int *len) { const char *iptr = in; int l; @@ -123,42 +126,53 @@ expand (const char *in) if (!ret) return ret; + + l=0; + while (*iptr) { if (*iptr == '\\') { - iptr++; + iptr++; switch (*iptr) { case '\'': case '\"': case '\?': case '\\': *(optr++) = *(iptr++); + l++; break; case 'a': *(optr++) = '\a'; + l++; iptr++; break; case 'b': *(optr++) = '\b'; + l++; iptr++; break; case 'f': *(optr++) = '\f'; + l++; iptr++; break; case 'n': *(optr++) = '\n'; + l++; iptr++; break; case 'r': *(optr++) = '\r'; + l++; iptr++; break; case 't': *(optr++) = '\t'; + l++; iptr++; break; case 'v': *(optr++) = '\v'; + l++; iptr++; break; case '0': @@ -170,19 +184,27 @@ expand (const char *in) case '6': case '7': *(optr++) = octal (&iptr); + l++; break; case 'x': *(optr++) = hex (&iptr); + l++; break; default: *(optr++) = '\\'; + l++; *(optr++) = *(iptr++); + l++; } } else { *(optr++) = *(iptr++); + l++; } } + if (*len) *len=l; + + *(optr++) = 0; return ret; } diff --git a/apps/sympathy.c b/apps/sympathy.c index 7c68529..d40caba 100644 --- a/apps/sympathy.c +++ b/apps/sympathy.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $Log$ + * Revision 1.39 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.38 2008/03/07 13:56:39 james * *** empty log message *** * @@ -145,7 +148,7 @@ static char rcsid[] = #include "mainloop.h" extern void usage (void); -extern char * expand(const char *); +extern char * expand(const char *,int *); static char hostname[1024]; char *socket_dirs[] = @@ -430,9 +433,17 @@ get_hostname (void) void send_to_server(Socket *c,char *s) { -s=expand(s); -//FIXME +int n; + +s=expand(s,&n); + +if (!n) return; +while (n--) { + ipc_msg_send_key (c, *(uint8_t *)s); + s++; +} + ipc_msg_send_killme (c); } int @@ -776,6 +787,7 @@ main (int argc, char *argv[]) fatal_moan ("-I requires an arugment"); send_to_server(client_socket,oargs['I']); } else { + if (client_socket) ipc_msg_send_initialize (client_socket); @@ -794,13 +806,13 @@ main (int argc, char *argv[]) ansi->set_title (ansi, oargs['k']); } } + } ctx->v = vt102_new (&size); ctx->h = history_new (history); mainloop (ctx, ansi, server_socket, client_socket); - } if (ansi) { ansi->close (ansi); @@ -820,7 +832,7 @@ main (int argc, char *argv[]) if (pid_file) unlink (pid_file); - if (!oflags['H']) + if (!oflags['H'] && !oflags['I']) printf ("you have now exited sympathy\n"); return 0; } diff --git a/src/ipc.c b/src/ipc.c index 328580b..93839b6 100644 --- a/src/ipc.c +++ b/src/ipc.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.11 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.10 2008/03/07 13:16:02 james * *** empty log message *** * @@ -266,3 +269,12 @@ ipc_msg_send_reset (Socket * s) return ipc_msg_send (s, (IPC_Msg *) & m); } +int +ipc_msg_send_killme (Socket * s) +{ + IPC_Msg_killme m; + + m.size = sizeof (m); + m.type = IPC_MSG_TYPE_KILLME; + return ipc_msg_send (s, (IPC_Msg *) & m); +} diff --git a/src/ipc.h b/src/ipc.h index d36dcfd..9b2f438 100644 --- a/src/ipc.h +++ b/src/ipc.h @@ -12,6 +12,9 @@ /* * $Log$ + * Revision 1.11 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.10 2008/03/07 13:16:02 james * *** empty log message *** * @@ -64,6 +67,7 @@ #define IPC_MSG_TYPE_HANGUP 12 #define IPC_MSG_TYPE_SETSIZE 13 #define IPC_MSG_TYPE_RESET 14 +#define IPC_MSG_TYPE_KILLME 15 typedef struct { @@ -186,6 +190,13 @@ typedef struct } IPC_Msg_reset; +typedef struct +{ + int32_t size; + int32_t type; +} IPC_Msg_killme; + + typedef union { @@ -205,6 +216,7 @@ typedef union IPC_Msg_hangup hangup; IPC_Msg_setsize setsize; IPC_Msg_reset reset; + IPC_Msg_killme killme; } IPC_Msg; diff --git a/src/keys.h b/src/keys.h index f030f5c..2d20966 100644 --- a/src/keys.h +++ b/src/keys.h @@ -12,6 +12,9 @@ /* * $Log$ + * Revision 1.9 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.8 2008/03/07 12:37:04 james * *** empty log message *** * @@ -32,92 +35,92 @@ #ifndef __KEYS_H__ #define __KEYS_H__ -#define KEY_UP 128 /*A*/ -#define KEY_DOWN 129 /*B*/ -#define KEY_RIGHT 130 /*C*/ -#define KEY_LEFT 131 /*D*/ -#define KEY_MIDDLE 132 /*E*/ -#define KEY_END 133 /*F*/ -#define KEY_134 134 /*G*/ -#define KEY_HOME 135 /*H*/ -#define KEY_136 136 /*I*/ -#define KEY_137 137 /*J*/ -#define KEY_138 138 /*K*/ -#define KEY_139 139 /*L*/ -#define KEY_ENTER 140 /*M*/ -#define KEY_141 141 /*N*/ -#define KEY_142 142 /*O*/ -#define KEY_PF1 143 /*P*/ /* Also F1 */ -#define KEY_PF2 144 /*Q*/ /* Also F2 */ -#define KEY_PF3 145 /*R*/ /* Also F3 */ -#define KEY_PF4 146 /*S*/ /* Also F4 */ -#define KEY_147 147 /*T*/ -#define KEY_148 148 /*U*/ -#define KEY_149 149 /*V*/ -#define KEY_150 150 /*W*/ -#define KEY_151 151 /*X*/ -#define KEY_152 152 /*Y*/ -#define KEY_153 153 /*Z*/ -#define KEY_154 154 /* a */ -#define KEY_155 155 /* b */ -#define KEY_156 156 /* c */ -#define KEY_157 157 /* d */ -#define KEY_158 158 /* e */ -#define KEY_159 159 /* f */ -#define KEY_160 160 /* g */ -#define KEY_161 161 /* h */ -#define KEY_162 162 /* i */ -#define KEY_STAR 163 /* j */ -#define KEY_PLUS 164 /* k */ -#define KEY_COMMA 165 /* l */ -#define KEY_MINUS 166 /* m */ -#define KEY_PERIOD 167 /* n */ -#define KEY_DIVIDE 168 /* o */ -#define KEY_0 169 /* p */ -#define KEY_1 170 /* q */ -#define KEY_2 171 /* r */ -#define KEY_3 172 /* s */ -#define KEY_4 173 /* t */ -#define KEY_5 174 /* u */ -#define KEY_6 175 /* v */ -#define KEY_7 176 /* w */ -#define KEY_8 177 /* x */ -#define KEY_9 178 /* y */ -#define KEY_179 179 /* z */ -#define KEY_180 180 /* 0 */ -#define KEY_VT220_HOME 181 /* 1 */ -#define KEY_INSERT 182 /* 2 */ -#define KEY_DELETE 183 /* 3 */ -#define KEY_VT220_END 184 /* 4 */ -#define KEY_PGUP 185 /* 5 */ -#define KEY_PGDN 186 /* 6 */ -#define KEY_187 187 /* 7 */ -#define KEY_188 188 /* 8 */ -#define KEY_189 189 /* 9 */ -#define KEY_190 190 /* 10 */ -#define KEY_F1 191 /* 11 */ -#define KEY_F2 192 /* 12 */ -#define KEY_F3 193 /* 13 */ -#define KEY_F4 194 /* 14 */ -#define KEY_F5 195 /* 15 */ -#define KEY_196 196 /* 16 */ -#define KEY_F6 197 /* 17 */ -#define KEY_F7 198 /* 18 */ -#define KEY_F8 199 /* 19 */ -#define KEY_F9 200 /* 20 */ -#define KEY_F10 201 /* 21 */ -#define KEY_202 202 /* 22 */ -#define KEY_F11 203 /* 23 */ -#define KEY_F12 204 /* 24 */ -#define KEY_F13 205 /* 25 */ -#define KEY_F14 206 /* 26 */ -#define KEY_207 207 /* 27 */ -#define KEY_F15 208 /* 28 */ -#define KEY_F16 209 /* 29 */ -#define KEY_210 210 /* 30 */ -#define KEY_F17 211 /* 31 */ -#define KEY_F18 212 /* 32 */ -#define KEY_F19 213 /* 33 */ -#define KEY_F20 214 /* 34 */ +#define KEY_UP 128 /* A */ +#define KEY_DOWN 129 /* B */ +#define KEY_RIGHT 130 /* C */ +#define KEY_LEFT 131 /* D */ +#define KEY_MIDDLE 132 /* E */ +#define KEY_END 133 /* F */ +#define KEY_134 134 /* G */ +#define KEY_HOME 135 /* H */ +#define KEY_136 136 /* I */ +#define KEY_137 137 /* J */ +#define KEY_138 138 /* K */ +#define KEY_139 139 /* L */ +#define KEY_ENTER 140 /* M */ +#define KEY_141 141 /* N */ +#define KEY_142 142 /* O */ +#define KEY_PF1 143 /* P */ /* Also F1 */ +#define KEY_PF2 144 /* Q */ /* Also F2 */ +#define KEY_PF3 145 /* R */ /* Also F3 */ +#define KEY_PF4 146 /* S */ /* Also F4 */ +#define KEY_147 147 /* T */ +#define KEY_148 148 /* U */ +#define KEY_149 149 /* V */ +#define KEY_150 150 /* W */ +#define KEY_151 151 /* X */ +#define KEY_152 152 /* Y */ +#define KEY_153 153 /* Z */ +#define KEY_154 154 /* a */ +#define KEY_155 155 /* b */ +#define KEY_156 156 /* c */ +#define KEY_157 157 /* d */ +#define KEY_158 158 /* e */ +#define KEY_159 159 /* f */ +#define KEY_160 160 /* g */ +#define KEY_161 161 /* h */ +#define KEY_162 162 /* i */ +#define KEY_STAR 163 /* j */ +#define KEY_PLUS 164 /* k */ +#define KEY_COMMA 165 /* l */ +#define KEY_MINUS 166 /* m */ +#define KEY_PERIOD 167 /* n */ +#define KEY_DIVIDE 168 /* o */ +#define KEY_0 169 /* p */ +#define KEY_1 170 /* q */ +#define KEY_2 171 /* r */ +#define KEY_3 172 /* s */ +#define KEY_4 173 /* t */ +#define KEY_5 174 /* u */ +#define KEY_6 175 /* v */ +#define KEY_7 176 /* w */ +#define KEY_8 177 /* x */ +#define KEY_9 178 /* y */ +#define KEY_179 179 /* z */ +#define KEY_180 180 /* 0 */ +#define KEY_VT220_HOME 181 /* 1 */ +#define KEY_INSERT 182 /* 2 */ +#define KEY_DELETE 183 /* 3 */ +#define KEY_VT220_END 184 /* 4 */ +#define KEY_PGUP 185 /* 5 */ +#define KEY_PGDN 186 /* 6 */ +#define KEY_187 187 /* 7 */ +#define KEY_188 188 /* 8 */ +#define KEY_189 189 /* 9 */ +#define KEY_190 190 /* 10 */ +#define KEY_F1 191 /* 11 */ +#define KEY_F2 192 /* 12 */ +#define KEY_F3 193 /* 13 */ +#define KEY_F4 194 /* 14 */ +#define KEY_F5 195 /* 15 */ +#define KEY_196 196 /* 16 */ +#define KEY_F6 197 /* 17 */ +#define KEY_F7 198 /* 18 */ +#define KEY_F8 199 /* 19 */ +#define KEY_F9 200 /* 20 */ +#define KEY_F10 201 /* 21 */ +#define KEY_202 202 /* 22 */ +#define KEY_F11 203 /* 23 */ +#define KEY_F12 204 /* 24 */ +#define KEY_F13 205 /* 25 */ +#define KEY_F14 206 /* 26 */ +#define KEY_207 207 /* 27 */ +#define KEY_F15 208 /* 28 */ +#define KEY_F16 209 /* 29 */ +#define KEY_210 210 /* 30 */ +#define KEY_F17 211 /* 31 */ +#define KEY_F18 212 /* 32 */ +#define KEY_F19 213 /* 33 */ +#define KEY_F20 214 /* 34 */ #define KEY_NUM 215 #endif /* __KEYS_H__ */ diff --git a/src/lockfile.c b/src/lockfile.c index 72e7960..b64b30b 100644 --- a/src/lockfile.c +++ b/src/lockfile.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $Log$ + * Revision 1.15 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.14 2008/03/07 13:16:02 james * *** empty log message *** * @@ -77,7 +80,7 @@ static char rcsid[] = #include "lockfile.h" -extern void *xmalloc(size_t); +extern void *xmalloc (size_t); Filelist * filelist_new (void) @@ -348,13 +351,13 @@ lockfile_make_list (char *device) ret = filelist_new (); if (ret) { - lockfile_add_name_from_dev (ret, dev_stat.st_rdev); + lockfile_add_name_from_dev (ret, dev_stat.st_rdev); - lockfile_add_name_from_path (ret, device); + lockfile_add_name_from_path (ret, device); - lockfile_check_dir_for_dev (ret, "/dev/", dev_stat.st_rdev); - lockfile_check_dir_for_dev (ret, "/dev/usb/", dev_stat.st_rdev); - lockfile_check_dir_for_dev (ret, "/dev/tts/", dev_stat.st_rdev); + lockfile_check_dir_for_dev (ret, "/dev/", dev_stat.st_rdev); + lockfile_check_dir_for_dev (ret, "/dev/usb/", dev_stat.st_rdev); + lockfile_check_dir_for_dev (ret, "/dev/tts/", dev_stat.st_rdev); } return ret; @@ -428,17 +431,17 @@ lockfile_lock (Filelist * fl) ret = filelist_new (); if (ret) { - lockfile_remove_stale (fl); - - for (fle = fl->head; fle; fle = fle->next) { - if (lockfile_make (fle->name)) { - fprintf (stderr, "Failed to get lockfile %s\n", fle->name); - filelist_free (ret); - return NULL; + lockfile_remove_stale (fl); + + for (fle = fl->head; fle; fle = fle->next) { + if (lockfile_make (fle->name)) { + fprintf (stderr, "Failed to get lockfile %s\n", fle->name); + filelist_free (ret); + return NULL; + } + filelist_add (ret, fle->name); } - filelist_add (ret, fle->name); } - } return ret; } diff --git a/src/prototypes.h b/src/prototypes.h index 6fd6a7a..107ab1f 100644 --- a/src/prototypes.h +++ b/src/prototypes.h @@ -1,183 +1,184 @@ /* ansi.c */ -extern ANSI *ansi_new_from_terminal(TTY *t, int utf8); +extern ANSI *ansi_new_from_terminal (TTY * t, int utf8); /* crt.c */ -extern void crt_erase(CRT *c, CRT_Pos s, CRT_Pos e, int ea, int color); -extern void crt_cls(CRT *c); -extern void crt_scroll_up(CRT *c, CRT_Pos s, CRT_Pos e, int ea, int color); -extern void crt_scroll_down(CRT *c, CRT_Pos s, CRT_Pos e, int ea, int color); -extern void crt_reset(CRT *c); -extern void crt_insert(CRT *c, CRT_CA ca); +extern void crt_erase (CRT * c, CRT_Pos s, CRT_Pos e, int ea, int color); +extern void crt_cls (CRT * c); +extern void crt_scroll_up (CRT * c, CRT_Pos s, CRT_Pos e, int ea, int color); +extern void crt_scroll_down (CRT * c, CRT_Pos s, CRT_Pos e, int ea, + int color); +extern void crt_reset (CRT * c); +extern void crt_insert (CRT * c, CRT_CA ca); /* html.c */ -extern ANSI *ansi_new_html(FILE *f); +extern ANSI *ansi_new_html (FILE * f); /* libsympathy.c */ /* render.c */ /* version.c */ -extern char *libsympathy_version(void); +extern char *libsympathy_version (void); /* vt102.c */ extern int vt102_cmd_length[128]; extern int vt102_cmd_termination[128]; -extern void vt102_crt_update(Context *c); -extern void vt102_do_resize(Context *c); -extern void vt102_log_line(Context *c, int line); -extern void vt102_history(Context *c, CRT_Pos t, CRT_Pos b); -extern void vt102_clip_cursor(VT102 *v, CRT_Pos tl, CRT_Pos br); -extern void vt102_cursor_normalize(VT102 *v); -extern void vt102_cursor_carriage_return(VT102 *v); -extern void vt102_cursor_advance_line(Context *c); -extern void vt102_cursor_retreat_line(Context *c); -extern void vt102_do_pending_wrap(Context *c); -extern void vt102_cursor_advance(Context *c); -extern void vt102_cursor_retreat(VT102 *v); -extern void vt102_reset_tabs(VT102 *v); -extern void vt102_cursor_advance_tab(VT102 *v); -extern void vt102_cursor_retreat_tab(VT102 *v); -extern int vt102_cursor_home(VT102 *v); -extern int vt102_cursor_absolute(VT102 *v, int x, int y); -extern int vt102_cursor_relative(VT102 *v, int x, int y); -extern void vt102_delete_from_line(VT102 *v, CRT_Pos p); -extern void vt102_insert_into_line(VT102 *v, CRT_Pos p); -extern void vt102_change_mode(Context *c, int private, char *ns, int set); -extern void vt102_parse_mode_string(Context *c, char *buf, int len); -extern void vt102_change_attr(VT102 *v, char *na); -extern void vt102_parse_attr_string(VT102 *v, char *buf, int len); -extern void vt102_save_state(VT102 *v); -extern void vt102_restore_state(VT102 *v); -extern void vt102_regular_char(Context *c, VT102 *v, uint32_t ch); -extern int vt102_send_id(Context *c, char *buf); -extern void vt102_scs(Context *c, int g, int s); -extern void vt102_status_line(VT102 *v, char *str); -extern void vt102_parser_reset(VT102_parser *p); -extern void vt102_reset_state(Context *c); -extern int vt102_rx_hook(Context *c, int ch); -extern int vt102_parse_char(Context *c, int ch); -extern void vt102_send(Context *c, uint8_t key); -extern void vt102_reset(Context *c); -extern VT102 *vt102_new(CRT_Pos *size); -extern void vt102_set_ansi(VT102 *v, int ansi); -extern void vt102_resize(Context *c, CRT_Pos size); -extern void vt102_free(VT102 *v); +extern void vt102_crt_update (Context * c); +extern void vt102_do_resize (Context * c); +extern void vt102_log_line (Context * c, int line); +extern void vt102_history (Context * c, CRT_Pos t, CRT_Pos b); +extern void vt102_clip_cursor (VT102 * v, CRT_Pos tl, CRT_Pos br); +extern void vt102_cursor_normalize (VT102 * v); +extern void vt102_cursor_carriage_return (VT102 * v); +extern void vt102_cursor_advance_line (Context * c); +extern void vt102_cursor_retreat_line (Context * c); +extern void vt102_do_pending_wrap (Context * c); +extern void vt102_cursor_advance (Context * c); +extern void vt102_cursor_retreat (VT102 * v); +extern void vt102_reset_tabs (VT102 * v); +extern void vt102_cursor_advance_tab (VT102 * v); +extern void vt102_cursor_retreat_tab (VT102 * v); +extern int vt102_cursor_home (VT102 * v); +extern int vt102_cursor_absolute (VT102 * v, int x, int y); +extern int vt102_cursor_relative (VT102 * v, int x, int y); +extern void vt102_delete_from_line (VT102 * v, CRT_Pos p); +extern void vt102_insert_into_line (VT102 * v, CRT_Pos p); +extern void vt102_change_mode (Context * c, int private, char *ns, int set); +extern void vt102_parse_mode_string (Context * c, char *buf, int len); +extern void vt102_change_attr (VT102 * v, char *na); +extern void vt102_parse_attr_string (VT102 * v, char *buf, int len); +extern void vt102_save_state (VT102 * v); +extern void vt102_restore_state (VT102 * v); +extern void vt102_regular_char (Context * c, VT102 * v, uint32_t ch); +extern int vt102_send_id (Context * c, char *buf); +extern void vt102_scs (Context * c, int g, int s); +extern void vt102_status_line (VT102 * v, char *str); +extern void vt102_parser_reset (VT102_parser * p); +extern void vt102_reset_state (Context * c); +extern int vt102_rx_hook (Context * c, int ch); +extern int vt102_parse_char (Context * c, int ch); +extern void vt102_send (Context * c, uint8_t key); +extern void vt102_reset (Context * c); +extern VT102 *vt102_new (CRT_Pos * size); +extern void vt102_set_ansi (VT102 * v, int ansi); +extern void vt102_resize (Context * c, CRT_Pos size); +extern void vt102_free (VT102 * v); /* tty.c */ -extern void tty_pre_select(TTY *t, fd_set *rfds, fd_set *wfds); -extern int tty_get_status(TTY *t, TTY_Status *s); -extern int tty_get_baud(TTY *t); -extern void tty_set_baud(TTY *t, int rate); -extern void tty_send_break(TTY *t); -extern void tty_set_flow(TTY *t, int flow); -extern void tty_hangup(TTY *t); -extern void tty_length(TTY *t, int l); -extern void tty_winch(TTY *t, CRT_Pos size); -extern void tty_parse_reset(Context *c); -extern void tty_analyse(Context *c); -extern TTY_Parser *tty_parser_new(void); -extern int tty_parse(Context *c, uint8_t *buf, int len); +extern void tty_pre_select (TTY * t, fd_set * rfds, fd_set * wfds); +extern int tty_get_status (TTY * t, TTY_Status * s); +extern int tty_get_baud (TTY * t); +extern void tty_set_baud (TTY * t, int rate); +extern void tty_send_break (TTY * t); +extern void tty_set_flow (TTY * t, int flow); +extern void tty_hangup (TTY * t); +extern void tty_length (TTY * t, int l); +extern void tty_winch (TTY * t, CRT_Pos size); +extern void tty_parse_reset (Context * c); +extern void tty_analyse (Context * c); +extern TTY_Parser *tty_parser_new (void); +extern int tty_parse (Context * c, uint8_t * buf, int len); /* keydis.c */ -extern KeyDis *keydis_vt102_new(void); -extern KeyDis *keydis_ipc_new(Socket *s); +extern KeyDis *keydis_vt102_new (void); +extern KeyDis *keydis_ipc_new (Socket * s); /* history.c */ -extern History *history_new(int n); -extern void history_free(History *h); -extern void history_add(History *h, CRT_CA *c); +extern History *history_new (int n); +extern void history_free (History * h); +extern void history_add (History * h, CRT_CA * c); /* ring.c */ -extern int ring_read(Ring *r, void *b, int n); -extern int ring_write(Ring *r, void *b, int n); -extern int ring_space(Ring *r); -extern int ring_bytes(Ring *r); -extern Ring *ring_new(int n); +extern int ring_read (Ring * r, void *b, int n); +extern int ring_write (Ring * r, void *b, int n); +extern int ring_space (Ring * r); +extern int ring_bytes (Ring * r); +extern Ring *ring_new (int n); /* ptty.c */ -extern TTY *ptty_open(char *path, char *argv[], CRT_Pos *size); +extern TTY *ptty_open (char *path, char *argv[], CRT_Pos * size); /* terminal.c */ extern int terminal_winches; -extern void terminal_atexit(void); -extern void terminal_getsize(TTY *_t); -extern void terminal_dispatch(void); -extern void terminal_register_handlers(void); -extern TTY *terminal_open(int rfd, int wfd); +extern void terminal_atexit (void); +extern void terminal_getsize (TTY * _t); +extern void terminal_dispatch (void); +extern void terminal_register_handlers (void); +extern TTY *terminal_open (int rfd, int wfd); /* util.c */ -extern int wrap_read(int fd, void *buf, int len); -extern int wrap_write(int fd, void *buf, int len); -extern void set_nonblocking(int fd); -extern void set_blocking(int fd); -extern void default_termios(struct termios *termios); -extern void client_termios(struct termios *termios); -extern int fput_cp(FILE *f, uint32_t ch); -extern void crash_out(char *why); -extern void *xmalloc(size_t s); -extern void *xrealloc(void *p, size_t s); -extern char *xstrdup(const char *s); +extern int wrap_read (int fd, void *buf, int len); +extern int wrap_write (int fd, void *buf, int len); +extern void set_nonblocking (int fd); +extern void set_blocking (int fd); +extern void default_termios (struct termios *termios); +extern void client_termios (struct termios *termios); +extern int fput_cp (FILE * f, uint32_t ch); +extern void crash_out (char *why); +extern void *xmalloc (size_t s); +extern void *xrealloc (void *p, size_t s); +extern char *xstrdup (const char *s); /* log.c */ -extern Log *file_log_new(char *fn, int rotate); -extern void log_f(Log *log, char *fmt, ...); +extern Log *file_log_new (char *fn, int rotate); +extern void log_f (Log * log, char *fmt, ...); /* ipc.c */ -extern IPC_Msg *ipc_check_for_message_in_slide(Slide *s); -extern void ipc_consume_message_in_slide(Slide *s); -extern int ipc_msg_send(Socket *s, IPC_Msg *m); -extern int ipc_msg_send_debug(Socket *s, char *msg); -extern int ipc_msg_send_initialize(Socket *s); -extern int ipc_msg_send_history(Socket *s, History_ent *l); -extern int ipc_msg_send_vt102(Socket *s, VT102 *v); -extern int ipc_msg_send_key(Socket *s, int key); -extern int ipc_msg_send_term(Socket *s, void *buf, int len); -extern int ipc_msg_send_status(Socket *s, char *buf); -extern int ipc_msg_send_setbaud(Socket *s, int baud); -extern int ipc_msg_send_sendbreak(Socket *s); -extern int ipc_msg_send_setflow(Socket *s, int flow); -extern int ipc_msg_send_setansi(Socket *s, int ansi); -extern int ipc_msg_send_hangup(Socket *s); -extern int ipc_msg_send_setsize(Socket *s, CRT_Pos size); -extern int ipc_msg_send_reset(Socket *s); +extern IPC_Msg *ipc_check_for_message_in_slide (Slide * s); +extern void ipc_consume_message_in_slide (Slide * s); +extern int ipc_msg_send (Socket * s, IPC_Msg * m); +extern int ipc_msg_send_debug (Socket * s, char *msg); +extern int ipc_msg_send_initialize (Socket * s); +extern int ipc_msg_send_history (Socket * s, History_ent * l); +extern int ipc_msg_send_vt102 (Socket * s, VT102 * v); +extern int ipc_msg_send_key (Socket * s, int key); +extern int ipc_msg_send_term (Socket * s, void *buf, int len); +extern int ipc_msg_send_status (Socket * s, char *buf); +extern int ipc_msg_send_setbaud (Socket * s, int baud); +extern int ipc_msg_send_sendbreak (Socket * s); +extern int ipc_msg_send_setflow (Socket * s, int flow); +extern int ipc_msg_send_setansi (Socket * s, int ansi); +extern int ipc_msg_send_hangup (Socket * s); +extern int ipc_msg_send_setsize (Socket * s, CRT_Pos size); +extern int ipc_msg_send_reset (Socket * s); /* slide.c */ -extern void slide_free(Slide *s); -extern void slide_consume(Slide *s, int n); -extern void slide_added(Slide *s, int n); -extern Slide *slide_new(int n); -extern void slide_expand(Slide *s, int n); +extern void slide_free (Slide * s); +extern void slide_consume (Slide * s, int n); +extern void slide_added (Slide * s, int n); +extern Slide *slide_new (int n); +extern void slide_expand (Slide * s, int n); /* symsocket.c */ -extern int wrap_recv(int fd, void *buf, int len); -extern int wrap_send(int fd, void *buf, int len); -extern void socket_free(Socket *s); -extern void socket_free_parent(Socket *s); -extern Socket *socket_listen(char *path); -extern Socket *socket_accept(Socket *l); -extern Socket *socket_connect(char *path); -extern void socket_consume_msg(Socket *s); -extern void socket_pre_select(Socket *s, fd_set *rfds, fd_set *wfds); -extern int socket_post_select(Socket *s, fd_set *rfds, fd_set *wfds); -extern int socket_write(Socket *s, void *buf, int len); +extern int wrap_recv (int fd, void *buf, int len); +extern int wrap_send (int fd, void *buf, int len); +extern void socket_free (Socket * s); +extern void socket_free_parent (Socket * s); +extern Socket *socket_listen (char *path); +extern Socket *socket_accept (Socket * l); +extern Socket *socket_connect (char *path); +extern void socket_consume_msg (Socket * s); +extern void socket_pre_select (Socket * s, fd_set * rfds, fd_set * wfds); +extern int socket_post_select (Socket * s, fd_set * rfds, fd_set * wfds); +extern int socket_write (Socket * s, void *buf, int len); /* serial.c */ -extern TTY *serial_open(char *path, int lock_mode); +extern TTY *serial_open (char *path, int lock_mode); /* cmd.c */ -extern int cmd_parse(Cmd *c, Context *ctx, ANSI *a, char *buf); -extern void cmd_show_status(Cmd *c, Context *ctx); -extern int cmd_key(Cmd *c, Context *ctx, ANSI *a, int key); -extern int cmd_deactivate(Cmd *c, Context *ctx); -extern int cmd_activate(Cmd *c, Context *ctx); -extern void cmd_new_status(Cmd *c, Context *ctx, char *msg); -extern Cmd *cmd_new(void); +extern int cmd_parse (Cmd * c, Context * ctx, ANSI * a, char *buf); +extern void cmd_show_status (Cmd * c, Context * ctx); +extern int cmd_key (Cmd * c, Context * ctx, ANSI * a, int key); +extern int cmd_deactivate (Cmd * c, Context * ctx); +extern int cmd_activate (Cmd * c, Context * ctx); +extern void cmd_new_status (Cmd * c, Context * ctx, char *msg); +extern Cmd *cmd_new (void); /* lockfile.c */ -extern Filelist *filelist_new(void); -extern void filelist_remove(Filelist *fl, Filelist_ent *fle); -extern void filelist_add(Filelist *fl, char *fn); -extern void filelist_free(Filelist *fl); -extern void filelist_print(Filelist *fl, FILE *f); -extern int lockfile_make(char *name); -extern void lockfile_add_places(Filelist *fl, char *leaf); -extern void lockfile_regularize_and_add(Filelist *fl, char *leaf); -extern void lockfile_add_name_from_path(Filelist *fl, char *file); -extern void lockfile_add_name_from_dev(Filelist *fl, dev_t dev); -extern void lockfile_check_dir_for_dev(Filelist *fl, char *dir, dev_t dev); -extern Filelist *lockfile_make_list(char *device); -extern void lockfile_remove_stale(Filelist *fl); -extern Filelist *lockfile_lock(Filelist *fl); -extern void lockfile_unlock(Filelist *fl); -extern int serial_lock_check(Serial_lock *l); -extern void serial_lock_free(Serial_lock *l); -extern Serial_lock *serial_lock_new(char *dev, int mode); +extern Filelist *filelist_new (void); +extern void filelist_remove (Filelist * fl, Filelist_ent * fle); +extern void filelist_add (Filelist * fl, char *fn); +extern void filelist_free (Filelist * fl); +extern void filelist_print (Filelist * fl, FILE * f); +extern int lockfile_make (char *name); +extern void lockfile_add_places (Filelist * fl, char *leaf); +extern void lockfile_regularize_and_add (Filelist * fl, char *leaf); +extern void lockfile_add_name_from_path (Filelist * fl, char *file); +extern void lockfile_add_name_from_dev (Filelist * fl, dev_t dev); +extern void lockfile_check_dir_for_dev (Filelist * fl, char *dir, dev_t dev); +extern Filelist *lockfile_make_list (char *device); +extern void lockfile_remove_stale (Filelist * fl); +extern Filelist *lockfile_lock (Filelist * fl); +extern void lockfile_unlock (Filelist * fl); +extern int serial_lock_check (Serial_lock * l); +extern void serial_lock_free (Serial_lock * l); +extern Serial_lock *serial_lock_new (char *dev, int mode); /* utf8.c */ -extern int utf8_flush(Context *c); -extern int utf8_parse(Context *c, uint32_t ch); -extern UTF8 *utf8_new(void); -extern int utf8_encode(char *ptr, int ch); -extern int utf8_emit(TTY *t, int ch); +extern int utf8_flush (Context * c); +extern int utf8_parse (Context * c, uint32_t ch); +extern UTF8 *utf8_new (void); +extern int utf8_encode (char *ptr, int ch); +extern int utf8_emit (TTY * t, int ch); /* vt102_charset.c */ extern uint32_t vt102_charset_c0[128]; extern uint32_t vt102_charset_us[128]; @@ -186,10 +187,10 @@ extern uint32_t vt102_charset_vt52[128]; extern uint32_t vt102_charset_gl[128]; extern uint32_t *charset_from_csid[]; /* rotate.c */ -extern void rotate_gzip(char *file); -extern void rotate(char *file); -extern int rotate_check(char *file); +extern void rotate_gzip (char *file); +extern void rotate (char *file); +extern int rotate_check (char *file); /* raw.c */ -extern RX *rx_new_raw(int rfd, int wfd); -extern TTY *terminal_new_raw(int rfd, int wfd); -extern ANSI *ansi_new_raw(int rfd, int wfd); +extern RX *rx_new_raw (int rfd, int wfd); +extern TTY *terminal_new_raw (int rfd, int wfd); +extern ANSI *ansi_new_raw (int rfd, int wfd); diff --git a/src/slide.c b/src/slide.c index a06daea..692b8d5 100644 --- a/src/slide.c +++ b/src/slide.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.8 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.7 2008/03/07 13:16:02 james * *** empty log message *** * @@ -57,7 +60,7 @@ slide_consume (Slide * s, int n) s->nbytes -= n; if (s->nbytes < 0) - crash_out("slide_consume called with -ve number of bytes"); + crash_out ("slide_consume called with -ve number of bytes"); memmove (s->slide, s->slide + n, s->nbytes); diff --git a/src/sympathy.h.head.in b/src/sympathy.h.head.in index d2edcdf..e26d094 100644 --- a/src/sympathy.h.head.in +++ b/src/sympathy.h.head.in @@ -12,6 +12,9 @@ /* * $Log$ + * Revision 1.3 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.2 2008/02/13 18:05:06 james * *** empty log message *** * @@ -38,9 +41,9 @@ extern "C" { #include #include -/*the integer constants here are set by configure*/ +/* the integer constants here are set by configure */ -/*get uint32_t and friends defined */ +/* get uint32_t and friends defined */ #if @G2_HAVE_STDINT_H@ #include #elif @G2_HAVE_SYS_INT_TYPES_H@ @@ -53,7 +56,7 @@ extern "C" { /* If the following is <> then configure failed to find where */ /* struct tm was defined - report it as a bug */ -/*get struct tm defined*/ +/* get struct tm defined */ #include <@G2_TM_H@> #if @G2_TM_IN_SYS_TIME@ diff --git a/src/symsocket.c b/src/symsocket.c index 0c1b42b..653cd35 100644 --- a/src/symsocket.c +++ b/src/symsocket.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $Log$ + * Revision 1.13 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.12 2008/03/07 13:16:02 james * *** empty log message *** * @@ -341,4 +344,3 @@ socket_write (Socket * s, void *buf, int len) return len; } - diff --git a/src/terminal.c b/src/terminal.c index c6c581c..6cdb15b 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $Log$ + * Revision 1.18 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.17 2008/03/07 13:16:02 james * *** empty log message *** * @@ -132,6 +135,7 @@ terminal_close (TTY * _t) // // // + // // to // bottom t->xmit (_t, buf, i); -- cgit v1.2.3