[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: 1-gary-darwin6.6-tidyup.patch
|
From: |
Gary V. Vaughan |
|
Subject: |
FYI: 1-gary-darwin6.6-tidyup.patch |
|
Date: |
Fri, 30 May 2003 17:21:35 +0100 |
|
User-agent: |
Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.3) Gecko/20030312 |
Installing latest autoconf, automake and libtool from fink, and building
gettext-0.12.1 from source, and then applying this patch: I can now build a
working CVS m4 on my darwin6.6 iBook :-)
Cheers,
Gary.
--
())_. Gary V. Vaughan gary@(oranda.demon.co.uk|gnu.org)
( '/ Research Scientist http://www.oranda.demon.co.uk ,_())____
/ )= GNU Hacker http://www.gnu.org/software/libtool \' `&
`(_~)_ Tech' Author http://sources.redhat.com/autobook =`---d__/
Index: ChangeLog
from Gary V. Vaughan <address@hidden>
These changes were necessary to get m4 to build on my iBook
running "powerpc-apple-darwin6.6" using Apples build of gcc "gcc
(GCC) 3.1 20020420 (prerelease)":
* src/main.c: Don't include dlfcn.h, ltdl.h handles correct
inclusion of module loader headers.
* modules/Makefile.am: Use AM_LDFLAGS, not LDFLAGS.
* m4/Makefile.am: Ditto.
(libm4_la_LIBADD): Added $(LTLIBINTL).
* m4/utility.c (program_name): Removed declaration in favour of
the one already in error.c!
* m4/m4module.h (program_name): Define to program_invocation_name
when using GNU C library. Use an explicit extern declaration.
(interactive, sync_output, debug_level, hash_table_size)
(no_gnu_extensions, prefix_all_builtins, max_debug_argument_length)
(suppress_warnings, warning_status, nesting_limit, discard_comments)
(lquote, rquote, bcomm, ecomm, m4_bad_argc, m4_skip_space)
(m4_numeric_arg, m4_shipout_int, m4_shipout_string, m4_dump_args)
(m4_debug, m4_debug_init, m4_debug_exit, m4_debug_decode)
(m4_debug_flush_files, m4_debug_set_output, m4_debug_message_prefix)
(m4_trace_prepre, m4_trace_pre, m4_trace_post, m4_sysval)
(m4_expansion_level, m4_expand_ranges, m4_expand_input)
(m4_call_macro, m4_process_macro, m4_syntax_table, m4_current_file)
(m4_current_line, m4_current_diversion, m4_output_current_line):
Don't rely on default, use an explicit extern.
* m4/error.h (error, error_at_line, error_print_progname)
(error_message_count, error_one_per_line): Ditto.
* m4/ltdl.c: Update from CVS libtool.
* m4/ltdl.h: Ditto.
* commit: Update from CVS cvs-utils.
Index: commit
===================================================================
RCS file: /cvsroot/m4/m4/commit,v
retrieving revision 1.1
diff -u -p -u -r1.1 commit
--- commit 25 Nov 2000 00:17:10 -0000 1.1
+++ commit 30 May 2003 15:11:59 -0000
@@ -1,15 +1,15 @@
#! /bin/sh
-# commit version 0.9.2
+# clcommit version 0.9.5
-# Copyright (C) 1999, Free Software Foundation
+# Copyright (C) 1999, 2000, Free Software Foundation
# This script is Free Software, and it can be copied, distributed and
# modified as defined in the GNU General Public License. A copy of
# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html
-# Originally by Gary V. Vaughan <address@hidden>
-# Heavily modified by Alexandre Oliva <address@hidden>
+# Originally by Gary V. Vaughan <address@hidden>
+# Pretty much rewritten by Alexandre Oliva <address@hidden>
# This scripts eases checking in changes to CVS-maintained projects
# with ChangeLog files. It will check that there have been no
@@ -19,32 +19,37 @@
# files in the current directory (and below, unless `-l' is given) are
# considered for check in.
-# The commit message will be extracted from the differences between
-# the local ChangeLog and the one in the repository (unless a message
-# was specified with `-m' or `-F'). An empty message is not accepted
-# (but a blank line is). If the message is acceptable, it will be
-# presented for verification (and possible edition) using the $PAGER
-# environment variable (or `more', if it is not set, or `cat', if the
-# `-f' switch is given). If $PAGER exits successfully, the modified
-# files (at that moment) are checked in, unless `-n' was specified, in
-# which case nothing is checked in.
+# The commit message will be extracted from the differences between a
+# file named ChangeLog* in the commit list, or named after -C, and the
+# one in the repository (unless a message was specified with `-m' or
+# `-F'). An empty message is not accepted (but a blank line is). If
+# the message is acceptable, it will be presented for verification
+# (and possible edition) using the $PAGER environment variable (or
+# `more', if it is not set, or `cat', if the `-f' switch is given).
+# If $PAGER exits successfully, the modified files (at that moment)
+# are checked in, unless `-n' was specified, in which case nothing is
+# checked in.
-# usage: commit [-v] [-h] [-f] [-l] [-n] [-q] [-z N]
-# [-m msg|-F msg_file] [--] [file|dir ...]
+# usage: clcommit [-v] [-h] [-f] [-l] [-n] [-q] [-z N] [-C ChangeLog_file]
+# [-m msg|-F msg_file|-1] [--] [file|dir ...]
-# -f --fast don't check (unless *followed* by -n), and just
-# --force display commit message instead of running $PAGER
+# -f --force don't check (unless *followed* by -n), and just
+# display commit message instead of running $PAGER
# -l --local don't descend into subdirectories
# -m msg --message=msg set commit message
# --msg=msg same as -m
# -F file --file=file read commit message from file
+# -1 --first extract first entry from ChangeLog, no cvs diff
+# -C file --changelog=file extract commit message from specified ChangeLog
+# --fast same as --force --first
# -n --dry-run don't commit anything
# -q --quiet run cvs in quiet mode
# -zN --compress=N set compression level (0-9, 0=none, 9=max)
# -v --version print version information
# -h,-? --help print short or long help message
-name=commit
+name=clcommit
+: ${CVS=cvs}
cvsopt=
updateopt=
commitopt=
@@ -52,6 +57,7 @@ dry_run=false
commit=:
update=:
log_file="${TMPDIR-/tmp}/commitlog.$$"
+first=false
rm -f "$log_file"
trap 'rm -f "$log_file"; exit 1' 1 2 15
@@ -63,7 +69,12 @@ while $main_repeat; do
repeat="test $# -gt 0"
while $repeat; do
case "$1" in
- -f|--force|--fast)
+ --fast)
+ shift
+ set fnord --force --first ${1+"$@"}
+ shift
+ ;;
+ -f|--force)
update=false
PAGER=cat
shift
@@ -78,8 +89,8 @@ while $repeat; do
echo "$name: missing argument for $1" >&2
break
fi
- if test -f "$log_file"; then
- echo "$name: you can have at most one of -m and -F" >&2
+ if $first || test -f "$log_file"; then
+ echo "$name: you can have at most one of -m, -F and -1" >&2
break
fi
shift
@@ -87,8 +98,8 @@ while $repeat; do
shift
;;
-F|--file)
- if test -f "$log_file"; then
- echo "$name: you can have at most one of -m and -F" >&2
+ if $first || test -f "$log_file"; then
+ echo "$name: you can have at most one of -m, -F and -1" >&2
break
fi
if test $# = 1; then
@@ -101,6 +112,27 @@ while $repeat; do
fi
shift
;;
+ -1|--first)
+ if test -f "$log_File"; then
+ echo "$name: you can have at most one of -m, -F and -1" >&2
+ break
+ fi
+ first=:
+ shift
+ ;;
+ -C|--[cC]hange[lL]og)
+ if test $# = 1; then
+ echo "$name: missing argument for $1" >&2
+ break
+ fi
+ shift
+ if test ! -f "$1"; then
+ echo "$name: ChangeLog file \`$1' does not exist" >&2
+ break
+ fi
+ ChangeLog="$1"
+ shift
+ ;;
-n|--dry-run)
commit=false
update=true
@@ -126,13 +158,13 @@ while $repeat; do
shift
;;
- -m*|-F*|-z*)
+ -m*|-F*|-C*|-z*)
opt=`echo "$1" | sed '1s/^\(..\).*$/\1/;q'`
arg=`echo "$1" | sed '1s/^-[a-zA-Z0-9]//'`
shift
set -- "$opt" "$arg" ${1+"$@"}
;;
- --message=*|--msg=*|--file=*|--compress=*)
+ --message=*|--msg=*|--file=*|--[Cc]hange[Ll]og=*|--compress=*)
opt=`echo "$1" | sed '1s/^\(--[^=]*\)=.*/\1/;q'`
arg=`echo "$1" | sed '1s/^--[^=]*=//'`
shift
@@ -171,7 +203,7 @@ $repeat && break
$update && \
if echo "$name: checking for conflicts..." >&2
- (cvs $cvsopt -q -n update $updateopt ${1+"$@"} 2>/dev/null \
+ ($CVS $cvsopt -q -n update $updateopt ${1+"$@"} \
| while read line; do
echo "$line"
echo "$line" >&3
@@ -181,11 +213,41 @@ if echo "$name: checking for conflicts..
fi
if test ! -f "$log_file"; then
+ if test -z "$ChangeLog"; then
+ for f in ${1+"$@"}; do
+ case "$f" in
+ ChangeLog* | */ChangeLog*)
+ if test -z "$ChangeLog"; then
+ ChangeLog="$f"
+ else
+ echo "$name: multiple ChangeLog files: $ChangeLog and $f" >&2
+ break
+ fi
+ ;;
+ esac
+ done
+ fi
+
echo "$name: checking commit message..." >&2
- cvs $cvsopt diff -u ChangeLog \
- | while read line; do
+ if $first; then
+ skipping=:
+ sed 's,^,+,' < ${ChangeLog-ChangeLog} |
+ while read line; do
case "$line" in
- "--- ChangeLog"*) :;;
+ "+") if $skipping; then skipping=false; else break; fi;;
+ "+ "*)
+ echo "$name: *** Warning: lines should start with tabs, not spaces;
ignoring line:" >&2
+ echo "$line" | sed 's/^.//' >&2;;
+ "+ "*)
+ $skipping || echo "$line" ;;
+ esac
+ done |
+ sed 's,^\+ ,,' > "$log_file" || break
+ else
+ $CVS $cvsopt diff -u ${ChangeLog-ChangeLog} |
+ while read line; do
+ case $line in
+ "--- "*) :;;
"-"*)
echo "$name: *** Warning: the following line in ChangeLog diff is
suspicious:" >&2
echo "$line" | sed 's/^.//' >&2;;
@@ -195,9 +257,10 @@ if test ! -f "$log_file"; then
"+") echo;;
"+ "*) echo "$line";;
esac
- done \
- | sed -e 's,\+ ,,' -e '/./p' -e '/./d' -e '1d' -e '$d' > "$log_file" \
- || break
+ done |
+ sed -e 's,\+ ,,' -e '/./p' -e '/./d' -e '1d' -e '$d' > "$log_file" \
+ || break
+ fi
# The sed script above removes "+TAB" from the beginning of a line, then
# deletes the first and/or the last line, when they happen to be empty
fi
@@ -208,7 +271,7 @@ if grep '[^ ]' < "$log_file" > /dev/nul
fi
if grep '^$' < "$log_file" > /dev/null; then
- echo "$name: *** Warning: blank lines should not appear within a commit
messages." >&2
+ echo "$name: *** Warning: blank lines should not appear within commit
messages." >&2
echo "$name: *** They should be used to separate distinct commits." >&2
fi
@@ -220,7 +283,7 @@ sleep 1 # give the user some time for a
# zeroed it out. If s/he did, it was probably intentional.
if $commit; then
- cvs $cvsopt commit $commitopt -F $log_file ${1+"$@"} || break
+ $CVS $cvsopt commit $commitopt -F $log_file ${1+"$@"} || break
fi
main_repeat=false
Index: m4/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/m4/Makefile.am,v
retrieving revision 1.14
diff -u -p -u -r1.14 Makefile.am
--- m4/Makefile.am 29 May 2002 18:06:42 -0000 1.14
+++ m4/Makefile.am 30 May 2003 15:11:59 -0000
@@ -1,6 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
##
-## Copyright 2000, 2001 Free Software Foundation
+## Copyright 2000, 2001, 2003 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ MAINTAINERCLEANFILES = Makefile.in
MODULE_PATH = $(pkglibexecdir)
pkgincdir = $(includedir)/@PACKAGE@
-LDFLAGS = -no-undefined -export-dynamic
+AM_LDFLAGS = -no-undefined -export-dynamic
INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
-I$(top_builddir)/src -I$(top_srcdir)/src $(INTLINCL)
@@ -39,7 +39,7 @@ lib_LTLIBRARIES = libm4.la
libm4_la_SOURCES = builtin.c debug.c error.c hash.c \
input.c ltdl.c macro.c module.c output.c \
path.c regex.c symtab.c syntax.c utility.c
-libm4_la_LIBADD = $(LTLIBOBJS) $(LIBADD_DL)
+libm4_la_LIBADD = $(LTLIBOBJS) $(LTLIBINTL) $(LIBADD_DL)
module.o module.lo: $(srcdir)/module.c pathconf.h
pathconf.h: Makefile
Index: m4/error.h
===================================================================
RCS file: /cvsroot/m4/m4/m4/error.h,v
retrieving revision 1.3
diff -u -p -u -r1.3 error.h
--- m4/error.h 20 Aug 2001 20:25:25 -0000 1.3
+++ m4/error.h 30 May 2003 15:11:59 -0000
@@ -1,5 +1,5 @@
/* Declaration for error-reporting function
- Copyright 1995-1997, 2000 Free Software Foundation, Inc.
+ Copyright 1995-1997, 2000, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. Its master source is NOT part of
the C library, however. The master source lives in /gd/gnu/lib.
@@ -57,22 +57,21 @@ extern void error_at_line (int status, i
/* If NULL, error will flush stdout, then print on stderr the program
name, a colon and a space. Otherwise, error will call this
function without parameters instead. */
-void (*error_print_progname) (void);
+extern void (*error_print_progname) (void);
#else
-void error ();
-void error_at_line ();
-void (*error_print_progname) ();
+extern void error ();
+extern void error_at_line ();
+extern void (*error_print_progname) ();
#endif
/* This variable is incremented each time `error' is called. */
-unsigned int error_message_count;
+extern unsigned int error_message_count;
/* Sometimes we want to have at most one error per line. This
variable controls whether this mode is selected or not. */
-int error_one_per_line;
+extern int error_one_per_line;
END_C_DECLS
#endif /* !M4_ERROR_H */
-
Index: m4/ltdl.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/ltdl.c,v
retrieving revision 1.12
diff -u -p -u -r1.12 ltdl.c
--- m4/ltdl.c 14 Oct 2001 11:44:41 -0000 1.12
+++ m4/ltdl.c 30 May 2003 15:11:59 -0000
@@ -65,20 +65,52 @@ Foundation, Inc., 59 Temple Place, Suite
# include <errno.h>
#endif
-#if HAVE_DIRENT_H
+
+#ifndef __WINDOWS__
+# ifdef __WIN32__
+# define __WINDOWS__
+# endif
+#endif
+
+
+#undef LT_USE_POSIX_DIRENT
+#ifdef HAVE_CLOSEDIR
+# ifdef HAVE_OPENDIR
+# ifdef HAVE_READDIR
+# ifdef HAVE_DIRENT_H
+# define LT_USE_POSIX_DIRENT
+# endif /* HAVE_DIRENT_H */
+# endif /* HAVE_READDIR */
+# endif /* HAVE_OPENDIR */
+#endif /* HAVE_CLOSEDIR */
+
+
+#undef LT_USE_WINDOWS_DIRENT_EMULATION
+#ifndef LT_USE_POSIX_DIRENT
+# ifdef __WINDOWS__
+# define LT_USE_WINDOWS_DIRENT_EMULATION
+# endif /* __WINDOWS__ */
+#endif /* LT_USE_POSIX_DIRENT */
+
+
+#ifdef LT_USE_POSIX_DIRENT
# include <dirent.h>
# define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name))
#else
-# define dirent direct
-# define LT_D_NAMLEN(dirent) ((dirent)->d_namlen)
-# if HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-# include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-# include <ndir.h>
+# ifdef LT_USE_WINDOWS_DIRENT_EMULATION
+# define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name))
+# else
+# define dirent direct
+# define LT_D_NAMLEN(dirent) ((dirent)->d_namlen)
+# if HAVE_SYS_NDIR_H
+# include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+# include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+# include <ndir.h>
+# endif
# endif
#endif
@@ -118,7 +150,28 @@ Foundation, Inc., 59 Temple Place, Suite
# define LT_READTEXT_MODE "r"
#endif
+#ifdef LT_USE_WINDOWS_DIRENT_EMULATION
+
+#include <windows.h>
+
+#define dirent lt_dirent
+#define DIR lt_DIR
+
+struct dirent
+{
+ char d_name[2048];
+ int d_namlen;
+};
+
+typedef struct _DIR
+{
+ HANDLE hSearch;
+ WIN32_FIND_DATA Win32FindData;
+ BOOL firsttime;
+ struct dirent file_info;
+} DIR;
+#endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
/* --- MANIFEST CONSTANTS --- */
@@ -158,7 +211,8 @@ static char *lt_estrdup LT_PARAMS((con
static lt_ptr lt_emalloc LT_PARAMS((size_t size));
static lt_ptr lt_erealloc LT_PARAMS((lt_ptr addr, size_t size));
-static lt_ptr rpl_realloc LT_PARAMS((lt_ptr ptr, size_t size));
+/* static lt_ptr rpl_realloc LT_PARAMS((lt_ptr ptr, size_t size)); */
+#define rpl_realloc realloc
/* These are the pointers that can be changed by the caller: */
LT_GLOBAL_DATA lt_ptr (*lt_dlmalloc) LT_PARAMS((size_t size))
@@ -371,6 +425,76 @@ memmove (dest, src, size)
#endif /* !HAVE_MEMMOVE */
+#ifdef LT_USE_WINDOWS_DIRENT_EMULATION
+
+static void closedir LT_PARAMS((DIR *entry));
+
+static void
+closedir(entry)
+ DIR *entry;
+{
+ assert(entry != (DIR *) NULL);
+ FindClose(entry->hSearch);
+ lt_dlfree((lt_ptr)entry);
+}
+
+
+static DIR * opendir LT_PARAMS((const char *path));
+
+static DIR*
+opendir (path)
+ const char *path;
+{
+ char file_specification[LT_FILENAME_MAX];
+ DIR *entry;
+
+ assert(path != (char *) NULL);
+ (void) strncpy(file_specification,path,LT_FILENAME_MAX-1);
+ (void) strcat(file_specification,"\\");
+ entry = LT_DLMALLOC (DIR,sizeof(DIR));
+ if (entry != (DIR *) 0)
+ {
+ entry->firsttime = TRUE;
+ entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData);
+ }
+ if (entry->hSearch == INVALID_HANDLE_VALUE)
+ {
+ (void) strcat(file_specification,"\\*.*");
+ entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData);
+ if (entry->hSearch == INVALID_HANDLE_VALUE)
+ {
+ LT_DLFREE (entry);
+ return (DIR *) 0;
+ }
+ }
+ return(entry);
+}
+
+
+static struct dirent *readdir LT_PARAMS((DIR *entry));
+
+static struct dirent *readdir(entry)
+ DIR *entry;
+{
+ int
+ status;
+
+ if (entry == (DIR *) 0)
+ return((struct dirent *) 0);
+ if (!entry->firsttime)
+ {
+ status = FindNextFile(entry->hSearch,&entry->Win32FindData);
+ if (status == 0)
+ return((struct dirent *) 0);
+ }
+ entry->firsttime = FALSE;
+ (void) strncpy(entry->file_info.d_name,entry->Win32FindData.cFileName,
+ LT_FILENAME_MAX-1);
+ entry->file_info.d_namlen = strlen(entry->file_info.d_name);
+ return(&entry->file_info);
+}
+
+#endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
/* According to Alexandre Oliva <address@hidden>,
``realloc is not entirely portable''
@@ -379,15 +503,22 @@ memmove (dest, src, size)
Instead implement our own version (with known boundary conditions)
using lt_dlmalloc and lt_dlfree. */
-#undef realloc
-#define realloc rpl_realloc
+/* #undef realloc
+ #define realloc rpl_realloc
+*/
+#if 0
+ /* You can't (re)define realloc unless you also (re)define malloc.
+ Right now, this code uses the size of the *destination* to decide
+ how much to copy. That's not right, but you can't know the size
+ of the source unless you know enough about, or wrote malloc. So
+ this code is disabled... */
static lt_ptr
realloc (ptr, size)
lt_ptr ptr;
size_t size;
{
- if (size <= 0)
+ if (size == 0)
{
/* For zero or less bytes, free the original memory */
if (ptr != 0)
@@ -418,6 +549,7 @@ realloc (ptr, size)
return mem;
}
}
+#endif
#if ! HAVE_ARGZ_APPEND
@@ -542,11 +674,6 @@ argz_insert (pargz, pargz_len, before, e
assert (pargz_len);
assert (entry && *entry);
- /* Either PARGZ/PARGZ_LEN is empty and BEFORE is NULL,
- or BEFORE points into an address within the ARGZ vector. */
- assert ((!*pargz && !*pargz_len && !before)
- || ((*pargz <= before) && (before < (*pargz + *pargz_len))));
-
/* No BEFORE address indicates ENTRY should be inserted after the
current last element. */
if (!before)
@@ -555,7 +682,7 @@ argz_insert (pargz, pargz_len, before, e
/* This probably indicates a programmer error, but to preserve
semantics, scan back to the start of an entry if BEFORE points
into the middle of it. */
- while ((before >= *pargz) && (before[-1] != LT_EOS_CHAR))
+ while ((before > *pargz) && (before[-1] != LT_EOS_CHAR))
--before;
{
@@ -911,11 +1038,7 @@ lt_estrdup (str)
/* --- DLOPEN() INTERFACE LOADER --- */
-/* The Cygwin dlopen implementation prints a spurious error message to
- stderr if its call to LoadLibrary() fails for any reason. We can
- mitigate this by not using the Cygwin implementation, and falling
- back to our own LoadLibrary() wrapper. */
-#if HAVE_LIBDL && !defined(__CYGWIN__)
+#if HAVE_LIBDL
/* dynamic linking with dlopen/dlsym */
@@ -1452,7 +1575,343 @@ static struct lt_user_dlloader sys_dld =
#endif /* HAVE_DLD */
+/* --- DYLD() MACOSX/DARWIN INTERFACE LOADER --- */
+#if HAVE_DYLD
+
+#if HAVE_MACH_O_DYLD_H
+# include <mach-o/dyld.h>
+#endif
+#include <mach-o/getsect.h>
+
+/* We have to put some stuff here that isn't in older dyld.h files */
+#ifndef ENUM_DYLD_BOOL
+# define ENUM_DYLD_BOOL
+# undef FALSE
+# undef TRUE
+ enum DYLD_BOOL {
+ FALSE,
+ TRUE
+ };
+#endif
+#ifndef LC_REQ_DYLD
+# define LC_REQ_DYLD 0x80000000
+#endif
+#ifndef LC_LOAD_WEAK_DYLIB
+# define LC_LOAD_WEAK_DYLIB (0x18 | LC_REQ_DYLD)
+#endif
+static const struct mach_header * (*ltdl_NSAddImage)(const char *image_name,
unsigned long options) = 0;
+static NSSymbol (*ltdl_NSLookupSymbolInImage)(const struct mach_header
*image,const char *symbolName, unsigned long options) = 0;
+static enum DYLD_BOOL (*ltdl_NSIsSymbolNameDefinedInImage)(const struct
mach_header *image, const char *symbolName) = 0;
+static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic)(NSModule module) = 0;
+
+#ifndef NSADDIMAGE_OPTION_NONE
+#define NSADDIMAGE_OPTION_NONE 0x0
+#endif
+#ifndef NSADDIMAGE_OPTION_RETURN_ON_ERROR
+#define NSADDIMAGE_OPTION_RETURN_ON_ERROR 0x1
+#endif
+#ifndef NSADDIMAGE_OPTION_WITH_SEARCHING
+#define NSADDIMAGE_OPTION_WITH_SEARCHING 0x2
+#endif
+#ifndef NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
+#define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED 0x4
+#endif
+#ifndef NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME
+#define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
+#endif
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND 0x0
+#endif
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW 0x1
+#endif
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY 0x2
+#endif
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
+#endif
+
+
+static const char *
+lt_int_dyld_error(othererror)
+ char* othererror;
+{
+/* return the dyld error string, or the passed in error string if none */
+ NSLinkEditErrors ler;
+ int lerno;
+ const char *errstr;
+ const char *file;
+ NSLinkEditError(&ler,&lerno,&file,&errstr);
+ if (!errstr || !strlen(errstr)) errstr = othererror;
+ return errstr;
+}
+
+static const struct mach_header *
+lt_int_dyld_get_mach_header_from_nsmodule(module)
+ NSModule module;
+{
+/* There should probably be an apple dyld api for this */
+ int i=_dyld_image_count();
+ int j;
+ const char *modname=NSNameOfModule(module);
+ const struct mach_header *mh=NULL;
+ if (!modname) return NULL;
+ for (j = 0; j < i; j++)
+ {
+ if (!strcmp(_dyld_get_image_name(j),modname))
+ {
+ mh=_dyld_get_image_header(j);
+ break;
+ }
+ }
+ return mh;
+}
+
+static const char* lt_int_dyld_lib_install_name(mh)
+ const struct mach_header *mh;
+{
+/* NSAddImage is also used to get the loaded image, but it only works if the
lib
+ is installed, for uninstalled libs we need to check the install_names
against
+ each other. Note that this is still broken if DYLD_IMAGE_SUFFIX is set and a
+ different lib was loaded as a result
+*/
+ int j;
+ struct load_command *lc;
+ unsigned long offset = sizeof(struct mach_header);
+ const char* retStr=NULL;
+ for (j = 0; j < mh->ncmds; j++)
+ {
+ lc = (struct load_command*)(((unsigned long)mh) + offset);
+ if (LC_ID_DYLIB == lc->cmd)
+ {
+ retStr=(char*)(((struct
dylib_command*)lc)->dylib.name.offset +
+
(unsigned long)lc);
+ }
+ offset += lc->cmdsize;
+ }
+ return retStr;
+}
+
+static const struct mach_header *
+lt_int_dyld_match_loaded_lib_by_install_name(const char *name)
+{
+ int i=_dyld_image_count();
+ int j;
+ const struct mach_header *mh=NULL;
+ const char *id=NULL;
+ for (j = 0; j < i; j++)
+ {
+ id=lt_int_dyld_lib_install_name(_dyld_get_image_header(j));
+ if ((id) && (!strcmp(id,name)))
+ {
+ mh=_dyld_get_image_header(j);
+ break;
+ }
+ }
+ return mh;
+}
+
+static NSSymbol
+lt_int_dyld_NSlookupSymbolInLinkedLibs(symbol,mh)
+ const char *symbol;
+ const struct mach_header *mh;
+{
+ /* Safe to assume our mh is good */
+ int j;
+ struct load_command *lc;
+ unsigned long offset = sizeof(struct mach_header);
+ NSSymbol retSym = 0;
+ const struct mach_header *mh1;
+ if ((ltdl_NSLookupSymbolInImage) && NSIsSymbolNameDefined(symbol) )
+ {
+ for (j = 0; j < mh->ncmds; j++)
+ {
+ lc = (struct load_command*)(((unsigned long)mh) +
offset);
+ if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB
== lc->cmd))
+ {
+
mh1=lt_int_dyld_match_loaded_lib_by_install_name((char*)(((struct
dylib_command*)lc)->dylib.name.offset +
+
(unsigned long)lc));
+ if (!mh1)
+ {
+ /* Maybe NSAddImage can find it */
+ mh1=ltdl_NSAddImage((char*)(((struct
dylib_command*)lc)->dylib.name.offset +
+
(unsigned long)lc),
+
NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED +
+
NSADDIMAGE_OPTION_WITH_SEARCHING +
+
NSADDIMAGE_OPTION_RETURN_ON_ERROR );
+ }
+ if (mh1)
+ {
+ retSym = ltdl_NSLookupSymbolInImage(mh1,
+
symbol,
+
NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+
| NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
+
);
+ if (retSym) break;
+ }
+ }
+ offset += lc->cmdsize;
+ }
+ }
+ return retSym;
+}
+
+static int
+sys_dyld_init()
+{
+ int retCode = 0;
+ int err = 0;
+ if (!_dyld_present()) {
+ retCode=1;
+ }
+ else {
+ err = _dyld_func_lookup("__dyld_NSAddImage",(unsigned
long*)<dl_NSAddImage);
+ err = _dyld_func_lookup("__dyld_NSLookupSymbolInImage",(unsigned
long*)<dl_NSLookupSymbolInImage);
+ err = _dyld_func_lookup("__dyld_NSIsSymbolNameDefinedInImage",(unsigned
long*)<dl_NSIsSymbolNameDefinedInImage);
+ err = _dyld_func_lookup("__dyld_NSMakePrivateModulePublic",(unsigned
long*)<dl_NSMakePrivateModulePublic);
+ }
+ return retCode;
+}
+
+static lt_module
+sys_dyld_open (loader_data, filename)
+ lt_user_data loader_data;
+ const char *filename;
+{
+ lt_module module = 0;
+ NSObjectFileImage ofi = 0;
+ NSObjectFileImageReturnCode ofirc;
+
+ if (!filename)
+ return (lt_module)-1;
+ ofirc = NSCreateObjectFileImageFromFile(filename, &ofi);
+ switch (ofirc)
+ {
+ case NSObjectFileImageSuccess:
+ module = NSLinkModule(ofi, filename,
+
NSLINKMODULE_OPTION_RETURN_ON_ERROR
+ | NSLINKMODULE_OPTION_PRIVATE
+ | NSLINKMODULE_OPTION_BINDNOW);
+ NSDestroyObjectFileImage(ofi);
+ if (module)
+ ltdl_NSMakePrivateModulePublic(module);
+ break;
+ case NSObjectFileImageInappropriateFile:
+ if (ltdl_NSIsSymbolNameDefinedInImage &&
ltdl_NSLookupSymbolInImage)
+ {
+ module = (lt_module)ltdl_NSAddImage(filename,
NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+ break;
+ }
+ default:
+ LT_DLMUTEX_SETERROR
(lt_int_dyld_error(LT_DLSTRERROR(CANNOT_OPEN)));
+ return 0;
+ }
+ if (!module) LT_DLMUTEX_SETERROR
(lt_int_dyld_error(LT_DLSTRERROR(CANNOT_OPEN)));
+ return module;
+}
+
+static int
+sys_dyld_close (loader_data, module)
+ lt_user_data loader_data;
+ lt_module module;
+{
+ int retCode = 0;
+ int flags = 0;
+ if (module == (lt_module)-1) return 0;
+#ifdef __BIG_ENDIAN__
+ if (((struct mach_header *)module)->magic == MH_MAGIC)
+#else
+ if (((struct mach_header *)module)->magic == MH_CIGAM)
+#endif
+ {
+ LT_DLMUTEX_SETERROR("Can not close a dylib");
+ retCode = 1;
+ }
+ else
+ {
+#if 1
+/* Currently, if a module contains c++ static destructors and it is unloaded,
we
+ get a segfault in atexit(), due to compiler and dynamic loader differences
of
+ opinion, this works around that.
+*/
+ if ((const struct section *)NULL !=
+
getsectbynamefromheader(lt_int_dyld_get_mach_header_from_nsmodule(module),
+ "__DATA","__mod_term_func"))
+ {
+ flags += NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
+ }
+#endif
+#ifdef __ppc__
+ flags += NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES;
+#endif
+ if (!NSUnLinkModule(module,flags))
+ {
+ retCode=1;
+ LT_DLMUTEX_SETERROR
(lt_int_dyld_error(LT_DLSTRERROR(CANNOT_CLOSE)));
+ }
+ }
+
+ return retCode;
+}
+
+static lt_ptr
+sys_dyld_sym (loader_data, module, symbol)
+ lt_user_data loader_data;
+ lt_module module;
+ const char *symbol;
+{
+ lt_ptr address = 0;
+ NSSymbol *nssym = 0;
+ void *unused;
+ const struct mach_header *mh=NULL;
+ if (module == (lt_module)-1)
+ {
+ _dyld_lookup_and_bind(symbol,(unsigned long*)&address,&unused);
+ return address;
+ }
+#ifdef __BIG_ENDIAN__
+ if (((struct mach_header *)module)->magic == MH_MAGIC)
+#else
+ if (((struct mach_header *)module)->magic == MH_CIGAM)
+#endif
+ {
+ if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
+ {
+ mh=module;
+ if (ltdl_NSIsSymbolNameDefinedInImage((struct
mach_header*)module,symbol))
+ {
+ nssym = ltdl_NSLookupSymbolInImage((struct
mach_header*)module,
+
symbol,
+
NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+
| NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
+
);
+ }
+ }
+
+ }
+ else {
+ nssym = NSLookupSymbolInModule(module, symbol);
+ }
+ if (!nssym)
+ {
+ if (!mh) mh=lt_int_dyld_get_mach_header_from_nsmodule(module);
+ nssym = lt_int_dyld_NSlookupSymbolInLinkedLibs(symbol,mh);
+ }
+ if (!nssym)
+ {
+ LT_DLMUTEX_SETERROR
(lt_int_dyld_error(LT_DLSTRERROR(SYMBOL_NOT_FOUND)));
+ return NULL;
+ }
+ return NSAddressOfSymbol(nssym);
+}
+
+static struct lt_user_dlloader sys_dyld =
+ { "_", sys_dyld_open, sys_dyld_close, sys_dyld_sym, 0, 0 };
+
+
+#endif /* HAVE_DYLD */
/* --- DLPREOPEN() INTERFACE LOADER --- */
@@ -1734,7 +2193,7 @@ lt_dlinit ()
handles = 0;
user_search_path = 0; /* empty search path */
-#if HAVE_LIBDL && !defined(__CYGWIN__)
+#if HAVE_LIBDL
errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dl, "dlopen");
#endif
#if HAVE_SHL_LOAD
@@ -1749,6 +2208,10 @@ lt_dlinit ()
#if HAVE_DLD
errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dld, "dld");
#endif
+#if HAVE_DYLD
+ errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dyld, "dyld");
+ errors += sys_dyld_init();
+#endif
errors += lt_dlloader_add (lt_dlloader_next (0), &presym, "dlpreload");
if (presym_init (presym.dlloader_data))
@@ -1919,6 +2382,18 @@ tryall_dlopen (handle, filename)
cur = *handle;
if (filename)
{
+ /* Comment out the check of file permissions using access.
+ This call seems to always return -1 with error EACCES.
+ */
+ /* We need to catch missing file errors early so that
+ file_not_found() can detect what happened.
+ if (access (filename, R_OK) != 0)
+ {
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
+ ++errors;
+ goto done;
+ } */
+
cur->info.filename = lt_estrdup (filename);
if (!cur->info.filename)
{
@@ -1981,8 +2456,9 @@ tryall_dlopen_module (handle, prefix, di
assert (strchr (dirname, LT_DIRSEP_CHAR) == 0);
#endif
- if (dirname[dirname_len -1] == '/')
- --dirname_len;
+ if (dirname_len > 0)
+ if (dirname[dirname_len -1] == '/')
+ --dirname_len;
filename_len = dirname_len + 1 + LT_STRLEN (dlname);
/* Allocate memory, and combine DIRNAME and MODULENAME into it.
@@ -2164,8 +2640,8 @@ foreach_dirinpath (search_path, base_nam
{
int result = 0;
int filenamesize = 0;
- int lenbase = LT_STRLEN (base_name);
- int argz_len = 0;
+ size_t lenbase = LT_STRLEN (base_name);
+ size_t argz_len = 0;
char *argz = 0;
char *filename = 0;
char *canonical = 0;
@@ -2188,7 +2664,7 @@ foreach_dirinpath (search_path, base_nam
char *dir_name = 0;
while ((dir_name = argz_next (argz, argz_len, dir_name)))
{
- int lendir = LT_STRLEN (dir_name);
+ size_t lendir = LT_STRLEN (dir_name);
if (lendir +1 +lenbase >= filenamesize)
{
@@ -2199,7 +2675,9 @@ foreach_dirinpath (search_path, base_nam
goto cleanup;
}
- strncpy (filename, dir_name, lendir);
+ assert (filenamesize > lendir);
+ strcpy (filename, dir_name);
+
if (base_name && *base_name)
{
if (filename[lendir -1] != '/')
@@ -2275,11 +2753,11 @@ find_handle_callback (filename, data, ig
lt_ptr data;
lt_ptr ignored;
{
- lt_dlhandle *handle = (lt_dlhandle *) data;
- int found = access (filename, R_OK);
+ lt_dlhandle *handle = (lt_dlhandle *) data;
+ int notfound = access (filename, R_OK);
/* Bail out if file cannot be read... */
- if (!found)
+ if (notfound)
return 0;
/* Try to dlopen the file, but do not continue searching in any
@@ -2499,7 +2977,7 @@ trim (dest, str)
/* remove the leading and trailing "'" from str
and store the result in dest */
const char *end = strrchr (str, '\'');
- int len = LT_STRLEN (str);
+ size_t len = LT_STRLEN (str);
char *tmp;
LT_DLFREE (*dest);
@@ -2624,7 +3102,6 @@ try_dlopen (phandle, filename)
char * deplibs = 0;
char * line = 0;
size_t line_len;
- int i;
/* if we can't find the installed flag, it is probably an
installed libtool archive, produced with an old version
@@ -2640,23 +3117,26 @@ try_dlopen (phandle, filename)
}
/* canonicalize the module name */
- for (i = 0; i < ext - base_name; ++i)
- {
- if (isalnum ((int)(base_name[i])))
- {
- name[i] = base_name[i];
- }
- else
- {
- name[i] = '_';
- }
- }
- name[ext - base_name] = LT_EOS_CHAR;
+ {
+ size_t i;
+ for (i = 0; i < ext - base_name; ++i)
+ {
+ if (isalnum ((int)(base_name[i])))
+ {
+ name[i] = base_name[i];
+ }
+ else
+ {
+ name[i] = '_';
+ }
+ }
+ name[ext - base_name] = LT_EOS_CHAR;
+ }
- /* Now try to open the .la file. If there is no directory name
- component, try to find it first in user_search_path and then other
- prescribed paths. Otherwise (or in any case if the module was not
- yet found) try opening just the module name as passed. */
+ /* Now try to open the .la file. If there is no directory name
+ component, try to find it first in user_search_path and then other
+ prescribed paths. Otherwise (or in any case if the module was not
+ yet found) try opening just the module name as passed. */
if (!dir)
{
const char *search_path;
@@ -2715,17 +3195,17 @@ try_dlopen (phandle, filename)
/* read the .la file */
while (!feof (file))
{
- if (!fgets (line, line_len, file))
+ if (!fgets (line, (int) line_len, file))
{
break;
}
/* Handle the case where we occasionally need to read a line
that is longer than the initial buffer size. */
- while (line[LT_STRLEN(line) -1] != '\n')
+ while ((line[LT_STRLEN(line) -1] != '\n') && (!feof (file)))
{
line = LT_DLREALLOC (char, line, line_len *2);
- if (!fgets (&line[line_len -1], line_len +1, file))
+ if (!fgets (&line[line_len -1], (int) line_len +1, file))
{
break;
}
@@ -2873,7 +3353,10 @@ try_dlopen (phandle, filename)
#endif
)))
{
- tryall_dlopen (&newhandle, filename);
+ if (tryall_dlopen (&newhandle, filename) != 0)
+ {
+ newhandle = NULL;
+ }
}
if (!newhandle)
@@ -2947,7 +3430,7 @@ lt_dlopenext (filename)
lt_dlhandle handle = 0;
char * tmp = 0;
char * ext = 0;
- int len;
+ size_t len;
int errors = 0;
if (!filename)
@@ -2985,7 +3468,7 @@ lt_dlopenext (filename)
failed, it is better to return an error message here than to
report FILE_NOT_FOUND when the alternatives (foo.so etc) are not
in the module search path. */
- if (handle || ((errors > 0) && file_not_found ()))
+ if (handle || ((errors > 0) && !file_not_found ()))
{
LT_DLFREE (tmp);
return handle;
@@ -3012,7 +3495,7 @@ lt_dlopenext (filename)
/* As before, if the file was found but loading failed, return now
with the current error message. */
- if (handle || ((errors > 0) && file_not_found ()))
+ if (handle || ((errors > 0) && !file_not_found ()))
{
LT_DLFREE (tmp);
return handle;
@@ -3337,7 +3820,7 @@ lt_dlsym (handle, symbol)
lt_dlhandle handle;
const char *symbol;
{
- int lensym;
+ size_t lensym;
char lsym[LT_SYMBOL_LENGTH];
char *sym;
lt_ptr address;
Index: m4/m4module.h
===================================================================
RCS file: /cvsroot/m4/m4/m4/m4module.h,v
retrieving revision 1.38
diff -u -p -u -r1.38 m4module.h
--- m4/m4module.h 29 May 2002 18:06:42 -0000 1.38
+++ m4/m4module.h 30 May 2003 15:11:59 -0000
@@ -1,5 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc.
+ Copyright 1989-1994, 1999, 2000, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -183,45 +183,49 @@ extern m4_builtin_func *m4_token_func
while (0)
/* The name this program was run with. */
-const char *program_name;
+#ifdef _LIBC
+/* In the GNU C library, there is a predefined variable for this. */
+# define program_name program_invocation_name
+#endif
+extern const char *program_name;
/* Option flags (defined in utility.c; set in m4.c). */
-int interactive; /* -e */
-int sync_output; /* -s */
-int debug_level; /* -d */
-int hash_table_size; /* -H */
-int no_gnu_extensions; /* -G */
-int prefix_all_builtins; /* -P */
-int max_debug_argument_length; /* -l */
-int suppress_warnings; /* -Q */
-int warning_status; /* -E */
-int nesting_limit; /* -L */
-int discard_comments; /* -c */
+extern int interactive; /* -e */
+extern int sync_output; /* -s */
+extern int debug_level; /* -d */
+extern int hash_table_size; /* -H */
+extern int no_gnu_extensions; /* -G */
+extern int prefix_all_builtins; /* -P */
+extern int max_debug_argument_length; /* -l */
+extern int suppress_warnings; /* -Q */
+extern int warning_status; /* -E */
+extern int nesting_limit; /* -L */
+extern int discard_comments; /* -c */
/* left and right quote, begin and end comment */
-m4_string lquote;
-m4_string rquote;
+extern m4_string lquote;
+extern m4_string rquote;
-m4_string bcomm;
-m4_string ecomm;
+extern m4_string bcomm;
+extern m4_string ecomm;
#define DEF_LQUOTE "`"
#define DEF_RQUOTE "\'"
#define DEF_BCOMM "#"
#define DEF_ECOMM "\n"
-boolean m4_bad_argc (int, m4_token **, int, int);
-const char *m4_skip_space (const char *);
-boolean m4_numeric_arg (int, m4_token **, int, int *);
-void m4_shipout_int (struct obstack *, int);
-void m4_shipout_string (struct obstack*, const char*, int, boolean);
-void m4_dump_args (struct obstack *obs, int argc, m4_token **argv, const char
*sep, boolean quoted);
+extern boolean m4_bad_argc (int, m4_token **, int, int);
+extern const char *m4_skip_space (const char *);
+extern boolean m4_numeric_arg (int, m4_token **, int, int *);
+extern void m4_shipout_int (struct obstack *, int);
+extern void m4_shipout_string (struct obstack*, const char*, int, boolean);
+extern void m4_dump_args (struct obstack *obs, int argc, m4_token **argv,
const char *sep, boolean quoted);
/* --- RUNTIME DEBUGGING --- */
-FILE *m4_debug;
+extern FILE *m4_debug;
/* The value of debug_level is a bitmask of the following. */
@@ -311,33 +315,33 @@ FILE *m4_debug;
} \
while (0)
-void m4_debug_init (void);
-void m4_debug_exit (void);
-int m4_debug_decode (const char *);
-void m4_debug_flush_files (void);
-boolean m4_debug_set_output (const char *);
-void m4_debug_message_prefix (void);
-
-void m4_trace_prepre (const char *, int);
-void m4_trace_pre (const char *, int, int, m4_token **);
-void m4_trace_post (const char *, int, int, m4_token **,
+extern void m4_debug_init (void);
+extern void m4_debug_exit (void);
+extern int m4_debug_decode (const char *);
+extern void m4_debug_flush_files (void);
+extern boolean m4_debug_set_output (const char *);
+extern void m4_debug_message_prefix (void);
+
+extern void m4_trace_prepre (const char *, int);
+extern void m4_trace_pre (const char *, int, int, m4_token **);
+extern void m4_trace_post (const char *, int, int, m4_token **,
const char *);
/* Exit code from last "syscmd" command. */
-int m4_sysval;
-int m4_expansion_level;
+extern int m4_sysval;
+extern int m4_expansion_level;
-const char *m4_expand_ranges (const char *s, struct obstack *obs);
-void m4_expand_input (void);
-void m4_call_macro (m4_symbol *, int, m4_token **, struct obstack *);
-void m4_process_macro (struct obstack *obs, m4_symbol *symbol, int argc,
m4_token **argv);
+extern const char *m4_expand_ranges (const char *s, struct obstack *obs);
+extern void m4_expand_input (void);
+extern void m4_call_macro (m4_symbol *, int, m4_token **, struct obstack *);
+extern void m4_process_macro (struct obstack *obs, m4_symbol *symbol, int
argc, m4_token **argv);
/* --- SYNTAX TABLE DEFINITIONS --- */
/* Please read the comment at the top of input.c for details */
-unsigned short m4_syntax_table[256];
+extern unsigned short m4_syntax_table[256];
extern void m4_syntax_init (void);
extern void m4_syntax_exit (void);
@@ -399,8 +403,8 @@ extern int m4_syntax_code (char ch);
/* --- TOKENISATION AND INPUT --- */
/* current input file, and line */
-const char *m4_current_file;
-int m4_current_line;
+extern const char *m4_current_file;
+extern int m4_current_line;
extern void m4_input_init (void);
extern void m4_input_exit (void);
@@ -423,8 +427,8 @@ extern void m4_set_quotes (const char *,
extern void m4_set_comment (const char *, const char *);
extern void m4_set_syntax (char, const unsigned char *);
-int m4_current_diversion;
-int m4_output_current_line;
+extern int m4_current_diversion;
+extern int m4_output_current_line;
extern void m4_output_init (void);
extern void m4_output_exit (void);
Index: m4/utility.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/utility.c,v
retrieving revision 1.21
diff -u -p -u -r1.21 utility.c
--- m4/utility.c 13 Oct 2001 08:55:43 -0000 1.21
+++ m4/utility.c 30 May 2003 15:11:59 -0000
@@ -1,5 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright 1989-1994, 1998-1999 Free Software Foundation, Inc.
+ Copyright 1989-1994, 1998-1999, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -25,9 +25,6 @@
#include "m4private.h"
static int dumpdef_cmp (const void *s1, const void *s2);
-
-/* The name this program was run with. */
-const char *program_name;
/* Exit code from last "syscmd" command. */
int m4_sysval = 0;
Index: modules/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/modules/Makefile.am,v
retrieving revision 1.17
diff -u -p -u -r1.17 Makefile.am
--- modules/Makefile.am 30 Sep 2001 14:23:27 -0000 1.17
+++ modules/Makefile.am 30 May 2003 15:11:59 -0000
@@ -1,5 +1,5 @@
## This file is part of GNU m4
-## Copyright 2000, 2001 Free Software Foundation, Inc.
+## Copyright 2000, 2001, 2003 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -30,17 +30,14 @@ EXTRA_DIST = modtest.m4 shadow.m4 time.m
INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
-I$(top_builddir)/m4 -I$(top_srcdir)/m4 $(INTLINCL)
LIBS = $(top_builddir)/m4/libm4.la
-LDFLAGS = -no-undefined
+AM_LDFLAGS = -no-undefined
pkglibexec_LTLIBRARIES = gnu.la load.la m4.la \
traditional.la perl.la \
modtest.la shadow.la stdlib.la time.la
-## Aaaarg. Automake 1.5 doesn't seem to like
-## pkglibexec_LTLIBRARIES += mpeval.la
-pkglibexec2dir = $(pkglibexecdir)
if USE_GMP
-pkglibexec2_LTLIBRARIES = mpeval.la
+pkglibexec_LTLIBRARIES += mpeval.la
endif
gnu_la_SOURCES = gnu.c
@@ -81,3 +78,4 @@ time_la_LDFLAGS = -module
BUILT_SOURCES = perlxsi.c
perlxsi.c:
perl -MExtUtils::Embed -e xsinit -- -o perlxsi.c
+
Index: po/cs.po
===================================================================
RCS file: /cvsroot/m4/m4/po/cs.po,v
retrieving revision 1.26
diff -u -p -u -r1.26 cs.po
--- po/cs.po 4 Nov 2002 14:28:44 -0000 1.26
+++ po/cs.po 30 May 2003 15:11:59 -0000
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
-"POT-Creation-Date: 2002-11-04 15:29+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-05-30 14:35+0100\n"
"PO-Revision-Date: 1998-12-07 22:02+01:00\n"
"Last-Translator: Jiøí Pavlovský <address@hidden>\n"
"Language-Team: Czech <address@hidden>\n"
@@ -610,31 +611,31 @@ msgstr ""
"Chyby v programu oznamujte na adrese <address@hidden> (anglicky).\n"
"Pøipomínky k pøekladu zasílejte na adresu <address@hidden> (èesky).\n"
-#: src/main.c:307
+#: src/main.c:305
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:311
+#: src/main.c:309
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
# , c-format
-#: src/main.c:340
+#: src/main.c:338
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "©patné ladící volby: `%s'"
-#: src/main.c:368
+#: src/main.c:366
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:371
+#: src/main.c:369
msgid "Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:374
+#: src/main.c:372
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/de.po
===================================================================
RCS file: /cvsroot/m4/m4/po/de.po,v
retrieving revision 1.26
diff -u -p -u -r1.26 de.po
--- po/de.po 4 Nov 2002 14:28:44 -0000 1.26
+++ po/de.po 30 May 2003 15:11:59 -0000
@@ -7,7 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: m4 1.4ppre2\n"
-"POT-Creation-Date: 2002-11-04 15:29+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-05-30 14:35+0100\n"
"PO-Revision-Date: 1999-03-20 00:46+01:00\n"
"Last-Translator: Martin von Löwis <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -580,30 +581,30 @@ msgstr ""
"\n"
"Probleme und Fehler an <address@hidden>.\n"
-#: src/main.c:307
+#: src/main.c:305
#, fuzzy, c-format
msgid "failed to add search directory `%s'"
msgstr "FEHLER: konnte Suchpfad `%s' nicht hinzufügen"
-#: src/main.c:311
+#: src/main.c:309
#, fuzzy, c-format
msgid "failed to add search directory `%s': %s"
msgstr "FEHLER: konnte Suchpfad `%s' nicht hinzufügen: %s"
-#: src/main.c:340
+#: src/main.c:338
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "Falsche Debug Flags: »%s«"
-#: src/main.c:368
+#: src/main.c:366
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:371
+#: src/main.c:369
msgid "Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:374
+#: src/main.c:372
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/el.po
===================================================================
RCS file: /cvsroot/m4/m4/po/el.po,v
retrieving revision 1.26
diff -u -p -u -r1.26 el.po
--- po/el.po 4 Nov 2002 14:28:44 -0000 1.26
+++ po/el.po 30 May 2003 15:11:59 -0000
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU m4 1.4n\n"
-"POT-Creation-Date: 2002-11-04 15:29+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-05-30 14:35+0100\n"
"PO-Revision-Date: 1999-06-24 00:25+0000\n"
"Last-Translator: Simos Xenitellis <address@hidden>\n"
"Language-Team: Greek <address@hidden>\n"
@@ -577,30 +578,30 @@ msgstr ""
"\n"
"ÁíáöÝñáôå óöÜëìáôá óôï <address@hidden>.\n"
-#: src/main.c:307
+#: src/main.c:305
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:311
+#: src/main.c:309
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:340
+#: src/main.c:338
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "ËÜèïò óçìáßåò åêóöáëìÜôùóçò: `%s'"
-#: src/main.c:368
+#: src/main.c:366
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:371
+#: src/main.c:369
msgid "Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:374
+#: src/main.c:372
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/fr.po
===================================================================
RCS file: /cvsroot/m4/m4/po/fr.po,v
retrieving revision 1.26
diff -u -p -u -r1.26 fr.po
--- po/fr.po 4 Nov 2002 14:28:44 -0000 1.26
+++ po/fr.po 30 May 2003 15:11:59 -0000
@@ -7,7 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: m4 1.4d\n"
-"POT-Creation-Date: 2002-11-04 15:29+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-05-30 14:35+0100\n"
"PO-Revision-Date: 1998-05-23 11:53+02:00\n"
"Last-Translator: Erick Branderhorst <address@hidden>\n"
"Language-Team: dutch <address@hidden>\n"
@@ -564,30 +565,30 @@ msgid ""
"Report bugs to <address@hidden>.\n"
msgstr ""
-#: src/main.c:307
+#: src/main.c:305
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:311
+#: src/main.c:309
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:340
+#: src/main.c:338
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "Mauvais indicateurs de mise-au-point: «%s»"
-#: src/main.c:368
+#: src/main.c:366
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:371
+#: src/main.c:369
msgid "Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:374
+#: src/main.c:372
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/it.po
===================================================================
RCS file: /cvsroot/m4/m4/po/it.po,v
retrieving revision 1.27
diff -u -p -u -r1.27 it.po
--- po/it.po 4 Nov 2002 14:28:44 -0000 1.27
+++ po/it.po 30 May 2003 15:11:59 -0000
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU M4\n"
-"POT-Creation-Date: 2002-11-04 15:29+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-05-30 14:35+0100\n"
"PO-Revision-Date: 2002-11-04 13:19+0100\n"
"Last-Translator: full name <address@hidden>\n"
"Language-Team: Italian <address@hidden>\n"
@@ -510,30 +511,30 @@ msgid ""
"Report bugs to <address@hidden>.\n"
msgstr ""
-#: src/main.c:307
+#: src/main.c:305
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:311
+#: src/main.c:309
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:340
+#: src/main.c:338
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "Indicatori di debug errati: `%s'"
-#: src/main.c:368
+#: src/main.c:366
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:371
+#: src/main.c:369
msgid "Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:374
+#: src/main.c:372
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/ja.po
===================================================================
RCS file: /cvsroot/m4/m4/po/ja.po,v
retrieving revision 1.26
diff -u -p -u -r1.26 ja.po
--- po/ja.po 4 Nov 2002 14:28:44 -0000 1.26
+++ po/ja.po 30 May 2003 15:11:59 -0000
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU m4 1.4.3\n"
-"POT-Creation-Date: 2002-11-04 15:29+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-05-30 14:35+0100\n"
"PO-Revision-Date: 1996-03-28 11:52 EST\n"
"Last-Translator: Akiko Matsushita <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -572,30 +573,30 @@ msgid ""
"Report bugs to <address@hidden>.\n"
msgstr ""
-#: src/main.c:307
+#: src/main.c:305
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:311
+#: src/main.c:309
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:340
+#: src/main.c:338
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "`%s' ¤ÏÉÔÀµ¤Ê¥Ç¥Ð¥Ã¥°¥ª¥×¥·¥ç¥ó°ú¿ô¤Ç¤¹¡£"
-#: src/main.c:368
+#: src/main.c:366
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:371
+#: src/main.c:369
msgid "Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:374
+#: src/main.c:372
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/nl.po
===================================================================
RCS file: /cvsroot/m4/m4/po/nl.po,v
retrieving revision 1.26
diff -u -p -u -r1.26 nl.po
--- po/nl.po 4 Nov 2002 14:28:44 -0000 1.26
+++ po/nl.po 30 May 2003 15:11:59 -0000
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: m4 1.4d\n"
-"POT-Creation-Date: 2002-11-04 15:29+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-05-30 14:35+0100\n"
"PO-Revision-Date: 1998-05-23 09:27+02:00\n"
"Last-Translator: Erick Branderhorst <address@hidden>\n"
"Language-Team: dutch <address@hidden>\n"
@@ -570,30 +571,30 @@ msgstr ""
"\n"
"Meld fouten via <address@hidden>.\n"
-#: src/main.c:307
+#: src/main.c:305
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:311
+#: src/main.c:309
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:340
+#: src/main.c:338
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "Onjuiste debug vlaggen: `%s'"
-#: src/main.c:368
+#: src/main.c:366
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:371
+#: src/main.c:369
msgid "Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:374
+#: src/main.c:372
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/pl.po
===================================================================
RCS file: /cvsroot/m4/m4/po/pl.po,v
retrieving revision 1.26
diff -u -p -u -r1.26 pl.po
--- po/pl.po 4 Nov 2002 14:28:44 -0000 1.26
+++ po/pl.po 30 May 2003 15:11:59 -0000
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
-"POT-Creation-Date: 2002-11-04 15:29+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-05-30 14:35+0100\n"
"PO-Revision-Date: 1999-05-03 19:47+0200\n"
"Last-Translator: Rafa³ Maszkowski <address@hidden>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -563,30 +564,30 @@ msgstr ""
"\n"
"Raporty o b³êdach wysy³aj do address@hidden"
-#: src/main.c:307
+#: src/main.c:305
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:311
+#: src/main.c:309
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:340
+#: src/main.c:338
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "B³êdne flagi debugowania: `%s'"
-#: src/main.c:368
+#: src/main.c:366
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:371
+#: src/main.c:369
msgid "Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:374
+#: src/main.c:372
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/ru.po
===================================================================
RCS file: /cvsroot/m4/m4/po/ru.po,v
retrieving revision 1.26
diff -u -p -u -r1.26 ru.po
--- po/ru.po 4 Nov 2002 14:28:44 -0000 1.26
+++ po/ru.po 30 May 2003 15:11:59 -0000
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
-"POT-Creation-Date: 2002-11-04 15:29+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-05-30 14:35+0100\n"
"PO-Revision-Date: 1999-04-17 20:58\n"
"Last-Translator: Denis Y. Pershin <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -570,30 +571,30 @@ msgstr ""
"\n"
"ðÏÓÙÌÁÊÔÅ ÏÔÞÅÔÙ Ï ÏÛÉÂËÁÈ ÎÁ <address@hidden>.\n"
-#: src/main.c:307
+#: src/main.c:305
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:311
+#: src/main.c:309
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:340
+#: src/main.c:338
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "îÅ×ÅÒÎÙÊ ÆÌÁÇ ÏÔÌÁÄËÉ: '%s'"
-#: src/main.c:368
+#: src/main.c:366
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:371
+#: src/main.c:369
msgid "Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:374
+#: src/main.c:372
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: po/sv.po
===================================================================
RCS file: /cvsroot/m4/m4/po/sv.po,v
retrieving revision 1.27
diff -u -p -u -r1.27 sv.po
--- po/sv.po 4 Nov 2002 14:28:44 -0000 1.27
+++ po/sv.po 30 May 2003 15:11:59 -0000
@@ -6,7 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
-"POT-Creation-Date: 2002-11-04 15:29+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-05-30 14:35+0100\n"
"PO-Revision-Date: 1999-03-28 18:56 +02:00\n"
"Last-Translator: Jan Djärv <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -565,30 +566,30 @@ msgstr ""
"Rapportera fel till <address@hidden>.\n"
"Rapportera fel på översättningen till <address@hidden>.\n"
-#: src/main.c:307
+#: src/main.c:305
#, c-format
msgid "failed to add search directory `%s'"
msgstr ""
-#: src/main.c:311
+#: src/main.c:309
#, c-format
msgid "failed to add search directory `%s': %s"
msgstr ""
-#: src/main.c:340
+#: src/main.c:338
#, c-format
msgid "Bad debug flags: `%s'"
msgstr "Okänd felsökningsflagga \"%s\""
-#: src/main.c:368
+#: src/main.c:366
msgid "Written by Rene' Seindal and Gary V. Vaughan.\n"
msgstr ""
-#: src/main.c:371
+#: src/main.c:369
msgid "Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc."
msgstr ""
-#: src/main.c:374
+#: src/main.c:372
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
Index: src/main.c
===================================================================
RCS file: /cvsroot/m4/m4/src/main.c,v
retrieving revision 1.33
diff -u -p -u -r1.33 main.c
--- src/main.c 29 May 2002 18:06:42 -0000 1.33
+++ src/main.c 30 May 2003 15:11:59 -0000
@@ -1,5 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright 1989-1994, 1999, 2000 Free Software Foundation, Inc.
+ Copyright 1989-1994, 1999, 2000, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -200,8 +200,6 @@ static const struct option long_options[
};
#define OPTSTRING "B:D:EF:GH:I:L:M:N:PQR:S:T:U:bcd::el:m:o:st:"
-
-#include <dlfcn.h>
int
main (int argc, char *const *argv, char *const *envp)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: 1-gary-darwin6.6-tidyup.patch,
Gary V. Vaughan <=