[hackers] [st] Add xstrdup function || Roberto E. Vargas Caballero

From: <git_AT_suckless.org>
Date: Sat, 08 Feb 2014 19:59:11 +0100

commit cdb3b1892af40110660da8c3f6fc06b1b054fd12
Author: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
Date: Sat Feb 1 11:12:47 2014 +0100

    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_AT_shike2.com>

diff --git a/st.c b/st.c
index 37bec70..cad61bf 100644
--- a/st.c
+++ b/st.c
_AT_@ -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,
_AT_@ -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
");
+
+ return p;
+}
+
 int
 utf8decode(char *s, long *u) {
         uchar c;
_AT_@ -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);
                         }
                 }
Received on Sat Feb 08 2014 - 19:59:11 CET