[gentoo-commits] proj/elfix:master commit in: misc/install.wrapper.c/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     c8259e3db52ff45c9346d8ae01e3d7e3285678f0
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 20:29:47 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 20:30:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=c8259e3d

misc/install.wrapper.c: add xstrdup() helper

---
 misc/install.wrapper.c/install.wrapper.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/misc/install.wrapper.c/install.wrapper.c b/misc/install.wrapper.c/install.wrapper.c
index 4925e32..bad64fe 100644
--- a/misc/install.wrapper.c/install.wrapper.c
+++ b/misc/install.wrapper.c/install.wrapper.c
@@ -20,6 +20,15 @@
 #include <sys/stat.h>
 #include <sys/xattr.h>
 
+static char *
+xstrdup(const char *s)
+{
+	char *ret = strdup(s);
+	if (ret == NULL)
+		err(1, "strdup() failed");
+	return ret;
+}
+
 static void *
 xmalloc(size_t size)
 {
@@ -137,7 +146,7 @@ which(const char *mydir)
 		path = xmalloc(len);
 		confstr(_CS_PATH, path, len);
 	} else
-		path = strdup(env_path);
+		path = xstrdup(env_path);
 
 	char *dir;       /* one directory in the $PATH string */
 	char *candir;    /* canonical value of that directory */
@@ -207,9 +216,9 @@ main(int argc, char* argv[])
 
 	portage_xattr_exclude = getenv("PORTAGE_XATTR_EXCLUDE");
 	if (portage_xattr_exclude == NULL)
-		exclude = strdup("security.* system.nfs4_acl");
+		exclude = xstrdup("security.* system.nfs4_acl");
 	else
-		exclude = strdup(portage_xattr_exclude);
+		exclude = xstrdup(portage_xattr_exclude);
 
 	len_exclude = strlen(exclude);