aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto E. Vargas Caballero <k0ga@shike2.com>2014-02-01 11:12:47 +0100
committerRoberto E. Vargas Caballero <k0ga@shike2.com>2014-02-08 19:58:37 +0100
commitcdb3b1892af40110660da8c3f6fc06b1b054fd12 (patch)
tree5fc8da65b8b76dcc64d1db2ace8b7eed556a666f
parent315b7ee9ce13603339104cab0402d7d6c10e92b8 (diff)
downloadst-cdb3b1892af40110660da8c3f6fc06b1b054fd12.tar.gz
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>
-rw-r--r--st.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/st.c b/st.c
index 37bec70..cad61bf 100644
--- a/st.c
+++ b/st.c
@@ -441,6 +441,7 @@ static int isfullutf8(char *, int);
static ssize_t xwrite(int, char *, size_t);
static void *xmalloc(size_t);
static void *xrealloc(void *, size_t);
+static char *xstrdup(char *s);
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
@@ -529,6 +530,16 @@ xrealloc(void *p, size_t len) {
return p;
}
+char *
+xstrdup(char *s) {
+ char *p = strdup(s);
+
+ if (!p)
+ die("Out of memory\n");
+
+ return p;
+}
+
int
utf8decode(char *s, long *u) {
uchar c;
@@ -3789,7 +3800,7 @@ main(int argc, char *argv[]) {
if(argc > 1) {
opt_cmd = &argv[1];
if(argv[1] != NULL && opt_title == NULL) {
- titles = strdup(argv[1]);
+ titles = xstrdup(argv[1]);
opt_title = basename(titles);
}
}