From 323bc18d626631a1e651164c3f950eead85b0a2a Mon Sep 17 00:00:00 2001
From: Werner LEMBERG <wl@gnu.org>
Date: Tue, 14 Mar 2000 17:16:54 +0000
Subject: [PATCH] * configure.in: Added test for strdup.

* src/devices/grolbp/lbp.cc: Added a strdup() version in case none
is available.

Replaced dynamic allocation of arrays `[...]' with `new' operator.

Other minor fixes.
---
 ChangeLog                 | 11 ++++++++++
 configure                 |  2 +-
 configure.in              |  2 +-
 src/devices/grolbp/lbp.cc | 55 +++++++++++++++++++++++++++++++++--------------
 4 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c6f77b91..8add471c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-03-14  Francisco Andres Verdu  <pandres@dragonet.es>
+
+	* configure.in: Added test for strdup.
+
+	* src/devices/grolbp/lbp.cc: Added a strdup() version in case none
+	is available.
+
+	Replaced dynamic allocation of arrays `[...]' with `new' operator.
+
+	Other minor fixes.
+
 2000-03-12  OKAZAKI Tetsurou  <okazaki@be.to>
 
 	* Makefile.comm: Add $(INCLUDES) to $(ALL_CFLAGS).
diff --git a/configure b/configure
index 5086ad06..a04f6b7a 100755
--- a/configure
+++ b/configure
@@ -2303,7 +2303,7 @@ done
 
 
 LIBS="$saved_libs"
-for ac_func in rename mkstemp strcasecmp strsep
+for ac_func in rename mkstemp strcasecmp strsep strdup
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:2310: checking for $ac_func" >&5
diff --git a/configure.in b/configure.in
index 4f88ab60..721fd4c8 100755
--- a/configure.in
+++ b/configure.in
@@ -39,7 +39,7 @@ saved_libs="$LIBS"
 LIBS="$LIBS -lc $LIBM"
 AC_REPLACE_FUNCS(fmod strtol getcwd strerror putenv)
 LIBS="$saved_libs"
-AC_CHECK_FUNCS(rename mkstemp strcasecmp strsep)
+AC_CHECK_FUNCS(rename mkstemp strcasecmp strsep strdup)
 AC_DECL_SYS_SIGLIST
 dnl checks for compiler characteristics
 GROFF_ARRAY_DELETE
diff --git a/src/devices/grolbp/lbp.cc b/src/devices/grolbp/lbp.cc
index 4a58a098..379846ab 100644
--- a/src/devices/grolbp/lbp.cc
+++ b/src/devices/grolbp/lbp.cc
@@ -80,6 +80,36 @@ private:
   int line_thickness;
 };
 
+//   Compatibility section.
+//
+//   Here we define some functions not present in some of the targets 
+//   platforms
+#ifndef HAVE_STRSEP
+// Solaris 8 doesn't have the strsep function
+static char *strsep(char **pcadena, const char *delim)
+{
+  char *p;
+
+	p = strtok(*pcadena,delim);
+ 	*pcadena = strtok(NULL,delim);
+    return p;
+ 
+};
+#endif
+
+#ifndef HAVE_STRDUP
+// Ditto with OS/390 and strdup
+static char *strdup(const char *s)
+{
+  char *result;
+
+  result = (char *)malloc(strlen(s)+1);
+  if (result != NULL) strcpy(result,s);
+  return result;
+  
+}; // strdup
+
+#endif
 lbp_font::lbp_font(const char *nm)
 : font(nm)
 {
@@ -190,7 +220,8 @@ char *lbp_printer::font_name(const lbp_font *f, const int siz)
   static char bfont_name[255] ; // The resulting font name
   char	type, // Italic, Roman, Bold
         ori, // Normal or Rotated
-	nam[strlen(f->lbpname)-2]; // The font name without other data.
+	*nam; // The font name without other data.
+//	nam[strlen(f->lbpname)-2]; // The font name without other data.
   int cpi; // The font size in characters per inch 
   	   // (Bitmaped fonts are monospaced).
 
@@ -204,12 +235,14 @@ char *lbp_printer::font_name(const lbp_font *f, const int siz)
   else		// Portrait
   	ori = 'N';
   type = f->lbpname[strlen(f->lbpname)-1];
+  nam = new char[strlen(f->lbpname)-2];
   strncpy(nam,&(f->lbpname[1]),strlen(f->lbpname)-2);
   nam[strlen(f->lbpname)-2] = 0x00;
    // fprintf(stderr,"Bitmap font '%s' %d %c %c \n",nam,siz,type,ori);
   /* Since these fonts are avaiable only at certain sizes,
     10 and 17 cpi for courier,  12 and 17 cpi for elite,
     we adjust the resulting size. */
+    cpi = 17;
     // Fortunately there were only two bitmaped fonts shiped with the printer.
     if (!strcasecmp(nam,"courier"))
     { // Courier font
@@ -354,8 +387,10 @@ lbp_printer::setfillmode(int mode)
 inline void
 lbp_printer::polygon( int hpos,int vpos,int np,int *p)
 {
- int points[np+2],i;
+ //int points[np+2],i;
+ int *points,i;
 
+ points = new int[np+2];
  points[0] = hpos;
  points[1] = vpos;
 /* fprintf(stderr,"Poligon (%d,%d) ", points[0],points[1]);*/
@@ -521,18 +556,6 @@ static struct
 { "executive", 40 },
 };
 
-#ifndef HAVE_STRSEP
-// Solaris 8 doesn't have the strsep function
-char *strsep(char **pcadena, const char *delim)
-{
-  char *p;
-
-	p = strtok(*pcadena,delim);
- 	*pcadena = strtok(NULL,delim);
-    return p;
- 
-};
-#endif
 
 static int set_papersize(const char *papersize)
 {
@@ -671,7 +694,7 @@ int main(int argc, char **argv)
 	font::set_unknown_desc_command_handler(handle_unknown_desc_command);
 	// command line parsing
   	int c = 0;
-	int digit_optind = 0, option_index = 0;
+	int  option_index = 0;
 
 	while (c >= 0 ) 
 	{
@@ -706,7 +729,7 @@ int main(int argc, char **argv)
 				   else 
 				     error("unknown orientation '%1'", optarg);
 				 }; 
-				break;
+                                break;
 			      };
     		  case 'c'  : {
 				char *ptr;
-- 
2.11.4.GIT