replace state with separate variables

[st.git] / std.c

diff --git a/std.c b/std.c
index ef946dd..4808db4 100644 (file)
--- a/std.c
+++ b/std.c
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <unistd.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))
 
 #define MAX(a,b)       (((a) > (b)) ? (a) : (b))
 #define MIN(a,b)       (((a) < (b)) ? (a) : (b))
 


@@ -31,8 +31,6 @@ void shell(void);
 void sigchld(int n);
 char unbuffer(void);
 
 void sigchld(int n);
 char unbuffer(void);
 

-enum { QuestionMark = 1, Digit = 2 };
-

 typedef struct {
        unsigned char data[BUFSIZ];
        int s, e;
 typedef struct {
        unsigned char data[BUFSIZ];
        int s, e;


@@ -41,10 +39,10 @@ typedef struct {
 
 int cols = 80, lines = 25;
 int cx = 0, cy = 0;
 
 int cols = 80, lines = 25;
 int cx = 0, cy = 0;

-int c, s;
+int c;

 FILE *fptm = NULL;
 int ptm, pts;
 FILE *fptm = NULL;
 int ptm, pts;

-_Bool bold;
+_Bool bold, digit, qmark;

 pid_t pid;
 RingBuffer buf;
 
 pid_t pid;
 RingBuffer buf;
 


@@ -109,11 +107,9 @@ getpty(void) {
        ptm = posix_openpt(O_RDWR);
 #else
        ptm = open("/dev/ptmx", O_RDWR);
        ptm = posix_openpt(O_RDWR);
 #else
        ptm = open("/dev/ptmx", O_RDWR);

-       if(ptm == -1) {
+       if(ptm == -1)

                if(openpty(&ptm, &pts, NULL, NULL, NULL) == -1)
                        eprintn("error, cannot open pty");
                if(openpty(&ptm, &pts, NULL, NULL, NULL) == -1)
                        eprintn("error, cannot open pty");

-               return;
-       }

 #endif
 #if defined(_XOPEN_SOURCE)
        if(ptm != -1) {
 #endif
 #if defined(_XOPEN_SOURCE)
        if(ptm != -1) {


@@ -127,7 +123,6 @@ getpty(void) {
                pts = open(ptsdev, O_RDWR);
                if(pts == -1)
                        eprintn("error, cannot open slave pty");
                pts = open(ptsdev, O_RDWR);
                if(pts == -1)
                        eprintn("error, cannot open slave pty");

-               puts(ptsdev);

        }
        else
                eprintn("error, cannot open pty");
        }
        else
                eprintn("error, cannot open pty");


@@ -154,28 +149,27 @@ parseesc(void) {
        int arg[16];
 
        memset(arg, 0, LENGTH(arg));
        int arg[16];
 
        memset(arg, 0, LENGTH(arg));

-       s = 0;

        c = getc(fptm);
        switch(c) {
        case '[':
                c = getc(fptm);
                for(j = 0; j < LENGTH(arg);) {
                        if(isdigit(c)) {
        c = getc(fptm);
        switch(c) {
        case '[':
                c = getc(fptm);
                for(j = 0; j < LENGTH(arg);) {
                        if(isdigit(c)) {

-                               s |= Digit;
+                               digit = 1;

                                arg[j] *= 10;
                                arg[j] += c - '0';
                        }
                        else if(c == '?')
                                arg[j] *= 10;
                                arg[j] += c - '0';
                        }
                        else if(c == '?')

-                               s |= QuestionMark; 
+                               qmark = 1;

                        else if(c == ';') {
                        else if(c == ';') {

-                               if(!(s & Digit))
-                                       eprint("syntax error");
-                               s &= ~Digit;
+                               if(!digit)
+                                       eprint("syntax error\n");
+                               digit = 0;

                                j++;
                        }
                        else {
                                j++;
                        }
                        else {

-                               if(s & Digit) {
-                                       s &= ~Digit;
+                               if(digit) {
+                                       digit = 0;

                                        j++;
                                }
                                break;
                                        j++;
                                }
                                break;


@@ -319,8 +313,5 @@ main(int argc, char *argv[]) {
                eprint("usage: st [-v]\n");
        getpty();
        shell();
                eprint("usage: st [-v]\n");
        getpty();
        shell();

-       fdopen(fptm, "r+");
-       if(!fptm)
-               eprintn("cannot open slave pty");

        return 0;
 }
        return 0;
 }