X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils_run.c;h=8137ec1c66168530f615069ecd97c4560ad2ffb6;hp=b6020b0ab6baea9f1f0d22e24385c3d213aad13f;hb=596714857b0c6b2779e861e4069d63f0fa27aa28;hpb=1aa1e24848903d11780db1ade355be73ad61a937

diff --git a/udev_utils_run.c b/udev_utils_run.c
index b6020b0ab..8137ec1c6 100644
--- a/udev_utils_run.c
+++ b/udev_utils_run.c
@@ -1,6 +1,4 @@
 /*
- * udev_utils_run.c - execute programs from udev and read its output
- *
  * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
@@ -14,7 +12,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -33,6 +31,7 @@
 
 #include "udev.h"
 
+extern char **environ;
 
 int pass_env_to_socket(const char *sockname, const char *devpath, const char *action)
 {
@@ -49,7 +48,7 @@ int pass_env_to_socket(const char *sockname, const char *devpath, const char *ac
 	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
 	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
 	saddr.sun_family = AF_LOCAL;
-	/* only abstract namespace is supported */
+	/* abstract namespace only */
 	strcpy(&saddr.sun_path[1], sockname);
 	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 
@@ -83,16 +82,18 @@ int run_program(const char *command, const char *subsystem,
 	int devnull;
 	int i;
 
+	/* build argv from comand */
 	strlcpy(arg, command, sizeof(arg));
 	i = 0;
-	if (strchr(arg, ' ')) {
+	if (strchr(arg, ' ') != NULL) {
 		char *pos = arg;
+
 		while (pos != NULL) {
 			if (pos[0] == '\'') {
 				/* don't separate if in apostrophes */
 				pos++;
 				argv[i] = strsep(&pos, "\'");
-				while (pos && pos[0] == ' ')
+				while (pos != NULL && pos[0] == ' ')
 					pos++;
 			} else {
 				argv[i] = strsep(&pos, " ");
@@ -101,13 +102,11 @@ int run_program(const char *command, const char *subsystem,
 			i++;
 		}
 		argv[i] = NULL;
-		info("'%s'", command);
 	} else {
 		argv[0] = arg;
-		argv[1] = (char *) subsystem;
-		argv[2] = NULL;
-		info("'%s' '%s'", arg, argv[1]);
+		argv[1] = NULL;
 	}
+	info("'%s'", command);
 
 	/* prepare pipes from child to parent */
 	if (result || log) {
@@ -150,14 +149,22 @@ int run_program(const char *command, const char *subsystem,
 			close(devnull);
 		} else
 			err("open /dev/null failed: %s", strerror(errno));
-		if (outpipe[WRITE_END] > 0)
+		if (outpipe[WRITE_END] > 0) {
 			dup2(outpipe[WRITE_END], STDOUT_FILENO);
-		if (errpipe[WRITE_END] > 0)
+			close(outpipe[WRITE_END]);
+		}
+		if (errpipe[WRITE_END] > 0) {
 			dup2(errpipe[WRITE_END], STDERR_FILENO);
+			close(errpipe[WRITE_END]);
+		}
 		execv(argv[0], argv);
-
-		/* we should never reach this */
-		err("exec of program '%s' failed", argv[0]);
+		if ((errno == ENOENT) || (errno = ENOTDIR)) {
+			/* may be on a filesytem which is not mounted right now */
+			info("program '%s' not found", argv[0]);
+		} else {
+			/* other problems */
+			err("exec of program '%s' failed", argv[0]);
+		}
 		_exit(1);
 	case -1:
 		err("fork of '%s' failed: %s", argv[0], strerror(errno));