Patch from Adam Fedor. See ChangeLog.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1789 72102866-910b-0410-8b05-ffd578937521

Headers/gnustep/base/Stream.h

@@ -27,6 +27,8 @@
 #include <gnustep/base/preface.h>
 #include <gnustep/base/Streaming.h>
 
+extern id<String> StreamException;
+
 @interface Stream : NSObject <Streaming>
 
 - init;

Headers/gnustep/base/Streaming.h

@@ -56,10 +56,18 @@
 
 @end
 
+typedef enum _seek_mode_t
+{
+  STREAM_SEEK_FROM_START, 
+  STREAM_SEEK_FROM_CURRENT, 
+  STREAM_SEEK_FROM_END
+} seek_mode_t;
+
 @protocol SeekableStreaming
 
 - (void) rewindStream;
 - (void) setStreamPosition: (unsigned)i;
+- (void) setStreamPosition: (unsigned)i seekMode: (seek_mode_t)mode;
 
 @end
 

Source/Makefile.in

@@ -174,6 +174,7 @@ Time.m \
 UdpPort.m \
 behavior.m \
 lex.pl.m \
+objc_streams.m \
 o_array.m \
 o_array_bas.m \
 o_array_cbs.m \
@@ -295,6 +296,7 @@ include/behavior.h \
 include/fake-main.h \
 include/mframe.h \
 include/numbers.h \
+include/objc_streams.h \
 include/o_array.h \
 include/o_array_bas.h \
 include/o_array_cbs.h \

Source/MemoryStream.m

@@ -24,6 +24,7 @@
 #include <gnustep/base/preface.h>
 #include <gnustep/base/MemoryStream.h>
 #include <gnustep/base/Coder.h>
+#include <Foundation/NSException.h>
 #include <stdarg.h>
 #include <assert.h>
 
@@ -54,6 +55,11 @@ enum {
 
 #define DEFAULT_MEMORY_STREAM_SIZE 64
 
+#define MEMORY_CHECK(buffer)			\
+  if (!buffer)					\
+      [NSException raise: StreamException	\
+        format: @"Virtual memory exhausted"]
+
 extern int
 o_vscanf (void *stream, 
 		int (*inchar_func)(void*), 
@@ -90,6 +96,7 @@ static BOOL debug_memory_stream = NO;
 {
   char *b;
   OBJC_MALLOC(b, char, s);
+  MEMORY_CHECK(b);
   return [self _initOnMallocBuffer:b size:s eofPosition:i
 	       prefix:p position:i];
 }
@@ -139,6 +146,7 @@ static BOOL debug_memory_stream = NO;
     {
       size = MAX(prefix+position+l, size*2);
       buffer = objc_realloc (buffer, size);
+      MEMORY_CHECK(buffer);
     }
   memcpy(buffer+prefix+position, b, l);
   position += l;
@@ -198,10 +206,10 @@ void unchar_func(void *s, int c)
 }
 
 #if HAVE_VSPRINTF
-- (int) writeFormat: (id <String>)format, ...
+- (int) writeFormat: (id <String>)format
+	  arguments: (va_list)arg
 {
   int ret;
-  va_list ap;
 
   /* xxx Using this ugliness we at least let ourselves safely print
      formatted strings up to 128 bytes long.
@@ -211,9 +219,7 @@ void unchar_func(void *s, int c)
   if (size - (prefix + position) < 128)
     [self setStreamBufferCapacity:size*2];
 
-  va_start(ap, format);
+  ret = vsprintf(buffer+prefix+position, [format cStringNoCopy], arg);
-  ret = vsprintf(buffer+prefix+position, [format cStringNoCopy], ap);
-  va_end(ap);
   position += ret;
   /* xxx Make sure we didn't overrun our buffer.
      As per above kludge, this would happen if we happen to have more than
@@ -243,9 +249,20 @@ void unchar_func(void *s, int c)
   return ret;
 }
 
-- (void) setStreamPosition: (unsigned)i
+- (void) setStreamPosition: (unsigned)i  seekMode: (seek_mode_t)mode
 {
-  position = i;
+  switch (mode)
+    {
+    case STREAM_SEEK_FROM_START:
+      position = i;
+      break;
+    case STREAM_SEEK_FROM_CURRENT:
+      position += i;
+      break;
+    case STREAM_SEEK_FROM_END:
+      position = eofPosition + i;
+      break;
+    }
 }
 
 - (unsigned) streamPosition
@@ -287,6 +304,7 @@ void unchar_func(void *s, int c)
   if (s > prefix + eofPosition)
     {
       buffer = objc_realloc (buffer, s);
+      MEMORY_CHECK(buffer);
       size = s;
     }
 }

Source/StdioStream.m

@@ -26,8 +26,7 @@
 #include <gnustep/base/Coder.h>
 #include <Foundation/NSException.h>
 #include <stdarg.h>
-
+#include <errno.h>
-/* xxx I should test return values of all functions on the FILE*. */
 
 enum {
   STREAM_READONLY = 0,
@@ -105,14 +104,26 @@ o_vscanf (void *stream,
 - initWithFilename: (id <String>)name fmode: (const char *)m
 {
   FILE *afp = fopen([name cStringNoCopy], (char*)m);
-  /* xxx Add error checking. */
+  if (!afp)
+    {
+      /* xxxFIXME: should be NSLog */
+      perror("Stream");
+      [super dealloc];
+      return nil;
+    }
   return [self initWithFilePointer:afp fmode:m];
 }
 
 - initWithFileDescriptor: (int)fd fmode: (const char *)m
 {
   FILE *afp = fdopen(fd, (char*)m);
-  /* xxx Add error checking. */
+  if (!afp)
+    {
+      /* xxxFIXME: should be NSLog */
+      perror("Stream");
+      [super dealloc];
+      return nil;
+    }
   return [self initWithFilePointer:afp fmode:m];
 }
 
@@ -137,40 +148,35 @@ o_vscanf (void *stream,
 
 - (int) writeBytes: (const void*)b length: (int)len
 {
-  /* xxx Check error conditions. */
   int ret = fwrite (b, 1, len, fp);
-  if (ret != len)
+  if (ferror(fp))
-    printf ("Write bytes differ.\n");
+    {
-  assert (ret == len);
+      [NSException raise: StreamException
+        format: @"%s", strerror(errno)];
+    }
+  else if (ret != len)
+    {
+      [NSException raise: StreamException
+        format: @"Write bytes differ"];
+    }
   return ret;
 }
 
 - (int) readBytes: (void*)b length: (int)len
 {
-  /* xxx Check error conditions. */
   int ret = fread (b, 1, len, fp);
-#if 0  /* No.  Sometimes we don't get as much as we asked for, and that ok. */
+  if (ferror(fp))
-  if (ret != len)
     {
-      printf ("Read bytes differ.\n");
+      [NSException raise: StreamException
-      if (feof (fp))
+        format: @"%s", strerror(errno)];
-	[NSException raise: NSGenericException
-		     format: @"Tried to read from eof"];
     }
-  assert (ret == len);
-#endif
   return ret;
 }
 
-- (int) writeFormat: (id <String>)format, ...
+- (int) writeFormat: (id <String>)format
+	  arguments: (va_list)arg
 {
-  int ret;
+  return vfprintf(fp, [format cStringNoCopy], arg);
-  va_list ap;
-
-  va_start(ap, format);
-  ret = vfprintf(fp, [format cStringNoCopy], ap);
-  va_end(ap);
-  return ret;
 }
 
 static int
@@ -232,9 +238,9 @@ stdio_unchar_func(void *s, int c)
   rewind(fp);
 }
 
-- (void) setStreamPosition: (unsigned)i
+- (void) setStreamPosition: (unsigned)i seekMode: (seek_mode_t)m
 {
-  fseek(fp, i, 0);
+  fseek(fp, i, m + SEEK_SET - STREAM_SEEK_FROM_START);
 }
 
 - (unsigned) streamPosition

Source/Stream.m

@@ -27,6 +27,8 @@
 #include <gnustep/base/Coder.h>
 #include <gnustep/base/NSString.h>
 
+NSString* StreamException = @"StreamException";
+
 @implementation Stream
 
 /* This is the designated initializer. */
@@ -66,8 +68,13 @@
 
 - (int) writeFormat: (id <String>)format, ...
 {
-  [self subclassResponsibility:_cmd];
+  int ret;
-  return 0;
+  va_list ap;
+
+  va_start(ap, format);
+  ret = [self writeFormat: format arguments: ap];
+  va_end(ap);
+  return ret;
 }
 
 - (int) readFormat: (id <String>)format
@@ -112,11 +119,16 @@
   return NO;
 }
 
-- (void) setStreamPosition: (unsigned)i
+- (void) setStreamPosition: (unsigned)i seekMode: (seek_mode_t)mode
 {
   [self subclassResponsibility:_cmd];
 }
 
+- (void) setStreamPosition: (unsigned)i
+{
+  [self setStreamPosition: i seekMode: STREAM_SEEK_FROM_START];
+}
+
 - (void) rewindStream
 {
   [self setStreamPosition:0];