|
From: Anton A. <an...@us...> - 2005-06-20 14:32:31
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11789 Modified Files: AUTHORS ChangeLog Makefile.in NEWS README aclocal.m4 autogen.sh config.guess config.h.in config.sub configure configure.ac ltmain.sh Log Message: Eeek. Someone did a commit just as I was about to commit so the commit message was lost! )-: Now again... Monster commit from me due to lack of time. Sorry about that. Features: - Version to 1.10.0 - Update readme, etc ready for release. - Update build system to suse linux 9.3 versions. - Fix warnings appearing for me on suse 9.3 with --enable-warnings --enable-debug. - Set attr_name to NULL in libntfs/attrib.c::__ntfs_attr_init() and fixup all callers apropriately. Thanks to FlatCap/Rich for pointing this out. - Determine endianness in ./configure and use that in addition to existing mechanisms for determining endianness. Index: AUTHORS =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/AUTHORS,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- AUTHORS 13 Jul 2004 13:01:42 -0000 1.11 +++ AUTHORS 20 Jun 2005 14:31:30 -0000 1.12 @@ -5,7 +5,6 @@ Current active developers on the project Anton Altaparmakov <ai...@ca...> Yuval Fledel (no email address on request) -Lode Leroy <lod...@ho...> -Leonard Norrgård <vi...@ni...> +Yura Pakhuchiy <pak...@gm...> Richard Russon <nt...@fl...> Szakacsits Szabolcs <sz...@si...> Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.229 retrieving revision 1.230 diff -u -p -r1.229 -r1.230 --- ChangeLog 12 Jun 2005 18:12:55 -0000 1.229 +++ ChangeLog 20 Jun 2005 14:31:30 -0000 1.230 @@ -1,4 +1,4 @@ -xx/xx/2005 - 2.0.0-WIP +20/06/2005 - 1.10.0 - Lots of new features, enhancements, and bug fixes. - Add start_vcn parameter to ntfs_get_size_for_mapping_pairs() and ntfs_mapping_pairs_build() and adapt all callers. @@ -162,6 +162,11 @@ xx/xx/2005 - 2.0.0-WIP - Move utils_pathname_to_inode from to library (dir.c), adapt it for the library, rename it to ntfs_pathname_to_inode, update all users. (Yura) + - Set attr_name to NULL in libntfs/attrib.c::__ntfs_attr_init() and + fixup all callers apropriately. Thanks to FlatCap/Rich for pointing + this out. (Anton) + - Determine endianness in ./configure and use that in addition to + existing mechanisms for determining endianness. (Anton) 04/09/2004 - 1.9.4 - Urgent bug fixes. Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/Makefile.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- Makefile.in 6 Jun 2005 14:31:37 -0000 1.30 +++ Makefile.in 20 Jun 2005 14:31:31 -0000 1.31 @@ -140,7 +140,6 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ Index: NEWS =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/NEWS,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- NEWS 6 Jun 2005 09:18:33 -0000 1.22 +++ NEWS 20 Jun 2005 14:31:39 -0000 1.23 @@ -9,7 +9,8 @@ Moved back from BitKeeper to CVS on SF.n ntfsprogs should now work completely on Windows 2000 and XP (Cygwin). mkntfs does not create bootable volumes when on Windows. Volumes are locked -when using a R/W utility in order to prevent data corruption. (Yuval Fledel) +when using a R/W utility in order to prevent data corruption. (Yuval Fledel, +Anton Altaparmakov) ntfsinfo has been extended and now provides much more detailed information as well as being able to resolve a path/filename instead of requiring the inode @@ -29,8 +30,7 @@ Linux. ntfsprogs ("make libs" only) now compiles on FreeBSD, NetBSD, Windows (Cygwin), and DOS (DJGPP). Thanks to Christophe Grenier for DOS and FreeBSD testing -and fixes and to Lode Leroy for Windows testing and fixes. Note, the Windows -version is read-only and has limited functionality at present. +and fixes and to Lode Leroy for Windows testing and fixes. Older news Index: README =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/README,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- README 19 May 2005 21:34:18 -0000 1.14 +++ README 20 Jun 2005 14:31:39 -0000 1.15 @@ -117,3 +117,5 @@ ntfsls - List information about files in partition. See man 8 ntfsls for details. ntfscat - Concatenate files and print their contents on the standard output. + +ntfscp - Overwrite files on an NTFS partition. Index: aclocal.m4 =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/aclocal.m4,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- aclocal.m4 6 Jun 2005 14:31:37 -0000 1.23 +++ aclocal.m4 20 Jun 2005 14:31:39 -0000 1.24 @@ -123,7 +123,7 @@ esac # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='sed -e s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -191,7 +191,7 @@ if test -n "$RANLIB"; then old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi [...1071 lines suppressed...] + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], - [$4]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. # Index: autogen.sh =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/autogen.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- autogen.sh 6 Jun 2005 14:31:39 -0000 1.8 +++ autogen.sh 20 Jun 2005 14:31:42 -0000 1.9 @@ -24,8 +24,8 @@ fi exit 1 } -echo Running autoreconf --verbose --install --warnings=all -autoreconf --force --verbose --install --warnings=all +echo Running autoreconf --verbose --install +autoreconf --force --verbose --install # This gets around the BitKeeper problem that it checks out files with the # current time stamp rather than the time stamp at check in time. Index: config.guess =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.guess,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- config.guess 6 Jun 2005 14:31:39 -0000 1.19 +++ config.guess 20 Jun 2005 14:31:42 -0000 1.20 @@ -136,6 +136,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_MACHINE}" in + i?86) + test -z "$VENDOR" && VENDOR=pc + ;; + *) + test -z "$VENDOR" && VENDOR=unknown + ;; +esac +test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -825,25 +835,25 @@ EOF echo ${UNAME_MACHINE}-pc-minix exit 0 ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo cris-axis-linux exit 0 ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo crisv32-axis-linux exit 0 ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo frv-${VENDOR}-linux exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; mips:Linux:*:*) eval $set_cc_for_build @@ -862,7 +872,7 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -881,13 +891,13 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-${VENDOR}-linux exit 0 ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-${VENDOR}-linux exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -900,34 +910,34 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC} exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-${VENDOR}-linux ;; + PA8*) echo hppa2.0-${VENDOR}-linux ;; + *) echo hppa-${VENDOR}-linux ;; esac exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-${VENDOR}-linux exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux exit 0 ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo x86_64-${VENDOR}-linux exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -942,18 +952,18 @@ EOF p'` case "$ld_supported_targets" in elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux" ;; a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" + echo "${UNAME_MACHINE}-${VENDOR}-linuxaout" exit 0 ;; coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" + echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff" exit 0 ;; "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or + # Either a pre-BFD a.out linker (linuxoldld) or # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld" exit 0 ;; esac # Determine whether the default compiler is a.out or elf @@ -982,7 +992,7 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) Index: config.h.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.h.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- config.h.in 6 Jun 2005 14:31:39 -0000 1.17 +++ config.h.in 20 Jun 2005 14:31:42 -0000 1.18 @@ -60,10 +60,6 @@ /* Define to 1 if you have the <locale.h> header file. */ #undef HAVE_LOCALE_H -/* Define to 1 if long double works and has more range or precision than - double. */ -#undef HAVE_LONG_DOUBLE - /* Define to 1 if you have the <machine/endian.h> header file. */ #undef HAVE_MACHINE_ENDIAN_H @@ -239,6 +235,14 @@ /* Version number of package */ #undef VERSION +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN + +/* Define to 1 if your processor stores words with the least significant byte + first (like Intel and VAX, unlike Motorola and SPARC). */ +#undef WORDS_LITTLEENDIAN + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS Index: config.sub =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.sub,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- config.sub 6 Jun 2005 14:31:39 -0000 1.19 +++ config.sub 20 Jun 2005 14:31:42 -0000 1.20 @@ -1172,7 +1172,7 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ @@ -1205,9 +1205,6 @@ case $os in -linux-dietlibc) os=-linux-dietlibc ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -sunos5*) os=`echo $os | sed -e 's|sunos5|solaris2|'` ;; Index: configure =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure,v retrieving revision 1.80 retrieving revision 1.81 diff -u -p -r1.80 -r1.81 --- configure 6 Jun 2005 14:31:39 -0000 1.80 +++ configure 20 Jun 2005 14:31:42 -0000 1.81 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for ntfsprogs 2.0.0-WIP. +# Generated by GNU Autoconf 2.59 for ntfsprogs 1.10.0. # # Report bugs to <lin...@li...>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='ntfsprogs' PACKAGE_TARNAME='ntfsprogs' [...2510 lines suppressed...] generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23716,7 +23503,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -ntfsprogs config.status 2.0.0-WIP +ntfsprogs config.status 1.10.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -24006,7 +23793,6 @@ s,@FFLAGS@,$FFLAGS,;t t s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@LIBNTFS_GNOMEVFS_CFLAGS@,$LIBNTFS_GNOMEVFS_CFLAGS,;t t s,@LIBNTFS_GNOMEVFS_LIBS@,$LIBNTFS_GNOMEVFS_LIBS,;t t s,@ENABLE_GNOME_VFS_TRUE@,$ENABLE_GNOME_VFS_TRUE,;t t Index: configure.ac =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- configure.ac 6 Jun 2005 14:31:42 -0000 1.57 +++ configure.ac 20 Jun 2005 14:31:47 -0000 1.58 @@ -2,7 +2,7 @@ # configure.ac - Source file to generate "./configure" to prepare package for # compilation. # -# Copyright (c) 2000-2004 Anton Altaparmakov +# Copyright (c) 2000-2005 Anton Altaparmakov # Copyright (c) 2003 Jan Kratochvil # # This program/include file is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ # AC_PREREQ(2.59) -AC_INIT([ntfsprogs],[2.0.0-WIP],[lin...@li...]) +AC_INIT([ntfsprogs],[1.10.0],[lin...@li...]) AC_CANONICAL_HOST([]) AC_CANONICAL_TARGET([]) AC_CONFIG_SRCDIR([config.h.in]) @@ -199,9 +199,13 @@ AC_CHECK_HEADERS([ctype.h fcntl.h libint # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL +AC_C_BIGENDIAN(, + [AC_DEFINE([WORDS_LITTLEENDIAN], 1, + [Define to 1 if your processor stores words with the least significant + byte first (like Intel and VAX, unlike Motorola and SPARC).])] + ,) AC_C_CONST AC_C_INLINE -AC_C_LONG_DOUBLE AC_TYPE_OFF_T AC_TYPE_SIZE_T AC_STRUCT_ST_BLOCKS Index: ltmain.sh =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ltmain.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- ltmain.sh 6 Jun 2005 14:31:42 -0000 1.16 +++ ltmain.sh 20 Jun 2005 14:31:47 -0000 1.17 @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -43,8 +43,8 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.18 -TIMESTAMP=" (1.1220.2.246 2005/05/16 10:00:18)" +VERSION=1.5.14 +TIMESTAMP=" (1.1220.2.195 2005/02/12 12:12:33)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -112,9 +112,8 @@ if test "${LANG+set}" = set; then fi # Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" +: ${IFS=" +"} if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then $echo "$modename: not configured to build any kind of library" 1>&2 @@ -251,14 +250,37 @@ func_extract_an_archive () { f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" + f_ex_an_ar_lib=`$echo "X$f_ex_an_ar_oldlib" | $Xsed -e 's%^.*/%%'` $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $show "cp $f_ex_an_ar_oldlib $f_ex_an_ar_dir/$f_ex_an_ar_lib" + $run eval "cp \$f_ex_an_ar_oldlib \$f_ex_an_ar_dir/\$f_ex_an_ar_lib" + $AR t "$f_ex_an_ar_oldlib" | sort | uniq -c \ + | $EGREP -v '^[ ]*1[ ]' | while read count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$f_ex_an_ar_dir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` + done + $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_lib '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_lib '$name' && $mv '$name' '$name_to' && $AR -d \$f_ex_an_ar_lib '$name')" || exit $? + i=`expr $i + 1` + done + done + $show "$rm $f_ex_an_ar_dir/$f_ex_an_ar_lib" + $run eval "$rm \$f_ex_an_ar_dir/\$f_ex_an_ar_lib" fi } @@ -735,15 +757,6 @@ if test -z "$show_help"; then esac done - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") - qlibobj="\"$qlibobj\"" ;; - esac - if test "X$libobj" != "X$qlibobj"; then - $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - exit $EXIT_FAILURE - fi objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` if test "X$xdir" = "X$obj"; then @@ -816,17 +829,12 @@ compiler." $run $rm $removelist exit $EXIT_FAILURE fi - $echo "$srcfile" > "$lockfile" + $echo $srcfile > "$lockfile" fi if test -n "$fix_srcfile_path"; then eval srcfile=\"$fix_srcfile_path\" fi - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") - qsrcfile="\"$qsrcfile\"" ;; - esac $run $rm "$libobj" "${libobj}T" @@ -848,10 +856,10 @@ EOF fbsd_hideous_sh_bug=$base_compile if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" + command="$base_compile $srcfile $pic_flag" else # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $srcfile" fi if test ! -d "${xdir}$objdir"; then @@ -931,9 +939,9 @@ EOF if test "$build_old_libs" = yes; then if test "$pic_mode" != yes; then # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $srcfile" else - command="$base_compile $qsrcfile $pic_flag" + command="$base_compile $srcfile $pic_flag" fi if test "$compiler_c_o" = yes; then command="$command -o $obj" @@ -1357,8 +1365,6 @@ EOF ;; darwin_framework) compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" prev= continue ;; @@ -1423,8 +1429,6 @@ EOF -framework) prev=darwin_framework compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" continue ;; @@ -2848,13 +2852,13 @@ EOF *) continue ;; esac case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in *" $depdepl "*) ;; *) deplibs="$depdepl $deplibs" ;; esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$deplibs $path" ;; + esac done fi # link_all_deplibs != no fi # linkmode = lib @@ -3120,7 +3124,7 @@ EOF case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 + $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; @@ -3129,7 +3133,7 @@ EOF case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 + $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; @@ -3138,7 +3142,7 @@ EOF case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 + $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; @@ -4365,18 +4369,8 @@ extern \"C\" { export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - $run eval "${SED} -e '1iEXPORTS'"' < "$export_symbols" > "$output_objdir/$outputname.def"' - ;; - esac else $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - case $host in - *cygwin* | *mingw* ) - $run eval "${SED} -e '1iEXPORTS'"' < "$output_objdir/$outputname.exp" > "$output_objdir/$outputname.def"' - ;; - esac $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi @@ -4499,25 +4493,12 @@ static const void *lt_preloaded_setup() $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. - #$show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - #$run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" + $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" + $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" # Transform the symbol file into the correct name. - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - fi - ;; - * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - ;; - esac + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 @@ -4546,9 +4527,8 @@ static const void *lt_preloaded_setup() # Delete the generated files. if test -n "$dlsyms"; then - #$show "$rm $output_objdir/${outputname}S.${objext}" - #$run $rm "$output_objdir/${outputname}S.${objext}" - : + $show "$rm $output_objdir/${outputname}S.${objext}" + $run $rm "$output_objdir/${outputname}S.${objext}" fi exit $status @@ -4691,9 +4671,8 @@ static const void *lt_preloaded_setup() esac case $host in *cygwin* | *mingw* ) - output_path=`dirname $output` - cwrappersource=`$echo ${output_path}/${objdir}/lt-${outputname}.c` - cwrapper=`$echo ${output_path}/${outputname}.exe` + cwrappersource=`$echo ${objdir}/lt-${outputname}.c` + cwrapper=`$echo ${output}.exe` $rm $cwrappersource $cwrapper trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -4720,7 +4699,6 @@ EOF #include <malloc.h> #include <stdarg.h> #include <assert.h> -#include <sys/stat.h> #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4731,19 +4709,15 @@ EOF #endif #ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' +#define DIR_SEPARATOR '/' #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif +#define HAVE_DOS_BASED_FILE_SYSTEM +#ifndef DIR_SEPARATOR_2 +#define DIR_SEPARATOR_2 '\\' +#endif #endif #ifndef DIR_SEPARATOR_2 @@ -4753,30 +4727,17 @@ EOF (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif - const char *program_name = NULL; void * xmalloc (size_t num); char * xstrdup (const char *string); char * basename (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); +char * fnqualify(const char *path); char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); @@ -4787,8 +4748,6 @@ main (int argc, char *argv[]) int i; program_name = (char *) xstrdup ((char *) basename (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); newargz = XMALLOC(char *, argc+2); EOF @@ -4797,23 +4756,13 @@ EOF EOF cat >> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); + newargz[1] = fnqualify(argv[0]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newar... [truncated message content] |
