remove TODO

[st.git] / std.c

diff --git a/std.c b/std.c
index daf759e..5bc27b8 100644 (file)
--- a/std.c
+++ b/std.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include "util.h"

 #include <sys/types.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <ctype.h>


@@ -42,7 +41,7 @@ typedef struct {
 static int cols = 80, lines = 25;
 static int cx = 0, cy = 0;
 static int c;
 static int cols = 80, lines = 25;
 static int cx = 0, cy = 0;
 static int c;

-int ptm, pts;
+static int ptm, pts;

 static _Bool bold, digit, qmark;
 static pid_t pid;
 static RingBuffer buf;
 static _Bool bold, digit, qmark;
 static pid_t pid;
 static RingBuffer buf;


@@ -265,7 +264,6 @@ ungetch(int c) {
 int
 main(int argc, char *argv[]) {
        fd_set rfds;
 int
 main(int argc, char *argv[]) {
        fd_set rfds;

-       int r;

 
        if(argc == 2 && !strcmp("-v", argv[1])) {
                fprintf(stderr, "std-"VERSION", © 2008 Matthias-Christian Ott\n");
 
        if(argc == 2 && !strcmp("-v", argv[1])) {
                fprintf(stderr, "std-"VERSION", © 2008 Matthias-Christian Ott\n");


@@ -281,8 +279,7 @@ main(int argc, char *argv[]) {
        FD_SET(STDIN_FILENO, &rfds);
        FD_SET(ptm, &rfds);
        for(;;) {
        FD_SET(STDIN_FILENO, &rfds);
        FD_SET(ptm, &rfds);
        for(;;) {

-               r = select(ptm + 1, &rfds, NULL, NULL, NULL);
-               if(r == -1)
+               if(select(ptm + 1, &rfds, NULL, NULL, NULL) == -1)

                        err(EXIT_FAILURE, "cannot select");
                if(FD_ISSET(ptm, &rfds)) {
                        do {
                        err(EXIT_FAILURE, "cannot select");
                if(FD_ISSET(ptm, &rfds)) {
                        do {