Changeset 1391 for branches/GNU/src/gcc/fastjar

Timestamp:

Apr 27, 2004, 8:39:34 PM (21 years ago)

Author:

bird

Message:

GCC v3.3.3 sources.

Location:

branches/GNU/src/gcc

Files:

• . (modified) (1 prop)
• fastjar/ChangeLog (modified) (3 diffs, 1 prop)
• fastjar/Makefile.am (modified) (1 diff, 1 prop)
• fastjar/Makefile.in (modified) (18 diffs, 1 prop)
• fastjar/README (modified) (1 diff, 1 prop)
• fastjar/aclocal.m4 (modified) (1 diff, 1 prop)
• fastjar/config.h.in (modified) (3 diffs, 1 prop)
• fastjar/configure (modified) (13 diffs, 1 prop)
• fastjar/configure.in (modified) (3 diffs, 1 prop)
• fastjar/dostime.c (modified) (1 diff, 1 prop)
• fastjar/jargrep.c (modified) (5 diffs, 1 prop)
• fastjar/jartool.c (modified) (12 diffs, 1 prop)

branches/GNU/src/gcc

@@ -26 +26 @@
 configure.vr
 configure.vrs
+dir.info
 Makefile
-dir.info
 lost+found
 update.out

@@ -26 +26 @@
 configure.vr
 configure.vrs
+dir.info
 Makefile
-dir.info
 lost+found
 update.out

branches/GNU/src/gcc/fastjar/ChangeLog

@@ -1 @@
-2003-02-05  Release Manager
-
-        * GCC 3.2.2 Released.
-
-2002-11-19  Release Manager
-
-        * GCC 3.2.1 Released.
-
-2002-11-19  Release Manager
-
-        * GCC 3.2.1 Released.
-
-2002-11-18  Release Manager
-
-        * GCC 3.2.1 Released.
+2004-02-14  Release Manager
+
+        * GCC 3.3.3 Released.
+
+2003-10-16  Release Manager
+
+        * GCC 3.3.2 Released.
+
+2003-08-13  Matthias Klose  <doko@debian.org>
+
+        * fastjar.texi: License manual under the GPL.
+        * Makefile.am: Remove reference to fdl.texi
+        * Makefile.in: Regenerate
+
+2003-08-04  Release Manager
+
+        * GCC 3.3.1 Released.
+
+2003-07-11  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
+
+        * README: Note that FastJar is not part of GCC.
+
+2003-05-13  Release Manager
+
+        * GCC 3.3 Released.
+
+2003-03-30  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+        * fastjar.texi: Remove @ at start of file.
+
+2003-03-10  Mohan Embar  <gnustuff@thisiscool.com>
+
+       * dostime.c: add #include <stddef.h> for definition of NULL
+
+2003-02-04  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+        * fastjar.texi: Update to GFDL 1.2.
+
+2003-01-31  Daiki Ueno  <ueno@unixuser.org>
+
+        * jartool.c (extract_jar): Don't lseek to skip extra fields.
+        (consume): If the stream is seekable, do lseek.
+
+2003-01-28  Ranjit Mathew  <rmathew@hotmail.com>
+
+        * jargrep.c: Include xregex.h from libiberty instead of
+        system regex.h for better portability.
+
+2003-01-21  Ranjit Mathew  <rmathew@hotmail.com>
+
+        * jartool.c (list_jar): Terminate the 'ascii_date' buffer
+        with a '\0' to guard against the case where the formatted
+        time string is more than the size allowed by the buffer.
+
+2002-12-30  DJ Delorie  <dj@redhat.com>
+
+        * Makefile.am (jar.1, grepjar.1): Protect against
+        texi2pod/pod2man failing.
+        * Makefile.in: Regenerated.
+
+2002-12-23  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+        * fastjar.texi: Include Cover Texts in man page.
+
+2002-12-04  Jakub Jelinek  <jakub@redhat.com>
+
+        * fastjar.texi (jar @direntry, grepjar @direntry): Add (fastjar).
+
+2002-11-21  Ranjit Mathew <rmathew@hotmail.com>
+
+        * jartool.c (extract_jar): Use "open" with O_BINARY instead of
+        "creat" to create extracted files.
 
 2002-11-11  Tom Tromey  <tromey@redhat.com>
@@ -22 +79 @@
         and day of month.
 
+2002-11-10  Jakub Jelinek  <jakub@redhat.com>
+
+        * jartool.c (add_to_jar): Only compare file to jarfile if jarfile is
+        non-NULL.
+
+        * configure.in (AC_CHECK_HEADERS): Add limits.h.
+        * configure, config.h.in: Rebuilt.
+
 2002-11-07  Tom Tromey  <tromey@redhat.com>
 
@@ -27 +92 @@
         * dostime.h (dostime): Removed.
 
-2002-08-14  Release Manager
-
-        * GCC 3.2 Released.
-
-2002-07-25  Release Manager
-
-        * GCC 3.1.1 Released.
-
-2002-05-14  Release Manager
-
-        * GCC 3.1 Released.
-
-2002-05-14  Release Manager
-
-        * GCC 3.1 Released.
+2002-10-20  Tom Tromey  <tromey@redhat.com>
+
+        * jartool.c: Use mode 0666 when opening new file.
+
+2002-10-15  Ranjit Mathew  <rmathew@hotmail.com>
+
+        * configure, config.h.in: Rebuilt.
+        * configure.in: Call gcc_AC_FUNC_MKDIR_TAKES_ONE_ARG.
+
+2002-09-11  Tom Tromey  <tromey@redhat.com>
+
+        * Makefile.in: Rebuilt.
+        * Makefile.am (TEXINFO_TEX): New macro.
+        (info_TEXINFOS): Likewise.
+        (fastjar_TEXINFOS): Likewise.
+        (man_MANS): Likewise.
+        (EXTRA_DIST): Likewise.
+        (my_makei_flags): Likewise.
+        (fastjar.info): New rule.
+        (fastjar_TEXINFOS): Don't mention `$(srcdir)'.
+        (TEXINFO_TEX): Likewise.
+        (AUTOMAKE_OPTIONS): Added `cygnus'.
+
+2002-09-11  Matthias Klose  <doko@debian.org>
+
+        * Makefile.am: Revert the previous patch.
+        * Makefile.in: Regenerated.
+
+2002-09-10  Matthias Klose  <doko@debian.org>
+
+        * fastjar.texi: New.
+        * Makefile.am: Support building info docs and manpages.
+        * Makefile.in: Regenerated.
+        * configure.in: Set gcc_version.
+        * configure: Regenerated.
+        * jargrep.c: Update usage and help strings.
+
+2002-09-09  Tom Tromey  <tromey@redhat.com>
+
+        * jartool.c (mkdir): Define.
+        * config.h.in: Rebuilt.
+        * aclocal.m4, configure: Rebuilt.
+        * acinclude.m4: New file.  Copied gcc_AC_COMPILE_CHECK_SIZEOF,
+        gcc_AC_EXAMINE_OBJECT, and fastjar_AC_COMPILE_C_BIGENDIAN from
+        aclocal.m4.
+
+2002-09-04  Tom Tromey  <tromey@redhat.com>
+
+        From greenrd@hotmail.com:
+        * jartool.c (list_jar): Correctly determine when new `filename'
+        buffer must be allocated.  Fixes PR java/7830.
+
+2002-06-03  Geoffrey Keating  <geoffk@redhat.com>
+
+        * configure.in: Support cross-compiling.
+        * configure: Regenerate.
+        * aclocal.m4 (gcc_AC_COMPILE_CHECK_SIZEOF): New.
+        (gcc_AC_EXAMINE_OBJECT): New.
+        (fastjar_AC_COMPILE_C_BIGENDIAN): New.
 
 2002-03-18  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>

branches/GNU/src/gcc/fastjar/Makefile.am

@@ -58 +58 @@
 
 AM_CFLAGS = @fastjar_warn_cflags@
+
+TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
+info_TEXINFOS = fastjar.texi
+fastjar_TEXINFOS = \
+        ../gcc/doc/include/gcc-common.texi \
+        ../gcc/doc/include/gpl.texi
+man_MANS = jar.1 grepjar.1
+EXTRA_DIST = $(man_MANS)
+
+## This is a hack.  We can't set AM_MAKEINFOFLAGS, since that isn't
+## available in 1.4.  Nor can we override or append to MAKEINFO or
+## MAKEINFOFLAGS, since these are overridden by the top-level
+## Makefile.  So, we just duplicate the rules.  FIXME: remove this
+## when we upgrade automake.  Note that we don't include $(srcdir) in
+## my_makei_flags; makeinfo is run in srcdir.
+my_makei_flags += -I ../gcc/doc/include
+fastjar.info: fastjar.texi $(fastjar_TEXINFOS)
+        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+        cd $(srcdir) \
+          && $(MAKEINFO) $(my_makei_flags) `echo $< | sed 's,.*/,,'`
+
+
+TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
+POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"
+
+$(srcdir)/jar.1: $(srcdir)/fastjar.texi
+        -$(TEXI2POD) -D jar < $(srcdir)/fastjar.texi > fastjar.pod
+        -($(POD2MAN) --section=1 fastjar.pod > jar.1.T$$$$ && \
+                mv -f jar.1.T$$$$ $(srcdir)/jar.1) || \
+                (rm -f jar.1.T$$$$ && exit 1)
+        -rm -f fastjar.pod
+
+$(srcdir)/grepjar.1: $(srcdir)/fastjar.texi
+        -$(TEXI2POD) -D grepjar < $(srcdir)/fastjar.texi > grepjar.pod
+        -($(POD2MAN) --section=1 grepjar.pod > grepjar.1.T$$$$ && \
+                mv -f grepjar.1.T$$$$ $(srcdir)/grepjar.1) || \
+                (rm -f grepjar.1.T$$$$ && exit 1)
+        -rm -f grepjar.pod

branches/GNU/src/gcc/fastjar/Makefile.in

@@ -1 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -74 +74 @@
 ZLIBS = @ZLIBS@
 fastjar_warn_cflags = @fastjar_warn_cflags@
+gcc_version = @gcc_version@
 
 AUTOMAKE_OPTIONS = no-dependencies
@@ -80 +81 @@
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
-AM_MAKEFLAGS = \
-        "AR_FLAGS=$(AR_FLAGS)" \
-        "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
-        "CFLAGS=$(CFLAGS)" \
-        "CXXFLAGS=$(CXXFLAGS)" \
-        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
-        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-        "INSTALL=$(INSTALL)" \
-        "INSTALL_DATA=$(INSTALL_DATA)" \
-        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-        "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-        "JC1FLAGS=$(JC1FLAGS)" \
-        "LDFLAGS=$(LDFLAGS)" \
-        "LIBCFLAGS=$(LIBCFLAGS)" \
-        "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
-        "MAKE=$(MAKE)" \
-        "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
-        "PICFLAG=$(PICFLAG)" \
-        "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
-        "SHELL=$(SHELL)" \
-        "exec_prefix=$(exec_prefix)" \
-        "infodir=$(infodir)" \
-        "libdir=$(libdir)" \
-        "prefix=$(prefix)" \
-        "AR=$(AR)" \
-        "AS=$(AS)" \
-        "CC=$(CC)" \
-        "CXX=$(CXX)" \
-        "LD=$(LD)" \
-        "LIBCFLAGS=$(LIBCFLAGS)" \
-        "NM=$(NM)" \
-        "PICFLAG=$(PICFLAG)" \
-        "RANLIB=$(RANLIB)" \
-        "DESTDIR=$(DESTDIR)"
+AM_MAKEFLAGS =          "AR_FLAGS=$(AR_FLAGS)"  "CC_FOR_BUILD=$(CC_FOR_BUILD)"  "CFLAGS=$(CFLAGS)"      "CXXFLAGS=$(CXXFLAGS)"  "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)"  "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)"        "INSTALL=$(INSTALL)"    "INSTALL_DATA=$(INSTALL_DATA)"  "INSTALL_PROGRAM=$(INSTALL_PROGRAM)"    "INSTALL_SCRIPT=$(INSTALL_SCRIPT)"      "JC1FLAGS=$(JC1FLAGS)"  "LDFLAGS=$(LDFLAGS)"    "LIBCFLAGS=$(LIBCFLAGS)"        "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)"  "MAKE=$(MAKE)"  "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)"         "PICFLAG=$(PICFLAG)"    "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)"      "SHELL=$(SHELL)"        "exec_prefix=$(exec_prefix)"    "infodir=$(infodir)"    "libdir=$(libdir)"      "prefix=$(prefix)"      "AR=$(AR)"      "AS=$(AS)"      "CC=$(CC)"      "CXX=$(CXX)"    "LD=$(LD)"      "LIBCFLAGS=$(LIBCFLAGS)"        "NM=$(NM)"      "PICFLAG=$(PICFLAG)"    "RANLIB=$(RANLIB)"      "DESTDIR=$(DESTDIR)"
 
 
@@ -121 +89 @@
 
 bin_PROGRAMS = jar grepjar
-jar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h \
-zipfile.h dostime.h compress.h pushback.h
+jar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
 
 jar_LDADD = $(ZLIBS) $(LIBIBERTY)
 jar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY)
 
-grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h \
-zipfile.h dostime.h compress.h pushback.h
+grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
 
 grepjar_LDADD = $(ZLIBS) $(LIBIBERTY)
@@ -134 +100 @@
 
 AM_CFLAGS = @fastjar_warn_cflags@
+
+TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
+info_TEXINFOS = fastjar.texi
+fastjar_TEXINFOS =      ../gcc/doc/include/gcc-common.texi      ../gcc/doc/include/gpl.texi
+
+man_MANS = jar.1 grepjar.1
+EXTRA_DIST = $(man_MANS)
+
+my_makei_flags =  -I ../gcc/doc/include
+
+TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
+POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -154 +132 @@
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS aclocal.m4 config.h.in configure \
-configure.in install-defs.sh.in install-sh missing mkinstalldirs
+TEXI2DVI = texi2dvi
+INFO_DEPS = fastjar.info
+DVIS = fastjar.dvi
+TEXINFOS = fastjar.texi
+man1dir = $(mandir)/man1
+MANS = $(man_MANS)
+
+NROFF = nroff
+DIST_COMMON =  README $(fastjar_TEXINFOS) ./stamp-h.in AUTHORS COPYING \
+ChangeLog INSTALL Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 \
+config.h.in configure configure.in install-defs.sh.in install-sh \
+missing mkinstalldirs
 
 
@@ -168 +155 @@
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .o .s
+.SUFFIXES: .S .c .dvi .info .o .ps .s .texi .texinfo .txi
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
         cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
@@ -176 +163 @@
           && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
         cd $(srcdir) && $(ACLOCAL)
 
@@ -266 +253 @@
         $(LINK) $(grepjar_LDFLAGS) $(grepjar_OBJECTS) $(grepjar_LDADD) $(LIBS)
 
+fastjar.info: fastjar.texi $(fastjar_TEXINFOS)
+fastjar.dvi: fastjar.texi $(fastjar_TEXINFOS)
+
+
+DVIPS = dvips
+
+.texi.info:
+        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+        cd $(srcdir) \
+          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texi.dvi:
+        TEXINPUTS=$(srcdir)/../gcc/doc/include:$$TEXINPUTS \
+          MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.texi:
+        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+        cd $(srcdir) \
+          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texinfo.info:
+        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+        cd $(srcdir) \
+          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texinfo:
+        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+        cd $(srcdir) \
+          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texinfo.dvi:
+        TEXINPUTS=$(srcdir)/../gcc/doc/include:$$TEXINPUTS \
+          MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.txi.info:
+        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+        cd $(srcdir) \
+          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.txi.dvi:
+        TEXINPUTS=$(srcdir)/../gcc/doc/include:$$TEXINPUTS \
+          MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.txi:
+        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+        cd $(srcdir) \
+          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+.dvi.ps:
+        $(DVIPS) $< -o $@
+
+install-info-am: $(INFO_DEPS)
+        @$(NORMAL_INSTALL)
+        $(mkinstalldirs) $(DESTDIR)$(infodir)
+        @list='$(INFO_DEPS)'; \
+        for file in $$list; do \
+          d=$(srcdir); \
+          for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+            if test -f $$d/$$ifile; then \
+              echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
+              $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+            else : ; fi; \
+          done; \
+        done
+        @$(POST_INSTALL)
+        @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+          list='$(INFO_DEPS)'; \
+          for file in $$list; do \
+            echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
+            install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+          done; \
+        else : ; fi
+
+uninstall-info:
+        $(PRE_UNINSTALL)
+        @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+          ii=yes; \
+        else ii=; fi; \
+        list='$(INFO_DEPS)'; \
+        for file in $$list; do \
+          test -z "$$ii" \
+            || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
+        done
+        @$(NORMAL_UNINSTALL)
+        list='$(INFO_DEPS)'; \
+        for file in $$list; do \
+          (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
+        done
+
+dist-info: $(INFO_DEPS)
+        list='$(INFO_DEPS)'; \
+        for base in $$list; do \
+          d=$(srcdir); \
+          for file in `cd $$d && eval echo $$base*`; do \
+            test -f $(distdir)/$$file \
+            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+            || cp -p $$d/$$file $(distdir)/$$file; \
+          done; \
+        done
+
+mostlyclean-aminfo:
+        -rm -f fastjar.aux fastjar.cp fastjar.cps fastjar.dvi fastjar.fn \
+          fastjar.fns fastjar.ky fastjar.kys fastjar.ps fastjar.log \
+          fastjar.pg fastjar.toc fastjar.tp fastjar.tps fastjar.vr \
+          fastjar.vrs fastjar.op fastjar.tr fastjar.cv fastjar.cn
+
+clean-aminfo:
+
+distclean-aminfo:
+
+maintainer-clean-aminfo:
+        cd $(srcdir) && for i in $(INFO_DEPS); do \
+          rm -f $$i; \
+          if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
+            rm -f $$i-[0-9]*; \
+          fi; \
+        done
+
+install-man1:
+        $(mkinstalldirs) $(DESTDIR)$(man1dir)
+        @list='$(man1_MANS)'; \
+        l2='$(man_MANS)'; for i in $$l2; do \
+          case "$$i" in \
+            *.1*) list="$$list $$i" ;; \
+          esac; \
+        done; \
+        for i in $$list; do \
+          if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+          else file=$$i; fi; \
+          ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+          inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+          inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+          echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+          $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+        done
+
+uninstall-man1:
+        @list='$(man1_MANS)'; \
+        l2='$(man_MANS)'; for i in $$l2; do \
+          case "$$i" in \
+            *.1*) list="$$list $$i" ;; \
+          esac; \
+        done; \
+        for i in $$list; do \
+          ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+          inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+          inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+          echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+          rm -f $(DESTDIR)$(man1dir)/$$inst; \
+        done
+install-man: $(MANS)
+        @$(NORMAL_INSTALL)
+        $(MAKE) $(AM_MAKEFLAGS) install-man1
+uninstall-man:
+        @$(NORMAL_UNINSTALL)
+        $(MAKE) $(AM_MAKEFLAGS) uninstall-man1
+
 tags: TAGS
 
@@ -284 +427 @@
                END { for (i in files) print i; }'`; \
         test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-          || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+          || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
 
 mostlyclean-tags:
@@ -336 +479 @@
           d=$(srcdir); \
           if test -d $$d/$$file; then \
-            cp -pr $$/$$file $(distdir)/$$file; \
+            cp -pr $$d/$$file $(distdir)/$$file; \
           else \
             test -f $(distdir)/$$file \
@@ -343 +486 @@
           fi; \
         done
-info-am:
+        $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
+info-am: $(INFO_DEPS)
 info: info-am
-dvi-am:
+dvi-am: $(DVIS)
 dvi: dvi-am
 check-am: all-am
@@ -357 +501 @@
 install-exec: install-exec-am
 
-install-data-am:
+install-data-am: install-info-am install-man
 install-data: install-data-am
 
@@ -363 +507 @@
         @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-info uninstall-man
 uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS) config.h
+all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(MANS) config.h
 all-redirect: all-am
 install-strip:
         $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
-        $(mkinstalldirs)  $(DESTDIR)$(bindir)
+        $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) \
+                $(DESTDIR)$(mandir)/man1
 
 
@@ -383 +528 @@
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
-                mostlyclean-compile mostlyclean-tags \
+                mostlyclean-compile mostlyclean-aminfo mostlyclean-tags \
                 mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-                clean-generic mostlyclean-am
+clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-aminfo \
+                clean-tags clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
-                distclean-tags distclean-generic clean-am
+                distclean-aminfo distclean-tags distclean-generic \
+                clean-am
 
 distclean: distclean-am
@@ -400 +546 @@
 
 maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
-                maintainer-clean-compile maintainer-clean-tags \
-                maintainer-clean-generic distclean-am
+                maintainer-clean-compile maintainer-clean-aminfo \
+                maintainer-clean-tags maintainer-clean-generic \
+                distclean-am
         @echo "This command is intended for maintainers to use;"
         @echo "it deletes files that may require special tools to rebuild."
@@ -412 +559 @@
 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck all-recursive-am install-exec-am \
+maintainer-clean-compile install-info-am uninstall-info \
+mostlyclean-aminfo distclean-aminfo clean-aminfo \
+maintainer-clean-aminfo install-man1 uninstall-man1 install-man \
+uninstall-man tags mostlyclean-tags distclean-tags clean-tags \
+maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck all-recursive-am install-exec-am \
 install-exec install-data-am install-data install-am install \
 uninstall-am uninstall all-redirect all-am all installdirs \
@@ -420 +570 @@
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
+fastjar.info: fastjar.texi $(fastjar_TEXINFOS)
+        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+        cd $(srcdir) \
+          && $(MAKEINFO) $(my_makei_flags) `echo $< | sed 's,.*/,,'`
+
+$(srcdir)/jar.1: $(srcdir)/fastjar.texi
+        -$(TEXI2POD) -D jar < $(srcdir)/fastjar.texi > fastjar.pod
+        -($(POD2MAN) --section=1 fastjar.pod > jar.1.T$$$$ && \
+                mv -f jar.1.T$$$$ $(srcdir)/jar.1) || \
+                (rm -f jar.1.T$$$$ && exit 1)
+        -rm -f fastjar.pod
+
+$(srcdir)/grepjar.1: $(srcdir)/fastjar.texi
+        -$(TEXI2POD) -D grepjar < $(srcdir)/fastjar.texi > grepjar.pod
+        -($(POD2MAN) --section=1 grepjar.pod > grepjar.1.T$$$$ && \
+                mv -f grepjar.1.T$$$$ $(srcdir)/grepjar.1) || \
+                (rm -f grepjar.1.T$$$$ && exit 1)
+        -rm -f grepjar.pod
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

branches/GNU/src/gcc/fastjar/README

@@ +1 @@
+This directory contains the FastJar package, which is not part of GCC but
+shipped with GCC as convenience.
+
 =======
 FastJar 0.90

branches/GNU/src/gcc/fastjar/aclocal.m4

@@ -10 +10 @@
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
+
+
+dnl Host type sizes probe.
+dnl By Kaveh R. Ghazi.  One typo fixed since.
+dnl
+AC_DEFUN([gcc_AC_COMPILE_CHECK_SIZEOF],
+[changequote(<<, >>)dnl
+dnl The name to #define.
+define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
+dnl The cache variable name.
+define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
+changequote([, ])dnl
+AC_MSG_CHECKING(size of $1)
+AC_CACHE_VAL(AC_CV_NAME,
+[for ac_size in 4 8 1 2 16 $3 ; do # List sizes in rough order of prevalence.
+  AC_TRY_COMPILE([#include "confdefs.h"
+#include <sys/types.h>
+$2
+], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size)
+  if test x$AC_CV_NAME != x ; then break; fi
+done
+])
+if test x$AC_CV_NAME = x ; then
+  AC_MSG_ERROR([cannot determine a size for $1])
+fi
+AC_MSG_RESULT($AC_CV_NAME)
+AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])
+undefine([AC_TYPE_NAME])dnl
+undefine([AC_CV_NAME])dnl
+])
+
+dnl Utility macro used by next two tests.
+dnl AC_EXAMINE_OBJECT(C source code,
+dnl     commands examining object file,
+dnl     [commands to run if compile failed]):
+dnl
+dnl Compile the source code to an object file; then convert it into a
+dnl printable representation.  All unprintable characters and
+dnl asterisks (*) are replaced by dots (.).  All white space is
+dnl deleted.  Newlines (ASCII 0x10) in the input are preserved in the
+dnl output, but runs of newlines are compressed to a single newline.
+dnl Finally, line breaks are forcibly inserted so that no line is
+dnl longer than 80 columns and the file ends with a newline.  The
+dnl result of all this processing is in the file conftest.dmp, which
+dnl may be examined by the commands in the second argument.
+dnl
+AC_DEFUN([gcc_AC_EXAMINE_OBJECT],
+[AC_LANG_SAVE
+AC_LANG_C
+dnl Next bit cribbed from AC_TRY_COMPILE.
+cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+$1
+]EOF
+if AC_TRY_EVAL(ac_compile); then
+  od -c conftest.o |
+    sed ['s/^[0-7]*[    ]*/ /
+          s/\*/./g
+          s/ \\n/*/g
+          s/ [0-9][0-9][0-9]/./g
+          s/  \\[^ ]/./g'] |
+    tr -d '
+ ' | tr -s '*' '
+' | fold | sed '$a\
+' > conftest.dmp
+  $2
+ifelse($3, , , else
+  $3
+)dnl
+fi
+rm -rf conftest*
+AC_LANG_RESTORE])
+
+dnl Host endianness probe.
+dnl Differs from AC_C_BIGENDIAN in that it does not require
+dnl running a program on the host.
+dnl
+AC_DEFUN([fastjar_AC_COMPILE_C_BIGENDIAN],
+[AC_CACHE_CHECK(byte ordering, ac_cv_c_compile_endian,
+[ac_cv_c_compile_endian=unknown
+gcc_AC_EXAMINE_OBJECT([
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+/* This structure must have no internal padding.  */
+  struct {
+    char prefix[sizeof "\nendian:" - 1];
+    short word;
+    char postfix[2];
+ } tester = {
+    "\nendian:",
+#if SIZEOF_SHORT == 4
+    ('A' << (CHAR_BIT * 3)) | ('B' << (CHAR_BIT * 2)) |
+#endif
+    ('A' << CHAR_BIT) | 'B',
+    'X', '\n'
+};],
+ [if   grep 'endian:AB' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_compile_endian=big-endian
+  elif grep 'endian:BA' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_compile_endian=little-endian
+  fi])
+])
+if test $ac_cv_c_compile_endian = unknown; then
+  AC_MSG_ERROR([*** unable to determine endianness])
+elif test $ac_cv_c_compile_endian = big-endian; then
+  AC_DEFINE(WORDS_BIG_ENDIAN, 1,
+  [Define if the host machine stores words of multi-word integers in
+   big-endian order.])
+fi
+])
+
+dnl Define MKDIR_TAKES_ONE_ARG if mkdir accepts only one argument instead
+dnl of the usual 2.
+AC_DEFUN(gcc_AC_FUNC_MKDIR_TAKES_ONE_ARG,
+[AC_CACHE_CHECK([if mkdir takes one argument], gcc_cv_mkdir_takes_one_arg,
+[AC_TRY_COMPILE([
+#include <sys/types.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#ifdef HAVE_DIRECT_H
+# include <direct.h>
+#endif], [mkdir ("foo", 0);],
+         gcc_cv_mkdir_takes_one_arg=no, gcc_cv_mkdir_takes_one_arg=yes)])
+if test $gcc_cv_mkdir_takes_one_arg = yes ; then
+   AC_DEFINE(MKDIR_TAKES_ONE_ARG, 1, [Define if host mkdir takes a
+single argument.])
+fi
+])
 
 # Do all the work for Automake.  This macro actually does too much --

branches/GNU/src/gcc/fastjar/config.h.in

@@ -9 +9 @@
 /* Define if your <sys/time.h> declares struct tm.  */
 #undef TM_IN_SYS_TIME
-
-/* Define if your processor stores words with the most significant
-   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-#undef WORDS_BIGENDIAN
-
-/* The number of bytes in a char.  */
-#undef SIZEOF_CHAR
-
-/* The number of bytes in a int.  */
-#undef SIZEOF_INT
-
-/* The number of bytes in a long.  */
-#undef SIZEOF_LONG
-
-/* The number of bytes in a long long.  */
-#undef SIZEOF_LONG_LONG
-
-/* The number of bytes in a short.  */
-#undef SIZEOF_SHORT
 
 /* Define if you have the <dirent.h> header file.  */
@@ -40 +21 @@
 /* Define if you have the <stdlib.h> header file.  */
 #undef HAVE_STDLIB_H
+
+/* Define if you have the <limits.h> header file.  */
+#undef HAVE_LIMITS_H
 
 /* Define if you have the <sys/dir.h> header file.  */
@@ -59 +43 @@
 #undef VERSION
 
+/* Define if host mkdir takes a
+single argument. */
+#undef MKDIR_TAKES_ONE_ARG
+
+/* The number of bytes in type char */
+#undef SIZEOF_CHAR
+
+/* The number of bytes in type short */
+#undef SIZEOF_SHORT
+
+/* The number of bytes in type int */
+#undef SIZEOF_INT
+
+/* The number of bytes in type long */
+#undef SIZEOF_LONG
+
+/* The number of bytes in type long long */
+#undef SIZEOF_LONG_LONG
+
+/* Define if the host machine stores words of multi-word integers in
+   big-endian order. */
+#undef WORDS_BIG_ENDIAN
+

branches/GNU/src/gcc/fastjar/configure

@@ -1692 +1692 @@
 fi
 
-for ac_hdr in fcntl.h unistd.h sys/param.h stdlib.h
+for ac_hdr in fcntl.h unistd.h sys/param.h stdlib.h limits.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@@ -1801 +1801 @@
 
 
-echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:1805: checking size of char" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+# mkdir takes a single argument on some systems.
+echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6
+echo "configure:1806: checking if mkdir takes one argument" >&5
+if eval "test \"`echo '$''{'gcc_cv_mkdir_takes_one_arg'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1813 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(char));
-  exit(0);
-}
-EOF
-if { (eval echo configure:1824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_char=`cat conftestval`
+#line 1811 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#ifdef HAVE_DIRECT_H
+# include <direct.h>
+#endif
+int main() {
+mkdir ("foo", 0);
+; return 0; }
+EOF
+if { (eval echo configure:1828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  gcc_cv_mkdir_takes_one_arg=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_char=0
-fi
-rm -fr conftest*
-fi
-
+  rm -rf conftest*
+  gcc_cv_mkdir_takes_one_arg=yes
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$gcc_cv_mkdir_takes_one_arg" 1>&6
+if test $gcc_cv_mkdir_takes_one_arg = yes ; then
+   cat >> confdefs.h <<\EOF
+#define MKDIR_TAKES_ONE_ARG 1
+EOF
+
+fi
+
+
+echo $ac_n "checking size of char""... $ac_c" 1>&6
+echo "configure:1850: checking size of char" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
+  cat > conftest.$ac_ext <<EOF
+#line 1856 "configure"
+#include "confdefs.h"
+#include "confdefs.h"
+#include <sys/types.h>
+
+
+int main() {
+switch (0) case 0: case (sizeof (char) == $ac_size):;
+; return 0; }
+EOF
+if { (eval echo configure:1866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sizeof_char=$ac_size
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+  if test x$ac_cv_sizeof_char != x ; then break; fi
+done
+
+fi
+
+if test x$ac_cv_sizeof_char = x ; then
+  { echo "configure: error: cannot determine a size for char" 1>&2; exit 1; }
 fi
 echo "$ac_t""$ac_cv_sizeof_char" 1>&6
@@ -1841 +1886 @@
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:1844: checking size of short" >&5
+echo "configure:1889: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
+  for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 1852 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(short));
-  exit(0);
-}
-EOF
-if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_short=`cat conftestval`
+#line 1895 "configure"
+#include "confdefs.h"
+#include "confdefs.h"
+#include <sys/types.h>
+
+
+int main() {
+switch (0) case 0: case (sizeof (short) == $ac_size):;
+; return 0; }
+EOF
+if { (eval echo configure:1905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sizeof_short=$ac_size
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_short=0
-fi
-rm -fr conftest*
-fi
-
+fi
+rm -f conftest*
+  if test x$ac_cv_sizeof_short != x ; then break; fi
+done
+
+fi
+
+if test x$ac_cv_sizeof_short = x ; then
+  { echo "configure: error: cannot determine a size for short" 1>&2; exit 1; }
 fi
 echo "$ac_t""$ac_cv_sizeof_short" 1>&6
@@ -1880 +1925 @@
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1883: checking size of int" >&5
+echo "configure:1928: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
+  for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 1891 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int));
-  exit(0);
-}
-EOF
-if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int=`cat conftestval`
+#line 1934 "configure"
+#include "confdefs.h"
+#include "confdefs.h"
+#include <sys/types.h>
+
+
+int main() {
+switch (0) case 0: case (sizeof (int) == $ac_size):;
+; return 0; }
+EOF
+if { (eval echo configure:1944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sizeof_int=$ac_size
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_int=0
-fi
-rm -fr conftest*
-fi
-
+fi
+rm -f conftest*
+  if test x$ac_cv_sizeof_int != x ; then break; fi
+done
+
+fi
+
+if test x$ac_cv_sizeof_int = x ; then
+  { echo "configure: error: cannot determine a size for int" 1>&2; exit 1; }
 fi
 echo "$ac_t""$ac_cv_sizeof_int" 1>&6
@@ -1919 +1964 @@
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1922: checking size of long" >&5
+echo "configure:1967: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
+  for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 1930 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long));
-  exit(0);
-}
-EOF
-if { (eval echo configure:1941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long=`cat conftestval`
+#line 1973 "configure"
+#include "confdefs.h"
+#include "confdefs.h"
+#include <sys/types.h>
+
+
+int main() {
+switch (0) case 0: case (sizeof (long) == $ac_size):;
+; return 0; }
+EOF
+if { (eval echo configure:1983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sizeof_long=$ac_size
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long=0
-fi
-rm -fr conftest*
-fi
-
+fi
+rm -f conftest*
+  if test x$ac_cv_sizeof_long != x ; then break; fi
+done
+
+fi
+
+if test x$ac_cv_sizeof_long = x ; then
+  { echo "configure: error: cannot determine a size for long" 1>&2; exit 1; }
 fi
 echo "$ac_t""$ac_cv_sizeof_long" 1>&6
@@ -1958 +2003 @@
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:1961: checking size of long long" >&5
+echo "configure:2006: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
+  for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 1969 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long long));
-  exit(0);
-}
-EOF
-if { (eval echo configure:1980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long_long=`cat conftestval`
+#line 2012 "configure"
+#include "confdefs.h"
+#include "confdefs.h"
+#include <sys/types.h>
+
+
+int main() {
+switch (0) case 0: case (sizeof (long long) == $ac_size):;
+; return 0; }
+EOF
+if { (eval echo configure:2022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sizeof_long_long=$ac_size
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long_long=0
-fi
-rm -fr conftest*
-fi
-
+fi
+rm -f conftest*
+  if test x$ac_cv_sizeof_long_long != x ; then break; fi
+done
+
+fi
+
+if test x$ac_cv_sizeof_long_long = x ; then
+  { echo "configure: error: cannot determine a size for long long" 1>&2; exit 1; }
 fi
 echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
@@ -1997 +2042 @@
 
 
-echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:2001: checking whether byte ordering is bigendian" >&5
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
+echo $ac_n "checking byte ordering""... $ac_c" 1>&6
+echo "configure:2046: checking byte ordering" >&5
+if eval "test \"`echo '$''{'ac_cv_c_compile_endian'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_c_compile_endian=unknown
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
 cat > conftest.$ac_ext <<EOF
-#line 2008 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
+#line 2060 "configure"
+#include "confdefs.h"
+
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
 #endif
-; return 0; }
-EOF
-if { (eval echo configure:2019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat > conftest.$ac_ext <<EOF
-#line 2023 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
+/* This structure must have no internal padding.  */
+  struct {
+    char prefix[sizeof "\nendian:" - 1];
+    short word;
+    char postfix[2];
+ } tester = {
+    "\nendian:",
+#if SIZEOF_SHORT == 4
+    ('A' << (CHAR_BIT * 3)) | ('B' << (CHAR_BIT * 2)) |
 #endif
-; return 0; }
-EOF
-if { (eval echo configure:2034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_bigendian=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_bigendian=no
-fi
-rm -f conftest*
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-if test $ac_cv_c_bigendian = unknown; then
-if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2054 "configure"
-#include "confdefs.h"
-main () {
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-EOF
-if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_bigendian=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_bigendian=yes
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-if test $ac_cv_c_bigendian = yes; then
+    ('A' << CHAR_BIT) | 'B',
+    'X', '\n'
+};
+EOF
+if { (eval echo configure:2080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  od -c conftest.o |
+    sed 's/^[0-7]*[     ]*/ /
+          s/\*/./g
+          s/ \\n/*/g
+          s/ [0-9][0-9][0-9]/./g
+          s/  \\[^ ]/./g' |
+    tr -d '
+ ' | tr -s '*' '
+' | fold | sed '$a\
+' > conftest.dmp
+  if   grep 'endian:AB' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_compile_endian=big-endian
+  elif grep 'endian:BA' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_compile_endian=little-endian
+  fi
+fi
+rm -rf conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+fi
+
+echo "$ac_t""$ac_cv_c_compile_endian" 1>&6
+if test $ac_cv_c_compile_endian = unknown; then
+  { echo "configure: error: *** unable to determine endianness" 1>&2; exit 1; }
+elif test $ac_cv_c_compile_endian = big-endian; then
   cat >> confdefs.h <<\EOF
-#define WORDS_BIGENDIAN 1
+#define WORDS_BIG_ENDIAN 1
 EOF
 
@@ -2101 +2129 @@
 if test "$with_system_zlib" = yes; then
    echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:2104: checking for deflate in -lz" >&5
+echo "configure:2132: checking for deflate in -lz" >&5
 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2109 +2137 @@
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2112 "configure"
+#line 2140 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2120 +2148 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2153 +2181 @@
 
 
+
+
+# Get the version trigger filename from the toplevel
+if test "${with_gcc_version_trigger+set}" = set; then
+   gcc_version_trigger=$with_gcc_version_trigger
+else
+   gcc_version_trigger=${srcdir}/version.c
+fi
+gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'`
+gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
 
 
@@ -2313 +2351 @@
 s%@ZDEPS@%$ZDEPS%g
 s%@ZINCS@%$ZINCS%g
+s%@gcc_version@%$gcc_version%g
 
 CEOF
@@ -2321 +2360 @@
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.

branches/GNU/src/gcc/fastjar/configure.in

@@ -25 +25 @@
 AC_HEADER_STDC
 AC_STRUCT_TM
-AC_CHECK_HEADERS(fcntl.h unistd.h sys/param.h stdlib.h)
+AC_CHECK_HEADERS(fcntl.h unistd.h sys/param.h stdlib.h limits.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -31 +31 @@
 AC_STRUCT_TM
 
+# mkdir takes a single argument on some systems.
+gcc_AC_FUNC_MKDIR_TAKES_ONE_ARG
+
 dnl Check for type-widths
-AC_CHECK_SIZEOF(char)
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
+gcc_AC_COMPILE_CHECK_SIZEOF(char)
+gcc_AC_COMPILE_CHECK_SIZEOF(short)
+gcc_AC_COMPILE_CHECK_SIZEOF(int)
+gcc_AC_COMPILE_CHECK_SIZEOF(long)
+gcc_AC_COMPILE_CHECK_SIZEOF(long long)
 
 dnl Check byte order
-AC_C_BIGENDIAN
+fastjar_AC_COMPILE_C_BIGENDIAN
 
 AC_ARG_WITH(system-zlib,
@@ -64 +67 @@
 AC_SUBST(ZINCS)
 
+# Get the version trigger filename from the toplevel
+if test "${with_gcc_version_trigger+set}" = set; then
+   gcc_version_trigger=$with_gcc_version_trigger
+else
+   gcc_version_trigger=${srcdir}/version.c
+fi
+changequote(,)dnl
+gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'`
+gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
+changequote([,])dnl
+AC_SUBST(gcc_version)
+
 AC_OUTPUT(Makefile install-defs.sh)

branches/GNU/src/gcc/fastjar/dostime.c

@@ -21 +21 @@
 
 #include <time.h>
+
+#include <stddef.h>
 
 #include "dostime.h"

branches/GNU/src/gcc/fastjar/jargrep.c

@@ -1 +1 @@
 /*
   jargrep.c - main functions for jargrep utility
-  Copyright (C) 2002 Free Software Foundation
+  Copyright (C) 2002, 2003 Free Software Foundation
   Copyright (C) 1999, 2000 Bryan Burns
   Copyright (C) 2000 Cory Hollingsworth 
@@ -106 +106 @@
 #include <stdio.h>
 #include <unistd.h>
-#include <regex.h>
 #include <errno.h>
 #include <string.h>
@@ -116 +115 @@
 #include <stdlib.h>
 #endif
+
+#include "xregex.h"
+
 #include "jargrep.h"
 #include "jartool.h"
@@ -127 +129 @@
 void help(const char *name);
 
-#define Usage "Usage: %s [-bcinsw] <-e PATTERN | PATTERN> FILE ...\n"
+#define Usage "Usage: %s [-bcinsVw] [--version|--help] <-e PATTERN | PATTERN> FILE ...\n"
 
 /*
@@ -770 +772 @@
    -s                suppress error messages\n\
    -w                force PATTERN to match only whole words\n\
-   -e PATTERN        use PATTERN as regular exprssion\n\
+   -e PATTERN        use PATTERN as regular expression\n\
+   -V|--version      print version number and exit\n\
+   --help            print help\n\
 ");
 

branches/GNU/src/gcc/fastjar/jartool.c

@@ -239 +239 @@
 #include "pushback.h"
 #include "compress.h"
+
+/* Some systems have mkdir that takes a single argument.  */
+#ifdef MKDIR_TAKES_ONE_ARG
+# define mkdir(a,b) mkdir(a)
+#endif
+
 
 #ifdef WORDS_BIGENDIAN
@@ -434 +440 @@
   if(action == ACTION_CREATE){
     if(jarfile){
-      jarfd = open(jarfile, O_CREAT | O_BINARY | O_WRONLY | O_TRUNC,
-                   S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+      jarfd = open(jarfile, O_CREAT | O_BINARY | O_WRONLY | O_TRUNC, 0666);
 
       if(jarfd < 0){
@@ -839 +844 @@
   }
 
-  if(!strcmp(file, jarfile)){
+  if(jarfile && !strcmp(file, jarfile)){
     if(verbose)
       printf("skipping: %s\n", file);
@@ -920 +925 @@
       if(de->d_name[0] == '.')
         continue;
-      if(!strcmp(de->d_name, jarfile)){ /* we don't want to add ourselves.  Believe me */
+      if(jarfile && !strcmp(de->d_name, jarfile)){
+        /* we don't want to add ourselves.  Believe me */
         if(verbose)
           printf("skipping: %s\n", de->d_name);
@@ -1450 +1456 @@
 
     if(f_fd != -1 && handle){
-      f_fd = creat((const char *)filename, 00644);
+      f_fd = open((const char *)filename,
+                  O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
 
       if(f_fd < 0){
@@ -1465 +1472 @@
 
     if(method == 8 || flags & 0x0008){
-      if(seekable)
-        lseek(fd, eflen, SEEK_CUR);
-      else
         consume(&pbf, eflen);
       
@@ -1502 +1506 @@
       }
 
-      if(seekable)
-        lseek(fd, eflen, SEEK_CUR);
-      else
         consume(&pbf, eflen);
     }
@@ -1565 +1566 @@
   time_t tdate;
   struct tm *s_tm;
-  char ascii_date[30];
+  char ascii_date[31];
   zipentry ze;
 
@@ -1656 +1657 @@
         s_tm = localtime(&tdate);
         strftime(ascii_date, 30, "%a %b %d %H:%M:%S %Z %Y", s_tm);
-      }
-
-      if(filename_len < fnlen){
+        ascii_date[30] = '\0';
+      }
+
+      if(filename_len < fnlen + 1){
         if(filename != NULL)
           free(filename);
@@ -1775 +1777 @@
         s_tm = localtime(&tdate);
         strftime(ascii_date, 30, "%a %b %d %H:%M:%S %Z %Y", s_tm);
-      }
-
-      if(filename_len < fnlen){
+        ascii_date[30] = '\0';
+      }
+
+      if(filename_len < fnlen + 1){
         if(filename != NULL)
           free(filename);
@@ -1848 +1851 @@
 #endif
 
+  if (seekable){
+    if (amt <= (int)pbf->buff_amt)
+      pb_read(pbf, buff, amt);
+    else {
+      lseek(pbf->fd, amt - pbf->buff_amt, SEEK_CUR);
+      pb_read(pbf, buff, pbf->buff_amt); /* clear pbf */
+    }
+  } else
   while(tc < amt){
     rdamt = pb_read(pbf, buff, ((amt - tc) < RDSZ ? (amt - tc) : RDSZ));
@@ -1857 +1868 @@
 
 #ifdef DEBUG
-  printf("%d bytes consumed\n", tc);
+  printf("%d bytes consumed\n", amt);
 #endif
 

@@ -26 +26 @@
 configure.vr
 configure.vrs
+dir.info
 Makefile
-dir.info
 lost+found
 update.out