@@ -661,6 +661,7 @@ int cli_updatelimits(cli_ctx *, unsigned long);

 unsigned long cli_getsizelimit(cli_ctx *, unsigned long);

 int cli_matchregex(const char *str, const char *regex);

 void cli_qsort(void *a, size_t n, size_t es, int (*cmp)(const void *, const void *));

+void cli_qsort_r(void *a, size_t n, size_t es, int (*cmp)(const void*, const void *, const void *), void *arg);

 int cli_checktimelimit(cli_ctx *ctx);

 /* symlink behaviour */

@@ -38,6 +38,7 @@

 #include "others.h"

 static inline char	*med3(char *, char *, char *, int (*)(const void *, const void *));

+static inline char	*med3_r(void *, char *, char *, char *, int (*)(const void *, const void *, const void *));

 static inline void	 swapfunc(char *, char *, int, int);

 /*

@@ -80,7 +81,9 @@ swapfunc(a, b, n, swaptype)

 #define CMP1(a, b) ((int)(*((uint32_t *)(a)) - *((uint32_t *)(b))))

 #define CMP(a, b)   (cmp ? (cmp(a, b)) : CMP1(a, b))

+#define CMP_R(arg, a, b)   (cmp ? (cmp(arg, a, b)) : CMP1(a, b))

 #define MED3(a, b, c, d)   (d ? (med3(a, b, c, d)) : (CMP1(a, b) < 0 ? (CMP1(b, c) < 0 ? (b) : (CMP1(a, c) < 0 ? (c) : (a))) : (CMP1(b, c) > 0 ? (b) : (CMP1(a, c) < 0 ? (a) : (c)))))

+#define MED3_R(arg, a, b, c, d)   (d ? (med3_r(arg, a, b, c, d)) : (CMP1(a, b) < 0 ? (CMP1(b, c) < 0 ? (b) : (CMP1(a, c) < 0 ? (c) : (a))) : (CMP1(b, c) > 0 ? (b) : (CMP1(a, c) < 0 ? (a) : (c)))))

 static inline char *

 med3(a, b, c, cmp)

@@ -92,6 +95,17 @@ med3(a, b, c, cmp)

               :(CMP(b, c) > 0 ? b : (CMP(a, c) < 0 ? a : c ));

 }

+static inline char *

+med3_r(arg, a, b, c, cmp)

+	void *arg;

+	char *a, *b, *c;

+	int (*cmp)(const void *, const void *, const void *);

+{

+	return CMP_R(arg, a, b) < 0 ?

+	       (CMP_R(arg, b, c) < 0 ? b : (CMP_R(arg, a, c) < 0 ? c : a ))

+              :(CMP_R(arg, b, c) > 0 ? b : (CMP_R(arg, a, c) < 0 ? a : c ));

+}

+

 void cli_qsort(void *a, size_t n, size_t es, int (*cmp)(const void *, const void *))

 {

 	char *pa, *pb, *pc, *pd, *pl, *pm, *pn;

@@ -169,3 +183,81 @@ loop:	SWAPINIT(a, es);

 	}

 /*		cli_qsort(pn - r, r / es, es, cmp);*/

 }

+

+void cli_qsort_r(void *a, size_t n, size_t es, int (*cmp)(const void*, const void *, const void *), void *arg)

+{

+	char *pa, *pb, *pc, *pd, *pl, *pm, *pn;

+	int d, r, swaptype, swap_cnt;

+

+loop:	SWAPINIT(a, es);

+	swap_cnt = 0;

+	if (n < 7) {

+		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)

+			for (pl = pm; pl > (char *) a && CMP_R(arg, pl - es, pl) > 0;

+			     pl -= es)

+				swap(pl, pl - es);

+		return;

+	}

+	pm = (char *) a + (n / 2) * es;

+	if (n > 7) {

+		pl = a;

+		pn = (char *) a + (n - 1) * es;

+		if (n > 40) {

+			d = (n / 8) * es;

+			pl = MED3_R(arg, pl, pl + d, pl + 2 * d, cmp);

+			pm = MED3_R(arg, pm - d, pm, pm + d, cmp);

+			pn = MED3_R(arg, pn - 2 * d, pn - d, pn, cmp);

+		}

+		pm = MED3_R(arg, pl, pm, pn, cmp);

+	}

+	swap(a, pm);

+	pa = pb = (char *) a + es;

+

+	pc = pd = (char *) a + (n - 1) * es;

+	for (;;) {

+		while (pb <= pc && (r = CMP_R(arg, pb, a)) <= 0) {

+			if (r == 0) {

+				swap_cnt = 1;

+				swap(pa, pb);

+				pa += es;

+			}

+			pb += es;

+		}

+		while (pb <= pc && (r = CMP_R(arg, pc, a)) >= 0) {

+			if (r == 0) {

+				swap_cnt = 1;

+				swap(pc, pd);

+				pd -= es;

+			}

+			pc -= es;

+		}

+		if (pb > pc)

+			break;

+		swap(pb, pc);

+		swap_cnt = 1;

+		pb += es;

+		pc -= es;

+	}

+	if (swap_cnt == 0) {  /* Switch to insertion sort */

+		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)

+			for (pl = pm; pl > (char *) a && CMP_R(arg, pl - es, pl) > 0; 

+			     pl -= es)

+				swap(pl, pl - es);

+		return;

+	}

+

+	pn = (char *) a + n * es;

+	r = MIN(pa - (char *)a, pb - pa);

+	vecswap(a, pb - r, r);

+	r = MIN((size_t) (pd - pc), (size_t) (pn - pd - es));

+	vecswap(pb, pn - r, r);

+	if ((size_t) (r = pb - pa) > es)

+		cli_qsort_r(a, r / es, es, cmp, arg);

+	if ((size_t) (r = pd - pc) > es) { 

+		/* Iterate rather than recurse to save stack space */

+		a = pn - r;

+		n = r / es;

+		goto loop;

+	}

+/*		cli_qsort_r(pn - r, r / es, es, cmp);*/

+}