bekucera/coreutils
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/coreutils.git synced 2025-09-10 07:59:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

(complement, COMPLEMENT_OPTION): New.

Browse Source 
(longopts): Add --complement.
(usage): Say not that -b, -c, and -f `print' fields,
but rather that they `select' fields for printing.
Describe the new --complement option.
(mark_range_start): Extracted from set_fields.
(print_kth): Support --complement.
(compare_ranges): New function.
(set_fields): Rewrite the part that populates range_start_ht,
merging it with the part that populates printable_field.
(main): Handle --complement.

From Paolo Bonzini.
This commit is contained in:
Jim Meyering
2004-12-04 13:32:48 +00:00
parent 4dd208a372
commit 7380cf792a
1 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/cut.c
View File

@@ -126,6 +126,10 @@ static enum operating_mode operating_mode;
with field mode. */
static bool suppress_non_delimited;
/* If nonzero, print all bytes, characters, or fields _except_
those that were specified. */
static bool complement;
/* The delimeter character for field mode. */
static unsigned char delim;
@@ -155,7 +159,8 @@ static Hash_table *range_start_ht;
non-character as a pseudo short option, starting with CHAR_MAX + 1. */
enum
{
OUTPUT_DELIMITER_OPTION = CHAR_MAX + 1
OUTPUT_DELIMITER_OPTION = CHAR_MAX + 1,
COMPLEMENT_OPTION
};
static struct option const longopts[] =
@@ -166,6 +171,7 @@ static struct option const longopts[] =
{"delimiter", required_argument, 0, 'd'},
{"only-delimited", no_argument, 0, 's'},
{"output-delimiter", required_argument, 0, OUTPUT_DELIMITER_OPTION},
{"complement", no_argument, 0, COMPLEMENT_OPTION},
{GETOPT_HELP_OPTION_DECL},
{GETOPT_VERSION_OPTION_DECL},
{0, 0, 0, 0}
@@ -191,15 +197,19 @@ Print selected parts of lines from each FILE to standard output.\n\
Mandatory arguments to long options are mandatory for short options too.\n\
"), stdout);
fputs (_("\
-b, --bytes=LIST output only these bytes\n\
-c, --characters=LIST output only these characters\n\
-b, --bytes=LIST select only these bytes\n\
-c, --characters=LIST select only these characters\n\
-d, --delimiter=DELIM use DELIM instead of TAB for field delimiter\n\
"), stdout);
fputs (_("\
-f, --fields=LIST output only these fields; also print any line\n\
-f, --fields=LIST select only these fields; also print any line\n\
that contains no delimiter character, unless\n\
the -s option is specified\n\
-n (ignored)\n\
"), stdout);
fputs (_("\
--complement complement the set of selected bytes, characters\n\
or fields.\n\
"), stdout);
fputs (_("\
-s, --only-delimited do not print lines not containing delimiters\n\
@@ -227,6 +237,19 @@ With no FILE, or when FILE is -, read standard input.\n\
exit (status);
}
static inline void
mark_range_start (size_t i)
{
/* Record the fact that `i' is a range-start index. */
void *ent_from_table = hash_insert (range_start_ht, (void*) i);
if (ent_from_table == NULL)
{
/* Insertion failed due to lack of memory. */
xalloc_die ();
}
assert ((size_t) ent_from_table == i);
}
static inline void
mark_printable_field (size_t i)
{
@@ -272,15 +295,25 @@ is_range_start_index (size_t i)
static bool
print_kth (size_t k, bool *range_start)
{
if ((0 < eol_range_start && eol_range_start <= k)
|| (k <= max_range_endpoint && is_printable_field (k)))
{
if (range_start)
*range_start = is_range_start_index (k);
return true;
}
bool k_selected
= ((0 < eol_range_start && eol_range_start <= k)
|| (k <= max_range_endpoint && is_printable_field (k)));
return false;
bool is_selected = k_selected ^ complement;
if (range_start && is_selected)
*range_start = is_range_start_index (k);
return is_selected;
}
/* Comparison function for qsort to order the list of
struct range_pairs. */
static int
compare_ranges (const void *a, const void *b)
{
int a_start = ((const struct range_pair *) a)->lo;
int b_start = ((const struct range_pair *) b)->lo;
return a_start < b_start ? -1 : a_start > b_start;
}
/* Given the list of field or byte range specifications FIELDSTR, set
@@ -461,51 +494,30 @@ set_fields (const char *fieldstr)
printable_field = xzalloc (max_range_endpoint / CHAR_BIT + 1);
qsort (rp, n_rp, sizeof (rp[0]), compare_ranges);
/* Set the array entries corresponding to integers in the ranges of RP. */
for (i = 0; i < n_rp; i++)
{
size_t j;
for (j = rp[i].lo; j <= rp[i].hi; j++)
{
mark_printable_field (j);
}
}
size_t rsi_candidate;
if (output_delimiter_specified)
{
/* Record the range-start indices, i.e., record each start
index that is not part of any other (lo..hi] range. */
for (i = 0; i <= n_rp; i++)
{
size_t j;
size_t rsi = (i < n_rp ? rp[i].lo : eol_range_start);
rsi_candidate = complement ? rp[i].hi + 1 : rp[i].lo;
if (output_delimiter_specified
&& !is_printable_field (rsi_candidate))
mark_range_start (rsi_candidate);
for (j = 0; j < n_rp; j++)
{
if (rp[j].lo < rsi && rsi <= rp[j].hi)
{
rsi = 0;
break;
}
}
if (eol_range_start && eol_range_start < rsi)
rsi = 0;
if (rsi)
{
/* Record the fact that `rsi' is a range-start index. */
void *ent_from_table = hash_insert (range_start_ht, (void*) rsi);
if (ent_from_table == NULL)
{
/* Insertion failed due to lack of memory. */
xalloc_die ();
}
assert ((size_t) ent_from_table == rsi);
}
}
for (j = rp[i].lo; j <= rp[i].hi; j++)
mark_printable_field (j);
}
if (output_delimiter_specified
&& !complement
&& eol_range_start && !is_printable_field (eol_range_start))
mark_range_start (eol_range_start);
free (rp);
return field_found;
@@ -799,6 +811,10 @@ main (int argc, char **argv)
suppress_non_delimited = true;
break;
case COMPLEMENT_OPTION:
complement = true;
break;
case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);