emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ shortened main() a little, and a few aesthetic cleanups here & there.

Browse Source
This commit is contained in:
John Beppu 2000-09-28 17:49:59 +00:00
parent c0321f9bc6
commit 8d369e98a5
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
coreutils/sort.c
View File

@ -99,13 +99,13 @@ static Line *line_release(Line * self)
/* ascii order */ /* ascii order */
static int compare_ascii(const void *a, const void *b) static int compare_ascii(const void *a, const void *b)
{ {
Line **doh; Line **val;
Line *x, *y; Line *x, *y;
doh = (Line **) a; val = (Line **) a;
x = *doh; x = *val;
doh = (Line **) b; val = (Line **) b;
y = *doh; y = *val;
// fprintf(stdout, "> %p: %s< %p: %s", x, x->data, y, y->data); // fprintf(stdout, "> %p: %s< %p: %s", x, x->data, y, y->data);
return APPLY_REVERSE(strcmp(x->data, y->data)); return APPLY_REVERSE(strcmp(x->data, y->data));
@ -114,14 +114,14 @@ static int compare_ascii(const void *a, const void *b)
/* numeric order */ /* numeric order */
static int compare_numeric(const void *a, const void *b) static int compare_numeric(const void *a, const void *b)
{ {
Line **doh; Line **val;
Line *x, *y; Line *x, *y;
int xint, yint; int xint, yint;
doh = (Line **) a; val = (Line **) a;
x = *doh; x = *val;
doh = (Line **) b; val = (Line **) b;
y = *doh; y = *val;
xint = strtoul(x->data, NULL, 10); xint = strtoul(x->data, NULL, 10);
yint = strtoul(y->data, NULL, 10); yint = strtoul(y->data, NULL, 10);
@ -255,19 +255,16 @@ int sort_main(int argc, char **argv)
} }
} }
/* this could be factored better */ if (i >= argc) {
/* work w/ stdin */ /* work w/ stdin */
if (i >= argc) {
while ((l = line_newFromFile(stdin))) { while ((l = line_newFromFile(stdin))) {
list_insert(&list, l); list_insert(&list, l);
} }
list_sort(&list, compare);
list_writeToFile(&list, stdout); } else {
list_release(&list);
/* work w/ what's left in argv[] */ /* work w/ what's left in argv[] */
} else {
FILE *src; FILE *src;
for (; i < argc; i++) { for (; i < argc; i++) {
@ -280,12 +277,13 @@ int sort_main(int argc, char **argv)
} }
fclose(src); fclose(src);
} }
}
list_sort(&list, compare); list_sort(&list, compare);
list_writeToFile(&list, stdout); list_writeToFile(&list, stdout);
list_release(&list); list_release(&list);
}
return(0); return(0);
} }
/* $Id: sort.c,v 1.22 2000/09/25 21:45:58 andersen Exp $ */ /* $Id: sort.c,v 1.23 2000/09/28 17:49:59 beppu Exp $ */

34
sort.c
View File

@ -99,13 +99,13 @@ static Line *line_release(Line * self)
/* ascii order */ /* ascii order */
static int compare_ascii(const void *a, const void *b) static int compare_ascii(const void *a, const void *b)
{ {
Line **doh; Line **val;
Line *x, *y; Line *x, *y;
doh = (Line **) a; val = (Line **) a;
x = *doh; x = *val;
doh = (Line **) b; val = (Line **) b;
y = *doh; y = *val;
// fprintf(stdout, "> %p: %s< %p: %s", x, x->data, y, y->data); // fprintf(stdout, "> %p: %s< %p: %s", x, x->data, y, y->data);
return APPLY_REVERSE(strcmp(x->data, y->data)); return APPLY_REVERSE(strcmp(x->data, y->data));
@ -114,14 +114,14 @@ static int compare_ascii(const void *a, const void *b)
/* numeric order */ /* numeric order */
static int compare_numeric(const void *a, const void *b) static int compare_numeric(const void *a, const void *b)
{ {
Line **doh; Line **val;
Line *x, *y; Line *x, *y;
int xint, yint; int xint, yint;
doh = (Line **) a; val = (Line **) a;
x = *doh; x = *val;
doh = (Line **) b; val = (Line **) b;
y = *doh; y = *val;
xint = strtoul(x->data, NULL, 10); xint = strtoul(x->data, NULL, 10);
yint = strtoul(y->data, NULL, 10); yint = strtoul(y->data, NULL, 10);
@ -255,19 +255,16 @@ int sort_main(int argc, char **argv)
} }
} }
/* this could be factored better */ if (i >= argc) {
/* work w/ stdin */ /* work w/ stdin */
if (i >= argc) {
while ((l = line_newFromFile(stdin))) { while ((l = line_newFromFile(stdin))) {
list_insert(&list, l); list_insert(&list, l);
} }
list_sort(&list, compare);
list_writeToFile(&list, stdout); } else {
list_release(&list);
/* work w/ what's left in argv[] */ /* work w/ what's left in argv[] */
} else {
FILE *src; FILE *src;
for (; i < argc; i++) { for (; i < argc; i++) {
@ -280,12 +277,13 @@ int sort_main(int argc, char **argv)
} }
fclose(src); fclose(src);
} }
}
list_sort(&list, compare); list_sort(&list, compare);
list_writeToFile(&list, stdout); list_writeToFile(&list, stdout);
list_release(&list); list_release(&list);
}
return(0); return(0);
} }
/* $Id: sort.c,v 1.22 2000/09/25 21:45:58 andersen Exp $ */ /* $Id: sort.c,v 1.23 2000/09/28 17:49:59 beppu Exp $ */