chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libudev: allocate udev_device->envp[] dynamically
[elogind.git]
/
udev
/
lib
/
libudev-device.c
diff --git
a/udev/lib/libudev-device.c
b/udev/lib/libudev-device.c
index acab263785a95fe4892989a765818e17b869936b..86f7918d49ac2514cdfd54c9eb08885e98f41e58 100644
(file)
--- a/
udev/lib/libudev-device.c
+++ b/
udev/lib/libudev-device.c
@@
-31,6
+31,8
@@
#include "libudev.h"
#include "libudev-private.h"
#include "libudev.h"
#include "libudev-private.h"
+#define ENVP_SIZE 128
+
struct udev_device {
int refcount;
struct udev *udev;
struct udev_device {
int refcount;
struct udev *udev;
@@
-46,7
+48,7
@@
struct udev_device {
struct udev_list_node devlinks_list;
int devlinks_uptodate;
struct udev_list_node properties_list;
struct udev_list_node devlinks_list;
int devlinks_uptodate;
struct udev_list_node properties_list;
- char *
envp[128]
;
+ char *
*envp
;
int envp_uptodate;
char *driver;
int driver_set;
int envp_uptodate;
char *driver;
int driver_set;
@@
-60,7
+62,7
@@
struct udev_device {
int num_fake_partitions;
int devlink_priority;
int ignore_remove;
int num_fake_partitions;
int devlink_priority;
int ignore_remove;
- struct udev_list_node attr_list;
+ struct udev_list_node
sys
attr_list;
int info_loaded;
};
int info_loaded;
};
@@
-75,7
+77,7
@@
static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *f
return util_path_encode(&filename[start], len - start);
}
return util_path_encode(&filename[start], len - start);
}
-
static int
device_read_db(struct udev_device *udev_device)
+
int udev_
device_read_db(struct udev_device *udev_device)
{
struct stat stats;
char filename[UTIL_PATH_SIZE];
{
struct stat stats;
char filename[UTIL_PATH_SIZE];
@@
-220,7
+222,7
@@
static void device_load_info(struct udev_device *device)
{
device->info_loaded = 1;
udev_device_read_uevent_file(device);
{
device->info_loaded = 1;
udev_device_read_uevent_file(device);
- device_read_db(device);
+
udev_
device_read_db(device);
}
void udev_device_set_info_loaded(struct udev_device *device)
}
void udev_device_set_info_loaded(struct udev_device *device)
@@
-231,20
+233,25
@@
void udev_device_set_info_loaded(struct udev_device *device)
struct udev_device *device_new(struct udev *udev)
{
struct udev_device *udev_device;
struct udev_device *device_new(struct udev *udev)
{
struct udev_device *udev_device;
+ struct udev_list_entry *list_entry;
if (udev == NULL)
return NULL;
if (udev == NULL)
return NULL;
- udev_device =
malloc(
sizeof(struct udev_device));
+ udev_device =
calloc(1,
sizeof(struct udev_device));
if (udev_device == NULL)
return NULL;
if (udev_device == NULL)
return NULL;
- memset(udev_device, 0x00, sizeof(struct udev_device));
udev_device->refcount = 1;
udev_device->udev = udev;
udev_list_init(&udev_device->devlinks_list);
udev_list_init(&udev_device->properties_list);
udev_device->refcount = 1;
udev_device->udev = udev;
udev_list_init(&udev_device->devlinks_list);
udev_list_init(&udev_device->properties_list);
- udev_list_init(&udev_device->attr_list);
+ udev_list_init(&udev_device->
sys
attr_list);
udev_device->event_timeout = -1;
udev_device->event_timeout = -1;
+ /* copy global properties */
+ udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
+ udev_device_add_property(udev_device,
+ udev_list_entry_get_name(list_entry),
+ udev_list_entry_get_value(list_entry));
info(udev_device->udev, "udev_device: %p created\n", udev_device);
return udev_device;
}
info(udev_device->udev, "udev_device: %p created\n", udev_device);
return udev_device;
}
@@
-598,15
+605,18
@@
void udev_device_unref(struct udev_device *udev_device)
free(udev_device->sysname);
free(udev_device->devnode);
free(udev_device->subsystem);
free(udev_device->sysname);
free(udev_device->devnode);
free(udev_device->subsystem);
- udev_list_cleanup(udev_device->udev, &udev_device->devlinks_list);
- udev_list_cleanup(udev_device->udev, &udev_device->properties_list);
+ udev_list_cleanup
_entries
(udev_device->udev, &udev_device->devlinks_list);
+ udev_list_cleanup
_entries
(udev_device->udev, &udev_device->properties_list);
free(udev_device->action);
free(udev_device->driver);
free(udev_device->devpath_old);
free(udev_device->physdevpath);
free(udev_device->action);
free(udev_device->driver);
free(udev_device->devpath_old);
free(udev_device->physdevpath);
- udev_list_cleanup(udev_device->udev, &udev_device->attr_list);
- for (i = 0; i < ARRAY_SIZE(udev_device->envp) && udev_device->envp[i] != NULL; i++)
- free(udev_device->envp[i]);
+ udev_list_cleanup_entries(udev_device->udev, &udev_device->sysattr_list);
+ if (udev_device->envp != NULL) {
+ for (i = 0; i < ENVP_SIZE && udev_device->envp[i] != NULL; i++)
+ free(udev_device->envp[i]);
+ free(udev_device->envp);
+ }
info(udev_device->udev, "udev_device: %p released\n", udev_device);
free(udev_device);
}
info(udev_device->udev, "udev_device: %p released\n", udev_device);
free(udev_device);
}
@@
-741,7
+751,7
@@
struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *
void udev_device_cleanup_devlinks_list(struct udev_device *udev_device)
{
udev_device->devlinks_uptodate = 0;
void udev_device_cleanup_devlinks_list(struct udev_device *udev_device)
{
udev_device->devlinks_uptodate = 0;
- udev_list_cleanup(udev_device->udev, &udev_device->devlinks_list);
+ udev_list_cleanup
_entries
(udev_device->udev, &udev_device->devlinks_list);
}
/**
}
/**
@@
-817,7
+827,7
@@
unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device)
return udev_device->seqnum;
}
return udev_device->seqnum;
}
-const char *udev_device_get_
attr_value(struct udev_device *udev_device, const char *
attr)
+const char *udev_device_get_
sysattr_value(struct udev_device *udev_device, const char *sys
attr)
{
struct udev_list_entry *list_entry;
char path[UTIL_PATH_SIZE];
{
struct udev_list_entry *list_entry;
char path[UTIL_PATH_SIZE];
@@
-829,25
+839,25
@@
const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
if (udev_device == NULL)
return NULL;
if (udev_device == NULL)
return NULL;
- if (attr == NULL)
+ if (
sys
attr == NULL)
return NULL;
/* look for possibly already cached result */
return NULL;
/* look for possibly already cached result */
- udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_device->attr_list)) {
- if (strcmp(udev_list_entry_get_name(list_entry), attr) == 0) {
+ udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_device->
sys
attr_list)) {
+ if (strcmp(udev_list_entry_get_name(list_entry),
sys
attr) == 0) {
info(udev_device->udev, "got '%s' (%s) from cache\n",
info(udev_device->udev, "got '%s' (%s) from cache\n",
- attr, udev_list_entry_get_value(list_entry));
+
sys
attr, udev_list_entry_get_value(list_entry));
return udev_list_entry_get_value(list_entry);
}
}
util_strlcpy(path, udev_device_get_syspath(udev_device), sizeof(path));
util_strlcat(path, "/", sizeof(path));
return udev_list_entry_get_value(list_entry);
}
}
util_strlcpy(path, udev_device_get_syspath(udev_device), sizeof(path));
util_strlcat(path, "/", sizeof(path));
- util_strlcat(path, attr, sizeof(path));
+ util_strlcat(path,
sys
attr, sizeof(path));
if (lstat(path, &statbuf) != 0) {
info(udev_device->udev, "no attribute '%s', keep negative entry\n", path);
if (lstat(path, &statbuf) != 0) {
info(udev_device->udev, "no attribute '%s', keep negative entry\n", path);
- udev_list_entry_add(udev_device->udev, &udev_device->
attr_list,
attr, NULL, 0, 0);
+ udev_list_entry_add(udev_device->udev, &udev_device->
sysattr_list, sys
attr, NULL, 0, 0);
goto out;
}
goto out;
}
@@
-863,8
+873,8
@@
const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
pos = strrchr(target, '/');
if (pos != NULL) {
pos = &pos[1];
pos = strrchr(target, '/');
if (pos != NULL) {
pos = &pos[1];
- info(udev_device->udev, "cache '%s' with link value '%s'\n", attr, pos);
- list_entry = udev_list_entry_add(udev_device->udev, &udev_device->
attr_list,
attr, pos, 0, 0);
+ info(udev_device->udev, "cache '%s' with link value '%s'\n",
sys
attr, pos);
+ list_entry = udev_list_entry_add(udev_device->udev, &udev_device->
sysattr_list, sys
attr, pos, 0, 0);
val = udev_list_entry_get_value(list_entry);
}
}
val = udev_list_entry_get_value(list_entry);
}
}
@@
-896,7
+906,7
@@
const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
value[size] = '\0';
util_remove_trailing_chars(value, '\n');
info(udev_device->udev, "'%s' has attribute value '%s'\n", path, value);
value[size] = '\0';
util_remove_trailing_chars(value, '\n');
info(udev_device->udev, "'%s' has attribute value '%s'\n", path, value);
- list_entry = udev_list_entry_add(udev_device->udev, &udev_device->
attr_list,
attr, value, 0, 0);
+ list_entry = udev_list_entry_add(udev_device->udev, &udev_device->
sysattr_list, sys
attr, value, 0, 0);
val = udev_list_entry_get_value(list_entry);
out:
return val;
val = udev_list_entry_get_value(list_entry);
out:
return val;
@@
-930,8
+940,13
@@
int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath
}
/* trailing number */
}
/* trailing number */
- while (isdigit(udev_device->sysname[--len]))
+ while (
len > 0 &&
isdigit(udev_device->sysname[--len]))
udev_device->sysnum = &udev_device->sysname[len];
udev_device->sysnum = &udev_device->sysname[len];
+
+ /* sysname is completely numeric */
+ if (len == 0)
+ udev_device->sysnum = NULL;
+
return 0;
}
return 0;
}
@@
-969,6
+984,15
@@
int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink
struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value)
{
udev_device->envp_uptodate = 0;
struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value)
{
udev_device->envp_uptodate = 0;
+ if (value == NULL) {
+ struct udev_list_entry *list_entry;
+
+ list_entry = udev_device_get_properties_list_entry(udev_device);
+ list_entry = udev_list_entry_get_by_name(list_entry, key);
+ if (list_entry != NULL)
+ udev_list_entry_remove(list_entry);
+ return NULL;
+ }
return udev_list_entry_add(udev_device->udev, &udev_device->properties_list, key, value, 1, 0);
}
return udev_list_entry_add(udev_device->udev, &udev_device->properties_list, key, value, 1, 0);
}
@@
-994,14
+1018,18
@@
char **udev_device_get_properties_envp(struct udev_device *udev_device)
unsigned int i;
struct udev_list_entry *list_entry;
unsigned int i;
struct udev_list_entry *list_entry;
- for (i = 0; i < ARRAY_SIZE(udev_device->envp) && udev_device->envp[i] != NULL; i++)
- free(udev_device->envp[i]);
+ if (udev_device->envp) {
+ for (i = 0; i < 128 && udev_device->envp[i] != NULL; i++)
+ free(udev_device->envp[i]);
+ } else
+ udev_device->envp = malloc(sizeof(char *) * ENVP_SIZE);
+
i = 0;
udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
asprintf(&udev_device->envp[i++], "%s=%s",
udev_list_entry_get_name(list_entry),
udev_list_entry_get_value(list_entry));
i = 0;
udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
asprintf(&udev_device->envp[i++], "%s=%s",
udev_list_entry_get_name(list_entry),
udev_list_entry_get_value(list_entry));
- if (i+1 >=
ARRAY_SIZE(udev_device->envp)
)
+ if (i+1 >=
ENVP_SIZE
)
break;
}
udev_device->envp[i] = NULL;
break;
}
udev_device->envp[i] = NULL;