Changeset 2322

Timestamp:

Jul 10, 2007, 11:30:11 AM (16 years ago)

Author:

titer

Message:

Adds basename/dirname implementation for platforms that lack it (BeOS...)

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (1 diff)
• configure (modified) (2 diffs)
• libtransmission/basename.c (added)
• libtransmission/dirname.c (added)
• libtransmission/makemeta.c (modified) (1 diff)
• libtransmission/trcompat.h (modified) (1 diff)
• mk/lib.mk (modified) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -1476 +1476 @@
                                         "-DHAVE_STRLCPY",
                                         "-DHAVE_STRLCAT",
+                                        "-DHAVE_LIBGEN",
                                 );
                                 PRODUCT_NAME = transmission;

trunk/configure

@@ -177 +177 @@
   then
     CFLAGS="$CFLAGS -DHAVE_STRLCAT"
+  fi
+  rm -f testconf*
+}
+
+libgen_test()
+{
+  verbose libgen_test
+  cat > testconf.c << EOF
+#include <libgen.h>
+int main()
+{
+  return 0;
+}
+EOF
+  if runcmd $CC -o testconf testconf.c
+  then
+    CFLAGS="$CFLAGS -DHAVE_LIBGEN"
   fi
   rm -f testconf*
@@ -451 +468 @@
 strlcpy_test
 strlcat_test
+libgen_test
 
 #

trunk/libtransmission/makemeta.c

@@ -13 +13 @@
 #include <sys/stat.h>
 #include <unistd.h>
-#include <libgen.h>
 #include <dirent.h>
 #include <stdio.h> /* FILE, snprintf, stderr */

trunk/libtransmission/trcompat.h

@@ -37 +37 @@
 #endif
 
+#ifdef HAVE_LIBGEN
+# include <libgen.h>
+#else
+char *
+dirname(const char *path);
+char *
+basename(const char *path);
+#endif
+
 #endif /* TRCOMPAT_H */

trunk/mk/lib.mk

@@ -7 +7 @@
        http.c inout.c ipcparse.c list.c makemeta.c metainfo.c natpmp.c \
        net.c peer.c platform.c ratecontrol.c sha1.c shared.c strlcat.c \
-       strlcpy.c torrent.c tracker.c transmission.c upnp.c utils.c xml.c 
+       strlcpy.c torrent.c tracker.c transmission.c upnp.c utils.c xml.c \
+       basename.c dirname.c
 
 OBJS = $(SRCS:%.c=%.o)