X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-rules.c;h=21fa11775d2341536954c0b787e81021988d5c5f;hp=226f35296dc763e1fa4c9612c6e02ddaeebb12d2;hb=1e78dcbe51419124846e1f35e540cb0253362231;hpb=a0e17034eecf3933223503377b5e3f4c4eac0e86;ds=sidebyside

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 226f35296..21fa11775 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1631,7 +1631,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 
 			if (sort_base == NULL)
 				continue;
-
+			/* sort entry into existing list */
 			udev_list_entry_foreach_safe(file_loop, file_tmp, udev_list_get_entry(&file_list)) {
 				const char *file_name = udev_list_entry_get_name(file_loop);
 				const char *file_base = strrchr(file_name, '/');
@@ -1641,15 +1641,24 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 				if (strcmp(file_base, sort_base) == 0) {
 					info(udev, "rule file basename '%s' already added, ignoring '%s'\n",
 					     file_name, sort_name);
-					udev_list_entry_remove(sort_loop);
+					udev_list_entry_delete(sort_loop);
 					sort_loop = NULL;
 					break;
 				}
-				if (strcmp(file_base, sort_base) > 0)
+				if (strcmp(file_base, sort_base) > 0) {
+					/* found later file, insert before */
+					udev_list_entry_remove(sort_loop);
+					udev_list_entry_insert_before(sort_loop, file_loop);
+					sort_loop = NULL;
 					break;
+				}
 			}
-			if (sort_loop != NULL)
-				udev_list_entry_move_before(sort_loop, file_loop);
+			/* current file already handled */
+			if (sort_loop == NULL)
+				continue;
+			/* no later file, append to end of list */
+			udev_list_entry_remove(sort_loop);
+			udev_list_entry_append(sort_loop, &file_list);
 		}
 	}
 
@@ -1673,7 +1682,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 			parse_file(rules, filename, filename_off);
 		else
 			info(udev, "can not read '%s'\n", filename);
-		udev_list_entry_remove(file_loop);
+		udev_list_entry_delete(file_loop);
 	}
 
 	memset(&end_token, 0x00, sizeof(struct token));