ncurses 5.9 - patch 20111022

[ncurses.git] / ncurses / tinfo / lib_print.c

diff --git a/ncurses/tinfo/lib_print.c b/ncurses/tinfo/lib_print.c
index 975b46d85773ec362eca8e6d8f1aefe49ee27089..e30ceae87226ca1b698931b9777cdde77dd5442b 100644 (file)
--- a/ncurses/tinfo/lib_print.c
+++ b/ncurses/tinfo/lib_print.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,23 +29,31 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey                        1996-on                 *
+ *     and: Juergen Pfeifer                                                 *

  ****************************************************************************/
 
 #include <curses.priv.h>
 
  ****************************************************************************/
 
 #include <curses.priv.h>
 

-#include <term.h>
+#ifndef CUR
+#define CUR SP_TERMTYPE
+#endif

 
 

-MODULE_ID("$Id: lib_print.c,v 1.16 2006/11/26 00:26:34 tom Exp $")
+MODULE_ID("$Id: lib_print.c,v 1.21 2011/10/22 16:34:50 tom Exp $")

 
 NCURSES_EXPORT(int)
 
 NCURSES_EXPORT(int)

-mcprint(char *data, int len)
+NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)

 /* ship binary character data to the printer via mc4/mc5/mc5p */
 {
 /* ship binary character data to the printer via mc4/mc5/mc5p */
 {

+    int result;

     char *mybuf, *switchon;
     char *mybuf, *switchon;

-    size_t onsize, offsize, res;
+    size_t onsize, offsize;
+    size_t need;

 
     errno = 0;
 
     errno = 0;

-    if (!cur_term || (!prtr_non && (!prtr_on || !prtr_off))) {
+    if (!HasTInfoTerminal(SP_PARM)
+       || len <= 0
+       || (!prtr_non && (!prtr_on || !prtr_off))) {

        errno = ENODEV;
        return (ERR);
     }
        errno = ENODEV;
        return (ERR);
     }


@@ -60,14 +68,16 @@ mcprint(char *data, int len)
        offsize = strlen(prtr_off);
     }
 
        offsize = strlen(prtr_off);
     }
 

+    need = onsize + (size_t) len + offsize;
+

     if (switchon == 0
     if (switchon == 0

-       || (mybuf = typeMalloc(char, onsize + len + offsize + 1)) == 0) {
+       || (mybuf = typeMalloc(char, need + 1)) == 0) {

        errno = ENOMEM;
        return (ERR);
     }
 
     (void) strcpy(mybuf, switchon);
        errno = ENOMEM;
        return (ERR);
     }
 
     (void) strcpy(mybuf, switchon);

-    memcpy(mybuf + onsize, data, (unsigned) len);
+    memcpy(mybuf + onsize, data, (size_t) len);

     if (offsize)
        (void) strcpy(mybuf + onsize + len, prtr_off);
 
     if (offsize)
        (void) strcpy(mybuf + onsize + len, prtr_off);
 


@@ -78,15 +88,24 @@ mcprint(char *data, int len)
      * data has actually been shipped to the terminal.  If the write(2)
      * operation is truly atomic we're protected from this.
      */
      * data has actually been shipped to the terminal.  If the write(2)
      * operation is truly atomic we're protected from this.
      */

-    res = write(cur_term->Filedes, mybuf, onsize + len + offsize);
+    result = (int) write(TerminalOf(SP_PARM)->Filedes, mybuf, need);

 
     /*
      * By giving up our scheduler slot here we increase the odds that the
      * kernel will ship the contiguous clist items from the last write
      * immediately.
      */
 
     /*
      * By giving up our scheduler slot here we increase the odds that the
      * kernel will ship the contiguous clist items from the last write
      * immediately.
      */

+#ifndef __MINGW32__

     (void) sleep(0);
     (void) sleep(0);

-
+#endif

     free(mybuf);
     free(mybuf);

-    return (res);
+    return (result);
+}
+
+#if NCURSES_SP_FUNCS && !defined(USE_TERM_DRIVER)
+NCURSES_EXPORT(int)
+mcprint(char *data, int len)
+{
+    return NCURSES_SP_NAME(mcprint) (CURRENT_SCREEN, data, len);

 }
 }

+#endif