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

Fixed segfault with 'cut -f 1 -d:' and added 'cut -s' suport.

Browse Source 
Fix thanks to Arne Bernin <arne@matrix.loopback.org>
 -Erik
This commit is contained in:
Eric Andersen 2000-06-26 12:14:30 +00:00
parent ef40aa81c5
commit 1386e70210
4 changed files with 55 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -6,6 +6,8 @@
* Fixed a nasty bug in tar when could mess up saved symlinks. * Fixed a nasty bug in tar when could mess up saved symlinks.
* Fixed insmod module option parsing for options lacking an '='. * Fixed insmod module option parsing for options lacking an '='.
Fix thanks to Marc Nijdam <marc_nijdam@hp.com> Fix thanks to Marc Nijdam <marc_nijdam@hp.com>
* Fixed segfault with 'cut -f 1 -d:' and added 'cut -s' suport.
Fix thanks to Arne Bernin <arne@matrix.loopback.org>
-Erik Andersen -Erik Andersen

30
coreutils/cut.c
View File

@ -51,15 +51,14 @@ int num_args;
#define OPTIONC 2 /* define for mode: option -c */ #define OPTIONC 2 /* define for mode: option -c */
#define OPTIONB 3 /* define for mode: option -b */ #define OPTIONB 3 /* define for mode: option -b */
#define NOTSET 0 /* option not selected */ #define NOTSET 0 /* option not selected */
#define SET 1 /* option selected */ #define SET 1 /* option selected */
#define OPTIONS 1 /*define option -s */
/* Defines for the warnings */ /* Defines for the warnings */
#define DELIMITER_NOT_APPLICABLE 0 #define DELIMITER_NOT_APPLICABLE 0
#define OVERRIDING_PREVIOUS_MODE 1 #define OVERRIDING_PREVIOUS_MODE 1
#define OPTION_NOT_APPLICABLE 2 #define OPTION_NOT_APPLICABLE 2
#define UNKNOWN_OPTION 3 #define UNKNOWN_OPTION 3
#define FILE_NOT_READABLE 4 #define FILE_NOT_READABLE 4
/* Defines for the fatal errors */ /* Defines for the fatal errors */
#define SYNTAX_ERROR 101 #define SYNTAX_ERROR 101
#define POSITION_ERROR 102 #define POSITION_ERROR 102
@ -75,6 +74,7 @@ FILE *fd;
char *name; char *name;
char line[BUFSIZ]; char line[BUFSIZ];
int exit_status; int exit_status;
int option = 0; /* for -s option */
int cut_main(int argc, char **argv); int cut_main(int argc, char **argv);
void warn(int warn_number, char *option); void warn(int warn_number, char *option);
@ -85,7 +85,7 @@ void cut(void);
void warn(int warn_number, char *option) void warn(int warn_number, char *option)
{ {
static char *warn_msg[] = { static char *warn_msg[] = {
"%s: Option -d allowed only with -f\n", "%s: Option -%s allowed only with -f\n",
"%s: -%s overrides earlier option\n", "%s: -%s overrides earlier option\n",
"%s: -%s not allowed in current mode\n", "%s: -%s not allowed in current mode\n",
"%s: Cannot open %s\n" "%s: Cannot open %s\n"
@ -161,7 +161,8 @@ void cut()
char *columns[MAX_FIELD]; char *columns[MAX_FIELD];
while (fgets(line, BUFSIZ, fd)) { while (fgets(line, BUFSIZ, fd)) {
length = strlen(line) - 1; maxcol=0;
length = strlen(line) - 1;
*(line + length) = 0; *(line + length) = 0;
switch (mode) { switch (mode) {
case DUMP_STDIN: case DUMP_STDIN:
@ -182,11 +183,15 @@ void cut()
for (i = 0; i < num_args; i++) { for (i = 0; i < num_args; i++) {
for (j = args[i * 2]; j <= args[i * 2 + 1]; j++) for (j = args[i * 2]; j <= args[i * 2 + 1]; j++)
if (j <= maxcol) { if (j <= maxcol) {
printf("%s", columns[j - 1]); printf("%s", columns[j - 1]);
if (i != num_args - 1 || j != args[i * 2 + 1]) if (i != num_args - 1 || j != args[i * 2 + 1])
putchar(delim); putchar(delim);
} }
} }
} else if (option != OPTIONS) {
printf("%s",line);
} }
break; break;
case OPTIONC: case OPTIONC:
@ -217,7 +222,8 @@ int cut_main(int argc, char **argv)
"Options:\n" "Options:\n"
"\t-b LIST\tOutput only bytes from LIST\n" "\t-b LIST\tOutput only bytes from LIST\n"
"\t-c LIST\tOutput only characters from LIST\n" "\t-c LIST\tOutput only characters from LIST\n"
"\t-d DELIM\tUse DELIM instead of tab as the field delimiter\n" "\t-d CHAR\tUse CHAR instead of tab as the field delimiter\n"
"\t-s\tOnly output Lines if the include DELIM\n"
"\t-f N\tPrint only these fields\n" "\t-f N\tPrint only these fields\n"
"\t-n\tIgnored\n" "\t-n\tIgnored\n"
#endif #endif
@ -229,7 +235,10 @@ int cut_main(int argc, char **argv)
case 'd': case 'd':
if (mode == OPTIONC || mode == OPTIONB) if (mode == OPTIONC || mode == OPTIONB)
warn(DELIMITER_NOT_APPLICABLE, "d"); warn(DELIMITER_NOT_APPLICABLE, "d");
delim = argv[i++][0]; if (argc > i)
delim = argv[i++][0];
else
cuterror(SYNTAX_ERROR);
break; break;
case 'f': case 'f':
sprintf(line, "%s", argv[i++]); sprintf(line, "%s", argv[i++]);
@ -248,6 +257,10 @@ int cut_main(int argc, char **argv)
if (mode == OPTIONF || mode == OPTIONB) if (mode == OPTIONF || mode == OPTIONB)
warn(OVERRIDING_PREVIOUS_MODE, "c"); warn(OVERRIDING_PREVIOUS_MODE, "c");
mode = OPTIONC; mode = OPTIONC;
break;
case 's':
option = OPTIONS;
break; break;
case '\0': /* - means: read from stdin */ case '\0': /* - means: read from stdin */
numberFilenames++; numberFilenames++;
@ -268,6 +281,9 @@ int cut_main(int argc, char **argv)
/* Here follow the checks, if the selected options are reasonable. */ /* Here follow the checks, if the selected options are reasonable. */
if (mode == OPTIONB) /* since in Minix char := byte */ if (mode == OPTIONB) /* since in Minix char := byte */
mode = OPTIONC; mode = OPTIONC;
if (mode != OPTIONF && option == OPTIONS)
warn(DELIMITER_NOT_APPLICABLE,"s");
get_args(); get_args();
if (numberFilenames != 0) { if (numberFilenames != 0) {
i = 1; i = 1;

30
cut.c
View File

@ -51,15 +51,14 @@ int num_args;
#define OPTIONC 2 /* define for mode: option -c */ #define OPTIONC 2 /* define for mode: option -c */
#define OPTIONB 3 /* define for mode: option -b */ #define OPTIONB 3 /* define for mode: option -b */
#define NOTSET 0 /* option not selected */ #define NOTSET 0 /* option not selected */
#define SET 1 /* option selected */ #define SET 1 /* option selected */
#define OPTIONS 1 /*define option -s */
/* Defines for the warnings */ /* Defines for the warnings */
#define DELIMITER_NOT_APPLICABLE 0 #define DELIMITER_NOT_APPLICABLE 0
#define OVERRIDING_PREVIOUS_MODE 1 #define OVERRIDING_PREVIOUS_MODE 1
#define OPTION_NOT_APPLICABLE 2 #define OPTION_NOT_APPLICABLE 2
#define UNKNOWN_OPTION 3 #define UNKNOWN_OPTION 3
#define FILE_NOT_READABLE 4 #define FILE_NOT_READABLE 4
/* Defines for the fatal errors */ /* Defines for the fatal errors */
#define SYNTAX_ERROR 101 #define SYNTAX_ERROR 101
#define POSITION_ERROR 102 #define POSITION_ERROR 102
@ -75,6 +74,7 @@ FILE *fd;
char *name; char *name;
char line[BUFSIZ]; char line[BUFSIZ];
int exit_status; int exit_status;
int option = 0; /* for -s option */
int cut_main(int argc, char **argv); int cut_main(int argc, char **argv);
void warn(int warn_number, char *option); void warn(int warn_number, char *option);
@ -85,7 +85,7 @@ void cut(void);
void warn(int warn_number, char *option) void warn(int warn_number, char *option)
{ {
static char *warn_msg[] = { static char *warn_msg[] = {
"%s: Option -d allowed only with -f\n", "%s: Option -%s allowed only with -f\n",
"%s: -%s overrides earlier option\n", "%s: -%s overrides earlier option\n",
"%s: -%s not allowed in current mode\n", "%s: -%s not allowed in current mode\n",
"%s: Cannot open %s\n" "%s: Cannot open %s\n"
@ -161,7 +161,8 @@ void cut()
char *columns[MAX_FIELD]; char *columns[MAX_FIELD];
while (fgets(line, BUFSIZ, fd)) { while (fgets(line, BUFSIZ, fd)) {
length = strlen(line) - 1; maxcol=0;
length = strlen(line) - 1;
*(line + length) = 0; *(line + length) = 0;
switch (mode) { switch (mode) {
case DUMP_STDIN: case DUMP_STDIN:
@ -182,11 +183,15 @@ void cut()
for (i = 0; i < num_args; i++) { for (i = 0; i < num_args; i++) {
for (j = args[i * 2]; j <= args[i * 2 + 1]; j++) for (j = args[i * 2]; j <= args[i * 2 + 1]; j++)
if (j <= maxcol) { if (j <= maxcol) {
printf("%s", columns[j - 1]); printf("%s", columns[j - 1]);
if (i != num_args - 1 || j != args[i * 2 + 1]) if (i != num_args - 1 || j != args[i * 2 + 1])
putchar(delim); putchar(delim);
} }
} }
} else if (option != OPTIONS) {
printf("%s",line);
} }
break; break;
case OPTIONC: case OPTIONC:
@ -217,7 +222,8 @@ int cut_main(int argc, char **argv)
"Options:\n" "Options:\n"
"\t-b LIST\tOutput only bytes from LIST\n" "\t-b LIST\tOutput only bytes from LIST\n"
"\t-c LIST\tOutput only characters from LIST\n" "\t-c LIST\tOutput only characters from LIST\n"
"\t-d DELIM\tUse DELIM instead of tab as the field delimiter\n" "\t-d CHAR\tUse CHAR instead of tab as the field delimiter\n"
"\t-s\tOnly output Lines if the include DELIM\n"
"\t-f N\tPrint only these fields\n" "\t-f N\tPrint only these fields\n"
"\t-n\tIgnored\n" "\t-n\tIgnored\n"
#endif #endif
@ -229,7 +235,10 @@ int cut_main(int argc, char **argv)
case 'd': case 'd':
if (mode == OPTIONC || mode == OPTIONB) if (mode == OPTIONC || mode == OPTIONB)
warn(DELIMITER_NOT_APPLICABLE, "d"); warn(DELIMITER_NOT_APPLICABLE, "d");
delim = argv[i++][0]; if (argc > i)
delim = argv[i++][0];
else
cuterror(SYNTAX_ERROR);
break; break;
case 'f': case 'f':
sprintf(line, "%s", argv[i++]); sprintf(line, "%s", argv[i++]);
@ -248,6 +257,10 @@ int cut_main(int argc, char **argv)
if (mode == OPTIONF || mode == OPTIONB) if (mode == OPTIONF || mode == OPTIONB)
warn(OVERRIDING_PREVIOUS_MODE, "c"); warn(OVERRIDING_PREVIOUS_MODE, "c");
mode = OPTIONC; mode = OPTIONC;
break;
case 's':
option = OPTIONS;
break; break;
case '\0': /* - means: read from stdin */ case '\0': /* - means: read from stdin */
numberFilenames++; numberFilenames++;
@ -268,6 +281,9 @@ int cut_main(int argc, char **argv)
/* Here follow the checks, if the selected options are reasonable. */ /* Here follow the checks, if the selected options are reasonable. */
if (mode == OPTIONB) /* since in Minix char := byte */ if (mode == OPTIONB) /* since in Minix char := byte */
mode = OPTIONC; mode = OPTIONC;
if (mode != OPTIONF && option == OPTIONS)
warn(DELIMITER_NOT_APPLICABLE,"s");
get_args(); get_args();
if (numberFilenames != 0) { if (numberFilenames != 0) {
i = 1; i = 1;

13
docs/busybox.pod
View File

@ -276,11 +276,12 @@ Prints selected fields from each input FILE to standard output.
Options: Options:
-b LIST Output only bytes from LIST -b LIST Output only bytes from LIST
-c LIST Output only characters from LIST -c LIST Output only characters from LIST
-d DELIM Use DELIM instead of tab as the field delimiter -d CHAR Use CHAR instead of tab as the field delimiter
-f N Print only these fields -s Only output Lines if the include DELIM
-n Ignored -f N Print only these fields
-n Ignored
Example: Example:
@ -2062,4 +2063,4 @@ Enrique Zanardi <ezanardi@ull.es>
=cut =cut
# $Id: busybox.pod,v 1.51 2000/06/21 22:53:24 andersen Exp $ # $Id: busybox.pod,v 1.52 2000/06/26 12:14:30 andersen Exp $