X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=std.c;h=5bc27b8dfa34533842ee61135f23d6887f7ebdeb;hb=0cbcedb89ffe6e29b3c0640f371bed578c6e0c07;hp=84048e4681f39e625120868507c6060c162c9f94;hpb=d83cbc27b99427d00846832a73810f285d8f0d05;p=st.git

diff --git a/std.c b/std.c
index 84048e4..5bc27b8 100644
--- a/std.c
+++ b/std.c
@@ -1,8 +1,8 @@
 /* See LICENSE file for copyright and license details. */
-#include "util.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <ctype.h>
+#include <err.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -41,7 +41,7 @@ typedef struct {
 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;
@@ -73,7 +73,7 @@ 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");
+			err(EXIT_FAILURE, "cannot read from slave pty");
 		rbuf.i = 0;
 	}
 	return rbuf.data[rbuf.i];
@@ -113,7 +113,7 @@ parseesc(void) {
 				qmark = 1;
 			else if(c == ';') {
 				if(!digit)
-					eprint("syntax error\n");
+					errx(EXIT_FAILURE, "syntax error");
 				digit = 0;
 				j++;
 			}
@@ -216,7 +216,7 @@ shell(void) {
 	pid = fork();
 	switch(pid) {
 	case -1:
-		eprint("error, cannot fork\n");
+		err(EXIT_FAILURE, "cannot fork");
 	case 0:
 		setsid();
 		dup2(pts, STDIN_FILENO);
@@ -237,7 +237,7 @@ sigchld(int n) {
 	int ret;
 
 	if(waitpid(pid, &ret, 0) == -1)
-		eprintn("error, waiting for child failed");
+		err(EXIT_FAILURE, "waiting for child failed");
 	if(WIFEXITED(ret))
 		exit(WEXITSTATUS(ret));
 	else
@@ -257,28 +257,30 @@ unbuffer(void) {
 void
 ungetch(int c) {
 	if(rbuf.i + 1 >= rbuf.n)
-		eprint("error, read buffer full\n");
+		errx(EXIT_FAILURE, "read buffer full");
 	rbuf.data[rbuf.i++] = c;
 }
 
 int
 main(int argc, char *argv[]) {
 	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");
+	if(argc == 2 && !strcmp("-v", argv[1])) {
+		fprintf(stderr, "std-"VERSION", © 2008 Matthias-Christian Ott\n");
+		exit(EXIT_SUCCESS);
+	}
+	else if(argc == 1) {
+		fprintf(stderr, "usage: st [-v]\n");
+		exit(EXIT_FAILURE);
+	}
 	getpty();
 	shell();
 	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(select(ptm + 1, &rfds, NULL, NULL, NULL) == -1)
+			err(EXIT_FAILURE, "cannot select");
 		if(FD_ISSET(ptm, &rfds)) {
 			do {
 				c = getch();