rpms/util-linux/devel util-linux-2.12p-col-EILSEQ.patch, 1.1, 1.2 util-linux.spec, 1.106, 1.107

[fedora-cvs-commits at redhat.com]

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27598

Modified Files:
	util-linux-2.12p-col-EILSEQ.patch util-linux.spec 
Log Message:
fix col-EILSEQ.patch

util-linux-2.12p-col-EILSEQ.patch:
 col.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

Index: util-linux-2.12p-col-EILSEQ.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.12p-col-EILSEQ.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.12p-col-EILSEQ.patch	3 Jan 2006 17:50:20 -0000	1.1
+++ util-linux-2.12p-col-EILSEQ.patch	21 Feb 2006 21:28:13 -0000	1.2
@@ -1,5 +1,5 @@
---- util-linux-2.12p/text-utils/col.c.EILSEQ	2002-03-09 00:05:12.000000000 +0100
-+++ util-linux-2.12p/text-utils/col.c	2006-01-02 18:00:06.000000000 +0100
+--- util-linux-2.13-pre6/text-utils/col.c.kzak	2002-03-09 00:05:12.000000000 +0100
++++ util-linux-2.13-pre6/text-utils/col.c	2006-02-21 22:25:48.000000000 +0100
 @@ -128,6 +128,7 @@
  	int this_line;			/* line l points to */
  	int nflushd_lines;		/* number of lines that were flushed */
@@ -8,7 +8,7 @@
  
  	setlocale(LC_ALL, "");
  	bindtextdomain(PACKAGE, LOCALEDIR);
-@@ -175,8 +176,15 @@
+@@ -175,8 +176,16 @@
  	cur_line = max_line = nflushd_lines = this_line = 0;
  	cur_set = last_set = CS_NORMAL;
  	lines = l = alloc_line();
@@ -18,15 +18,16 @@
 +	while (feof(stdin)==0) {
 +		errno = 0;
 +		if ((ch = getwchar()) == WEOF) {
-+			if (errno==EILSEQ)
++			if (errno==EILSEQ) {
 +				perror("col");
-+			ret = 1;
++				ret = 1;
++			}
 +			break;
 +		}	
  		if (!iswgraph(ch)) {
  			switch (ch) {
  			case BS:		/* can't go back further */
-@@ -332,7 +340,7 @@
+@@ -332,7 +341,7 @@
  	flush_blanks();
  	if (ferror(stdout) || fclose(stdout))
  		return 1;


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- util-linux.spec	11 Feb 2006 05:56:30 -0000	1.106
+++ util-linux.spec	21 Feb 2006 21:28:13 -0000	1.107
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.15.1
+Release: 0.16
 License: distributable
 Group: System Environment/Base
 
@@ -627,6 +627,9 @@
 /sbin/losetup
 
 %changelog
+* Tue Feb 21 2006 Karel Zak <kzak at redhat.com> 2.13-0.16
+- fix #180730 - col is exiting with 1 (fix util-linux-2.12p-col-EILSEQ.patch)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13-0.15.1
 - bump again for double-long bug on ppc(64)