1 files changed, 3 insertions, 33 deletions

diff --git a/text-utils/column.c b/text-utils/column.c
index 89d46d280..195814328 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -86,7 +86,6 @@ struct column_control {
 	const char *tree_parent;
 
 	wchar_t *input_separator;
-	char *input_separator_raw;
 	const char *output_separator;
 
 	wchar_t	**ents;		/* input entries */
@@ -96,7 +95,6 @@ struct column_control {
 	unsigned int greedy :1,
 		     json :1,
 		     header_repeat :1,
-		     input_sep_space : 1,	/* input separator contains space chars */
 		     tab_noheadings :1;
 };
 
@@ -470,19 +468,7 @@ static int read_input(struct column_control *ctl, FILE *fp)
 	char *buf = NULL;
 	size_t bufsz = 0;
 	size_t maxents = 0;
-	int rc = 0, is_space_sep = 0;
-
-	/* Check if columns separator contains spaces chars */
-	if (ctl->mode == COLUMN_MODE_TABLE && ctl->input_separator_raw) {
-		char *p;
-
-		for (p = ctl->input_separator_raw; *p; p++) {
-			if (isspace(*p)) {
-				is_space_sep = 1;
-				break;
-			}
-		}
-	}
+	int rc = 0;
 
 	/* Read input */
 	do {
@@ -496,19 +482,6 @@ static int read_input(struct column_control *ctl, FILE *fp)
 			err(EXIT_FAILURE, _("read failed"));
 		}
 		str = (char *) skip_space(buf);
-
-		/* The table columns separator could be a space. In this case
-		 * don't skip the separator if at begin of the line. For example:
-		 *
-		 * echo -e "\tcol1\tcol2\nrow\t1\t2" \
-		 *	| column -t -s "$(echo -e '\t')" --table-columns A,B,C
-		 */
-		if (is_space_sep && str > buf) {
-			char *x = strpbrk(buf, ctl->input_separator_raw);
-			if (x && x < str)
-				str = x;
-		}
-
 		if (str) {
 			p = strchr(str, '\n');
 			if (p)
@@ -517,13 +490,13 @@ static int read_input(struct column_control *ctl, FILE *fp)
 		if (!str || !*str)
 			continue;
 
-		wcs = mbs_to_wcs(str);
+		wcs = mbs_to_wcs(buf);
 		if (!wcs) {
 			/*
 			 * Convert broken sequences to \x<hex> and continue.
 			 */
 			size_t tmpsz = 0;
-			char *tmp = mbs_invalid_encode(str, &tmpsz);
+			char *tmp = mbs_invalid_encode(buf, &tmpsz);
 
 			if (!tmp)
 				err(EXIT_FAILURE, _("read failed"));
@@ -720,7 +693,6 @@ int main(int argc, char **argv)
 
 	ctl.output_separator = "  ";
 	ctl.input_separator = mbs_to_wcs("\t ");
-	ctl.input_separator_raw = xstrdup("\t ");
 
 	while ((c = getopt_long(argc, argv, "c:dE:eH:hi:JN:n:O:o:p:R:r:s:T:tVW:x", longopts, NULL)) != -1) {
 
@@ -775,9 +747,7 @@ int main(int argc, char **argv)
 			break;
 		case 's':
 			free(ctl.input_separator);
-			free(ctl.input_separator_raw);
 			ctl.input_separator = mbs_to_wcs(optarg);
-			ctl.input_separator_raw = xstrdup(optarg);
 			ctl.greedy = 0;
 			break;
 		case 'T':