split udev_util in several files

It too big for the small tools to link against for only the log function.

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

5 files changed, 322 insertions, 253 deletions

diff --git a/Makefile b/Makefile
index 7618d0f7fd..ecc798de89 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,6 @@ SYSFS_OBJS = \
 	libsysfs/dlist.o
 
 UDEV_OBJS = \
-	udev_utils.o			\
 	udev_event.o			\
 	udev_device.o			\
 	udev_config.o			\
@@ -146,6 +145,9 @@ UDEV_OBJS = \
 	udev_db.o			\
 	udev_rules.o			\
 	udev_rules_parse.o		\
+	udev_utils.o			\
+	udev_utils_file.o		\
+	udev_utils_run.o		\
 	udev_libc_wrapper.o
 
 OBJS = \
diff --git a/udev_event.c b/udev_event.c
index 8a3ed29315..3580ab937f 100644
--- a/udev_event.c
+++ b/udev_event.c
@@ -28,10 +28,6 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <syslog.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/utsname.h>
 
 #include "udev_libc_wrapper.h"
 #include "udev.h"
diff --git a/udev_utils.c b/udev_utils.c
index 500d595c01..de43dee30d 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -28,11 +28,6 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <syslog.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
 #include <sys/utsname.h>
 
 #include "udev_libc_wrapper.h"
@@ -148,109 +143,6 @@ int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, u
 		return 0;
 }
 
-int create_path(const char *path)
-{
-	char p[PATH_SIZE];
-	char *pos;
-	struct stat stats;
-
-	strcpy (p, path);
-	pos = strrchr(p, '/');
-	if (pos == p || pos == NULL)
-		return 0;
-
-	while (pos[-1] == '/')
-		pos--;
-
-	pos[0] = '\0';
-
-	dbg("stat '%s'\n", p);
-	if (stat (p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
-		return 0;
-
-	if (create_path (p) != 0)
-		return -1;
-
-	dbg("mkdir '%s'\n", p);
-	return mkdir(p, 0755);
-}
-
-/* Reset permissions on the device node, before unlinking it to make sure,
- * that permisions of possible hard links will be removed too.
- */
-int unlink_secure(const char *filename)
-{
-	int retval;
-
-	retval = chown(filename, 0, 0);
-	if (retval)
-		dbg("chown(%s, 0, 0) failed with error '%s'", filename, strerror(errno));
-
-	retval = chmod(filename, 0000);
-	if (retval)
-		dbg("chmod(%s, 0000) failed with error '%s'", filename, strerror(errno));
-
-	retval = unlink(filename);
-	if (errno == ENOENT)
-		retval = 0;
-
-	if (retval)
-		dbg("unlink(%s) failed with error '%s'", filename, strerror(errno));
-
-	return retval;
-}
-
-int file_map(const char *filename, char **buf, size_t *bufsize)
-{
-	struct stat stats;
-	int fd;
-
-	fd = open(filename, O_RDONLY);
-	if (fd < 0) {
-		return -1;
-	}
-
-	if (fstat(fd, &stats) < 0) {
-		close(fd);
-		return -1;
-	}
-
-	*buf = mmap(NULL, stats.st_size, PROT_READ, MAP_SHARED, fd, 0);
-	if (*buf == MAP_FAILED) {
-		close(fd);
-		return -1;
-	}
-	*bufsize = stats.st_size;
-
-	close(fd);
-
-	return 0;
-}
-
-void file_unmap(void *buf, size_t bufsize)
-{
-	munmap(buf, bufsize);
-}
-
-/* return number of chars until the next newline, skip escaped newline */
-size_t buf_get_line(const char *buf, size_t buflen, size_t cur)
-{
-	int escape = 0;
-	size_t count;
-
-	for (count = cur; count < buflen; count++) {
-		if (!escape && buf[count] == '\n')
-			break;
-
-		if (buf[count] == '\\')
-			escape = 1;
-		else
-			escape = 0;
-	}
-
-	return count - cur;
-}
-
 void replace_untrusted_chars(char *string)
 {
 	size_t len;
@@ -373,143 +265,3 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
 	closedir(dir);
 	return 0;
 }
-
-int pass_env_to_socket(const char *sockname, const char *devpath, const char *action)
-{
-	int sock;
-	struct sockaddr_un saddr;
-	socklen_t addrlen;
-	char buf[2048];
-	size_t bufpos = 0;
-	int i;
-	int retval;
-
-	dbg("pass environment to socket '%s'", sockname);
-	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
-	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
-	saddr.sun_family = AF_LOCAL;
-	/* only abstract namespace is supported */
-	strcpy(&saddr.sun_path[1], sockname);
-	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
-
-	bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
-	bufpos++;
-	for (i = 0; environ[i] != NULL && bufpos < sizeof(buf); i++) {
-		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos-1);
-		bufpos++;
-	}
-
-	retval = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, addrlen);
-	if (retval != -1)
-		retval = 0;
-
-	close(sock);
-	return retval;
-}
-
-int execute_program(const char *command, const char *subsystem,
-		    char *result, size_t ressize, size_t *reslen)
-{
-	int retval = 0;
-	int count;
-	int status;
-	int pipefds[2];
-	pid_t pid;
-	char *pos;
-	char arg[PATH_SIZE];
-	char *argv[(sizeof(arg) / 2) + 1];
-	int devnull;
-	int i;
-	size_t len;
-
-	strlcpy(arg, command, sizeof(arg));
-	i = 0;
-	if (strchr(arg, ' ')) {
-		pos = arg;
-		while (pos != NULL) {
-			if (pos[0] == '\'') {
-				/* don't separate if in apostrophes */
-				pos++;
-				argv[i] = strsep(&pos, "\'");
-				while (pos && pos[0] == ' ')
-					pos++;
-			} else {
-				argv[i] = strsep(&pos, " ");
-			}
-			dbg("arg[%i] '%s'", i, argv[i]);
-			i++;
-		}
-		argv[i] =  NULL;
-		dbg("execute '%s' with parsed arguments", arg);
-	} else {
-		argv[0] = arg;
-		argv[1] = (char *) subsystem;
-		argv[2] = NULL;
-		dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
-	}
-
-	if (result) {
-		if (pipe(pipefds) != 0) {
-			err("pipe failed");
-			return -1;
-		}
-	}
-
-	pid = fork();
-	switch(pid) {
-	case 0:
-		/* child dup2 write side of pipe to STDOUT */
-		devnull = open("/dev/null", O_RDWR);
-		if (devnull >= 0) {
-			dup2(devnull, STDIN_FILENO);
-			if (!result)
-				dup2(devnull, STDOUT_FILENO);
-			dup2(devnull, STDERR_FILENO);
-			close(devnull);
-		}
-		if (result)
-			dup2(pipefds[1], STDOUT_FILENO);
-		execv(arg, argv);
-		err("exec of program failed");
-		_exit(1);
-	case -1:
-		err("fork of '%s' failed", arg);
-		return -1;
-	default:
-		/* parent reads from pipefds[0] */
-		if (result) {
-			close(pipefds[1]);
-			len = 0;
-			while (1) {
-				count = read(pipefds[0], result + len, ressize - len-1);
-				if (count < 0) {
-					err("read failed with '%s'", strerror(errno));
-					retval = -1;
-					break;
-				}
-
-				if (count == 0)
-					break;
-
-				len += count;
-				if (len >= ressize-1) {
-					err("ressize %ld too short", (long)ressize);
-					retval = -1;
-					break;
-				}
-			}
-			result[len] = '\0';
-			close(pipefds[0]);
-			if (reslen)
-				*reslen = len;
-		}
-		waitpid(pid, &status, 0);
-
-		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
-			dbg("exec program status 0x%x", status);
-			retval = -1;
-		}
-	}
-
-	return retval;
-}
diff --git a/udev_utils_file.c b/udev_utils_file.c
new file mode 100644
index 0000000000..f8518f64ad
--- /dev/null
+++ b/udev_utils_file.c
@@ -0,0 +1,140 @@
+/*
+ * udev_utils_file.c - files operations
+ *
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ *
+ *	This program is free software; you can redistribute it and/or modify it
+ *	under the terms of the GNU General Public License as published by the
+ *	Free Software Foundation version 2 of the License.
+ * 
+ *	This program is distributed in the hope that it will be useful, but
+ *	WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *	General Public License for more details.
+ * 
+ *	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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#include "udev_libc_wrapper.h"
+#include "udev.h"
+#include "logging.h"
+#include "udev_utils.h"
+#include "list.h"
+
+int create_path(const char *path)
+{
+	char p[PATH_SIZE];
+	char *pos;
+	struct stat stats;
+
+	strcpy (p, path);
+	pos = strrchr(p, '/');
+	if (pos == p || pos == NULL)
+		return 0;
+
+	while (pos[-1] == '/')
+		pos--;
+
+	pos[0] = '\0';
+
+	dbg("stat '%s'\n", p);
+	if (stat (p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
+		return 0;
+
+	if (create_path (p) != 0)
+		return -1;
+
+	dbg("mkdir '%s'\n", p);
+	return mkdir(p, 0755);
+}
+
+/* Reset permissions on the device node, before unlinking it to make sure,
+ * that permisions of possible hard links will be removed too.
+ */
+int unlink_secure(const char *filename)
+{
+	int retval;
+
+	retval = chown(filename, 0, 0);
+	if (retval)
+		dbg("chown(%s, 0, 0) failed with error '%s'", filename, strerror(errno));
+
+	retval = chmod(filename, 0000);
+	if (retval)
+		dbg("chmod(%s, 0000) failed with error '%s'", filename, strerror(errno));
+
+	retval = unlink(filename);
+	if (errno == ENOENT)
+		retval = 0;
+
+	if (retval)
+		dbg("unlink(%s) failed with error '%s'", filename, strerror(errno));
+
+	return retval;
+}
+
+int file_map(const char *filename, char **buf, size_t *bufsize)
+{
+	struct stat stats;
+	int fd;
+
+	fd = open(filename, O_RDONLY);
+	if (fd < 0) {
+		return -1;
+	}
+
+	if (fstat(fd, &stats) < 0) {
+		close(fd);
+		return -1;
+	}
+
+	*buf = mmap(NULL, stats.st_size, PROT_READ, MAP_SHARED, fd, 0);
+	if (*buf == MAP_FAILED) {
+		close(fd);
+		return -1;
+	}
+	*bufsize = stats.st_size;
+
+	close(fd);
+
+	return 0;
+}
+
+void file_unmap(void *buf, size_t bufsize)
+{
+	munmap(buf, bufsize);
+}
+
+/* return number of chars until the next newline, skip escaped newline */
+size_t buf_get_line(const char *buf, size_t buflen, size_t cur)
+{
+	int escape = 0;
+	size_t count;
+
+	for (count = cur; count < buflen; count++) {
+		if (!escape && buf[count] == '\n')
+			break;
+
+		if (buf[count] == '\\')
+			escape = 1;
+		else
+			escape = 0;
+	}
+
+	return count - cur;
+}
diff --git a/udev_utils_run.c b/udev_utils_run.c
new file mode 100644
index 0000000000..c2e77cbbcc
--- /dev/null
+++ b/udev_utils_run.c
@@ -0,0 +1,179 @@
+/*
+ * 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
+ *	under the terms of the GNU General Public License as published by the
+ *	Free Software Foundation version 2 of the License.
+ * 
+ *	This program is distributed in the hope that it will be useful, but
+ *	WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *	General Public License for more details.
+ * 
+ *	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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <ctype.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+
+#include "udev_libc_wrapper.h"
+#include "udev.h"
+#include "logging.h"
+#include "udev_utils.h"
+#include "list.h"
+
+
+int pass_env_to_socket(const char *sockname, const char *devpath, const char *action)
+{
+	int sock;
+	struct sockaddr_un saddr;
+	socklen_t addrlen;
+	char buf[2048];
+	size_t bufpos = 0;
+	int i;
+	int retval;
+
+	dbg("pass environment to socket '%s'", sockname);
+	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
+	saddr.sun_family = AF_LOCAL;
+	/* only abstract namespace is supported */
+	strcpy(&saddr.sun_path[1], sockname);
+	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+
+	bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
+	bufpos++;
+	for (i = 0; environ[i] != NULL && bufpos < sizeof(buf); i++) {
+		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos-1);
+		bufpos++;
+	}
+
+	retval = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, addrlen);
+	if (retval != -1)
+		retval = 0;
+
+	close(sock);
+	return retval;
+}
+
+int execute_program(const char *command, const char *subsystem,
+		    char *result, size_t ressize, size_t *reslen)
+{
+	int retval = 0;
+	int count;
+	int status;
+	int pipefds[2];
+	pid_t pid;
+	char *pos;
+	char arg[PATH_SIZE];
+	char *argv[(sizeof(arg) / 2) + 1];
+	int devnull;
+	int i;
+	size_t len;
+
+	strlcpy(arg, command, sizeof(arg));
+	i = 0;
+	if (strchr(arg, ' ')) {
+		pos = arg;
+		while (pos != NULL) {
+			if (pos[0] == '\'') {
+				/* don't separate if in apostrophes */
+				pos++;
+				argv[i] = strsep(&pos, "\'");
+				while (pos && pos[0] == ' ')
+					pos++;
+			} else {
+				argv[i] = strsep(&pos, " ");
+			}
+			dbg("arg[%i] '%s'", i, argv[i]);
+			i++;
+		}
+		argv[i] =  NULL;
+		dbg("execute '%s' with parsed arguments", arg);
+	} else {
+		argv[0] = arg;
+		argv[1] = (char *) subsystem;
+		argv[2] = NULL;
+		dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
+	}
+
+	if (result) {
+		if (pipe(pipefds) != 0) {
+			err("pipe failed");
+			return -1;
+		}
+	}
+
+	pid = fork();
+	switch(pid) {
+	case 0:
+		/* child dup2 write side of pipe to STDOUT */
+		devnull = open("/dev/null", O_RDWR);
+		if (devnull >= 0) {
+			dup2(devnull, STDIN_FILENO);
+			if (!result)
+				dup2(devnull, STDOUT_FILENO);
+			dup2(devnull, STDERR_FILENO);
+			close(devnull);
+		}
+		if (result)
+			dup2(pipefds[1], STDOUT_FILENO);
+		execv(arg, argv);
+		err("exec of program failed");
+		_exit(1);
+	case -1:
+		err("fork of '%s' failed", arg);
+		return -1;
+	default:
+		/* parent reads from pipefds[0] */
+		if (result) {
+			close(pipefds[1]);
+			len = 0;
+			while (1) {
+				count = read(pipefds[0], result + len, ressize - len-1);
+				if (count < 0) {
+					err("read failed with '%s'", strerror(errno));
+					retval = -1;
+					break;
+				}
+
+				if (count == 0)
+					break;
+
+				len += count;
+				if (len >= ressize-1) {
+					err("ressize %ld too short", (long)ressize);
+					retval = -1;
+					break;
+				}
+			}
+			result[len] = '\0';
+			close(pipefds[0]);
+			if (reslen)
+				*reslen = len;
+		}
+		waitpid(pid, &status, 0);
+
+		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
+			dbg("exec program status 0x%x", status);
+			retval = -1;
+		}
+	}
+
+	return retval;
+}
+