[perl-Term-Size] Port PerlIO patch to 0.207

Petr Šabata psabata at fedoraproject.org
Fri Jan 13 13:32:06 UTC 2012


commit 5851f7f8c7660740cdbf9af8c98d2170b884b6d8
Author: Petr Šabata <contyk at redhat.com>
Date:   Fri Jan 13 14:28:44 2012 +0100

    Port PerlIO patch to 0.207
    
    Still not included upstream.

 ...rlio.patch => perl-Term-Size-0.207-perlio.patch |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/rt38594.perlio.patch b/perl-Term-Size-0.207-perlio.patch
similarity index 61%
rename from rt38594.perlio.patch
rename to perl-Term-Size-0.207-perlio.patch
index eccd2b0..7871842 100644
--- a/rt38594.perlio.patch
+++ b/perl-Term-Size-0.207-perlio.patch
@@ -1,7 +1,9 @@
---- Size.xs.old	2008-08-16 10:27:56.000000000 +1000
-+++ Size.xs	2008-08-20 11:16:32.000000000 +1000
-@@ -17,14 +17,14 @@
- PROTOTYPES: ENABLE
+diff --git a/Size.xs b/Size.xs
+index ff585e0..60417ac 100644
+--- a/Size.xs
++++ b/Size.xs
+@@ -21,14 +21,14 @@ MODULE = Term::Size		PACKAGE = Term::Size
+ PROTOTYPES: DISABLE
  
  void
 -chars( f = stdin )
@@ -10,7 +12,7 @@
 +	PerlIO *f;
  
  	PREINIT:
- 	struct winsize w;
+ 	struct winsize w = { 0, 0, 0, 0 };
  
  	PPCODE:
 -	if (ioctl(fileno(f), TIOCGWINSZ, &w) == -1)
@@ -18,7 +20,7 @@
  		XSRETURN_NO;
  
  	XPUSHs(sv_2mortal(newSViv(w.ws_col)));
-@@ -32,14 +32,14 @@
+@@ -36,14 +36,14 @@ chars( f = stdin )
  		XPUSHs(sv_2mortal(newSViv(w.ws_row)));
  
  void
@@ -28,10 +30,10 @@
 +	PerlIO *f;
  
  	PREINIT:
- 	struct winsize w;
+ 	struct winsize w = { 0, 0, 0, 0 };
  
  	PPCODE:
--	if (ioctl(0, TIOCGWINSZ, &w) == -1)
+-	if (ioctl(fileno(f), TIOCGWINSZ, &w) == -1)
 +	if (ioctl(PerlIO_fileno(f), TIOCGWINSZ, &w) == -1)
  		XSRETURN_NO;
  


More information about the scm-commits mailing list