diff options
author | das <das> | 2006-07-20 06:18:37 (GMT) |
---|---|---|
committer | das <das> | 2006-07-20 06:18:37 (GMT) |
commit | 012ac88ab78de5f4b8f0e7b196e1746bb75bdf9b (patch) | |
tree | d0364276ac6c8c4168a1e2ff1c15ccf01d284585 /macosx/tclMacOSXFCmd.c | |
parent | f2a1ea5dbae4b3440723227e75a0c9da1d88ff93 (diff) | |
download | tcl-012ac88ab78de5f4b8f0e7b196e1746bb75bdf9b.zip tcl-012ac88ab78de5f4b8f0e7b196e1746bb75bdf9b.tar.gz tcl-012ac88ab78de5f4b8f0e7b196e1746bb75bdf9b.tar.bz2 |
* macosx/tclMacOSXNotify.c (Tcl_InitNotifier, Tcl_WaitForEvent): create
notifier thread lazily upon first call to Tcl_WaitForEvent() rather than
in Tcl_InitNotifier(). Allows calling exeve() in processes where the
event loop has not yet been run (Darwin's execve() fails in processes
with more than one thread), in particular allows embedders to call
fork() followed by execve(), previously the pthread_atfork() child
handler's call to Tcl_InitNotifier() would immediately recreate the
notifier thread in the child after a fork.
* macosx/tclMacOSXFCmd.c (TclMacOSXCopyFileAttributes): add support
* macosx/tclMacOSXNotify.c (Tcl_InitNotifier): for weakly
* unix/tclUnixInit.c (Tcl_GetEncodingNameFromEnvironment): importing
symbols not available on OSX 10.2 or 10.3, enables binaires built on
later OSX versions to run on earlier ones.
* macosx/Tcl.xcodeproj/project.pbxproj: enable weak-linking; turn on
extra warnings.
* macosx/README: document how to enable weak-linking; cleanup.
* unix/tclUnixPort.h: add support for weak-linking; conditionalize
AvailabilityMacros.h inclusion; only disable realpath on 10.2 or earlier
when threads are enabled.
* unix/tclLoadDyld.c (TclpLoadMemoryGetBuffer): change runtime Darwin
* unix/tclUnixInit.c (TclpInitPlatform): release check to use
global initialized once.
* unix/tclUnixFCmd.c (DoRenameFile, TclpObjNormalizePath): add runtime
Darwin release check to determine if realpath is threadsafe.
* unix/configure.in: add check on Darwin for compiler support of weak
* unix/tcl.m4: import and for AvailabilityMacros.h header;
move Darwin specific checks & defines that are only relevant to the tcl
build out of tcl.m4; restrict framework option to Darwin; cleanup
quoting and help messages.
* unix/configure: autoconf-2.59
* unix/tclConfig.h.in: autoheader-2.59
* unix/tclLoadDyld.c (TclpLoadMemory): fix signed-with-unsigned
comparison and other warnings from gcc4 -Wextra.
Diffstat (limited to 'macosx/tclMacOSXFCmd.c')
-rw-r--r-- | macosx/tclMacOSXFCmd.c | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c index 80e9785..51fe222 100644 --- a/macosx/tclMacOSXFCmd.c +++ b/macosx/tclMacOSXFCmd.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacOSXFCmd.c,v 1.8 2006/03/21 11:06:23 das Exp $ + * RCS: @(#) $Id: tclMacOSXFCmd.c,v 1.9 2006/07/20 06:18:37 das Exp $ */ #include "tclInt.h" @@ -21,7 +21,7 @@ #include <libkern/OSByteOrder.h> #endif -/* Darwin 8 copyfile API */ +/* Darwin 8 copyfile API. */ #ifdef HAVE_COPYFILE #ifdef HAVE_COPYFILE_H #include <copyfile.h> @@ -30,8 +30,14 @@ int copyfile(const char *from, const char *to, void *state, uint32_t flags); #define COPYFILE_ACL (1<<0) #define COPYFILE_XATTR (1<<2) #define COPYFILE_NOFOLLOW_SRC (1<<18) -#endif -#endif +#endif /* HAVE_COPYFILE_H */ +#if defined(HAVE_WEAK_IMPORT) && MAC_OS_X_VERSION_MIN_REQUIRED < 1040 +/* Support for weakly importing copyfile. */ +#define WEAK_IMPORT_COPYFILE +extern int copyfile(const char *from, const char *to, void *state, + uint32_t flags) WEAK_IMPORT_ATTRIBUTE; +#endif /* HAVE_WEAK_IMPORT */ +#endif /* HAVE_COPYFILE */ #include <libkern/OSByteOrder.h> @@ -365,14 +371,22 @@ TclMacOSXCopyFileAttributes( CONST Tcl_StatBuf *statBufPtr) /* Stat info for source file */ { -#if defined(HAVE_COPYFILE) +#ifdef WEAK_IMPORT_COPYFILE + if (copyfile != NULL) { +#endif +#ifdef HAVE_COPYFILE if (copyfile(src, dst, NULL, COPYFILE_XATTR | (S_ISLNK(statBufPtr->st_mode) ? COPYFILE_NOFOLLOW_SRC : COPYFILE_ACL)) < 0) { return TCL_ERROR; } return TCL_OK; -#elif defined(HAVE_GETATTRLIST) +#endif /* HAVE_COPYFILE */ +#ifdef WEAK_IMPORT_COPYFILE + } else { +#endif +#if !defined(HAVE_COPYFILE) || defined(WEAK_IMPORT_COPYFILE) +#ifdef HAVE_GETATTRLIST struct attrlist alist; fileinfobuf finfo; off_t *rsrcForkSize = (off_t*)(&finfo.data); @@ -430,6 +444,10 @@ TclMacOSXCopyFileAttributes( return TCL_OK; #else return TCL_ERROR; +#endif /* HAVE_GETATTRLIST */ +#endif /* !defined(HAVE_COPYFILE) || defined(WEAK_IMPORT_COPYFILE) */ +#ifdef WEAK_IMPORT_COPYFILE + } #endif } |