X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/47d8633f157156ef4701ce71ed7eff766206c107..339e7f35713ae0c35be2537e6639cd5eee592acb:/std.c?ds=sidebyside diff --git a/std.c b/std.c index 1b918f5..a7b2f4a 100644 --- a/std.c +++ b/std.c @@ -1,11 +1,8 @@ -#include -#include -#include +/* See LICENSE file for copyright and license details. */ +#include "util.h" #include #include #include -#include -#include #include #include #include @@ -19,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); @@ -67,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);