dir2list

Commit: f6d01e520f0f20a07df16575cf6c296730b990cc
Parent: 0b3d27d199c3b471822e5f3d1740186aeaee1fc8
Author: 0x766F6964
Date:   Tue,  5 May 2020 11:39:35 -0600

implement sorting of dir elements

Diffstat:
M
dir2list.c
 | 
25
+++++++++++++++----------

1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/dir2list.c b/dir2list.c
@@ -19,6 +19,10 @@ struct list {
 	struct list *next;
 };
 
+struct entry {
+	char *name;
+};
+
 static struct node *node_head;
 static struct list *list_head;
 
@@ -47,10 +51,11 @@ xmalloc(size_t s)
 	return p;		
 }
 
-static void
-sort(char **files, size_t elems)
+static int
+namecmp(const void *va, const void *vb)
 {
-	return;
+	const struct entry *a = va, *b = vb;
+	return strcmp(a->name, b->name);
 }
 
 static int
@@ -80,7 +85,8 @@ addfiles(const char *path, struct list *list)
 {
 	DIR *dir;
 	struct dirent *ent;
-	char *s, **files;
+	struct entry *fents;
+	char *s;
 	int i;
 	size_t len, n_files = 0;
 
@@ -98,7 +104,7 @@ addfiles(const char *path, struct list *list)
 
 	rewinddir(dir);
 
-	files = xmalloc(sizeof(char *) * n_files);
+	fents = xmalloc(sizeof(struct entry) * n_files);
 
 	for (i = 0; i < n_files;) {
 		if (!(ent = readdir(dir)))
@@ -110,21 +116,20 @@ addfiles(const char *path, struct list *list)
 		len = strlen(path) + strlen(ent->d_name) + 2;
 		s = xmalloc(len);
 		snprintf(s, len, "%s/%s", path, ent->d_name);
-		files[i] = s;
+		fents[i].name = s;
 
 		i++;
 	}
 	closedir(dir);
 
-	/* TODO */
-	sort(files, n_files);
+	qsort(fents, n_files, sizeof(struct entry), namecmp);
 
 	for (i = 0; i < n_files; i++) {
-		list->elem = files[i];
+		list->elem = fents[i].name;
 		list->next = xmalloc(sizeof(struct list));
 		list = list->next;
 	}
-	free(files);
+	free(fents);
 
 	list->next = NULL;