Changes in uspace/app/bdsh/cmds/modules/ls/ls.c [f2460a50:8d2dd7f2] in mainline

File:

• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (4 diffs)

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -39 +39 @@
 #include <vfs/vfs.h>
 #include <str.h>
+#include <sort.h>
 
 #include "ls.h"
@@ -61 +62 @@
 static unsigned int ls_start(ls_job_t *);
 static void ls_print(struct dir_elem_t *);
-static int ls_cmp(const void *, const void *);
+static int ls_cmp(void *, void *, void *);
 static signed int ls_scan_dir(const char *, DIR *, struct dir_elem_t **);
 static unsigned int ls_recursive(const char *, DIR *);
@@ -103 +104 @@
  * @param a             Pointer to the structure of the first element.
  * @param b             Pointer to the structure of the second element.
+ * @param arg           Pointer for an other and optionnal argument.
  *
  * @return              -1 if a < b, 1 otherwise.
  */
-static int ls_cmp(const void *a, const void *b)
-{
-        struct dir_elem_t const *da = a;
-        struct dir_elem_t const *db = b;
+static int ls_cmp(void *a, void *b, void *arg)
+{
+        struct dir_elem_t *da = a;
+        struct dir_elem_t *db = b;
         
         if ((da->s.is_directory && db->s.is_file) ||
@@ -189 +191 @@
         }
         
-        if (ls.sort)
-                qsort(&tosort[0], nbdirs, sizeof(struct dir_elem_t), ls_cmp);
+        if (ls.sort) {
+                if (!qsort(&tosort[0], nbdirs, sizeof(struct dir_elem_t),
+                    ls_cmp, NULL)) {
+                        printf("Sorting error.\n");
+                }
+        }
         
         for (i = 0; i < nbdirs; i++)