[BusyBox] cut bug
BRENT PRIDDY
brent.priddy at adtran.com
Fri Nov 17 17:22:06 UTC 2000
cut was not able to search for \n's so here is a fix
Brent
<-------------------- diff starts here -------------------------->
Index: cut.c
===================================================================
RCS file: /var/cvs/busybox/cut.c,v
retrieving revision 1.11
diff -u -r1.11 cut.c
--- cut.c 2000/09/25 21:45:57 1.11
+++ cut.c 2000/11/17 17:11:04
@@ -102,10 +102,10 @@
static void cut_file(FILE *file)
{
char *line;
+ unsigned int cr_hits = 0;
/* go through every line in the file */
for (line = NULL; (line = get_line_from_file(file)) != NULL;
free(line)) {
-
/* cut based on chars/bytes */
if (part == 'c' || part == 'b') {
int i;
@@ -129,34 +129,46 @@
char *start = line;
unsigned int delims_hit = 0;
- for (ptr = line; (ptr = strchr(ptr, delim)) != NULL;
ptr++) {
- delims_hit++;
- if (delims_hit == (startpos - 1)) {
- start = ptr+1;
- }
- if (delims_hit == endpos) {
- break;
- }
- }
- /* we didn't hit any delimeters */
- if (delims_hit == 0 && !supress_non_delimited_lines)
{
- fputs(line, stdout);
- }
- /* we =did= hit some delimiters */
- else if (delims_hit > 0) {
- /* we have a fixed end point */
- if (ptr) {
- while (start < ptr) {
+ if(delim == '\n') {
+ if(++cr_hits == startpos) {
+ while (*start && *start != '\n') {
fputc(*start, stdout);
start++;
}
fputc('\n', stdout);
}
- /* or we're just going til the end of the
line */
- else {
- while (*start) {
- fputc(*start, stdout);
- start++;
+ }
+ else {
+ for (ptr = line; (ptr = strchr(ptr, delim))
!= NULL; ptr++) {
+ delims_hit++;
+ if (delims_hit == (startpos - 1)) {
+ start = ptr+1;
+ }
+ if (delims_hit == endpos) {
+ break;
+ }
+ }
+
+ /* we didn't hit any delimeters */
+ if (delims_hit == 0 &&
!supress_non_delimited_lines) {
+ fputs(line, stdout);
+ }
+ /* we =did= hit some delimiters */
+ else if (delims_hit > 0) {
+ /* we have a fixed end point */
+ if (ptr) {
+ while (start < ptr) {
+ fputc(*start,
stdout);
+ start++;
+ }
+ fputc('\n', stdout);
+ }
+ /* or we're just going til the end
of the line */
+ else {
+ while (*start) {
+ fputc(*start,
stdout);
+ start++;
+ }
}
}
}
More information about the busybox
mailing list