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

Applied patch from Brent Priddy <brent.priddy@adtran.com> to handle the

Browse Source 
special-case of using newlines as field delimiters.
This commit is contained in:
Mark Whitley 2000-11-17 22:02:45 +00:00
parent 9028e2c96a
commit 0053087587
2 changed files with 74 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
coreutils/cut.c
View File

@ -102,10 +102,10 @@ static void decompose_list(const char *list)
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,6 +129,17 @@ static void cut_file(FILE *file)
char *start = line;
unsigned int delims_hit = 0;
if (delim == '\n') {
cr_hits++;
if (cr_hits >= startpos && cr_hits <= endpos) {
while (*start && *start != '\n') {
fputc(*start, stdout);
start++;
}
fputc('\n', stdout);
}
}
else {
for (ptr = line; (ptr = strchr(ptr, delim)) != NULL; ptr++) {
delims_hit++;
if (delims_hit == (startpos - 1)) {
@ -138,6 +149,7 @@ static void cut_file(FILE *file)
break;
}
}
/* we didn't hit any delimeters */
if (delims_hit == 0 && !supress_non_delimited_lines) {
fputs(line, stdout);
@ -162,6 +174,7 @@ static void cut_file(FILE *file)
}
}
}
}
}
extern int cut_main(int argc, char **argv)

15
cut.c
View File

@ -102,10 +102,10 @@ static void decompose_list(const char *list)
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,6 +129,17 @@ static void cut_file(FILE *file)
char *start = line;
unsigned int delims_hit = 0;
if (delim == '\n') {
cr_hits++;
if (cr_hits >= startpos && cr_hits <= endpos) {
while (*start && *start != '\n') {
fputc(*start, stdout);
start++;
}
fputc('\n', stdout);
}
}
else {
for (ptr = line; (ptr = strchr(ptr, delim)) != NULL; ptr++) {
delims_hit++;
if (delims_hit == (startpos - 1)) {
@ -138,6 +149,7 @@ static void cut_file(FILE *file)
break;
}
}
/* we didn't hit any delimeters */
if (delims_hit == 0 && !supress_non_delimited_lines) {
fputs(line, stdout);
@ -162,6 +174,7 @@ static void cut_file(FILE *file)
}
}
}
}
}
extern int cut_main(int argc, char **argv)