mathematical 1.3.0 → 1.4.0

data/ext/mathematical/mtex2MML/src/string_extras.c

@@ -2,20 +2,21 @@
 #include <stdlib.h>
 #include <string.h>
 #include "string_extras.h"
+#include "../deps/strdup/strdup.h"
 
-void remove_last_char(char* str)
+void mtex2MML_remove_last_char(char* str)
 {
   size_t len = strlen(str);
   str[len - 1] = '\0';
 }
 
-void remove_first_char(char* str)
+void mtex2MML_remove_first_char(char* str)
 {
   size_t len = strlen(str);
   memmove(str, str + 1, len);
 }
 
-char * str_replace (char *string, const char *substr, const char *replacement)
+char * mtex2MML_str_replace (char *string, const char *substr, const char *replacement)
 {
   char *tok = NULL;
   char *newstr = NULL;

data/ext/mathematical/mtex2MML/src/string_extras.h

@@ -5,7 +5,7 @@
 
 #include "../deps/uthash/utstring.h"
 
-// all for str_replace
+/* all for str_replace */
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -14,14 +14,14 @@
 extern "C" {
 #endif
 
-// Remove the final character in a string
-extern void remove_last_char(char* str);
+/* Remove the final character in a string */
+void mtex2MML_remove_last_char(char* str);
 
-// Remove the first character in a string
-extern void remove_first_char(char* str);
+/* Remove the first character in a string */
+void mtex2MML_remove_first_char(char* str);
 
-// replace a substr in a string with a replacement
-extern char * str_replace(char *string, const char *substr, const char *replacement);
+/* replace a substr in a string with a replacement */
+char * mtex2MML_str_replace(char *string, const char *substr, const char *replacement);
 
 #ifdef __cplusplus
 }

data/ext/mathematical/mtex2MML/tests/array.c

@@ -31,7 +31,7 @@ void test_array__basic_array(void)
 {
   fixture_tex = read_fixture_tex("array/basic_array.txt");
   fixture_mml = read_fixture_mml("array/basic_array.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -40,7 +40,7 @@ void test_array__array_with_hline(void)
 {
   fixture_tex = read_fixture_tex("array/array_with_hline.txt");
   fixture_mml = read_fixture_mml("array/array_with_hline.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -49,7 +49,7 @@ void test_array__array_with_hline_and_hdashline(void)
 {
   fixture_tex = read_fixture_tex("array/array_with_hline_and_hdashline.txt");
   fixture_mml = read_fixture_mml("array/array_with_hline_and_hdashline.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -58,7 +58,7 @@ void test_array__array_pos_alignment(void)
 {
   fixture_tex = read_fixture_tex("array/array_pos_alignment.txt");
   fixture_mml = read_fixture_mml("array/array_pos_alignment.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -67,7 +67,7 @@ void test_array__array_pos_alignment_with_hline(void)
 {
   fixture_tex = read_fixture_tex("array/array_pos_alignment_with_hline.txt");
   fixture_mml = read_fixture_mml("array/array_pos_alignment_with_hline.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -76,7 +76,7 @@ void test_array__array_vertical_column(void)
 {
   fixture_tex = read_fixture_tex("array/array_vertical_column.txt");
   fixture_mml = read_fixture_mml("array/array_vertical_column.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -85,7 +85,7 @@ void test_array__array_vertical_column_with_align(void)
 {
   fixture_tex = read_fixture_tex("array/array_vertical_column_with_align.txt");
   fixture_mml = read_fixture_mml("array/array_vertical_column_with_align.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -94,7 +94,7 @@ void test_array__array_with_vertical_and_horizontal_dashes(void)
 {
   fixture_tex = read_fixture_tex("array/array_with_vertical_and_horizontal_dashes.txt");
   fixture_mml = read_fixture_mml("array/array_with_vertical_and_horizontal_dashes.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -103,7 +103,7 @@ void test_array__array_nesting(void)
 {
   fixture_tex = read_fixture_tex("array/array_nesting.txt");
   fixture_mml = read_fixture_mml("array/array_nesting.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -112,7 +112,7 @@ void test_array__strip_excess_whitespace_in_array_attributes(void)
 {
   fixture_tex = read_fixture_tex("array/strip_excess_whitespace_in_array_attributes.txt");
   fixture_mml = read_fixture_mml("array/strip_excess_whitespace_in_array_attributes.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -121,7 +121,7 @@ void test_array__augmented_matrix(void)
 {
   fixture_tex = read_fixture_tex("array/augmented_matrix.txt");
   fixture_mml = read_fixture_mml("array/augmented_matrix.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }

data/ext/mathematical/mtex2MML/tests/basic.c

@@ -2,10 +2,11 @@
 #include "clar_test.h"
 #include "deps/trim/trim.h"
 #include <stdio.h>
+#include <string.h>
 
 static char *fixture_tex;
 static char *fixture_mml;
-static const char *result;
+static char *result;
 
 void test_basic__initialize(void)
 {
@@ -31,7 +32,7 @@ void test_basic__inline(void)
 {
   fixture_tex = read_fixture_tex("basic/inline.txt");
   fixture_mml = read_fixture_mml("basic/inline.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -40,7 +41,7 @@ void test_basic__block(void)
 {
   fixture_tex = read_fixture_tex("basic/block.txt");
   fixture_mml = read_fixture_mml("basic/block.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -49,7 +50,7 @@ void test_basic__comments(void)
 {
   fixture_tex = read_fixture_tex("basic/comments.txt");
   fixture_mml = read_fixture_mml("basic/comments.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -58,27 +59,27 @@ void test_basic__filter(void)
 {
   fixture_tex = read_fixture_tex("basic/filter.txt");
   fixture_mml = read_fixture_mml("basic/filter.html");
-  mtex2MML_filter(fixture_tex, strlen(fixture_tex));
+  mtex2MML_filter(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
   result = mtex2MML_output();
 
   cl_assert_equal_s(fixture_mml, result);
 }
 
-void test_basic__html_filter(void)
+void test_basic__text_filter(void)
 {
-  fixture_tex = read_fixture_tex("basic/html_filter.txt");
-  fixture_mml = read_fixture_mml("basic/html_filter.html");
-  mtex2MML_html_filter(fixture_tex, strlen(fixture_tex));
+  fixture_tex = read_fixture_tex("basic/text_filter.txt");
+  fixture_mml = read_fixture_mml("basic/text_filter.html");
+  mtex2MML_text_filter(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
   result = mtex2MML_output();
 
   cl_assert_equal_s(fixture_mml, trim(result));
 }
 
-void test_basic__strict_html_filter(void)
+void test_basic__strict_filter(void)
 {
-  fixture_tex = read_fixture_tex("basic/strict_html_filter.txt");
-  fixture_mml = read_fixture_mml("basic/strict_html_filter.html");
-  mtex2MML_strict_html_filter(fixture_tex, strlen(fixture_tex));
+  fixture_tex = read_fixture_tex("basic/strict_filter.txt");
+  fixture_mml = read_fixture_mml("basic/strict_filter.html");
+  mtex2MML_strict_filter(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
   result = mtex2MML_output();
 
   cl_assert_equal_s(fixture_mml, trim(result));

data/ext/mathematical/mtex2MML/tests/clar.c

@@ -13,6 +13,8 @@
 #include <stdarg.h>
 #include <wchar.h>
 
+#include "../deps/strdup/strdup.h"
+
 /* required for sandboxing */
 #include <sys/types.h>
 #include <sys/stat.h>

data/ext/mathematical/mtex2MML/tests/clar/fs.h

@@ -1,3 +1,5 @@
+#include "../../deps/strdup/strdup.h"
+
 #ifdef _WIN32
 
 #define RM_RETRY_COUNT	5
@@ -105,7 +107,7 @@ fs_rm_wait(WCHAR *_wpath)
 			ERROR_PATH_NOT_FOUND == last_error)
 			return 0;
 
-		Sleep(RM_RETRY_DELAY * retries * retries);	
+		Sleep(RM_RETRY_DELAY * retries * retries);
 	}
 	while (retries++ <= RM_RETRY_COUNT);
 

data/ext/mathematical/mtex2MML/tests/clar/sandbox.h

@@ -1,3 +1,6 @@
+#include "../../deps/strdup/strdup.h"
+#include "../deps/mkdtemp/mkdtemp.h"
+
 static char _clar_path[4096];
 
 static int
@@ -136,4 +139,3 @@ const char *clar_sandbox_path(void)
 {
 	return _clar_path;
 }
-

data/ext/mathematical/mtex2MML/tests/cornercases.c

@@ -1,6 +1,7 @@
 #include "clar.h"
 #include "clar_test.h"
 #include <stdio.h>
+#include <string.h>
 
 static char *fixture_tex;
 static char *fixture_mml;
@@ -30,7 +31,7 @@ void test_cornercases__broken_up_inline_env(void)
 {
   fixture_tex = read_fixture_tex("cornercases/broken_up_inline_env.txt");
   fixture_mml = read_fixture_mml("cornercases/broken_up_inline_env.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }
@@ -39,7 +40,7 @@ void test_cornercases__some_crazy_alignment(void)
 {
   fixture_tex = read_fixture_tex("cornercases/some_crazy_alignment.txt");
   fixture_mml = read_fixture_mml("cornercases/some_crazy_alignment.html");
-  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
 
   cl_assert_equal_s(fixture_mml, result);
 }

data/ext/mathematical/mtex2MML/tests/delimiters.c

@@ -0,0 +1,126 @@
+#include "clar.h"
+#include "clar_test.h"
+#include "deps/trim/trim.h"
+#include <stdio.h>
+#include <string.h>
+
+static char *fixture_tex;
+static char *fixture_mml;
+static char *result;
+
+void test_delimiters__initialize(void)
+{
+  global_test_counter++;
+}
+
+void test_delimiters__cleanup(void)
+{
+  if (fixture_mml != NULL) {
+    free(fixture_mml);
+  }
+
+  if (result != NULL) {
+    free(result);
+  }
+}
+
+void test_delimiters__single_dollar(void)
+{
+  fixture_tex = "$\\pi$";
+  fixture_mml = read_fixture_mml("delimiters/single_dollar.html");
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
+
+  cl_assert_equal_s(fixture_mml, result);
+}
+
+void test_delimiters__double_dollar(void)
+{
+  fixture_tex = "$$\\pi$$";
+  fixture_mml = read_fixture_mml("delimiters/double_dollar.html");
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
+
+  cl_assert_equal_s(fixture_mml, result);
+}
+
+void test_delimiters__parens(void)
+{
+  fixture_tex = "\\(\\pi\\)";
+  fixture_mml = read_fixture_mml("delimiters/parens.html");
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_PARENS);
+
+  cl_assert_equal_s(fixture_mml, result);
+}
+
+void test_delimiters__brackets(void)
+{
+  fixture_tex = "\\[\\pi\\]";
+  fixture_mml = read_fixture_mml("delimiters/brackets.html");
+  result = mtex2MML_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_BRACKETS);
+
+  cl_assert_equal_s(fixture_mml, result);
+}
+
+void test_delimiters__mixed(void)
+{
+  fixture_tex = "\\[\\alpha\\] $$\\beta$$";
+  fixture_mml = read_fixture_mml("delimiters/mixed.html");
+  mtex2MML_filter(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DOUBLE | MTEX2MML_DELIMITER_PARENS | MTEX2MML_DELIMITER_BRACKETS);
+  result = mtex2MML_output();
+
+  cl_assert_equal_s(fixture_mml, result);
+}
+
+void test_delimiters__dollar_spacings_with_text_filter(void)
+{
+  fixture_tex = read_fixture_tex("delimiters/dollar_spacings_text_filter.txt");
+  fixture_mml = read_fixture_mml("delimiters/dollar_spacings_text_filter.html");
+  mtex2MML_text_filter(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
+  result = mtex2MML_output();
+
+  cl_assert_equal_s(fixture_mml, trim(result));
+  free(fixture_tex);
+}
+
+void test_delimiters__dollar_spacings_with_filter(void)
+{
+  fixture_tex = read_fixture_tex("delimiters/dollar_spacings_filter.txt");
+  fixture_mml = read_fixture_mml("delimiters/dollar_spacings_filter.html");
+  mtex2MML_filter(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
+  result = mtex2MML_output();
+
+  cl_assert_equal_s(fixture_mml, trim(result));
+  free(fixture_tex);
+}
+
+void test_delimiters__escaping_with_dollars(void)
+{
+  fixture_tex = read_fixture_tex("delimiters/escaping.txt");
+  fixture_mml = read_fixture_mml("delimiters/escaping_with_dollars.html");
+  mtex2MML_text_filter(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT);
+  result = mtex2MML_output();
+
+  cl_assert_equal_s(fixture_mml, trim(result));
+  free(fixture_tex);
+}
+
+void test_delimiters__escaping_with_brackets(void)
+{
+  fixture_tex = read_fixture_tex("delimiters/escaping.txt");
+  fixture_mml = read_fixture_mml("delimiters/escaping_with_brackets.html");
+  mtex2MML_text_filter(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_BRACKETS);
+  result = mtex2MML_output();
+
+  cl_assert_equal_s(fixture_mml, trim(result));
+  free(fixture_tex);
+}
+
+void test_delimiters__escaping_with_parens(void)
+{
+  fixture_tex = read_fixture_tex("delimiters/escaping.txt");
+  fixture_mml = read_fixture_mml("delimiters/escaping_with_parens.html");
+  mtex2MML_text_filter(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_PARENS);
+  result = mtex2MML_output();
+
+  cl_assert_equal_s(fixture_mml, trim(result));
+  free(fixture_tex);
+}

data/ext/mathematical/mtex2MML/tests/deps/file2str/file2str.c

@@ -22,7 +22,7 @@ char *file2strl(
         return NULL;
     }
 
-    unsigned long file_len;
+    int file_len;
     if (-1 == (file_len = ftell(file)))
     {
         fprintf(stderr, "Unable to ftell() file %s\n", path);
@@ -55,10 +55,8 @@ char *file2strl(
 }
 
 char *file2str(
-    const char *path,
-    unsigned long *file_len_out
+    const char *path
 )
 {
     return file2strl(path,NULL);
 }
-

data/ext/mathematical/mtex2MML/tests/deps/mkdtemp/mkdtemp.c

@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 1987, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#if defined(_MSC_VER) || defined(__MINGW32__)
+# include <io.h>
+# include <process.h> // for getpid()
+# include <direct.h> // for mkdir()
+# if defined(_MSC_VER)
+/* MSVC is missing a few definitions from sys/types and sys/stat */
+typedef int pid_t;
+#  define S_ISDIR(m)  (((m) & _S_IFMT) == _S_IFDIR)
+# endif
+#else
+# include <unistd.h> // for getpid()
+#endif
+#include <errno.h>
+#include <stdio.h>
+
+static int
+do_mkdtemp (char *path)
+{
+  char *start, *trv;
+  struct stat sbuf;
+  pid_t pid;
+
+  /* To guarantee multiple calls generate unique names even if
+     the file is not created. 676 different possibilities with 7
+     or more X's, 26 with 6 or less. */
+  static char xtra[2] = { 'a', 'a' };
+  int xcnt = 0;
+
+  pid = getpid ();
+
+  /* Move to end of path and count trailing X's. */
+  for (trv = path; *trv; ++trv)
+    if (*trv == 'X')
+      xcnt++;
+    else
+      xcnt = 0;
+
+  /* Use at least one from xtra.  Use 2 if more than 6 X's. */
+  if (*(trv - 1) == 'X')
+    *--trv = xtra[0];
+  if (xcnt > 6 && *(trv - 1) == 'X')
+    *--trv = xtra[1];
+
+  /* Set remaining X's to pid digits with 0's to the left. */
+  while (*--trv == 'X')
+    {
+      *trv = (char)((pid % 10) + '0');
+      pid /= 10;
+    }
+
+  /* update xtra for next call. */
+  if (xtra[0] != 'z')
+    xtra[0]++;
+  else
+    {
+      xtra[0] = 'a';
+      if (xtra[1] != 'z')
+        xtra[1]++;
+      else
+        xtra[1] = 'a';
+    }
+
+  /*
+   * check the target directory; if you have six X's and it
+   * doesn't exist this runs for a *very* long time.
+   */
+  for (start = trv + 1;; --trv)
+    {
+      if (trv <= path)
+        break;
+      if (*trv == '/')
+        {
+          *trv = '\0';
+          if (stat (path, &sbuf))
+            return (0);
+          if (!S_ISDIR (sbuf.st_mode))
+            {
+              errno = ENOTDIR;
+              return (0);
+            }
+          *trv = '/';
+          break;
+        }
+    }
+
+  for (;;)
+    {
+#if !defined(_MSC_VER) && !defined(__MINGW32__)
+      if (mkdir (path, 0700) >= 0)
+#else
+      if (_mkdir (path) >= 0)
+#endif
+        return (1);
+      if (errno != EEXIST)
+        return (0);
+
+      /* tricky little algorithm for backward compatibility */
+      for (trv = start;;)
+        {
+          if (!*trv)
+            return (0);
+          if (*trv == 'z')
+            *trv++ = 'a';
+          else
+            {
+              if (*trv >= '0' && *trv <= '9')
+                *trv = 'a';
+              else
+                ++*trv;
+              break;
+            }
+        }
+    }
+ /*NOTREACHED*/}
+
+char *
+mkdtemp (char *path)
+{
+  return (do_mkdtemp (path) ? path : (char *) NULL);
+}