[FriBidi-commit] fribidi/bin fribidi-main.c,1.8,1.9

[Behdad Esfahbod]

Update of /cvs/fribidi/fribidi/bin
In directory pdx:/tmp/cvs-serv19464/bin

Modified Files:
	fribidi-main.c 
Log Message:
Redundant and compatibility stuff removed.  A few macros added, to compile
AbiWord from CVS.  The most important is the FRIBIDI_TYPE_PRIVATE in
fribidi-bidi-types.h


Index: fribidi-main.c
===================================================================
RCS file: /cvs/fribidi/fribidi/bin/fribidi-main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/fribidi-main.c	9 Jun 2004 08:56:53 -0000	1.8
+++ b/fribidi-main.c	9 Jun 2004 14:59:21 -0000	1.9
@@ -185,6 +185,19 @@
   exit (0);
 }
 
+char *my_fribidi_strdup (char *s)
+{
+  char *m;
+
+  m = fribidi_malloc (strlen (s) + 1);
+  if (!m)
+    return NULL;
+
+  strcpy(m, s);
+
+  return m;
+}
+
 int
 main (
   int argc,
@@ -306,14 +319,16 @@
 	  do_break = false;
 	  break;
 	case 'c':
-	  char_set = strdup (optarg);
+	  char_set = my_fribidi_strdup (optarg);
+	  if (!char_set)
+	    die1 ("memory allocation failed for char_set!");
 	  break;
 #if !FRIBIDI_MAIN_USE_ICONV_H
 	case CAPRTL:
 	  char_set = "CapRTL";
 	  break;
 	case CHARSETDESC:
-	  char_set = strdup (optarg);
+	  char_set = optarg;
 	  char_set_num = fribidi_parse_charset (char_set);
 	  if (!char_set_num)
 	    die2 ("unrecognized character set `%s'\n", char_set);