/*
- * ptty.c:
+ * serial.c:
*
* Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
* All rights reserved.
*
*/
-static char rcsid[] = "$Id$";
+static char rcsid[] =
+ "$Id$";
/*
* $Log$
+ * Revision 1.9 2008/02/24 00:42:53 james
+ * *** empty log message ***
+ *
+ * Revision 1.8 2008/02/23 13:05:58 staffcvs
+ * *** empty log message ***
+ *
+ * Revision 1.7 2008/02/15 23:52:12 james
+ * *** empty log message ***
+ *
+ * Revision 1.6 2008/02/15 19:51:30 james
+ * *** empty log message ***
+ *
+ * Revision 1.5 2008/02/15 19:09:00 james
+ * *** empty log message ***
+ *
+ * Revision 1.4 2008/02/15 16:48:56 james
+ * *** empty log message ***
+ *
+ * Revision 1.3 2008/02/15 03:32:07 james
+ * *** empty log message ***
+ *
+ * Revision 1.2 2008/02/14 16:21:17 james
+ * *** empty log message ***
+ *
* Revision 1.1 2008/02/14 12:51:14 james
* *** empty log message ***
*
*/
#include "project.h"
+#include <pwd.h>
+#include <dirent.h>
+#include <sys/stat.h>
typedef struct
{
TTY_SIGNATURE;
+ Serial_lock *lock;
int fd;
- pid_t child;
-} PTTY;
+} Serial;
static void
-ptty_close (TTY * _t)
+serial_close (TTY * _t)
{
- PTTY *t = (PTTY *) _t;
+ Serial *t = (Serial *) _t;
if (!t)
return;
+ tcflush (t->fd, TCIOFLUSH);
close (t->fd);
free (t);
}
-
static int
-ptty_read (TTY * _t, void *buf, int len)
+serial_read (TTY * _t, void *buf, int len)
{
- PTTY *t = (PTTY *) _t;
+ Serial *t = (Serial *) _t;
int red, done = 0;
+ t->blocked = serial_lock_check (t->lock);
+
+ if (t->blocked)
+ return 0;
+
do
{
static int
-ptty_write (TTY * _t, void *buf, int len)
+serial_write (TTY * _t, void *buf, int len)
{
int writ, done = 0;
- PTTY *t = (PTTY *) _t;
+ Serial *t = (Serial *) _t;
+
+ t->blocked = serial_lock_check (t->lock);
+ if (t->blocked)
+ return 0;
do
{
}
TTY *
-ptty_open (char *path, char *argv[])
+serial_open (char *path, int lock_mode)
{
- PTTY *t;
+ Serial *t;
pid_t child;
char name[1024];
struct winsize winsize = { 0 };
struct termios termios;
int fd;
- char *default_argv[] = { "-", (char *) 0 };
+ Serial_lock *l;
+ l = serial_lock_new (path, lock_mode);
+ if (!l)
+ return NULL;
- default_termios (&termios);
- winsize.ws_row = VT102_ROWS;
- winsize.ws_col = VT102_COLS;
+ fd = open (path, O_RDWR | O_NOCTTY | O_NONBLOCK);
- child = forkpty (&fd, name, &termios, &winsize);
+ set_nonblocking (fd);
- switch (child)
+
+ if (tcgetattr (fd, &termios))
{
- case -1: /*boo hiss */
+ close (fd);
return NULL;
- case 0: /*waaah */
- setenv ("TERM", "vt102", 1);
- setenv ("LANG", "C", 1);
- if (!path)
- path = "/bin/sh";
-
- if (!argv)
- argv = default_argv;
+ }
+ default_termios (&termios);
- execv (path, argv);
- _exit (-1);
+ if (tcsetattr (fd, TCSANOW, &termios))
+ {
+ close (fd);
+ return NULL;
}
- set_nonblocking (fd);
+ t = (Serial *) malloc (sizeof (Serial));
- t = (PTTY *) malloc (sizeof (PTTY));
+ t->lock = l;
- strncpy (t->name, name, sizeof (t->name));
+ strncpy (t->name, path, sizeof (t->name));
t->name[sizeof (t->name) - 1] = 0;
- t->recv = ptty_read;
- t->xmit = ptty_write;
- t->close = ptty_close;
+ t->recv = serial_read;
+ t->xmit = serial_write;
+ t->close = serial_close;
t->fd = fd;
- t->child = child;
t->rfd = t->fd;
t->wfd = t->fd;
- t->size.x = winsize.ws_row;
- t->size.y = winsize.ws_col;
- t->blocked = 0;
+ t->size.x = VT102_COLS;
+ t->size.y = VT102_ROWS;
+ t->blocked = serial_lock_check (t->lock);
+ t->hanging_up = 0;
return (TTY *) t;
}