aboutsummaryrefslogtreecommitdiff
path: root/std.c
diff options
context:
space:
mode:
authorMatthias-Christian Ott <ott@enolink.de>2008-06-10 17:56:57 +0200
committerMatthias-Christian Ott <ott@enolink.de>2008-06-10 17:56:57 +0200
commit3e8930a7a6f8cd9c6cadeb3c89a743beb698d1f8 (patch)
treed9c93f4d89197a5339f6e979b0cbd67519f37f0b /std.c
parentdf9140d0505aa38ac5cb8182b24f2b86a136ec35 (diff)
downloadst-3e8930a7a6f8cd9c6cadeb3c89a743beb698d1f8.tar.gz
st-3e8930a7a6f8cd9c6cadeb3c89a743beb698d1f8.tar.bz2
source utility functions out to util.c
Diffstat (limited to 'std.c')
-rw-r--r--std.c39
1 files changed, 1 insertions, 38 deletions
diff --git a/std.c b/std.c
index 3fd07a4..a7b2f4a 100644
--- a/std.c
+++ b/std.c
@@ -1,12 +1,8 @@
/* See LICENSE file for copyright and license details. */
-#include <sys/ioctl.h>
-#include <sys/select.h>
-#include <sys/stat.h>
+#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>
@@ -20,9 +16,6 @@
void buffer(char c);
void cmd(const char *cmdstr, ...);
-void *emallocz(unsigned int size);
-void eprint(const char *errstr, ...);
-void eprintn(const char *errstr, ...);
void getpty(void);
void movea(int x, int y);
void mover(int x, int y);
@@ -68,36 +61,6 @@ cmd(const char *cmdstr, ...) {
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
movea(int x, int y) {
x = MAX(x, cols);