-#include <sys/ioctl.h>
-#include <sys/select.h>
-#include <sys/stat.h>
+/* See LICENSE file for copyright and license details. */
+#include "util.h"
#include <sys/types.h>
#include <sys/wait.h>
#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#define LENGTH(x) (sizeof (x) / sizeof (x)[0])
+#define LENGTH(x) (sizeof(x) / sizeof((x)[0]))
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
void buffer(char c);
void cmd(const char *cmdstr, ...);
-void *emallocz(unsigned int size);
-void eprint(const char *errstr, ...);
-void eprintn(const char *errstr, ...);
+int getch();
void getpty(void);
void movea(int x, int y);
void mover(int x, int y);
-void parse(void);
+void parseesc(void);
void scroll(int l);
void shell(void);
void sigchld(int n);
char unbuffer(void);
-
-enum { QuestionMark = 1, Digit = 2 };
+void ungetch(int c);
typedef struct {
unsigned char data[BUFSIZ];
int n;
} RingBuffer;
+typedef struct {
+ unsigned char data[BUFSIZ];
+ int i, n;
+} ReadBuffer;
+
int cols = 80, lines = 25;
int cx = 0, cy = 0;
-int c, s;
-FILE *fptm = NULL;
+int c;
int ptm, pts;
-_Bool bold;
+_Bool bold, digit, qmark;
pid_t pid;
RingBuffer buf;
+ReadBuffer rbuf;
void
buffer(char c) {
va_end(ap);
}
-void *
-emallocz(unsigned int size) {
- void *res = calloc(1, size);
-
- if(!res)
- eprint("fatal: could not malloc() %u bytes\n", size);
- return res;
-}
-
-void
-eprint(const char *errstr, ...) {
- va_list ap;
-
- va_start(ap, errstr);
- vfprintf(stderr, errstr, ap);
- va_end(ap);
- exit(EXIT_FAILURE);
-}
-
-void
-eprintn(const char *errstr, ...) {
- va_list ap;
-
- va_start(ap, errstr);
- vfprintf(stderr, errstr, ap);
- va_end(ap);
- fprintf(stderr, ": %s\n", strerror(errno));
- exit(EXIT_FAILURE);
-}
-
-void
-getpty(void) {
- char *ptsdev;
-
-#if defined(_GNU_SOURCE)
- ptm = getpt();
-#elif _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
- ptm = posix_openpt(O_RDWR);
-#else
- ptm = open("/dev/ptmx", O_RDWR);
- if(ptm == -1) {
- if(openpty(&ptm, &pts, NULL, NULL, NULL) == -1)
- eprintn("error, cannot open pty");
- return;
- }
-#endif
-#if defined(_XOPEN_SOURCE)
- if(ptm != -1) {
- if(grantpt(ptm) == -1)
- eprintn("error, cannot grant access to pty");
- if(unlockpt(ptm) == -1)
- eprintn("error, cannot unlock pty");
- ptsdev = ptsname(ptm);
- if(!ptsdev)
- eprintn("error, slave pty name undefined");
- pts = open(ptsdev, O_RDWR);
- if(pts == -1)
- eprintn("error, cannot open slave pty");
- puts(ptsdev);
+int
+getch() {
+ if(rbuf.i++ >= rbuf.n) {
+ rbuf.n = read(ptm, rbuf.data, LENGTH(rbuf.data));
+ if(rbuf.n == -1)
+ eprintn("error, cannot read from slave pty");
+ rbuf.i = 0;
}
- else
- eprintn("error, cannot open pty");
-#endif
+ return rbuf.data[rbuf.i];
}
void
int arg[16];
memset(arg, 0, LENGTH(arg));
- s = 0;
- c = getc(fptm);
+ c = getch();
switch(c) {
case '[':
- c = getc(fptm);
+ c = getch();
for(j = 0; j < LENGTH(arg);) {
if(isdigit(c)) {
- s |= Digit;
+ digit = 1;
arg[j] *= 10;
arg[j] += c - '0';
}
else if(c == '?')
- s |= QuestionMark;
+ qmark = 1;
else if(c == ';') {
- if(!(s & Digit))
- eprint("syntax error");
- s &= ~Digit;
+ if(!digit)
+ eprint("syntax error\n");
+ digit = 0;
j++;
}
else {
- if(s & Digit) {
- s &= ~Digit;
+ if(digit) {
+ digit = 0;
j++;
}
break;
}
- c = getc(fptm);
+ c = getch();
}
switch(c) {
case '@':
break;
default:
putchar('\033');
- ungetc(c, fptm);
+ ungetch(c);
}
}
return c;
}
+void
+ungetch(int c) {
+ if(rbuf.i + 1 >= rbuf.n)
+ eprint("error, read buffer full\n");
+ rbuf.data[rbuf.i++] = c;
+}
+
int
main(int argc, char *argv[]) {
- fd_set rd;
+ fd_set rfds;
+ int r;
+
if(argc == 2 && !strcmp("-v", argv[1]))
eprint("std-"VERSION", © 2008 Matthias-Christian Ott\n");
else if(argc == 1)
eprint("usage: st [-v]\n");
getpty();
shell();
- fdopen(fptm, "r+");
- if(!fptm)
- eprintn("cannot open slave pty");
+ FD_ZERO(&rfds);
+ FD_SET(STDIN_FILENO, &rfds);
+ FD_SET(ptm, &rfds);
+ for(;;) {
+ r = select(ptm + 1, &rfds, NULL, NULL, NULL);
+ if(r == -1)
+ eprintn("error, cannot select");
+ if(FD_ISSET(ptm, &rfds)) {
+ c = getch();
+ switch(c) {
+ case '\033':
+ parseesc();
+ break;
+ default:
+ putchar(c);
+ }
+ fflush(stdout);
+ }
+ }
return 0;
}