extern int udev_db_delete_device(struct udevice *dev);
extern int udev_db_get_device(struct udevice *udev, const char *devpath);
-extern int udev_db_search_name(char *devpath, size_t len, const char *name);
+extern int udev_db_search_name(const char *name, char *devpath, size_t len);
extern int udev_db_get_all_entries(struct list_head *name_list);
#endif /* _UDEV_DB_H_ */
/* finds the lowest positive N such that <name>N isn't present in the udevdb
* if <name> doesn't exist, 0 is returned, N otherwise
*/
-static int find_free_number(const char *name)
+static int find_free_number(const char *name, const char *devpath)
{
- char devpath[PATH_SIZE];
+ char db_devpath[PATH_SIZE];
char filename[PATH_SIZE];
int num = 0;
strlcpy(filename, name, sizeof(filename));
while (1) {
dbg("look for existing node '%s'", filename);
- if (udev_db_search_name(devpath, sizeof(devpath), filename) != 0) {
+ if (udev_db_search_name(filename, db_devpath, sizeof(db_devpath)) != 0) {
dbg("free num=%d", num);
- return num;
+ break;
}
num++;
- if (num > 1000) {
- info("find_free_number gone crazy (num=%d), aborted", num);
- return -1;
+ if (num > 100000) {
+ err("find_free_number aborted at num=%d", num);
+ num = -1;
+ break;
}
snprintf(filename, sizeof(filename), "%s%d", name, num);
filename[sizeof(filename)-1] = '\0';
}
+
+ return num;
}
static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device,
dbg("substitute sysfs value '%s'", temp2);
break;
case SUBST_ENUM:
- next_free_number = find_free_number(string);
+ next_free_number = find_free_number(string, udev->devpath);
if (next_free_number > 0) {
sprintf(temp2, "%d", next_free_number);
strlcat(string, temp2, maxsize);
} else
pos = name;
- retval = udev_db_search_name(devpath, sizeof(devpath), pos);
+ retval = udev_db_search_name(pos, devpath, sizeof(devpath));
if (retval != 0) {
fprintf(stderr, "no record for '%s' in database\n", pos);
goto exit;