Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 16:31:24 +00:00
Code Issues Projects Releases Wiki Activity

Rewrote.

Browse Source
This commit is contained in:
Matt Kraai 2000-12-20 20:49:56 +00:00
parent e75f6a972c
commit 5e8c0ffb75
2 changed files with 74 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

276
coreutils/sort.c
View File

@ -3,8 +3,7 @@
* Mini sort implementation for busybox * Mini sort implementation for busybox
* *
* *
* Copyright (C) 1999,2000 by Lineo, inc. * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
* Written by John Beppu <beppu@lineo.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -23,267 +22,66 @@
*/ */
#include "busybox.h" #include "busybox.h"
#include <sys/types.h>
#include <fcntl.h>
#include <dirent.h>
#include <stdio.h>
#include <errno.h>
#ifdef BB_FEATURE_SORT_REVERSE int compare_ascii(const void *x, const void *y)
#define APPLY_REVERSE(x) (reverse ? -(x) : (x))
static int reverse = 0;
#else
#define APPLY_REVERSE(x) (x)
#endif
/* typedefs _______________________________________________________________ */
/* line node */
typedef struct Line {
char *data; /* line data */
struct Line *next; /* pointer to next line node */
} Line;
/* singly-linked list of lines */
typedef struct {
int len; /* number of Lines */
Line **sorted; /* array fed to qsort */
Line *head; /* head of List */
Line *current; /* current Line */
} List;
/* comparison function */
typedef int (Compare) (const void *, const void *);
/* methods ________________________________________________________________ */
static const int max = 1024;
/* mallocate Line */
static Line *line_alloc()
{ {
Line *self; return strcmp(*(char **)x, *(char **)y);
self = xmalloc(1 * sizeof(Line));
return self;
} }
/* Construct Line from FILE* */ int compare_numeric(const void *x, const void *y)
static Line *line_newFromFile(FILE * src)
{ {
Line *self; return atoi(*(char **)x) - atoi(*(char **)y);
char *cstring = NULL;
if ((cstring = get_line_from_file(src))) {
self = line_alloc();
self->data = cstring;
self->next = NULL;
return self;
}
return NULL;
} }
/* Line destructor */
static Line *line_release(Line * self)
{
if (self->data) {
free(self->data);
free(self);
}
return self;
}
/* Comparison */
/* ascii order */
static int compare_ascii(const void *a, const void *b)
{
Line **val;
Line *x, *y;
val = (Line **) a;
x = *val;
val = (Line **) b;
y = *val;
// fprintf(stdout, "> %p: %s< %p: %s", x, x->data, y, y->data);
return APPLY_REVERSE(strcmp(x->data, y->data));
}
/* numeric order */
static int compare_numeric(const void *a, const void *b)
{
Line **val;
Line *x, *y;
int xint, yint;
val = (Line **) a;
x = *val;
val = (Line **) b;
y = *val;
xint = strtoul(x->data, NULL, 10);
yint = strtoul(y->data, NULL, 10);
return APPLY_REVERSE(xint - yint);
}
/* List */
/* */
static List *list_init(List * self)
{
self->len = 0;
self->sorted = NULL;
self->head = NULL;
self->current = NULL;
return self;
}
/* for simplicity, the List gains ownership of the line */
static List *list_insert(List * self, Line * line)
{
if (line == NULL) {
return NULL;
}
/* first insertion */
if (self->head == NULL) {
self->head = line;
self->current = line;
/* all subsequent insertions */
} else {
self->current->next = line;
self->current = line;
}
self->len++;
return self;
}
/* order the list according to compare() */
static List *list_sort(List * self, Compare * compare)
{
int i;
Line *line;
/* mallocate array of Line*s */
self->sorted = (Line **) xmalloc(self->len * sizeof(Line *));
/* fill array w/ List's contents */
i = 0;
line = self->head;
while (line) {
self->sorted[i++] = line;
line = line->next;
}
/* apply qsort */
qsort(self->sorted, self->len, sizeof(Line *), compare);
return self;
}
/* precondition: list must be sorted */
static List *list_writeToFile(List * self, FILE * dst)
{
int i;
Line **line = self->sorted;
if (self->sorted == NULL) {
return NULL;
}
for (i = 0; i < self->len; i++) {
fprintf(dst, "%s", line[i]->data);
}
return self;
}
/* deallocate */
static void list_release(List * self)
{
Line *i;
Line *die;
i = self->head;
while (i) {
die = i;
i = die->next;
line_release(die);
}
}
int sort_main(int argc, char **argv) int sort_main(int argc, char **argv)
{ {
int i; FILE *fp;
char opt; char *line, **lines = NULL;
List list; int i, opt, nlines = 0;
Line *l; int (*compare)(const void *, const void *) = compare_ascii;
Compare *compare; #ifdef BB_FEATURE_SORT_REVERSE
int reverse = FALSE;
#endif
/* init */ while ((opt = getopt(argc, argv, "nr")) != -1) {
compare = compare_ascii; switch (opt) {
list_init(&list);
/* parse argv[] */
for (i = 1; i < argc; i++) {
if (argv[i][0] == '-') {
opt = argv[i][1];
switch (opt) {
case 'h':
usage(sort_usage);
break;
case 'n': case 'n':
/* numeric comparison */
compare = compare_numeric; compare = compare_numeric;
break; break;
#ifdef BB_FEATURE_SORT_REVERSE #ifdef BB_FEATURE_SORT_REVERSE
case 'r': case 'r':
/* reverse */ reverse = TRUE;
reverse = 1;
break; break;
#endif #endif
default: default:
error_msg("invalid option -- %c\n", opt);
usage(sort_usage); usage(sort_usage);
}
} else {
break;
} }
} }
if (i >= argc) { /* read the input */
for (i = optind; i == optind || i < argc; i++) {
if (argv[i] == NULL)
fp = stdin;
else
fp = xfopen(argv[i], "r");
/* work w/ stdin */ while ((line = get_line_from_file(fp)) != NULL) {
while ((l = line_newFromFile(stdin))) { lines = xrealloc(lines, sizeof(char *) * (nlines + 1));
list_insert(&list, l); lines[nlines++] = line;
} }
} else {
/* work w/ what's left in argv[] */
FILE *src;
for (; i < argc; i++) {
src = fopen(argv[i], "r");
if (src == NULL) {
break;
}
while ((l = line_newFromFile(src))) {
list_insert(&list, l);
}
fclose(src);
}
} }
list_sort(&list, compare);
list_writeToFile(&list, stdout);
list_release(&list);
return(0); /* sort it */
qsort(lines, nlines, sizeof(char *), compare);
/* print it */
#ifdef BB_FEATURE_SORT_REVERSE
if (reverse)
for (i = nlines - 1; 0 <= i; i--)
fputs(lines[i], stdout);
else
#endif
for (i = 0; i < nlines; i++)
fputs(lines[i], stdout);
return EXIT_SUCCESS;
} }
/* $Id: sort.c,v 1.24 2000/12/07 19:56:48 markw Exp $ */

276
sort.c
View File

@ -3,8 +3,7 @@
* Mini sort implementation for busybox * Mini sort implementation for busybox
* *
* *
* Copyright (C) 1999,2000 by Lineo, inc. * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
* Written by John Beppu <beppu@lineo.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -23,267 +22,66 @@
*/ */
#include "busybox.h" #include "busybox.h"
#include <sys/types.h>
#include <fcntl.h>
#include <dirent.h>
#include <stdio.h>
#include <errno.h>
#ifdef BB_FEATURE_SORT_REVERSE int compare_ascii(const void *x, const void *y)
#define APPLY_REVERSE(x) (reverse ? -(x) : (x))
static int reverse = 0;
#else
#define APPLY_REVERSE(x) (x)
#endif
/* typedefs _______________________________________________________________ */
/* line node */
typedef struct Line {
char *data; /* line data */
struct Line *next; /* pointer to next line node */
} Line;
/* singly-linked list of lines */
typedef struct {
int len; /* number of Lines */
Line **sorted; /* array fed to qsort */
Line *head; /* head of List */
Line *current; /* current Line */
} List;
/* comparison function */
typedef int (Compare) (const void *, const void *);
/* methods ________________________________________________________________ */
static const int max = 1024;
/* mallocate Line */
static Line *line_alloc()
{ {
Line *self; return strcmp(*(char **)x, *(char **)y);
self = xmalloc(1 * sizeof(Line));
return self;
} }
/* Construct Line from FILE* */ int compare_numeric(const void *x, const void *y)
static Line *line_newFromFile(FILE * src)
{ {
Line *self; return atoi(*(char **)x) - atoi(*(char **)y);
char *cstring = NULL;
if ((cstring = get_line_from_file(src))) {
self = line_alloc();
self->data = cstring;
self->next = NULL;
return self;
}
return NULL;
} }
/* Line destructor */
static Line *line_release(Line * self)
{
if (self->data) {
free(self->data);
free(self);
}
return self;
}
/* Comparison */
/* ascii order */
static int compare_ascii(const void *a, const void *b)
{
Line **val;
Line *x, *y;
val = (Line **) a;
x = *val;
val = (Line **) b;
y = *val;
// fprintf(stdout, "> %p: %s< %p: %s", x, x->data, y, y->data);
return APPLY_REVERSE(strcmp(x->data, y->data));
}
/* numeric order */
static int compare_numeric(const void *a, const void *b)
{
Line **val;
Line *x, *y;
int xint, yint;
val = (Line **) a;
x = *val;
val = (Line **) b;
y = *val;
xint = strtoul(x->data, NULL, 10);
yint = strtoul(y->data, NULL, 10);
return APPLY_REVERSE(xint - yint);
}
/* List */
/* */
static List *list_init(List * self)
{
self->len = 0;
self->sorted = NULL;
self->head = NULL;
self->current = NULL;
return self;
}
/* for simplicity, the List gains ownership of the line */
static List *list_insert(List * self, Line * line)
{
if (line == NULL) {
return NULL;
}
/* first insertion */
if (self->head == NULL) {
self->head = line;
self->current = line;
/* all subsequent insertions */
} else {
self->current->next = line;
self->current = line;
}
self->len++;
return self;
}
/* order the list according to compare() */
static List *list_sort(List * self, Compare * compare)
{
int i;
Line *line;
/* mallocate array of Line*s */
self->sorted = (Line **) xmalloc(self->len * sizeof(Line *));
/* fill array w/ List's contents */
i = 0;
line = self->head;
while (line) {
self->sorted[i++] = line;
line = line->next;
}
/* apply qsort */
qsort(self->sorted, self->len, sizeof(Line *), compare);
return self;
}
/* precondition: list must be sorted */
static List *list_writeToFile(List * self, FILE * dst)
{
int i;
Line **line = self->sorted;
if (self->sorted == NULL) {
return NULL;
}
for (i = 0; i < self->len; i++) {
fprintf(dst, "%s", line[i]->data);
}
return self;
}
/* deallocate */
static void list_release(List * self)
{
Line *i;
Line *die;
i = self->head;
while (i) {
die = i;
i = die->next;
line_release(die);
}
}
int sort_main(int argc, char **argv) int sort_main(int argc, char **argv)
{ {
int i; FILE *fp;
char opt; char *line, **lines = NULL;
List list; int i, opt, nlines = 0;
Line *l; int (*compare)(const void *, const void *) = compare_ascii;
Compare *compare; #ifdef BB_FEATURE_SORT_REVERSE
int reverse = FALSE;
#endif
/* init */ while ((opt = getopt(argc, argv, "nr")) != -1) {
compare = compare_ascii; switch (opt) {
list_init(&list);
/* parse argv[] */
for (i = 1; i < argc; i++) {
if (argv[i][0] == '-') {
opt = argv[i][1];
switch (opt) {
case 'h':
usage(sort_usage);
break;
case 'n': case 'n':
/* numeric comparison */
compare = compare_numeric; compare = compare_numeric;
break; break;
#ifdef BB_FEATURE_SORT_REVERSE #ifdef BB_FEATURE_SORT_REVERSE
case 'r': case 'r':
/* reverse */ reverse = TRUE;
reverse = 1;
break; break;
#endif #endif
default: default:
error_msg("invalid option -- %c\n", opt);
usage(sort_usage); usage(sort_usage);
}
} else {
break;
} }
} }
if (i >= argc) { /* read the input */
for (i = optind; i == optind || i < argc; i++) {
if (argv[i] == NULL)
fp = stdin;
else
fp = xfopen(argv[i], "r");
/* work w/ stdin */ while ((line = get_line_from_file(fp)) != NULL) {
while ((l = line_newFromFile(stdin))) { lines = xrealloc(lines, sizeof(char *) * (nlines + 1));
list_insert(&list, l); lines[nlines++] = line;
} }
} else {
/* work w/ what's left in argv[] */
FILE *src;
for (; i < argc; i++) {
src = fopen(argv[i], "r");
if (src == NULL) {
break;
}
while ((l = line_newFromFile(src))) {
list_insert(&list, l);
}
fclose(src);
}
} }
list_sort(&list, compare);
list_writeToFile(&list, stdout);
list_release(&list);
return(0); /* sort it */
qsort(lines, nlines, sizeof(char *), compare);
/* print it */
#ifdef BB_FEATURE_SORT_REVERSE
if (reverse)
for (i = nlines - 1; 0 <= i; i--)
fputs(lines[i], stdout);
else
#endif
for (i = 0; i < nlines; i++)
fputs(lines[i], stdout);
return EXIT_SUCCESS;
} }
/* $Id: sort.c,v 1.24 2000/12/07 19:56:48 markw Exp $ */