# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 861635507 -7200
# Node ID 25448051786476668df91ee5918c258bf342215f
# Parent  51c6f1d918c2778f5669b959b96ae2818a63dd1c
handle long line read error.

diff -r 51c6f1d918c2 -r 254480517864 XBMReader.st
--- a/XBMReader.st	Sat Apr 19 17:24:51 1997 +0200
+++ b/XBMReader.st	Mon Apr 21 17:11:47 1997 +0200
@@ -84,31 +84,37 @@
     inStream := self streamReadingFile:aFileName.
     inStream isNil ifTrue:[^ false].
 
-    line := inStream nextLine.
+    Stream readErrorSignal handle:[:ex |
+        line := nil.
+    ] do:[
+        line := inStream nextLine.
+    ].
     line isNil ifTrue:[
-	inStream close.
-	^ false
+        inStream close.
+        ^ false
     ].
     [line startsWith:'#'] whileFalse:[
-	line := inStream nextLine.
-	line isNil ifTrue:[
-	    inStream close.
-	    ^ false
-	]
+        line := inStream nextLine.
+        line isNil ifTrue:[
+            inStream close.
+            ^ false
+        ]
     ].
     index1 := line indexOf:(Character space).
     index2 := line indexOf:(Character space) startingAt:(index1 + 1).
     (index2 == 0) ifTrue:[
-	inStream close.
-	^ false
+        inStream close.
+        ^ false
     ].
     keyword := line copyFrom:index1 to:(index2 - 1).
     (keyword endsWith:'_width') ifFalse:[
-	inStream close.
-	^ false
+        inStream close.
+        ^ false
     ].
     inStream close.
     ^ true
+
+    "Modified: 21.4.1997 / 17:10:52 / cg"
 ! !
 
 !XBMReader methodsFor:'reading from file'!
@@ -305,6 +311,6 @@
 !XBMReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/XBMReader.st,v 1.33 1997-04-11 14:51:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/XBMReader.st,v 1.34 1997-04-21 15:11:36 cg Exp $'
 ! !
 XBMReader initialize!
diff -r 51c6f1d918c2 -r 254480517864 XPMReader.st
--- a/XPMReader.st	Sat Apr 19 17:24:51 1997 +0200
+++ b/XPMReader.st	Mon Apr 21 17:11:47 1997 +0200
@@ -102,7 +102,11 @@
     inStream := self streamReadingFile:aFileName.
     inStream isNil ifTrue:[^ false].
 
-    line := inStream nextLine.
+    Stream readErrorSignal handle:[:ex |
+        line := nil
+    ] do:[
+        line := inStream nextLine.
+    ].
     inStream close.
     line isNil ifTrue:[^ false].
     (line startsWith:'/* XPM') ifFalse:[^ false].
@@ -112,7 +116,9 @@
      XPMReader isValidImageFile:'bitmaps/magtape.xpm'    
      XPMReader isValidImageFile:'bitmaps/ljet.xpm'      
      XPMReader isValidImageFile:'bitmaps/garfield.gif' 
-    " 
+    "
+
+    "Modified: 21.4.1997 / 17:10:35 / cg"
 ! !
 
 !XPMReader methodsFor:'reading from file'!
@@ -506,6 +512,6 @@
 !XPMReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/XPMReader.st,v 1.28 1997-04-04 13:02:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/XPMReader.st,v 1.29 1997-04-21 15:11:47 cg Exp $'
 ! !
 XPMReader initialize!