/hg/icedtea-web: Remove dependency on libjli so we can work with...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Dec 14 16:57:41 PST 2010
changeset 772872ac68d5 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=772872ac68d5
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Dec 15 00:54:34 2010 +0000
Remove dependency on libjli so we can work with IcedTea7.
2010-12-14 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (LAUNCHER_OBJECTS): Add jli_util.o,
parse_manifest.o, version_comp.o, wildcard.o.
(LAUNCEHR_FLAGS): Add -DEXPAND_CLASSPATH_WILDCARDS as used
in build of libjli in OpenJDK. (LAUNCHER_LINK): Don't link
to libjli.
* launcher/jli_util.c,
* launcher/parse_manifest.c,
* launcher/version_comp.c,
* launcher/wildcard.c: Add source files from OpenJDK6 to match
header files already used.
diffstat:
6 files changed, 1564 insertions(+), 5 deletions(-)
ChangeLog | 15 +
Makefile.am | 9
launcher/jli_util.c | 83 ++++++
launcher/parse_manifest.c | 610 +++++++++++++++++++++++++++++++++++++++++++++
launcher/version_comp.c | 357 ++++++++++++++++++++++++++
launcher/wildcard.c | 495 ++++++++++++++++++++++++++++++++++++
diffs (truncated from 1608 to 500 lines):
diff -r adef5d4159ee -r 772872ac68d5 ChangeLog
--- a/ChangeLog Mon Dec 13 17:28:01 2010 -0500
+++ b/ChangeLog Wed Dec 15 00:54:34 2010 +0000
@@ -1,3 +1,18 @@ 2010-12-13 Omair Majid <omajid at redhat.
+2010-12-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (LAUNCHER_OBJECTS): Add jli_util.o, parse_manifest.o,
+ version_comp.o, wildcard.o.
+ (LAUNCEHR_FLAGS): Add -DEXPAND_CLASSPATH_WILDCARDS
+ as used in build of libjli in OpenJDK.
+ (LAUNCHER_LINK): Don't link to libjli.
+ * launcher/jli_util.c,
+ * launcher/parse_manifest.c,
+ * launcher/version_comp.c,
+ * launcher/wildcard.c:
+ Add source files from OpenJDK6 to match header files
+ already used.
+
2010-12-13 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/config/ValueValidator.java: New file.
diff -r adef5d4159ee -r 772872ac68d5 Makefile.am
--- a/Makefile.am Mon Dec 13 17:28:01 2010 -0500
+++ b/Makefile.am Wed Dec 15 00:54:34 2010 +0000
@@ -71,17 +71,16 @@ endif
# Launcher
LAUNCHER_SRCDIR = $(abs_top_srcdir)/launcher
-LAUNCHER_OBJECTS = java.o java_md.o splashscreen_stubs.o
+LAUNCHER_OBJECTS = java.o java_md.o splashscreen_stubs.o jli_util.o parse_manifest.o version_comp.o wildcard.o
PLUGIN_LAUNCHER_OBJECTS = $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS))
NETX_LAUNCHER_OBJECTS = $(addprefix $(NETX_DIR)/launcher/,$(LAUNCHER_OBJECTS))
CONTROLPANEL_LAUNCHER_OBJECTS = $(addprefix $(NETX_DIR)/launcher/controlpanel/,$(LAUNCHER_OBJECTS))
LAUNCHER_FLAGS = -O2 -fno-strict-aliasing -fPIC -pthread -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \
-g -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -DLAUNCHER_NAME='"java"' -I$(LAUNCHER_SRCDIR) \
- -DJDK_MAJOR_VERSION='"1"' -DJDK_MINOR_VERSION='"6"' -DLIBARCHNAME='"$(JRE_ARCH_DIR)"'
+ -DJDK_MAJOR_VERSION='"1"' -DJDK_MINOR_VERSION='"6"' -DLIBARCHNAME='"$(JRE_ARCH_DIR)"' \
+ -DEXPAND_CLASSPATH_WILDCARDS
LAUNCHER_LINK = -o $@ -pthread -Xlinker -O1 -Xlinker -z -Xlinker defs -L$(BOOT_DIR)/lib/$(INSTALL_ARCH_DIR) \
- -Wl,-soname=lib.so -L $(BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jli -Wl,-z -Wl,origin \
- -Wl,--allow-shlib-undefined -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(INSTALL_ARCH_DIR)/jli -Wl,-rpath \
- -Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli $(X11_CFLAGS) $(X11_LIBS) -ljli -ldl -lz
+ -Wl,-soname=lib.so -Wl,-z -Wl,origin -Wl,--allow-shlib-undefined $(X11_CFLAGS) $(X11_LIBS) -ldl -lz
PLUGIN_VERSION = IcedTea-Web $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
diff -r adef5d4159ee -r 772872ac68d5 launcher/jli_util.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/launcher/jli_util.c Wed Dec 15 00:54:34 2010 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "jli_util.h"
+
+/*
+ * Returns a pointer to a block of at least 'size' bytes of memory.
+ * Prints error message and exits if the memory could not be allocated.
+ */
+void *
+JLI_MemAlloc(size_t size)
+{
+ void *p = malloc(size);
+ if (p == 0) {
+ perror("malloc");
+ exit(1);
+ }
+ return p;
+}
+
+/*
+ * Equivalent to realloc(size).
+ * Prints error message and exits if the memory could not be reallocated.
+ */
+void *
+JLI_MemRealloc(void *ptr, size_t size)
+{
+ void *p = realloc(ptr, size);
+ if (p == 0) {
+ perror("realloc");
+ exit(1);
+ }
+ return p;
+}
+
+/*
+ * Wrapper over strdup(3C) which prints an error message and exits if memory
+ * could not be allocated.
+ */
+char *
+JLI_StringDup(const char *s1)
+{
+ char *s = strdup(s1);
+ if (s == NULL) {
+ perror("strdup");
+ exit(1);
+ }
+ return s;
+}
+
+/*
+ * Very equivalent to free(ptr).
+ * Here to maintain pairing with the above routines.
+ */
+void
+JLI_MemFree(void *ptr)
+{
+ free(ptr);
+}
diff -r adef5d4159ee -r 772872ac68d5 launcher/parse_manifest.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/launcher/parse_manifest.c Wed Dec 15 00:54:34 2010 +0000
@@ -0,0 +1,610 @@
+/*
+ * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/*
+ * If Windows is POSIX compliant, why isn't the prototype for lseek where
+ * POSIX says it should be?
+ */
+#ifdef _WIN32
+#include <windows.h>
+#include <io.h>
+#else /* Unix */
+#include <unistd.h>
+#endif /* Unix */
+
+#include <zlib.h>
+#include "manifest_info.h"
+
+/*
+ * On Windows, str[n]casecmp() are known as str[n]icmp().
+ */
+#ifdef _WIN32
+#define strcasecmp(p1, p2) stricmp((p1), (p2))
+#define strncasecmp(p1, p2, p3) strnicmp((p1), (p2), (p3))
+#endif
+
+static char *manifest;
+
+static const char *manifest_name = "META-INF/MANIFEST.MF";
+
+/*
+ * Inflate the manifest file (or any file for that matter).
+ *
+ * fd: File descriptor of the jar file.
+ * entry: Contains the information necessary to perform the inflation
+ * (the compressed and uncompressed sizes and the offset in
+ * the file where the compressed data is located).
+ * size_out: Returns the size of the inflated file.
+ *
+ * Upon success, it returns a pointer to a NUL-terminated malloc'd buffer
+ * containing the inflated manifest file. When the caller is done with it,
+ * this buffer should be released by a call to free(). Upon failure,
+ * returns NULL.
+ */
+static char *
+inflate_file(int fd, zentry *entry, int *size_out)
+{
+ char *in;
+ char *out;
+ z_stream zs;
+
+ if (entry->csize == 0xffffffff || entry->isize == 0xffffffff)
+ return (NULL);
+ if (lseek(fd, entry->offset, SEEK_SET) < (off_t)0)
+ return (NULL);
+ if ((in = malloc(entry->csize + 1)) == NULL)
+ return (NULL);
+ if ((size_t)(read(fd, in, (unsigned int)entry->csize)) != entry->csize) {
+ free(in);
+ return (NULL);
+ }
+ if (entry->how == STORED) {
+ *(char *)((size_t)in + entry->csize) = '\0';
+ if (size_out) {
+ *size_out = entry->csize;
+ }
+ return (in);
+ } else if (entry->how == DEFLATED) {
+ zs.zalloc = (alloc_func)Z_NULL;
+ zs.zfree = (free_func)Z_NULL;
+ zs.opaque = (voidpf)Z_NULL;
+ zs.next_in = (Byte*)in;
+ zs.avail_in = (uInt)entry->csize;
+ if (inflateInit2(&zs, -MAX_WBITS) < 0) {
+ free(in);
+ return (NULL);
+ }
+ if ((out = malloc(entry->isize + 1)) == NULL) {
+ free(in);
+ return (NULL);
+ }
+ zs.next_out = (Byte*)out;
+ zs.avail_out = (uInt)entry->isize;
+ if (inflate(&zs, Z_PARTIAL_FLUSH) < 0) {
+ free(in);
+ free(out);
+ return (NULL);
+ }
+ *(char *)((size_t)out + entry->isize) = '\0';
+ free(in);
+ if (inflateEnd(&zs) < 0) {
+ free(out);
+ return (NULL);
+ }
+ if (size_out) {
+ *size_out = entry->isize;
+ }
+ return (out);
+ } else
+ return (NULL);
+}
+
+/*
+ * A very little used routine to handle the case that zip file has
+ * a comment at the end. Believe it or not, the only way to find the
+ * END record is to walk backwards, byte by bloody byte looking for
+ * the END record signature.
+ *
+ * fd: File descriptor of the jar file.
+ * eb: Pointer to a buffer to receive a copy of the END header.
+ *
+ * Returns the offset of the END record in the file on success,
+ * -1 on failure.
+ */
+static off_t
+find_end(int fd, Byte *eb)
+{
+ off_t len;
+ off_t pos;
+ off_t flen;
+ int bytes;
+ Byte *cp;
+ Byte *endpos;
+ Byte *buffer;
+
+ /*
+ * 99.44% (or more) of the time, there will be no comment at the
+ * end of the zip file. Try reading just enough to read the END
+ * record from the end of the file.
+ */
+ if ((pos = lseek(fd, -ENDHDR, SEEK_END)) < (off_t)0)
+ return (-1);
+ if ((bytes = read(fd, eb, ENDHDR)) < 0)
+ return (-1);
+ if (GETSIG(eb) == ENDSIG)
+ return (pos);
+
+ /*
+ * Shucky-Darn,... There is a comment at the end of the zip file.
+ *
+ * Allocate and fill a buffer with enough of the zip file
+ * to meet the specification for a maximal comment length.
+ */
+ if ((flen = lseek(fd, 0, SEEK_END)) < (off_t)0)
+ return (-1);
+ len = (flen < END_MAXLEN) ? flen : END_MAXLEN;
+ if (lseek(fd, -len, SEEK_END) < (off_t)0)
+ return (-1);
+ if ((buffer = malloc(END_MAXLEN)) == NULL)
+ return (-1);
+ if ((bytes = read(fd, buffer, len)) < 0) {
+ free(buffer);
+ return (-1);
+ }
+
+ /*
+ * Search backwards from the end of file stopping when the END header
+ * signature is found. (The first condition of the "if" is just a
+ * fast fail, because the GETSIG macro isn't always cheap. The
+ * final condition protects against false positives.)
+ */
+ endpos = &buffer[bytes];
+ for (cp = &buffer[bytes - ENDHDR]; cp >= &buffer[0]; cp--)
+ if ((*cp == (ENDSIG & 0xFF)) && (GETSIG(cp) == ENDSIG) &&
+ (cp + ENDHDR + ENDCOM(cp) == endpos)) {
+ (void) memcpy(eb, cp, ENDHDR);
+ free(buffer);
+ return (flen - (endpos - cp));
+ }
+ free(buffer);
+ return (-1);
+}
+
+/*
+ * Locate the manifest file with the zip/jar file.
+ *
+ * fd: File descriptor of the jar file.
+ * entry: To be populated with the information necessary to perform
+ * the inflation (the compressed and uncompressed sizes and
+ * the offset in the file where the compressed data is located).
+ *
+ * Returns zero upon success. Returns a negative value upon failure.
+ *
+ * The buffer for reading the Central Directory if the zip/jar file needs
+ * to be large enough to accommodate the largest possible single record
+ * and the signature of the next record which is:
+ *
+ * 3*2**16 + CENHDR + SIGSIZ
+ *
+ * Each of the three variable sized fields (name, comment and extension)
+ * has a maximum possible size of 64k.
+ *
+ * Typically, only a small bit of this buffer is used with bytes shuffled
+ * down to the beginning of the buffer. It is one thing to allocate such
+ * a large buffer and another thing to actually start faulting it in.
+ *
+ * In most cases, all that needs to be read are the first two entries in
+ * a typical jar file (META-INF and META-INF/MANIFEST.MF). Keep this factoid
+ * in mind when optimizing this code.
+ */
+#define BUFSIZE (3 * 65536 + CENHDR + SIGSIZ)
+#define MINREAD 1024
+
+static int
+find_file(int fd, zentry *entry, const char *file_name)
+{
+ int bytes;
+ int res;
+ int entry_size;
+ int read_size;
+ int base_offset;
+ Byte *p;
+ Byte *bp;
+ Byte buffer[BUFSIZE];
+ Byte locbuf[LOCHDR];
+
+ p = buffer;
+ bp = buffer;
+
+ /*
+ * Read the END Header, which is the starting point for ZIP files.
+ * (Clearly designed to make writing a zip file easier than reading
+ * one. Now isn't that precious...)
+ */
+ if ((base_offset = find_end(fd, bp)) == -1)
+ return (-1);
+
+ /*
+ * There is a historical, but undocumented, ability to allow for
+ * additional "stuff" to be prepended to the zip/jar file. It seems
+ * that this has been used to prepend an actual java launcher
+ * executable to the jar on Windows. Although this is just another
+ * form of statically linking a small piece of the JVM to the
+ * application, we choose to continue to support it. Note that no
+ * guarantees have been made (or should be made) to the customer that
+ * this will continue to work.
+ *
+ * Therefore, calculate the base offset of the zip file (within the
+ * expanded file) by assuming that the central directory is followed
+ * immediately by the end record.
+ */
+ base_offset = base_offset - ENDSIZ(p) - ENDOFF(p);
+
+ /*
+ * The END Header indicates the start of the Central Directory
+ * Headers. Remember that the desired Central Directory Header (CEN)
+ * will almost always be the second one and the first one is a small
+ * directory entry ("META-INF/"). Keep the code optimized for
+ * that case.
+ *
+ * Begin by seeking to the beginning of the Central Directory and
+ * reading in the first buffer full of bits.
+ */
+ if (lseek(fd, base_offset + ENDOFF(p), SEEK_SET) < (off_t)0)
+ return (-1);
+ if ((bytes = read(fd, bp, MINREAD)) < 0)
+ return (-1);
+
+ /*
+ * Loop through the Central Directory Headers. Note that a valid zip/jar
+ * must have an ENDHDR (with ENDSIG) after the Central Directory.
+ */
+ while (GETSIG(p) == CENSIG) {
+
+ /*
+ * If a complete header isn't in the buffer, shift the contents
+ * of the buffer down and refill the buffer. Note that the check
+ * for "bytes < CENHDR" must be made before the test for the entire
+ * size of the header, because if bytes is less than CENHDR, the
+ * actual size of the header can't be determined. The addition of
+ * SIGSIZ guarantees that the next signature is also in the buffer
+ * for proper loop termination.
+ */
+ if (bytes < CENHDR) {
+ p = memmove(bp, p, bytes);
+ if ((res = read(fd, bp + bytes, MINREAD)) <= 0)
+ return (-1);
+ bytes += res;
+ }
+ entry_size = CENHDR + CENNAM(p) + CENEXT(p) + CENCOM(p);
+ if (bytes < entry_size + SIGSIZ) {
+ if (p != bp)
+ p = memmove(bp, p, bytes);
+ read_size = entry_size - bytes + SIGSIZ;
+ read_size = (read_size < MINREAD) ? MINREAD : read_size;
+ if ((res = read(fd, bp + bytes, read_size)) <= 0)
+ return (-1);
+ bytes += res;
+ }
+
+ /*
+ * Check if the name is the droid we are looking for; the jar file
+ * manifest. If so, build the entry record from the data found in
+ * the header located and return success.
+ */
+ if (CENNAM(p) == strlen(file_name) &&
+ memcmp((p + CENHDR), file_name, strlen(file_name)) == 0) {
+ if (lseek(fd, base_offset + CENOFF(p), SEEK_SET) < (off_t)0)
+ return (-1);
+ if (read(fd, locbuf, LOCHDR) < 0)
+ return (-1);
+ if (GETSIG(locbuf) != LOCSIG)
+ return (-1);
+ entry->isize = CENLEN(p);
+ entry->csize = CENSIZ(p);
+ entry->offset = base_offset + CENOFF(p) + LOCHDR +
+ LOCNAM(locbuf) + LOCEXT(locbuf);
+ entry->how = CENHOW(p);
+ return (0);
+ }
+
+ /*
+ * Point to the next entry and decrement the count of valid remaining
+ * bytes.
+ */
+ bytes -= entry_size;
+ p += entry_size;
+ }
+
+ return (-1); /* Fell off the end the loop without a Manifest */
+}
+
+/*
+ * Parse a Manifest file header entry into a distinct "name" and "value".
+ * Continuation lines are joined into a single "value". The documented
+ * syntax for a header entry is:
+ *
+ * header: name ":" value
+ *
+ * name: alphanum *headerchar
+ *
+ * value: SPACE *otherchar newline *continuation
+ *
+ * continuation: SPACE *otherchar newline
More information about the distro-pkg-dev
mailing list