X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=6d39d294e1dba8843e93549eeae839f943fbad6c;hp=262108dff7d25a09dcbcf6062928b5552ed40df6;hb=e047ca9bdfc3d95cccbbcf6d4f2358648c7d0758;hpb=e8bacccab296d6b75c4c9f43cb4e71007aff5b8a

diff --git a/udev_config.c b/udev_config.c
index 262108dff..6d39d294e 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -3,7 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *
  *	This program is free software; you can redistribute it and/or modify it
@@ -34,24 +34,32 @@
 
 #include "udev.h"
 #include "udev_version.h"
+#include "logging.h"
 #include "namedev.h"
 #include "libsysfs/libsysfs.h"
 
 /* global variables */
 char sysfs_path[SYSFS_PATH_MAX];
-char udev_config_dir[PATH_MAX];
 char udev_root[PATH_MAX];
 char udev_db_filename[PATH_MAX+NAME_MAX];
-char udev_permission_filename[PATH_MAX+NAME_MAX];
+char udev_permissions_filename[PATH_MAX+NAME_MAX];
 char udev_rules_filename[PATH_MAX+NAME_MAX];
 char udev_config_filename[PATH_MAX+NAME_MAX];
-char default_mode_str[NAME_MAX];
+char default_mode_str[MODE_SIZE];
+char default_owner_str[OWNER_SIZE];
+char default_group_str[GROUP_SIZE];
 
 
 static void init_variables(void)
 {
+	/* fill up the defaults.  
+	 * If any config values are specified, they will
+	 * override these values. */
 	strfieldcpy(udev_root, UDEV_ROOT);
-	strfieldcpy(udev_config_dir, UDEV_CONFIG_DIR);
+	strfieldcpy(udev_db_filename, UDEV_DB);
+	strfieldcpy(udev_config_filename, UDEV_CONFIG_FILE);
+	strfieldcpy(udev_rules_filename, UDEV_RULES_FILE);
+	strfieldcpy(udev_permissions_filename, UDEV_PERMISSION_FILE);
 }
 
 #define set_var(_name, _var)				\
@@ -60,6 +68,41 @@ static void init_variables(void)
 		strncpy(_var, value, sizeof(_var));	\
 	}
 
+int parse_get_pair(char **orig_string, char **left, char **right)
+{
+	char *temp;
+	char *string = *orig_string;
+
+	if (!string)
+		return -ENODEV;
+
+	/* eat any whitespace */
+	while (isspace(*string) || *string == ',')
+		++string;
+
+	/* split based on '=' */
+	temp = strsep(&string, "=");
+	*left = temp;
+	if (!string)
+		return -ENODEV;
+
+	/* take the right side and strip off the '"' */
+	while (isspace(*string))
+		++string;
+	if (*string == '"')
+		++string;
+	else
+		return -ENODEV;
+
+	temp = strsep(&string, "\"");
+	if (!string || *temp == '\0')
+		return -ENODEV;
+	*right = temp;
+	*orig_string = string;
+	
+	return 0;
+}
+
 static int parse_config_file(void)
 {
 	char line[255];
@@ -100,7 +143,7 @@ static int parse_config_file(void)
 		if (*temp == COMMENT_CHARACTER)
 			continue;
 
-		retval = get_pair(&temp, &variable, &value);
+		retval = parse_get_pair(&temp, &variable, &value);
 		if (retval)
 			break;
 		
@@ -109,8 +152,10 @@ static int parse_config_file(void)
 		set_var("udev_root", udev_root);
 		set_var("udev_db", udev_db_filename);
 		set_var("udev_rules", udev_rules_filename);
-		set_var("udev_permissions", udev_permission_filename);
+		set_var("udev_permissions", udev_permissions_filename);
 		set_var("default_mode", default_mode_str);
+		set_var("default_owner", default_owner_str);
+		set_var("default_group", default_group_str);
 	}
 	dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
 		  lineno, temp - line, temp);
@@ -122,10 +167,6 @@ exit:
 static void get_dirs(void)
 {
 	char *temp;
-	char *udev_db = UDEV_DB;
-	char *udev_config = UDEV_CONFIG_FILE;
-	char *udev_rules = UDEV_RULES_FILE;
-	char *udev_permission = UDEV_PERMISSION_FILE;
 	int retval;
 
 	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
@@ -139,51 +180,24 @@ static void get_dirs(void)
 		temp = getenv("SYSFS_PATH");
 		if (temp)
 			strfieldcpy(sysfs_path, temp);
-		temp = getenv("UDEV_CONFIG_DIR");
-		if (temp)
-			strfieldcpy(udev_config_dir, temp);
-		temp = getenv("UDEV_ROOT");
-		if (temp)
-			strfieldcpy(udev_root, temp);
-		temp = getenv("UDEV_DB");
-		if (temp)
-			udev_db = temp;
 		temp = getenv("UDEV_CONFIG_FILE");
 		if (temp)
-			udev_config = temp;
-		temp = getenv("UDEV_RULES_FILE");
-		if (temp)
-			udev_rules = temp;
-		temp = getenv("UDEV_PERMISSION_FILE");
-		if (temp)
-			udev_permission = temp;
+			strfieldcpy(udev_config_filename, temp);
 	}
 	dbg("sysfs_path='%s'", sysfs_path);
 
-	strncpy(udev_db_filename, udev_root, sizeof(udev_db_filename));
-	strncat(udev_db_filename, udev_db, sizeof(udev_db_filename));
-
-	strncpy(udev_config_filename, udev_config_dir, sizeof(udev_config_filename));
-	strncat(udev_config_filename, udev_config, sizeof(udev_config_filename));
-	
-	strncpy(udev_rules_filename, udev_config_dir, sizeof(udev_permission_filename));
-	strncat(udev_rules_filename, udev_rules, sizeof(udev_permission_filename));
-
-	strncpy(udev_permission_filename, udev_config_dir, sizeof(udev_permission_filename));
-	strncat(udev_permission_filename, udev_permission, sizeof(udev_permission_filename));
-
 	dbg_parse("udev_root = %s", udev_root);
 	dbg_parse("udev_config_filename = %s", udev_config_filename);
 	dbg_parse("udev_db_filename = %s", udev_db_filename);
 	dbg_parse("udev_rules_filename = %s", udev_rules_filename);
-	dbg_parse("udev_permission_filename = %s", udev_permission_filename);
+	dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
 	parse_config_file();
 
 	dbg_parse("udev_root = %s", udev_root);
 	dbg_parse("udev_config_filename = %s", udev_config_filename);
 	dbg_parse("udev_db_filename = %s", udev_db_filename);
 	dbg_parse("udev_rules_filename = %s", udev_rules_filename);
-	dbg_parse("udev_permission_filename = %s", udev_permission_filename);
+	dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
 }
 
 void udev_init_config(void)