/*
- * udevdb.c
+ * udevdb.c - udev database library
*
* Userspace devfs
*
*
*/
-/*
- * udev database library
- */
-#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
+#include <stddef.h>
#include <fcntl.h>
#include <string.h>
#include <sys/stat.h>
#include <signal.h>
#include "libsysfs/sysfs/libsysfs.h"
-#include "udev_version.h"
#include "udev.h"
+#include "udev_lib.h"
+#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
#include "udevdb.h"
#include "tdb/tdb.h"
static TDB_CONTEXT *udevdb;
+sig_atomic_t gotalarm;
-
-int udevdb_add_dev(const char *path, const struct udevice *dev)
+int udevdb_add_dev(struct udevice *udev)
{
TDB_DATA key, data;
char keystr[SYSFS_PATH_MAX];
- if ((path == NULL) || (dev == NULL))
- return -ENODEV;
+ if (udev->test_run)
+ return 0;
+
+ if (udevdb == NULL)
+ return -1;
- memset(keystr, 0, NAME_SIZE);
- strcpy(keystr, path);
+ memset(keystr, 0x00, SYSFS_PATH_MAX);
+ strfieldcpy(keystr, udev->devpath);
key.dptr = keystr;
key.dsize = strlen(keystr) + 1;
- data.dptr = (void *)dev;
- data.dsize = UDEVICE_LEN;
+ data.dptr = (void *) udev;
+ data.dsize = UDEVICE_DB_LEN;
+ dbg("store key '%s' for device '%s'", keystr, udev->name);
return tdb_store(udevdb, key, data, TDB_REPLACE);
}
-int udevdb_get_dev(const char *path, struct udevice *dev)
+int udevdb_get_dev(const char *path, struct udevice *udev)
{
TDB_DATA key, data;
+ if (udevdb == NULL)
+ return -1;
+
if (path == NULL)
return -ENODEV;
if (data.dptr == NULL || data.dsize == 0)
return -ENODEV;
- memset(dev, 0, sizeof(struct udevice));
- memcpy(dev, data.dptr, UDEVICE_LEN);
+ memset(udev, 0x00, sizeof(struct udevice));
+ memcpy(udev, data.dptr, UDEVICE_DB_LEN);
+
return 0;
}
TDB_DATA key;
char keystr[SYSFS_PATH_MAX];
+ if (udevdb == NULL)
+ return -1;
+
if (path == NULL)
return -EINVAL;
memset(keystr, 0, sizeof(keystr));
- strcpy(keystr, path);
+ strfieldcpy(keystr, path);
key.dptr = keystr;
key.dsize = strlen(keystr) + 1;
if (init_flag != UDEVDB_DEFAULT && init_flag != UDEVDB_INTERNAL)
return -EINVAL;
+ tdb_set_lock_alarm(&gotalarm);
+
udevdb = tdb_open(udev_db_filename, 0, init_flag, O_RDWR | O_CREAT, 0644);
if (udevdb == NULL) {
if (init_flag == UDEVDB_INTERNAL)
return 0;
}
-static int (*user_record_callback) (char *path, struct udevice *dev);
+static int (*user_record_callback) (const char *path, struct udevice *dev);
static int traverse_callback(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
{
* udevdb_call_foreach: dumps whole database by passing record data to user function
* @user_record_handler: user function called for every record in the database
*/
-int udevdb_call_foreach(int (*user_record_handler) (char *path, struct udevice *dev))
+int udevdb_call_foreach(int (*user_record_handler) (const char *path, struct udevice *dev))
{
int retval = 0;
+ if (udevdb == NULL)
+ return -1;
+
if (user_record_handler == NULL) {
dbg("invalid user record handling function");
return -EINVAL;
static const char *find_name;
static int find_found;
-static int find_device_by_name(char *path, struct udevice *dev)
+static int find_device_by_name(const char *path, struct udevice *udev)
{
- if (strncmp(dev->name, find_name, sizeof(dev->name)) == 0) {
- memcpy(find_dev, dev, sizeof(*find_dev));
- strncpy(find_path, path, NAME_SIZE);
+ char *pos;
+ int len;
+
+ if (strncmp(udev->name, find_name, sizeof(udev->name)) == 0) {
+ memcpy(find_dev, udev, sizeof(struct udevice));
+ strfieldcpymax(find_path, path, NAME_SIZE);
find_found = 1;
/* stop search */
return 1;
}
+ /* look for matching symlink*/
+ foreach_strpart(udev->symlink, " ", pos, len) {
+ if (strncmp(pos, find_name, len) != 0)
+ continue;
+
+ if (len != strlen(find_name))
+ continue;
+
+ memcpy(find_dev, udev, sizeof(struct udevice));
+ strfieldcpymax(find_path, path, NAME_SIZE);
+ find_found = 1;
+ return 1;
+ }
return 0;
}