From 36058cae5fd06bf2af9f6849306850199cac65e8 Mon Sep 17 00:00:00 2001 From: Oliver Lehmann Date: Thu, 27 Aug 2009 09:09:39 +0000 Subject: [PATCH] more work --- WEGA/src/lib/libc/gen/TODO | 1 - WEGA/src/lib/libc/gen/qsort.c | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/WEGA/src/lib/libc/gen/TODO b/WEGA/src/lib/libc/gen/TODO index b59015b..21eeec0 100644 --- a/WEGA/src/lib/libc/gen/TODO +++ b/WEGA/src/lib/libc/gen/TODO @@ -3,5 +3,4 @@ execvp.o /z/src/libc/orig_obj/execvp.o differ: char 6, line 1 getgrent.o /z/src/libc/orig_obj/getgrent.o differ: char 132, line 1 malloc.o /z/src/libc/orig_obj/malloc.o differ: char 5, line 1 nlist.o /z/src/libc/orig_obj/nlist.o differ: char 5, line 1 -qsort.o /z/src/libc/orig_obj/qsort.o differ: char 5, line 1 ttyname.o /z/src/libc/orig_obj/ttyname.o differ: char 5, line 1 diff --git a/WEGA/src/lib/libc/gen/qsort.c b/WEGA/src/lib/libc/gen/qsort.c index 1ea70c6..ebc147b 100644 --- a/WEGA/src/lib/libc/gen/qsort.c +++ b/WEGA/src/lib/libc/gen/qsort.c @@ -2,7 +2,6 @@ static int (*qscmp)(); static int qses; -int qsuflg; /* used by sort command */ qsort(a, n, es, fc) char *a; @@ -20,7 +19,7 @@ char *a, *l; { register char *i, *j; register es; - char **k; + char *foo1, *foo2; char *lp, *hp; int c; unsigned n; @@ -70,10 +69,6 @@ loop: if(i == lp) { - if(qsuflg) - /* nullify non-unique lines */ - for(k=(char **)lp; k<(char **)hp;) - *(*++k) = '\0'; if(lp-a >= l-hp) { qs1(hp+es, l); l = lp;