remove emallocz()
parent
f982c1c37c
commit
b3902ca178
6
Makefile
6
Makefile
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
include config.mk
|
include config.mk
|
||||||
|
|
||||||
SRC = st.c std.c util.c pty.c
|
SRC = st.c std.c pty.c
|
||||||
OBJ = ${SRC:.c=.o}
|
OBJ = ${SRC:.c=.o}
|
||||||
|
|
||||||
all: options st std
|
all: options st std
|
||||||
|
@ -21,11 +21,11 @@ options:
|
||||||
|
|
||||||
${OBJ}: config.mk
|
${OBJ}: config.mk
|
||||||
|
|
||||||
st: st.o util.o
|
st: st.o
|
||||||
@echo CC -o $@
|
@echo CC -o $@
|
||||||
@${CC} -o $@ $^ ${LDFLAGS} ${X11LDFLAGS}
|
@${CC} -o $@ $^ ${LDFLAGS} ${X11LDFLAGS}
|
||||||
|
|
||||||
std: std.o pty.o util.o
|
std: std.o pty.o
|
||||||
@echo CC -o $@
|
@echo CC -o $@
|
||||||
@${CC} -o $@ $^ ${LDFLAGS}
|
@${CC} -o $@ $^ ${LDFLAGS}
|
||||||
|
|
||||||
|
|
1
pty.c
1
pty.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/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
1
std.c
1
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/types.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
16
util.c
16
util.c
|
@ -1,16 +0,0 @@
|
||||||
/* 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)
|
|
||||||
err(EXIT_FAILURE, "could not malloc() %u bytes\n", size);
|
|
||||||
return res;
|
|
||||||
}
|
|
Reference in New Issue