#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
-#include "udevdb.h"
+#include "udev_db.h"
static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
* @param name Name to check for
* @return 0 if <name> didn't exist and N otherwise.
*/
-static unsigned int find_free_number (struct udevice *udev, char *name)
+static int find_free_number(struct udevice *udev, const char *name)
{
- char temp[NAME_SIZE];
- char path[NAME_SIZE];
- struct udevice dev;
- int result;
+ char filename[NAME_SIZE];
+ int num = 0;
+ struct udevice db_udev;
- /* have to sweep the database for each lookup */
- result = 0;
- strncpy(temp, name, sizeof (temp));
+ strfieldcpy(filename, name);
while (1) {
- if (udevdb_get_dev_byname(temp, path, &dev) != 0)
- goto found;
- /* symlink might be stale if $(udevroot) isn't cleaned; check
- * on major/minor to see if it's the same device
- */
- if (dev.major == udev->major && dev.minor == udev->minor)
- goto found;
- snprintf (temp, sizeof(temp), "%s%d", name, ++result);
- }
+ dbg("look for existing node '%s'", filename);
+ memset(&db_udev, 0x00, sizeof(struct udevice));
+ if (udev_db_get_device_byname(&db_udev, filename) != 0) {
+ dbg("free num=%d", num);
+ return num;
+ }
-found:
- return result;
+ num++;
+ if (num > 1000) {
+ info("find_free_number gone crazy (num=%d), aborted", num);
+ return -1;
+ }
+ snprintf(filename, NAME_SIZE, "%s%d", name, num);
+ filename[NAME_SIZE-1] = '\0';
+ }
}
static void apply_format(struct udevice *udev, char *string, size_t maxsize,
case 'e':
next_free_number = find_free_number(udev, string);
if (next_free_number > 0) {
- snprintf(temp2, sizeof(temp2), "%d", next_free_number);
+ sprintf(temp2, "%d", next_free_number);
strfieldcatmax(string, temp2, maxsize);
}
break;
}
}
-static int execute_program(const char *path, char *value, int len)
+static int execute_program(struct udevice *udev, const char *path, char *value, int len)
{
int retval;
int count;
dbg("execute '%s' with parsed arguments", arg);
} else {
argv[0] = arg;
- argv[1] = main_argv[1];
+ argv[1] = udev->subsystem;
argv[2] = NULL;
dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
}
dbg("result is '%s'", value);
close(fds[0]);
- wait(&status);
+ waitpid(pid, &status, 0);
if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
dbg("exec program status 0x%x", status);
dbg("check " FIELD_PROGRAM);
strfieldcpy(program, dev->program);
apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
- if (execute_program(program, udev->program_result, NAME_SIZE) != 0) {
+ if (execute_program(udev, program, udev->program_result, NAME_SIZE) != 0) {
dbg(FIELD_PROGRAM " returned nonzero");
goto try_parent;
} else {
set_empty_perms(udev, perm->mode,
perm->owner,
perm->group);
- } else {
- set_empty_perms(udev, get_default_mode(),
- get_default_owner(),
- get_default_group());
}
+ set_empty_perms(udev, get_default_mode(),
+ get_default_owner(),
+ get_default_group());
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);