Changeset 13080

Timestamp:

Nov 10, 2011, 3:31:43 AM (11 years ago)

Author:

jordan

Message:

(trunk libT) #4625 "Transmission 2.42 fails to build on Solaris 10: Undefined symbol 'mkdtemp'" -- fixed.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/utils.c (modified) (2 diffs)
• libtransmission/utils.h (modified) (1 diff)

trunk/configure.ac

@@ -102 +102 @@
 
 AC_CHECK_HEADERS([stdbool.h])
-AC_CHECK_FUNCS([iconv_open pread pwrite lrintf strlcpy daemon dirname basename strcasecmp localtime_r fallocate64 posix_fallocate memmem strsep strtold syslog valloc getpagesize posix_memalign statvfs htonll ntohll])
+AC_CHECK_FUNCS([iconv_open pread pwrite lrintf strlcpy daemon dirname basename strcasecmp localtime_r fallocate64 posix_fallocate memmem strsep strtold syslog valloc getpagesize posix_memalign statvfs htonll ntohll mkdtemp])
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET

trunk/libtransmission/torrent.c

@@ -2757 +2757 @@
     base = tr_strdup_printf( "%s__XXXXXX", tr_torrentName( tor ) );
     tmpdir = tr_buildPath( top, base, NULL );
-    mkdtemp( tmpdir );
+    tr_mkdtemp( tmpdir );
     tr_free( base );
 

trunk/libtransmission/utils.c

@@ -18 +18 @@
  #define HAVE_GETPAGESIZE
  #define HAVE_ICONV_OPEN
+ #define HAVE_MKDTEMP
  #define HAVE_VALLOC
 #endif
@@ -503 +504 @@
     tr_free( tmp );
     return ret;
+}
+
+char*
+tr_mkdtemp( char * template )
+{
+#ifdef HAVE_MKDTEMP
+    return mkdtemp( template );
+#else
+    if( !mktemp( template ) || mkdir( template, 0700 ) )
+        return NULL;
+    return template;
+#endif
 }
 

trunk/libtransmission/utils.h

@@ -222 +222 @@
  */
 int tr_mkdirp( const char * path, int permissions ) TR_GNUC_NONNULL(1);
+
+/** @brief Portability wrapper for mkdtemp() that uses the system implementation if available */
+char* tr_mkdtemp( char * template );