From: Neil Brown <neilb@suse.de>
Date: Fri, 23 Jun 2006 07:10:56 +0000 (+1000)
Subject: Further coverity related cleanups.
X-Git-Tag: nfs-utils-1-0-9-pre1~3
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=0523fd513c6baa8dbf45d1a7afea2044262aeb3d;p=nfs-utils.git

Further coverity related cleanups.

Greg Banks suggested some variations, particularly improved
use of xmalloc/xstrdup functions.  Thanks.
---

diff --git a/support/misc/mountpoint.c b/support/misc/mountpoint.c
index 2cf1324..750b6e8 100644
--- a/support/misc/mountpoint.c
+++ b/support/misc/mountpoint.c
@@ -22,9 +22,8 @@ is_mountpoint(char *path)
 	struct stat stb, pstb;
 	int rv;
 
-	dotdot = malloc(strlen(path)+4);
-	if (!dotdot)
-		return 0;
+	dotdot = xmalloc(strlen(path)+4);
+
 	strcat(strcpy(dotdot, path), "/..");
 	if (lstat(path, &stb) != 0 ||
 	    lstat(dotdot, &pstb) != 0)
diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
index 1231db4..5fc7811 100644
--- a/utils/idmapd/idmapd.c
+++ b/utils/idmapd/idmapd.c
@@ -1003,12 +1003,15 @@ mydaemon(int nochdir, int noclose)
 
 	if (noclose == 0) {
 		tempfd = open("/dev/null", O_RDWR);
+		if (tempfd < 0)
+			tempfd = open("/", O_RDONLY);
 		if (tempfd >= 0) {
 			dup2(tempfd, 0);
 			dup2(tempfd, 1);
 			dup2(tempfd, 2);
-		}
-		closeall(3);
+			closeall(3);
+		} else
+			closeall(0);
 	}
 
 	return;
diff --git a/utils/statd/notlist.c b/utils/statd/notlist.c
index 98aa6e2..b74d9df 100644
--- a/utils/statd/notlist.c
+++ b/utils/statd/notlist.c
@@ -54,19 +54,13 @@ nlist_new(char *my_name, char *mon_name, int state)
 {
 	notify_list	*new;
 
-	if (!(new = (notify_list *) xmalloc(sizeof(notify_list))))
-		return NULL;
+	new = (notify_list *) xmalloc(sizeof(notify_list));
 	memset(new, 0, sizeof(*new));
 
 	NL_TIMES(new) = MAX_TRIES;
 	NL_STATE(new) = state;
-	if (!(NL_MY_NAME(new) = xstrdup(my_name))
-	    || !(NL_MON_NAME(new) = xstrdup(mon_name))) {
-		if (NL_MY_NAME(new))
-			free(NL_MY_NAME(new));
-		free(new);
-		return NULL;
-	}
+	NL_MY_NAME(new) = xstrdup(my_name);
+	NL_MON_NAME(new) = xstrdup(mon_name);
 
 	return new;
 }