X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fascii.c;h=b91b6a6b4b1fd43e53593dc22889fea49de62d40;hb=a1c8f6fe2935432af4dbe30aef2434c6ad437a56;hp=6fa1573be050ae5ade4cf94ad947f03be6f8a266;hpb=92bfefccd465052e492f669ce561aa25b0110283;p=pspp

diff --git a/src/ascii.c b/src/ascii.c
index 6fa1573be0..b91b6a6b4b 100644
--- a/src/ascii.c
+++ b/src/ascii.c
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "error.h"
@@ -165,9 +165,9 @@ struct ascii_driver_ext
     int bottom_margin;		/* Bottom margin in lines. */
     int paginate;		/* 1=insert formfeeds. */
     int tab_width;		/* Width of a tab; 0 not to use tabs. */
-    struct len_string ops[OPS_COUNT]; /* Basic output strings. */
-    struct len_string box[LNS_COUNT]; /* Line & box drawing characters. */
-    struct len_string fonts[FSTY_COUNT]; /* Font styles; NULL=overstrike. */
+    struct fixed_string ops[OPS_COUNT]; /* Basic output strings. */
+    struct fixed_string box[LNS_COUNT]; /* Line & box drawing characters. */
+    struct fixed_string fonts[FSTY_COUNT]; /* Font styles; NULL=overstrike. */
     int overstrike_style;	/* OVS_SINGLE or OVS_LINE. */
     int carriage_return_style;	/* Carriage return style. */
     int squeeze_blank_lines;    /* 1=squeeze multiple blank lines into one. */
@@ -187,16 +187,26 @@ struct ascii_driver_ext
 static int postopen (struct file_ext *);
 static int preclose (struct file_ext *);
 
+static struct outp_option_info *option_info;
+
 static int
 ascii_open_global (struct outp_class *this UNUSED)
 {
+  option_info = xmalloc ( sizeof (struct outp_option_info ) ) ;
+  option_info->initial = 0;
+  option_info->options = 0;
   return 1;
 }
 
 
+static unsigned char *s=0;
 static int
 ascii_close_global (struct outp_class *this UNUSED)
 {
+  free(option_info->initial);
+  free(option_info->options);
+  free(option_info);
+  free(s);
   return 1;
 }
 
@@ -456,7 +466,6 @@ static struct outp_option option_tab[] =
     {"squeeze", boolean_arg, 2},
     {"", 0, 0},
   };
-static struct outp_option_info option_info;
 
 static void
 ascii_option (struct outp_driver *this, const char *key,
@@ -484,7 +493,7 @@ ascii_option (struct outp_driver *this, const char *key,
       return;
     }
 
-  cat = outp_match_keyword (key, option_tab, &option_info, &subcat);
+  cat = outp_match_keyword (key, option_tab, option_info, &subcat);
   switch (cat)
     {
     case 0:
@@ -590,7 +599,7 @@ ascii_option (struct outp_driver *this, const char *key,
       break;
     case string_arg:
       {
-	struct len_string *s;
+	struct fixed_string *s;
 	switch (subcat)
 	  {
 	  case 0:
@@ -661,7 +670,7 @@ int
 postopen (struct file_ext *f)
 {
   struct ascii_driver_ext *x = f->param;
-  struct len_string *s = &x->ops[OPS_INIT];
+  struct fixed_string *s = &x->ops[OPS_INIT];
 
   if (!ls_empty_p (s) && fwrite (ls_c_str (s), ls_length (s), 1, f->file) < 1)
     {
@@ -676,7 +685,7 @@ int
 preclose (struct file_ext *f)
 {
   struct ascii_driver_ext *x = f->param;
-  struct len_string *d = &x->ops[OPS_DONE];
+  struct fixed_string *d = &x->ops[OPS_DONE];
 
   if (!ls_empty_p (d) && fwrite (ls_c_str (d), ls_length (d), 1, f->file) < 1)
     {
@@ -1200,7 +1209,7 @@ output_shorts (struct outp_driver *this,
     {
       if (*bp & 0x800)
 	{
-	  struct len_string *box = &ext->box[*bp & 0xff];
+	  struct fixed_string *box = &ext->box[*bp & 0xff];
 	  size_t len = ls_length (box);
 
 	  if (remaining >= len)
@@ -1219,7 +1228,7 @@ output_shorts (struct outp_driver *this,
 	}
       else if (*bp & 0x0300)
 	{
-	  struct len_string *on;
+	  struct fixed_string *on;
 	  char buf[5];
 	  int len;
 
@@ -1364,7 +1373,7 @@ output_lines (struct outp_driver *this, int first, int count)
   struct ascii_driver_ext *ext = this->ext;
   int line_num;
 
-  struct len_string *newline = &ext->ops[OPS_NEWLINE];
+  struct fixed_string *newline = &ext->ops[OPS_NEWLINE];
 
   int n_chars;
   int n_passes;
@@ -1412,7 +1421,7 @@ output_lines (struct outp_driver *this, int first, int count)
 	  /* Turn off old font. */
 	  if (attr != (OUTP_F_R << 8))
 	    {
-	      struct len_string *off;
+	      struct fixed_string *off;
 
 	      switch (attr)
 		{
@@ -1437,7 +1446,7 @@ output_lines (struct outp_driver *this, int first, int count)
 	  attr = (*bp & 0x0300);
 	  if (attr != (OUTP_F_R << 8))
 	    {
-	      struct len_string *on;
+	      struct fixed_string *on;
 
 	      switch (attr)
 		{
@@ -1518,10 +1527,10 @@ output_lines (struct outp_driver *this, int first, int count)
     }
 }
 
+
 static int
 ascii_close_page (struct outp_driver *this)
 {
-  static unsigned char *s;
   static int s_len;
 
   struct ascii_driver_ext *x = this->ext;
@@ -1610,13 +1619,33 @@ ascii_close_page (struct outp_driver *this)
   memcpy (cp, ls_c_str (&x->ops[OPS_FORMFEED]), ff_len);
   if ( x->paginate ) 
 	  output_string (this, s, &s[total_len]);
+
   if (line_p != line_buf && !commit_line_buf (this))
+    {
+    free(s);
+    s=0;
     return 0;
+    }
 
   this->page_open = 0;
   return 1;
 }
 
+
+
+static void
+ascii_chart_initialise(struct outp_driver *d UNUSED, struct chart *ch )
+{
+  msg(MW, _("Charts are unsupported with ascii drivers."));
+  ch->lp = 0;
+}
+
+static void 
+ascii_chart_finalise(struct outp_driver *d UNUSED, struct chart *ch UNUSED)
+{
+  
+}
+
 struct outp_class ascii_class =
 {
   "ascii",
@@ -1655,4 +1684,7 @@ struct outp_class ascii_class =
   ascii_text_get_size,
   ascii_text_metrics,
   ascii_text_draw,
+
+  ascii_chart_initialise,
+  ascii_chart_finalise
 };