Add xstrdup function

Since we are using xmalloc, xrealloc ..., then it is not logical
call directly to strdup.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
dev
Roberto E. Vargas Caballero 2014-02-01 11:12:47 +01:00
parent 315b7ee9ce
commit cdb3b1892a
1 changed files with 12 additions and 1 deletions

13
st.c
View File

@ -441,6 +441,7 @@ static int isfullutf8(char *, int);
static ssize_t xwrite(int, char *, size_t); static ssize_t xwrite(int, char *, size_t);
static void *xmalloc(size_t); static void *xmalloc(size_t);
static void *xrealloc(void *, size_t); static void *xrealloc(void *, size_t);
static char *xstrdup(char *s);
static void (*handler[LASTEvent])(XEvent *) = { static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress, [KeyPress] = kpress,
@ -529,6 +530,16 @@ xrealloc(void *p, size_t len) {
return p; return p;
} }
char *
xstrdup(char *s) {
char *p = strdup(s);
if (!p)
die("Out of memory\n");
return p;
}
int int
utf8decode(char *s, long *u) { utf8decode(char *s, long *u) {
uchar c; uchar c;
@ -3789,7 +3800,7 @@ main(int argc, char *argv[]) {
if(argc > 1) { if(argc > 1) {
opt_cmd = &argv[1]; opt_cmd = &argv[1];
if(argv[1] != NULL && opt_title == NULL) { if(argv[1] != NULL && opt_title == NULL) {
titles = strdup(argv[1]); titles = xstrdup(argv[1]);
opt_title = basename(titles); opt_title = basename(titles);
} }
} }