Browse Source

source utility functions out to util.c

master
Matthias-Christian Ott 16 years ago
parent
commit
5f28725471
6 changed files with 46 additions and 39 deletions
  1. +1
    -1
      Makefile
  2. +1
    -0
      pty.c
  3. +1
    -0
      st.c
  4. +1
    -38
      std.c
  5. +37
    -0
      util.c
  6. +5
    -0
      util.h

+ 1
- 1
Makefile View File

@ -3,7 +3,7 @@
include config.mk include config.mk
SRC = st.c std.c
SRC = st.c std.c util.c pty.c
OBJ = ${SRC:.c=.o} OBJ = ${SRC:.c=.o}
all: options st all: options st


+ 1
- 0
pty.c View File

@ -1,4 +1,5 @@
/* 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/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>


+ 1
- 0
st.c View File

@ -1,4 +1,5 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
#include "util.h"
#include <stdio.h> #include <stdio.h>
int int


+ 1
- 38
std.c View File

@ -1,12 +1,8 @@
/* See LICENSE file for copyright and license details. */ /* 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/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <signal.h> #include <signal.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
@ -20,9 +16,6 @@
void buffer(char c); void buffer(char c);
void cmd(const char *cmdstr, ...); void cmd(const char *cmdstr, ...);
void *emallocz(unsigned int size);
void eprint(const char *errstr, ...);
void eprintn(const char *errstr, ...);
void getpty(void); void getpty(void);
void movea(int x, int y); void movea(int x, int y);
void mover(int x, int y); void mover(int x, int y);
@ -68,36 +61,6 @@ cmd(const char *cmdstr, ...) {
va_end(ap); 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 void
movea(int x, int y) { movea(int x, int y) {
x = MAX(x, cols); x = MAX(x, cols);


+ 37
- 0
util.c View File

@ -0,0 +1,37 @@
/* See LICENSE file for copyright and license details. */
#include "util.h"
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
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);
}

+ 5
- 0
util.h View File

@ -0,0 +1,5 @@
/* See LICENSE file for copyright and license details. */
void *emallocz(unsigned int size);
void eprint(const char *errstr, ...);
void eprintn(const char *errstr, ...);

Loading…
Cancel
Save