2005-05-22 Andrew Cagney <cagney@gnu.org>

[deliverable/binutils-gdb.git] / gdb / ui-file.c

diff --git a/gdb/ui-file.c b/gdb/ui-file.c
index 3af6d2cc3b252c350725065c03484b00f8407919..5a2d04778fe19f19dc36e4fd1d0c951eb60818ae 100644 (file)
--- a/gdb/ui-file.c
+++ b/gdb/ui-file.c
@@ -25,9 +25,12 @@
 #include "ui-file.h"
 #include "gdb_string.h"
 
+#include <errno.h>
+
 static ui_file_isatty_ftype null_file_isatty;
 static ui_file_write_ftype null_file_write;
 static ui_file_fputs_ftype null_file_fputs;
+static ui_file_read_ftype null_file_read;
 static ui_file_flush_ftype null_file_flush;
 static ui_file_delete_ftype null_file_delete;
 static ui_file_rewind_ftype null_file_rewind;
@@ -39,6 +42,7 @@ struct ui_file
     ui_file_flush_ftype *to_flush;
     ui_file_write_ftype *to_write;
     ui_file_fputs_ftype *to_fputs;
+    ui_file_read_ftype *to_read;
     ui_file_delete_ftype *to_delete;
     ui_file_isatty_ftype *to_isatty;
     ui_file_rewind_ftype *to_rewind;
@@ -56,6 +60,7 @@ ui_file_new (void)
   set_ui_file_flush (file, null_file_flush);
   set_ui_file_write (file, null_file_write);
   set_ui_file_fputs (file, null_file_fputs);
+  set_ui_file_read (file, null_file_read);
   set_ui_file_isatty (file, null_file_isatty);
   set_ui_file_rewind (file, null_file_rewind);
   set_ui_file_put (file, null_file_put);
@@ -123,6 +128,15 @@ null_file_write (struct ui_file *file,
     }
 }
 
+static long
+null_file_read (struct ui_file *file,
+               char *buf,
+               long sizeof_buf)
+{
+  errno = EBADF;
+  return 0;
+}
+
 static void
 null_file_fputs (const char *buf, struct ui_file *file)
 {
@@ -148,7 +162,7 @@ ui_file_data (struct ui_file *file)
 {
   if (file->magic != &ui_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "ui_file_data: bad magic number");
+                   _("ui_file_data: bad magic number"));
   return file->to_data;
 }
 
@@ -186,6 +200,12 @@ ui_file_write (struct ui_file *file,
   file->to_write (file, buf, length_buf);
 }
 
+long
+ui_file_read (struct ui_file *file, char *buf, long length_buf)
+{
+  return file->to_read (file, buf, length_buf); 
+}
+
 void
 fputs_unfiltered (const char *buf, struct ui_file *file)
 {
@@ -223,6 +243,12 @@ set_ui_file_write (struct ui_file *file,
   file->to_write = write;
 }
 
+void
+set_ui_file_read (struct ui_file *file, ui_file_read_ftype *read)
+{
+  file->to_read = read;
+}
+
 void
 set_ui_file_fputs (struct ui_file *file, ui_file_fputs_ftype *fputs)
 {
@@ -314,7 +340,7 @@ mem_file_delete (struct ui_file *file)
   struct mem_file *stream = ui_file_data (file);
   if (stream->magic != &mem_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "mem_file_delete: bad magic number");
+                   _("mem_file_delete: bad magic number"));
   if (stream->buffer != NULL)
     xfree (stream->buffer);
   xfree (stream);
@@ -332,7 +358,7 @@ mem_file_rewind (struct ui_file *file)
   struct mem_file *stream = ui_file_data (file);
   if (stream->magic != &mem_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "mem_file_rewind: bad magic number");
+                   _("mem_file_rewind: bad magic number"));
   stream->length_buffer = 0;
 }
 
@@ -344,7 +370,7 @@ mem_file_put (struct ui_file *file,
   struct mem_file *stream = ui_file_data (file);
   if (stream->magic != &mem_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "mem_file_put: bad magic number");
+                   _("mem_file_put: bad magic number"));
   if (stream->length_buffer > 0)
     write (dest, stream->buffer, stream->length_buffer);
 }
@@ -357,7 +383,7 @@ mem_file_write (struct ui_file *file,
   struct mem_file *stream = ui_file_data (file);
   if (stream->magic != &mem_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "mem_file_write: bad magic number");
+                   _("mem_file_write: bad magic number"));
   if (stream->buffer == NULL)
     {
       stream->length_buffer = length_buffer;
@@ -383,6 +409,7 @@ mem_file_write (struct ui_file *file,
 
 static ui_file_write_ftype stdio_file_write;
 static ui_file_fputs_ftype stdio_file_fputs;
+static ui_file_read_ftype stdio_file_read;
 static ui_file_isatty_ftype stdio_file_isatty;
 static ui_file_delete_ftype stdio_file_delete;
 static struct ui_file *stdio_file_new (FILE * file, int close_p);
@@ -409,6 +436,7 @@ stdio_file_new (FILE *file, int close_p)
   set_ui_file_flush (ui_file, stdio_file_flush);
   set_ui_file_write (ui_file, stdio_file_write);
   set_ui_file_fputs (ui_file, stdio_file_fputs);
+  set_ui_file_read (ui_file, stdio_file_read);
   set_ui_file_isatty (ui_file, stdio_file_isatty);
   return ui_file;
 }
@@ -419,7 +447,7 @@ stdio_file_delete (struct ui_file *file)
   struct stdio_file *stdio = ui_file_data (file);
   if (stdio->magic != &stdio_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "stdio_file_delete: bad magic number");
+                   _("stdio_file_delete: bad magic number"));
   if (stdio->close_p)
     {
       fclose (stdio->file);
@@ -433,17 +461,27 @@ stdio_file_flush (struct ui_file *file)
   struct stdio_file *stdio = ui_file_data (file);
   if (stdio->magic != &stdio_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "stdio_file_flush: bad magic number");
+                   _("stdio_file_flush: bad magic number"));
   fflush (stdio->file);
 }
 
+static long
+stdio_file_read (struct ui_file *file, char *buf, long length_buf)
+{
+  struct stdio_file *stdio = ui_file_data (file);
+  if (stdio->magic != &stdio_file_magic)
+    internal_error (__FILE__, __LINE__,
+                   _("stdio_file_read: bad magic number"));
+  return read (fileno (stdio->file), buf, length_buf);
+}
+
 static void
 stdio_file_write (struct ui_file *file, const char *buf, long length_buf)
 {
   struct stdio_file *stdio = ui_file_data (file);
   if (stdio->magic != &stdio_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "stdio_file_write: bad magic number");
+                   _("stdio_file_write: bad magic number"));
   fwrite (buf, length_buf, 1, stdio->file);
 }
 
@@ -453,7 +491,7 @@ stdio_file_fputs (const char *linebuffer, struct ui_file *file)
   struct stdio_file *stdio = ui_file_data (file);
   if (stdio->magic != &stdio_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "stdio_file_fputs: bad magic number");
+                   _("stdio_file_fputs: bad magic number"));
   fputs (linebuffer, stdio->file);
 }
 
@@ -463,7 +501,7 @@ stdio_file_isatty (struct ui_file *file)
   struct stdio_file *stdio = ui_file_data (file);
   if (stdio->magic != &stdio_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "stdio_file_isatty: bad magic number");
+                   _("stdio_file_isatty: bad magic number"));
   return (isatty (fileno (stdio->file)));
 }
 
@@ -526,7 +564,7 @@ tee_file_delete (struct ui_file *file)
   struct tee_file *tee = ui_file_data (file);
   if (tee->magic != &tee_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "tee_file_delete: bad magic number");
+                   _("tee_file_delete: bad magic number"));
   if (tee->close_one)
     ui_file_delete (tee->one);
   if (tee->close_two)
@@ -541,7 +579,7 @@ tee_file_flush (struct ui_file *file)
   struct tee_file *tee = ui_file_data (file);
   if (tee->magic != &tee_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "tee_file_flush: bad magic number");
+                   _("tee_file_flush: bad magic number"));
   tee->one->to_flush (tee->one);
   tee->two->to_flush (tee->two);
 }
@@ -552,7 +590,7 @@ tee_file_write (struct ui_file *file, const char *buf, long length_buf)
   struct tee_file *tee = ui_file_data (file);
   if (tee->magic != &tee_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "tee_file_write: bad magic number");
+                   _("tee_file_write: bad magic number"));
   ui_file_write (tee->one, buf, length_buf);
   ui_file_write (tee->two, buf, length_buf);
 }
@@ -563,7 +601,7 @@ tee_file_fputs (const char *linebuffer, struct ui_file *file)
   struct tee_file *tee = ui_file_data (file);
   if (tee->magic != &tee_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "tee_file_fputs: bad magic number");
+                   _("tee_file_fputs: bad magic number"));
   tee->one->to_fputs (linebuffer, tee->one);
   tee->two->to_fputs (linebuffer, tee->two);
 }
@@ -574,6 +612,6 @@ tee_file_isatty (struct ui_file *file)
   struct tee_file *tee = ui_file_data (file);
   if (tee->magic != &tee_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "tee_file_isatty: bad magic number");
+                   _("tee_file_isatty: bad magic number"));
   return (0);
 }