*
*/
-static char rcsid[] = "$Id$";
+static char rcsid[] =
+ "$Id$";
/*
* $Log$
+ * Revision 1.15 2008/02/27 01:31:14 james
+ * *** empty log message ***
+ *
+ * Revision 1.14 2008/02/24 00:43:55 james
+ * *** empty log message ***
+ *
+ * Revision 1.13 2008/02/24 00:42:53 james
+ * *** empty log message ***
+ *
+ * Revision 1.12 2008/02/23 11:48:52 james
+ * *** empty log message ***
+ *
+ * Revision 1.11 2008/02/20 20:16:07 james
+ * *** empty log message ***
+ *
+ * Revision 1.10 2008/02/20 19:44:37 james
+ * @@
+ *
+ * Revision 1.9 2008/02/20 18:49:11 staffcvs
+ * *** empty log message ***
+ *
* Revision 1.8 2008/02/20 18:33:37 james
* *** empty log message ***
*
#include <sys/utsname.h>
#include <sys/stat.h>
#include <dirent.h>
+#include <string.h>
+#include <strings.h>
+#include <malloc.h>
#include "mainloop.h"
int c;
extern char *optarg;
extern int optind, opterr, optopt;
+ int width=VT102_COLS_80;
int oflags[128];
char *oargs[128];
memset (oflags, 0, sizeof (oflags));
memset (oargs, 0, sizeof (oargs));
-#if 0
- "sympathy -t [-K] [-d serialdev|-p] [-b baud] [-f] [-L log]\n"
- "sympathy -s [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-F] [-k skt]\n"
- " [-n hlines]\n"
- "sympathy [-s -c] [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-k skt]\n"
- " [-n hlines]\n"
- "sympathy -c [-H] -k skt\n"
- "sympathy -r id [-H]\n" "sympathy {-l|-ls}\n"
-#endif
- while ((c = getopt (argc, argv, "tscr:lKHd:pb:fL:Fk:n:")) != EOF)
+ while ((c = getopt (argc, argv, "w:utscr:lKHd:pb:fL:Fk:n:")) != EOF)
{
switch (c)
{
oflags['f'] = 0;
oflags['L'] = 0;
oflags['n'] = 0;
+ oflags['w'] = 0;
if (server_socket)
{
socket_free_parent (server_socket);
}
}
+
if (oflags['c'] && !oflags['k'])
fatal_moan ("-c requires a socket to be specified with -s or -k");
oflags['p']++;
}
+ if (oflags['w']) {
+ width=safe_atoi(oargs['w']);
+ if ((width>VT102_MAX_COLS) || (width<1))
+ fatal_moan("-w requires a width between 1 and %d\n",VT102_MAX_COLS);
+ }
+
+ if (oflags['s'] && !oflags['F'])
+ {
+ daemon (1, 0); /*incase socket is relative path, unlink then will fail */
+ }
+
if (oflags['s'] || oflags['t'])
{
if (oflags['p'])
{
- tty = ptty_open (NULL, NULL);
+ tty = ptty_open (NULL, NULL, width);
if (!tty)
fatal_moan ("unable to open a ptty");
}
}
- if (oflags['s'] && !oflags['F'])
- {
- daemon (1, 0); /*incase socket is relative path, unlink then will fail */
- }
if (oflags['c'] || oflags['t'])
{
if (oflags['H'])
{
- fatal_moan ("fix a bug in HTML dispatcher before this works");
+ ansi = ansi_new_html (stdout);
}
else
{
- ansi = (ANSI *) malloc (sizeof (ANSI));
- memset (ansi, 0, sizeof (ANSI));
-
terminal_register_handlers ();
- ansi->terminal = terminal_open (0, 1);
- ansi_reset (ansi, NULL);
+ ansi =
+ ansi_new_from_terminal (terminal_open (0, 1),
+ oflags['u'] ? 0 : 1);
+ ansi->reset (ansi, NULL);
}
}
- mainloop (tty, server_socket, client_socket, ansi, log, history);
+ mainloop (tty, server_socket, client_socket, ansi, log, history,width);
if (ansi)
{
- ansi_terminal_reset (ansi);
+ ansi->close (ansi);
terminal_atexit ();
}
if (client_socket)
socket_free (client_socket);
- printf ("you have now exited sympathy\n");
+ if (!oflags['H'])
+ printf ("you have now exited sympathy\n");
return 0;
}