public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM] master: Merge commit 'origin'
@ 2008-02-05 21:08 mark
0 siblings, 0 replies; 2+ messages in thread
From: mark @ 2008-02-05 21:08 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via 5aeecb313a635e3523458519d0a741b36edd7fdc (commit)
via 2f60bbf93d87b6e0cd7ea05bc826e104868f6aae (commit)
via e865a5692d1da0739b37a8be1d4bd185e7707a20 (commit)
from 154edcc30cc41ec5a2bb973ea632351cb67603b5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 5aeecb313a635e3523458519d0a741b36edd7fdc
Merge: 2f60bbf93d87b6e0cd7ea05bc826e104868f6aae 154edcc30cc41ec5a2bb973ea632351cb67603b5
Author: Mark Wielaard <mwielaard@redhat.com>
Date: Tue Feb 5 22:06:26 2008 +0100
Merge commit 'origin'
commit 2f60bbf93d87b6e0cd7ea05bc826e104868f6aae
Merge: 7c08b13dc4b83fc468190c889ba3de2f7d8e83f7 e865a5692d1da0739b37a8be1d4bd185e7707a20
Author: Mark Wielaard <mwielaard@redhat.com>
Date: Tue Feb 5 21:48:54 2008 +0100
Merge branch 'vendor/LIBUNWIND'
Conflicts:
frysk-imports/libunwind/Makefile.in
frysk-imports/libunwind/aclocal.m4
frysk-imports/libunwind/configure
frysk-imports/libunwind/configure.in
frysk-imports/libunwind/doc/Makefile.in
frysk-imports/libunwind/src/Makefile.in
frysk-imports/libunwind/src/dwarf/Gfde.c
frysk-imports/libunwind/src/dwarf/Gfind_proc_info-lsb.c
frysk-imports/libunwind/src/mi/Gget_reg.c
frysk-imports/libunwind/tests/Makefile.in
-----------------------------------------------------------------------
Summary of changes:
frysk-imports/libunwind/Makefile.am | 8 +
frysk-imports/libunwind/configure.in | 5 +
frysk-imports/libunwind/include/dwarf.h | 19 +-
frysk-imports/libunwind/include/dwarf_i.h | 72 ++-
frysk-imports/libunwind/include/libunwind-arm.h | 298 ++++++++
.../{libunwind-x86_64.h => libunwind-mips.h} | 128 +++--
frysk-imports/libunwind/include/remote.h | 8 +-
.../include/{tdep-x86 => tdep-arm}/dwarf-config.h | 15 +-
.../include/{tdep-x86 => tdep-arm}/jmpbuf.h | 5 +-
.../include/{tdep-x86 => tdep-arm}/libunwind_i.h | 28 +-
.../libunwind/include/tdep-hppa/libunwind_i.h | 1 +
.../{tdep-x86_64 => tdep-mips}/dwarf-config.h | 23 +-
.../include/{tdep-x86 => tdep-mips}/jmpbuf.h | 5 +-
.../include/{tdep-x86 => tdep-mips}/libunwind_i.h | 103 ++-
.../libunwind/include/tdep-ppc32/libunwind_i.h | 1 +
.../libunwind/include/tdep-ppc64/libunwind_i.h | 1 +
.../libunwind/include/tdep-x86/libunwind_i.h | 1 +
.../libunwind/include/tdep-x86_64/libunwind_i.h | 1 +
frysk-imports/libunwind/src/Makefile.am | 118 +++-
.../src/{hppa => arm}/Gcreate_addr_space.c | 15 +-
.../libunwind/src/{ia64 => arm}/Gget_proc_info.c | 11 +-
.../libunwind/src/{hppa => arm}/Gget_save_loc.c | 28 +-
.../libunwind/src/{hppa => arm}/Gglobal.c | 21 +-
frysk-imports/libunwind/src/{x86 => arm}/Ginit.c | 42 +-
.../libunwind/src/{hppa => arm}/Ginit_local.c | 3 +-
.../libunwind/src/{hppa => arm}/Ginit_remote.c | 3 +-
.../_UPT_destroy.c => arm/Gis_signal_frame.c} | 15 +-
frysk-imports/libunwind/src/{ppc32 => arm}/Gregs.c | 67 +-
.../src/{ia64/Gget_proc_info.c => arm/Gresume.c} | 27 +-
.../src/{ia64/Gget_proc_info.c => arm/Gstep.c} | 22 +-
.../src/{hppa => arm}/Lcreate_addr_space.c | 0
.../libunwind/src/{hppa => arm}/Lget_proc_info.c | 0
.../libunwind/src/{hppa => arm}/Lget_save_loc.c | 0
.../libunwind/src/{hppa => arm}/Lglobal.c | 0
frysk-imports/libunwind/src/{hppa => arm}/Linit.c | 0
.../libunwind/src/{hppa => arm}/Linit_local.c | 0
.../libunwind/src/{hppa => arm}/Linit_remote.c | 0
.../libunwind/src/{hppa => arm}/Lis_signal_frame.c | 0
frysk-imports/libunwind/src/{hppa => arm}/Lregs.c | 0
.../libunwind/src/{hppa => arm}/Lresume.c | 0
frysk-imports/libunwind/src/{dwarf => arm}/Lstep.c | 0
frysk-imports/libunwind/src/arm/gen-offsets.c | 54 ++
.../arm/getcontext.S} | 59 +-
frysk-imports/libunwind/src/{x86 => arm}/init.h | 42 +-
.../libunwind/src/{x86_64 => arm}/is_fpreg.c | 19 +-
frysk-imports/libunwind/src/arm/offsets.h | 36 +
frysk-imports/libunwind/src/arm/regname.c | 90 +++
frysk-imports/libunwind/src/arm/siglongjmp.S | 8 +
.../src/{mi/dyn-info-list.c => arm/unwind_i.h} | 21 +-
frysk-imports/libunwind/src/dwarf/Gexpr.c | 60 ++-
frysk-imports/libunwind/src/dwarf/Gfde.c | 73 ++-
.../libunwind/src/dwarf/Gfind_proc_info-lsb.c | 734 +++++++++++++++++---
frysk-imports/libunwind/src/dwarf/Gpe.c | 2 +
.../libunwind/src/mi/Gfind_dynamic_proc_info.c | 2 +-
frysk-imports/libunwind/src/mi/Gget_reg.c | 4 +-
frysk-imports/libunwind/src/mi/backtrace.c | 2 +-
frysk-imports/libunwind/src/mi/dyn-info-list.c | 2 +-
frysk-imports/libunwind/src/mi/flush_cache.c | 14 +
.../src/{ia64 => mips}/Gcreate_addr_space.c | 28 +-
.../libunwind/src/{ia64 => mips}/Gget_proc_info.c | 11 +-
.../libunwind/src/{x86_64 => mips}/Gget_save_loc.c | 48 +-
.../libunwind/src/{hppa => mips}/Gglobal.c | 21 +-
frysk-imports/libunwind/src/{x86 => mips}/Ginit.c | 87 ++--
.../libunwind/src/{hppa => mips}/Ginit_local.c | 3 +-
.../libunwind/src/{hppa => mips}/Ginit_remote.c | 3 +-
.../_UPT_destroy.c => mips/Gis_signal_frame.c} | 15 +-
.../libunwind/src/{ppc32 => mips}/Gregs.c | 85 ++-
.../src/{ia64/Gget_proc_info.c => mips/Gresume.c} | 27 +-
.../src/{ia64/Gget_proc_info.c => mips/Gstep.c} | 22 +-
.../src/{hppa => mips}/Lcreate_addr_space.c | 0
.../libunwind/src/{hppa => mips}/Lget_proc_info.c | 0
.../libunwind/src/{hppa => mips}/Lget_save_loc.c | 0
.../libunwind/src/{hppa => mips}/Lglobal.c | 0
frysk-imports/libunwind/src/{hppa => mips}/Linit.c | 0
.../libunwind/src/{hppa => mips}/Linit_local.c | 0
.../libunwind/src/{hppa => mips}/Linit_remote.c | 0
.../src/{hppa => mips}/Lis_signal_frame.c | 0
frysk-imports/libunwind/src/{hppa => mips}/Lregs.c | 0
.../libunwind/src/{hppa => mips}/Lresume.c | 0
.../libunwind/src/{dwarf => mips}/Lstep.c | 0
.../src/{ptrace/_UPT_destroy.c => mips/elfxx.c} | 11 +-
frysk-imports/libunwind/src/mips/gen-offsets.c | 30 +
.../src/{ia64/siglongjmp.S => mips/getcontext.S} | 102 ++--
frysk-imports/libunwind/src/{hppa => mips}/init.h | 23 +-
.../libunwind/src/{ppc32 => mips}/is_fpreg.c | 11 +-
frysk-imports/libunwind/src/mips/offsets.h | 39 +
.../libunwind/src/{x86_64 => mips}/regname.c | 30 +-
frysk-imports/libunwind/src/mips/siglongjmp.S | 8 +
.../libunwind/src/{x86 => mips}/unwind_i.h | 24 +-
.../libunwind/src/ptrace/_UPT_reg_offset.c | 2 +
frysk-imports/libunwind/src/setjmp/longjmp.c | 2 +-
frysk-imports/libunwind/src/setjmp/siglongjmp.c | 2 +-
.../libunwind/src/unwind/FindEnclosingFunction.c | 5 +-
.../libunwind/src/unwind/RaiseException.c | 2 +-
.../libunwind/src/unwind/unwind-internal.h | 2 +-
frysk-imports/libunwind/src/x86/Gget_save_loc.c | 8 +
96 files changed, 2227 insertions(+), 740 deletions(-)
create mode 100644 frysk-imports/libunwind/include/libunwind-arm.h
copy frysk-imports/libunwind/include/{libunwind-x86_64.h => libunwind-mips.h} (53%)
copy frysk-imports/libunwind/include/{tdep-x86 => tdep-arm}/dwarf-config.h (80%)
copy frysk-imports/libunwind/include/{tdep-x86 => tdep-arm}/jmpbuf.h (93%)
copy frysk-imports/libunwind/include/{tdep-x86 => tdep-arm}/libunwind_i.h (92%)
copy frysk-imports/libunwind/include/{tdep-x86_64 => tdep-mips}/dwarf-config.h (74%)
copy frysk-imports/libunwind/include/{tdep-x86 => tdep-mips}/jmpbuf.h (93%)
copy frysk-imports/libunwind/include/{tdep-x86 => tdep-mips}/libunwind_i.h (78%)
copy frysk-imports/libunwind/src/{hppa => arm}/Gcreate_addr_space.c (81%)
copy frysk-imports/libunwind/src/{ia64 => arm}/Gget_proc_info.c (86%)
copy frysk-imports/libunwind/src/{hppa => arm}/Gget_save_loc.c (78%)
copy frysk-imports/libunwind/src/{hppa => arm}/Gglobal.c (76%)
copy frysk-imports/libunwind/src/{x86 => arm}/Ginit.c (77%)
copy frysk-imports/libunwind/src/{hppa => arm}/Ginit_local.c (96%)
copy frysk-imports/libunwind/src/{hppa => arm}/Ginit_remote.c (93%)
copy frysk-imports/libunwind/src/{ptrace/_UPT_destroy.c => arm/Gis_signal_frame.c} (83%)
copy frysk-imports/libunwind/src/{ppc32 => arm}/Gregs.c (63%)
copy frysk-imports/libunwind/src/{ia64/Gget_proc_info.c => arm/Gresume.c} (79%)
copy frysk-imports/libunwind/src/{ia64/Gget_proc_info.c => arm/Gstep.c} (75%)
copy frysk-imports/libunwind/src/{hppa => arm}/Lcreate_addr_space.c (100%)
copy frysk-imports/libunwind/src/{hppa => arm}/Lget_proc_info.c (100%)
copy frysk-imports/libunwind/src/{hppa => arm}/Lget_save_loc.c (100%)
copy frysk-imports/libunwind/src/{hppa => arm}/Lglobal.c (100%)
copy frysk-imports/libunwind/src/{hppa => arm}/Linit.c (100%)
copy frysk-imports/libunwind/src/{hppa => arm}/Linit_local.c (100%)
copy frysk-imports/libunwind/src/{hppa => arm}/Linit_remote.c (100%)
copy frysk-imports/libunwind/src/{hppa => arm}/Lis_signal_frame.c (100%)
copy frysk-imports/libunwind/src/{hppa => arm}/Lregs.c (100%)
copy frysk-imports/libunwind/src/{hppa => arm}/Lresume.c (100%)
copy frysk-imports/libunwind/src/{dwarf => arm}/Lstep.c (100%)
create mode 100644 frysk-imports/libunwind/src/arm/gen-offsets.c
copy frysk-imports/libunwind/{tests/ia64-test-readonly-asm.S => src/arm/getcontext.S} (57%)
copy frysk-imports/libunwind/src/{x86 => arm}/init.h (54%)
copy frysk-imports/libunwind/src/{x86_64 => arm}/is_fpreg.c (69%)
create mode 100644 frysk-imports/libunwind/src/arm/offsets.h
create mode 100644 frysk-imports/libunwind/src/arm/regname.c
create mode 100644 frysk-imports/libunwind/src/arm/siglongjmp.S
copy frysk-imports/libunwind/src/{mi/dyn-info-list.c => arm/unwind_i.h} (80%)
copy frysk-imports/libunwind/src/{ia64 => mips}/Gcreate_addr_space.c (87%)
copy frysk-imports/libunwind/src/{ia64 => mips}/Gget_proc_info.c (86%)
copy frysk-imports/libunwind/src/{x86_64 => mips}/Gget_save_loc.c (68%)
copy frysk-imports/libunwind/src/{hppa => mips}/Gglobal.c (75%)
copy frysk-imports/libunwind/src/{x86 => mips}/Ginit.c (67%)
copy frysk-imports/libunwind/src/{hppa => mips}/Ginit_local.c (96%)
copy frysk-imports/libunwind/src/{hppa => mips}/Ginit_remote.c (93%)
copy frysk-imports/libunwind/src/{ptrace/_UPT_destroy.c => mips/Gis_signal_frame.c} (83%)
copy frysk-imports/libunwind/src/{ppc32 => mips}/Gregs.c (58%)
copy frysk-imports/libunwind/src/{ia64/Gget_proc_info.c => mips/Gresume.c} (79%)
copy frysk-imports/libunwind/src/{ia64/Gget_proc_info.c => mips/Gstep.c} (75%)
copy frysk-imports/libunwind/src/{hppa => mips}/Lcreate_addr_space.c (100%)
copy frysk-imports/libunwind/src/{hppa => mips}/Lget_proc_info.c (100%)
copy frysk-imports/libunwind/src/{hppa => mips}/Lget_save_loc.c (100%)
copy frysk-imports/libunwind/src/{hppa => mips}/Lglobal.c (100%)
copy frysk-imports/libunwind/src/{hppa => mips}/Linit.c (100%)
copy frysk-imports/libunwind/src/{hppa => mips}/Linit_local.c (100%)
copy frysk-imports/libunwind/src/{hppa => mips}/Linit_remote.c (100%)
copy frysk-imports/libunwind/src/{hppa => mips}/Lis_signal_frame.c (100%)
copy frysk-imports/libunwind/src/{hppa => mips}/Lregs.c (100%)
copy frysk-imports/libunwind/src/{hppa => mips}/Lresume.c (100%)
copy frysk-imports/libunwind/src/{dwarf => mips}/Lstep.c (100%)
copy frysk-imports/libunwind/src/{ptrace/_UPT_destroy.c => mips/elfxx.c} (87%)
create mode 100644 frysk-imports/libunwind/src/mips/gen-offsets.c
copy frysk-imports/libunwind/src/{ia64/siglongjmp.S => mips/getcontext.S} (54%)
copy frysk-imports/libunwind/src/{hppa => mips}/init.h (74%)
copy frysk-imports/libunwind/src/{ppc32 => mips}/is_fpreg.c (84%)
create mode 100644 frysk-imports/libunwind/src/mips/offsets.h
copy frysk-imports/libunwind/src/{x86_64 => mips}/regname.c (79%)
create mode 100644 frysk-imports/libunwind/src/mips/siglongjmp.S
copy frysk-imports/libunwind/src/{x86 => mips}/unwind_i.h (81%)
mode change 100644 => 100755 frysk-imports/libunwind/tests/perf-startup
First 500 lines of diff:
diff --git a/frysk-imports/libunwind/Makefile.am b/frysk-imports/libunwind/Makefile.am
index a46075b..e31e23e 100644
--- a/frysk-imports/libunwind/Makefile.am
+++ b/frysk-imports/libunwind/Makefile.am
@@ -1,9 +1,15 @@
+if ARCH_ARM
+include_HEADERS_tdep = include/libunwind-arm.h
+else
if ARCH_IA64
include_HEADERS_tdep = include/libunwind-ia64.h
else
if ARCH_HPPA
include_HEADERS_tdep = include/libunwind-hppa.h
else
+if ARCH_MIPS
+include_HEADERS_tdep = include/libunwind-mips.h
+else
if ARCH_X86
include_HEADERS_tdep = include/libunwind-x86.h
else
@@ -19,8 +25,10 @@ endif # ARCH_PPC64
endif # ARCH_PPC32
endif # ARCH_X86_64
endif # ARCH_X86
+endif # ARCH_MIPS
endif # ARCH_HPPA
endif # ARCH_IA64
+endif # ARCH_ARM
include_HEADERS_common = $(include_HEADERS_tdep) \
include/libunwind-dynamic.h include/libunwind-ptrace.h
diff --git a/frysk-imports/libunwind/configure.in b/frysk-imports/libunwind/configure.in
index 28ed2b2..26e256d 100644
--- a/frysk-imports/libunwind/configure.in
+++ b/frysk-imports/libunwind/configure.in
@@ -98,19 +98,24 @@ AM_CONDITIONAL(USE_ALTIVEC, test x$use_altivec = xhas_altivec)
get_arch() {
case "$1" in
+ arm*) echo arm;;
i?86) echo x86;;
hppa*) echo hppa;;
+ mips*) echo mips;;
powerpc64) echo "ppc64";;
*) echo $1;;
esac
}
build_arch=`get_arch $build_cpu`
+host_arch=`get_arch $host_cpu`
target_arch=`get_arch $target_cpu`
AM_CONDITIONAL(REMOTE_ONLY, test x$frysk_local = xyes)
+AM_CONDITIONAL(ARCH_ARM, test x$target_arch = xarm)
AM_CONDITIONAL(ARCH_IA64, test x$target_arch = xia64)
AM_CONDITIONAL(ARCH_HPPA, test x$target_arch = xhppa)
+AM_CONDITIONAL(ARCH_MIPS, test x$target_arch = xmips)
AM_CONDITIONAL(ARCH_X86, test x$target_arch = xx86)
AM_CONDITIONAL(ARCH_X86_64, test x$target_arch = xx86_64)
AM_CONDITIONAL(ARCH_PPC32, test x$target_arch = xppc32)
diff --git a/frysk-imports/libunwind/include/dwarf.h b/frysk-imports/libunwind/include/dwarf.h
index 3a17c87..61e5823 100644
--- a/frysk-imports/libunwind/include/dwarf.h
+++ b/frysk-imports/libunwind/include/dwarf.h
@@ -335,6 +335,23 @@ struct dwarf_rs_cache
dwarf_reg_state_t buckets[DWARF_UNW_CACHE_SIZE];
};
+/* A list of descriptors for loaded .debug_frame sections. */
+
+struct unw_debug_frame_list
+ {
+ /* The start (inclusive) and end (exclusive) of the described region. */
+ unw_word_t start;
+ unw_word_t end;
+ /* The debug frame itself. */
+ char *debug_frame;
+ size_t debug_frame_size;
+ /* Index (for binary search). */
+ struct table_entry *index;
+ size_t index_size;
+ /* Pointer to next descriptor. */
+ struct unw_debug_frame_list *next;
+ };
+
/* Convenience macros: */
#define dwarf_init UNW_ARCH_OBJ (dwarf_init)
#define dwarf_find_proc_info UNW_OBJ (dwarf_find_proc_info)
@@ -366,10 +383,10 @@ extern int dwarf_eval_expr (struct dwarf_cursor *c, unw_word_t *addr,
int *is_register);
extern int dwarf_extract_proc_info_from_fde (unw_addr_space_t as,
unw_accessors_t *a,
- unw_word_t table_start,
unw_word_t *fde_addr,
unw_proc_info_t *pi,
int need_unwind_info,
+ unw_word_t base,
void *arg);
extern int dwarf_find_save_locs (struct dwarf_cursor *c);
extern int dwarf_create_state_record (struct dwarf_cursor *c,
diff --git a/frysk-imports/libunwind/include/dwarf_i.h b/frysk-imports/libunwind/include/dwarf_i.h
index 5b78dc0..d01eab8 100644
--- a/frysk-imports/libunwind/include/dwarf_i.h
+++ b/frysk-imports/libunwind/include/dwarf_i.h
@@ -9,6 +9,12 @@
#include "dwarf.h"
#include "libunwind_i.h"
+/* Unless we are told otherwise, assume that a "machine address" is
+ the size of an unw_word_t. */
+#ifndef dwarf_addr_size
+# define dwarf_addr_size(as) (sizeof (unw_word_t))
+#endif
+
#define dwarf_to_unw_regnum_map UNW_OBJ (dwarf_to_unw_regnum_map)
extern uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
@@ -22,7 +28,7 @@ extern uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
/* In the local-only case, we can let the compiler directly access
memory and don't need to worry about differing byte-order. */
-typedef union
+typedef union __attribute__ ((packed))
{
int8_t s8;
int16_t s16;
@@ -32,16 +38,15 @@ typedef union
uint16_t u16;
uint32_t u32;
uint64_t u64;
- unw_word_t w;
void *ptr;
}
-dwarf_misaligned_value_t __attribute__ ((packed));
+dwarf_misaligned_value_t;
static inline int
dwarf_reads8 (unw_addr_space_t as, unw_accessors_t *a, unw_word_t *addr,
int8_t *val, void *arg)
{
- dwarf_misaligned_value_t *mvp = (void *) *addr;
+ dwarf_misaligned_value_t *mvp = (void *) (uintptr_t) *addr;
*val = mvp->s8;
*addr += sizeof (mvp->s8);
@@ -52,7 +57,7 @@ static inline int
dwarf_reads16 (unw_addr_space_t as, unw_accessors_t *a, unw_word_t *addr,
int16_t *val, void *arg)
{
- dwarf_misaligned_value_t *mvp = (void *) *addr;
+ dwarf_misaligned_value_t *mvp = (void *) (uintptr_t) *addr;
*val = mvp->s16;
*addr += sizeof (mvp->s16);
@@ -63,7 +68,7 @@ static inline int
dwarf_reads32 (unw_addr_space_t as, unw_accessors_t *a, unw_word_t *addr,
int32_t *val, void *arg)
{
- dwarf_misaligned_value_t *mvp = (void *) *addr;
+ dwarf_misaligned_value_t *mvp = (void *) (uintptr_t) *addr;
*val = mvp->s32;
*addr += sizeof (mvp->s32);
@@ -74,7 +79,7 @@ static inline int
dwarf_reads64 (unw_addr_space_t as, unw_accessors_t *a, unw_word_t *addr,
int64_t *val, void *arg)
{
- dwarf_misaligned_value_t *mvp = (void *) *addr;
+ dwarf_misaligned_value_t *mvp = (void *) (uintptr_t) *addr;
*val = mvp->s64;
*addr += sizeof (mvp->s64);
@@ -85,7 +90,7 @@ static inline int
dwarf_readu8 (unw_addr_space_t as, unw_accessors_t *a, unw_word_t *addr,
uint8_t *val, void *arg)
{
- dwarf_misaligned_value_t *mvp = (void *) *addr;
+ dwarf_misaligned_value_t *mvp = (void *) (uintptr_t) *addr;
*val = mvp->u8;
*addr += sizeof (mvp->u8);
@@ -96,7 +101,7 @@ static inline int
dwarf_readu16 (unw_addr_space_t as, unw_accessors_t *a, unw_word_t *addr,
uint16_t *val, void *arg)
{
- dwarf_misaligned_value_t *mvp = (void *) *addr;
+ dwarf_misaligned_value_t *mvp = (void *) (uintptr_t) *addr;
*val = mvp->u16;
*addr += sizeof (mvp->u16);
@@ -107,7 +112,7 @@ static inline int
dwarf_readu32 (unw_addr_space_t as, unw_accessors_t *a, unw_word_t *addr,
uint32_t *val, void *arg)
{
- dwarf_misaligned_value_t *mvp = (void *) *addr;
+ dwarf_misaligned_value_t *mvp = (void *) (uintptr_t) *addr;
*val = mvp->u32;
*addr += sizeof (mvp->u32);
@@ -118,24 +123,13 @@ static inline int
dwarf_readu64 (unw_addr_space_t as, unw_accessors_t *a, unw_word_t *addr,
uint64_t *val, void *arg)
{
- dwarf_misaligned_value_t *mvp = (void *) *addr;
+ dwarf_misaligned_value_t *mvp = (void *) (uintptr_t) *addr;
*val = mvp->u64;
*addr += sizeof (mvp->u64);
return 0;
}
-static inline int
-dwarf_readw (unw_addr_space_t as, unw_accessors_t *a, unw_word_t *addr,
- unw_word_t *val, void *arg)
-{
- dwarf_misaligned_value_t *mvp = (void *) *addr;
-
- *val = mvp->w;
- *addr += sizeof (mvp->w);
- return 0;
-}
-
#else /* !UNW_LOCAL_ONLY */
static inline int
@@ -263,25 +257,37 @@ dwarf_reads64 (unw_addr_space_t as, unw_accessors_t *a, unw_word_t *addr,
return 0;
}
+#endif /* !UNW_LOCAL_ONLY */
+
static inline int
dwarf_readw (unw_addr_space_t as, unw_accessors_t *a, unw_word_t *addr,
unw_word_t *val, void *arg)
{
- switch (sizeof (unw_word_t))
+ uint32_t u32;
+ uint64_t u64;
+ int ret;
+
+ switch (dwarf_addr_size (as))
{
case 4:
- return dwarf_readu32 (as, a, addr, (uint32_t *) val, arg);
+ ret = dwarf_readu32 (as, a, addr, &u32, arg);
+ if (ret < 0)
+ return ret;
+ *val = u32;
+ return ret;
case 8:
- return dwarf_readu64 (as, a, addr, (uint64_t *) val, arg);
+ ret = dwarf_readu64 (as, a, addr, &u64, arg);
+ if (ret < 0)
+ return ret;
+ *val = u64;
+ return ret;
default:
abort ();
}
}
-#endif /* !UNW_LOCAL_ONLY */
-
/* Read an unsigned "little-endian base 128" value. See Chapter 7.6
of DWARF spec v3. */
@@ -360,7 +366,8 @@ dwarf_read_encoded_pointer_inlined (unw_addr_space_t as, unw_accessors_t *a,
}
else if (encoding == DW_EH_PE_aligned)
{
- *addr = (initial_addr + sizeof (unw_word_t) - 1) & -sizeof (unw_word_t);
+ int size = dwarf_addr_size (as);
+ *addr = (initial_addr + size - 1) & -size;
return dwarf_readw (as, a, addr, valp, arg);
}
@@ -459,6 +466,15 @@ dwarf_read_encoded_pointer_inlined (unw_addr_space_t as, unw_accessors_t *a,
return -UNW_EINVAL;
}
+ /* Trim off any extra bits. Assume that sign extension isn't
+ required; the only place it is needed is MIPS kernel space
+ addresses. */
+ if (sizeof (val) > dwarf_addr_size (as))
+ {
+ assert (dwarf_addr_size (as) == 4);
+ val = (uint32_t) val;
+ }
+
if (encoding & DW_EH_PE_indirect)
{
unw_word_t indirect_addr = val;
diff --git a/frysk-imports/libunwind/include/libunwind-arm.h b/frysk-imports/libunwind/include/libunwind-arm.h
new file mode 100644
index 0000000..492331e
--- /dev/null
+++ b/frysk-imports/libunwind/include/libunwind-arm.h
@@ -0,0 +1,298 @@
+/* libunwind - a platform-independent unwind library
+ Copyright (C) 2008 CodeSourcery
+
+This file is part of libunwind.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
+
+#ifndef LIBUNWIND_H
+#define LIBUNWIND_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#include <inttypes.h>
+#include <ucontext.h>
+
+#define UNW_TARGET arm
+#define UNW_TARGET_ARM 1
+
+#define _U_TDEP_QP_TRUE 0 /* see libunwind-dynamic.h */
+
+/* This needs to be big enough to accommodate "struct cursor", while
+ leaving some slack for future expansion. Changing this value will
+ require recompiling all users of this library. Stack allocation is
+ relatively cheap and unwind-state copying is relatively rare, so we
+ want to err on making it rather too big than too small. */
+
+/* FIXME for ARM. Too big? What do other things use for similar tasks? */
+#define UNW_TDEP_CURSOR_LEN 4096
+
+typedef uint32_t unw_word_t;
+typedef int32_t unw_sword_t;
+
+typedef long double unw_tdep_fpreg_t;
+
+typedef enum
+ {
+ UNW_ARM_R0,
+ UNW_ARM_R1,
+ UNW_ARM_R2,
+ UNW_ARM_R3,
+ UNW_ARM_R4,
+ UNW_ARM_R5,
+ UNW_ARM_R6,
+ UNW_ARM_R7,
+ UNW_ARM_R8,
+ UNW_ARM_R9,
+ UNW_ARM_R10,
+ UNW_ARM_R11,
+ UNW_ARM_R12,
+ UNW_ARM_R13,
+ UNW_ARM_R14,
+ UNW_ARM_R15,
+
+ /* VFPv2 s0-s31 (obsolescent numberings). */
+ UNW_ARM_S0 = 64,
+ UNW_ARM_S1,
+ UNW_ARM_S2,
+ UNW_ARM_S3,
+ UNW_ARM_S4,
+ UNW_ARM_S5,
+ UNW_ARM_S6,
+ UNW_ARM_S7,
+ UNW_ARM_S8,
+ UNW_ARM_S9,
+ UNW_ARM_S10,
+ UNW_ARM_S11,
+ UNW_ARM_S12,
+ UNW_ARM_S13,
+ UNW_ARM_S14,
+ UNW_ARM_S15,
+ UNW_ARM_S16,
+ UNW_ARM_S17,
+ UNW_ARM_S18,
+ UNW_ARM_S19,
+ UNW_ARM_S20,
+ UNW_ARM_S21,
+ UNW_ARM_S22,
+ UNW_ARM_S23,
+ UNW_ARM_S24,
+ UNW_ARM_S25,
+ UNW_ARM_S26,
+ UNW_ARM_S27,
+ UNW_ARM_S28,
+ UNW_ARM_S29,
+ UNW_ARM_S30,
+ UNW_ARM_S31,
+
+ /* FPA register numberings. */
+ UNW_ARM_F0 = 96,
+ UNW_ARM_F1,
+ UNW_ARM_F2,
+ UNW_ARM_F3,
+ UNW_ARM_F4,
+ UNW_ARM_F5,
+ UNW_ARM_F6,
+ UNW_ARM_F7,
+
+ /* iWMMXt GR register numberings. */
+ UNW_ARM_wCGR0 = 104,
+ UNW_ARM_wCGR1,
+ UNW_ARM_wCGR2,
+ UNW_ARM_wCGR3,
+ UNW_ARM_wCGR4,
+ UNW_ARM_wCGR5,
+ UNW_ARM_wCGR6,
+ UNW_ARM_wCGR7,
+
+ /* iWMMXt register numberings. */
+ UNW_ARM_wR0 = 112,
+ UNW_ARM_wR1,
+ UNW_ARM_wR2,
+ UNW_ARM_wR3,
+ UNW_ARM_wR4,
+ UNW_ARM_wR5,
+ UNW_ARM_wR6,
+ UNW_ARM_wR7,
+ UNW_ARM_wR8,
+ UNW_ARM_wR9,
+ UNW_ARM_wR10,
+ UNW_ARM_wR11,
+ UNW_ARM_wR12,
+ UNW_ARM_wR13,
+ UNW_ARM_wR14,
+ UNW_ARM_wR15,
+
+ /* Two-byte encodings from here on. */
+
+ /* SPSR. */
+ UNW_ARM_SPSR = 128,
+ UNW_ARM_SPSR_FIQ,
+ UNW_ARM_SPSR_IRQ,
+ UNW_ARM_SPSR_ABT,
+ UNW_ARM_SPSR_UND,
+ UNW_ARM_SPSR_SVC,
+
+ /* User mode registers. */
+ UNW_ARM_R8_USR = 144,
+ UNW_ARM_R9_USR,
+ UNW_ARM_R10_USR,
+ UNW_ARM_R11_USR,
+ UNW_ARM_R12_USR,
+ UNW_ARM_R13_USR,
+ UNW_ARM_R14_USR,
+
+ /* FIQ registers. */
+ UNW_ARM_R8_FIQ = 151,
+ UNW_ARM_R9_FIQ,
+ UNW_ARM_R10_FIQ,
+ UNW_ARM_R11_FIQ,
+ UNW_ARM_R12_FIQ,
+ UNW_ARM_R13_FIQ,
+ UNW_ARM_R14_FIQ,
+
+ /* IRQ registers. */
+ UNW_ARM_R13_IRQ = 158,
+ UNW_ARM_R14_IRQ,
+
+ /* ABT registers. */
+ UNW_ARM_R13_ABT = 160,
+ UNW_ARM_R14_ABT,
+
+ /* UND registers. */
+ UNW_ARM_R13_UND = 162,
+ UNW_ARM_R14_UND,
+
+ /* SVC registers. */
+ UNW_ARM_R13_SVC = 164,
+ UNW_ARM_R14_SVC,
+
+ /* iWMMXt control registers. */
+ UNW_ARM_wC0 = 192,
+ UNW_ARM_wC1,
+ UNW_ARM_wC2,
+ UNW_ARM_wC3,
+ UNW_ARM_wC4,
+ UNW_ARM_wC5,
+ UNW_ARM_wC6,
+ UNW_ARM_wC7,
+
+ /* VFPv3/Neon 64-bit registers. */
+ UNW_ARM_D0 = 256,
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] 2+ messages in thread
* [SCM] master: Merge commit 'origin'
@ 2008-01-17 17:30 moore
0 siblings, 0 replies; 2+ messages in thread
From: moore @ 2008-01-17 17:30 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via 60492e907b8182e4bc2a9f27d467ef79a14dfb30 (commit)
via d07c3cc3baa0cc28cd6a7fa05cc2f0d51d744044 (commit)
via f51302c2c5c48ba4088d783e23b80eadbddcf9de (commit)
via aadf1a17a80683789875729c14bb4df9ef4cfb1e (commit)
via 2189e2a71a5e38d6ce0122ffa1dabd812ea8a62b (commit)
via 3ba4d42fbca6f5ce7dc22ab1f6b34a575537be46 (commit)
via 261cfee49f93bb042db2d123b6ed86b08ae35fee (commit)
via 131e257ac4b0815274b997039f41d442821d9d59 (commit)
via 019482335590d521328b71ebe0d2cbfcf4fb93b3 (commit)
via 398db1108cefd54a76534142dc851f14064703ff (commit)
from 122b4d0b3b983050d9f98ca9970e37c03d1a5db8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 60492e907b8182e4bc2a9f27d467ef79a14dfb30
Merge: d07c3cc3baa0cc28cd6a7fa05cc2f0d51d744044 122b4d0b3b983050d9f98ca9970e37c03d1a5db8
Author: Tim Moore <moore@blackbox.bricoworks.com>
Date: Thu Jan 17 18:27:48 2008 +0100
Merge commit 'origin'
commit d07c3cc3baa0cc28cd6a7fa05cc2f0d51d744044
Merge: f51302c2c5c48ba4088d783e23b80eadbddcf9de 882c8ebdcc825139e58e50982810a0f00f1a229b
Author: Tim Moore <moore@blackbox.bricoworks.com>
Date: Thu Jan 17 14:01:35 2008 +0100
Merge commit 'origin'
commit f51302c2c5c48ba4088d783e23b80eadbddcf9de
Merge: 0443d3a51378ad5454ed4b04d12823380e7385cf aadf1a17a80683789875729c14bb4df9ef4cfb1e
Author: Tim Moore <moore@blackbox.bricoworks.com>
Date: Wed Jan 16 15:48:04 2008 +0100
Merge branch 'topic/jline-import'
commit aadf1a17a80683789875729c14bb4df9ef4cfb1e
Author: Tim Moore <moore@blackbox.bricoworks.com>
Date: Wed Jan 16 15:24:34 2008 +0100
Changes for import of jline 0.0.93
frysk-imports/jline/ChangeLog:
2008-01-16 Tim Moore <timoore@redhat.com>
* src/src/main/java/jline/PtyTerminal.java (isEchoEnabled,
enableEcho, disableEcho): Implement new abstract methods in
Terminal.
Import jline 0.9.93, which has a new file layout.
commit 2189e2a71a5e38d6ce0122ffa1dabd812ea8a62b
Author: Tim Moore <moore@blackbox.bricoworks.com>
Date: Wed Jan 16 10:28:40 2008 +0100
Add back local patches
commit 3ba4d42fbca6f5ce7dc22ab1f6b34a575537be46
Author: Tim Moore <moore@blackbox.bricoworks.com>
Date: Wed Jan 16 10:17:15 2008 +0100
Add back new files to jline-.9.9.3
commit 261cfee49f93bb042db2d123b6ed86b08ae35fee
Merge: 131e257ac4b0815274b997039f41d442821d9d59 019482335590d521328b71ebe0d2cbfcf4fb93b3
Author: Tim Moore <moore@blackbox.bricoworks.com>
Date: Wed Jan 16 10:12:07 2008 +0100
Merge branch 'vendor/JLINE-9-9-3' into topic/jline-import
commit 131e257ac4b0815274b997039f41d442821d9d59
Author: Tim Moore <moore@blackbox.bricoworks.com>
Date: Wed Jan 16 10:11:39 2008 +0100
Delete old jline in preperation for merge
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/util/PtyTerminal.java | 19 +
frysk-imports/jline/.cvsignore | 4 -
frysk-imports/jline/AUTHORS | 1 -
frysk-imports/jline/CHANGELOG | 16 -
frysk-imports/jline/ChangeLog | 8 +
frysk-imports/jline/{LICENSE => LICENSE.txt} | 2 +-
frysk-imports/jline/Makefile.am | 7 +-
.../javadoc => apidocs}/allclasses-frame.html | 11 +-
.../javadoc => apidocs}/allclasses-noframe.html | 11 +-
.../javadoc => apidocs}/constant-values.html | 341 +++--
.../javadoc => apidocs}/deprecated-list.html | 33 +-
.../{doc-build/javadoc => apidocs}/help-doc.html | 57 +-
frysk-imports/jline/apidocs/index-all.html | 1459 +++++++++++++++++
frysk-imports/jline/apidocs/index.html | 37 +
.../jline/ANSIBuffer.ANSICodes.html | 411 +----
.../javadoc => apidocs}/jline/ANSIBuffer.html | 155 +-
...rgumentCompletor.AbstractArgumentDelimiter.html | 102 +-
.../jline/ArgumentCompletor.ArgumentDelimiter.html | 82 +-
.../jline/ArgumentCompletor.ArgumentList.html | 102 +-
...umentCompletor.WhitespaceArgumentDelimiter.html | 76 +-
.../jline/ArgumentCompletor.html | 223 +--
.../jline/CandidateCycleCompletionHandler.html | 90 +-
.../jline/CandidateListCompletionHandler.html | 365 +++++
.../jline/ClassNameCompletor.html | 121 +-
.../jline/CompletionHandler.html | 70 +-
.../javadoc => apidocs}/jline/Completor.html | 78 +-
.../jline/ConsoleOperations.html | 413 ++++--
.../javadoc => apidocs}/jline/ConsoleReader.html | 960 ++++++------
.../jline/ConsoleReaderInputStream.html | 121 +-
.../javadoc => apidocs}/jline/ConsoleRunner.html | 87 +-
.../javadoc => apidocs}/jline/CursorBuffer.html | 236 ++-
.../jline/FileNameCompletor.html | 138 +-
.../javadoc => apidocs}/jline/History.html | 231 ++-
frysk-imports/jline/apidocs/jline/JLineBuffer.html | 417 +++++
.../jline/apidocs/jline/JLineStringBuilder.html | 586 +++++++
.../javadoc => apidocs}/jline/MultiCompletor.html | 143 +-
.../javadoc => apidocs}/jline/NullCompletor.html | 84 +-
.../jline/SimpleCompletor.NoOpFilter.html | 78 +-
.../SimpleCompletor.SimpleCompletorFilter.html | 70 +-
.../javadoc => apidocs}/jline/SimpleCompletor.html | 231 +--
frysk-imports/jline/apidocs/jline/Terminal.html | 714 +++++++++
.../jline/apidocs/jline/UnixTerminal.html | 822 ++++++++++
.../jline/apidocs/jline/UnsupportedTerminal.html | 534 ++++++
.../jline/apidocs/jline/WindowsTerminal.html | 965 +++++++++++
.../jline/class-use/ANSIBuffer.ANSICodes.html | 139 ++
.../jline/apidocs/jline/class-use/ANSIBuffer.html | 259 +++
...rgumentCompletor.AbstractArgumentDelimiter.html | 165 ++
.../ArgumentCompletor.ArgumentDelimiter.html | 199 +++
.../class-use/ArgumentCompletor.ArgumentList.html | 173 ++
...umentCompletor.WhitespaceArgumentDelimiter.html | 139 ++
.../apidocs/jline/class-use/ArgumentCompletor.html | 139 ++
.../class-use/CandidateCycleCompletionHandler.html | 139 ++
.../class-use/CandidateListCompletionHandler.html | 139 ++
.../jline/class-use/ClassNameCompletor.html | 139 ++
.../apidocs/jline/class-use/CompletionHandler.html | 206 +++
.../jline/apidocs/jline/class-use/Completor.html | 303 ++++
.../apidocs/jline/class-use/ConsoleOperations.html | 196 +++
.../apidocs/jline/class-use/ConsoleReader.html | 266 +++
.../jline/class-use/ConsoleReaderInputStream.html | 139 ++
.../apidocs/jline/class-use/ConsoleRunner.html | 139 ++
.../apidocs/jline/class-use/CursorBuffer.html | 162 ++
.../apidocs/jline/class-use/FileNameCompletor.html | 139 ++
.../jline/apidocs/jline/class-use/History.html | 178 ++
.../jline/apidocs/jline/class-use/JLineBuffer.html | 194 +++
.../jline/class-use/JLineStringBuilder.html | 139 ++
.../apidocs/jline/class-use/MultiCompletor.html | 139 ++
.../apidocs/jline/class-use/NullCompletor.html | 139 ++
.../class-use/SimpleCompletor.NoOpFilter.html | 139 ++
.../SimpleCompletor.SimpleCompletorFilter.html | 183 +++
.../apidocs/jline/class-use/SimpleCompletor.html | 162 ++
.../jline/apidocs/jline/class-use/Terminal.html | 230 +++
.../apidocs/jline/class-use/UnixTerminal.html | 139 ++
.../jline/class-use/UnsupportedTerminal.html | 139 ++
.../apidocs/jline/class-use/WindowsTerminal.html | 139 ++
.../javadoc => apidocs}/jline/package-frame.html | 11 +-
.../javadoc => apidocs}/jline/package-summary.html | 77 +-
.../jline/apidocs/jline/package-tree.html | 179 +++
frysk-imports/jline/apidocs/jline/package-use.html | 238 +++
frysk-imports/jline/apidocs/options | 20 +
frysk-imports/jline/apidocs/overview-tree.html | 181 +++
.../{doc-build/javadoc => apidocs}/package-list | 0
frysk-imports/jline/apidocs/packages | 1 +
.../javadoc => apidocs}/resources/inherit.gif | Bin 57 -> 57 bytes
.../src-html/jline/ANSIBuffer.ANSICodes.html | 471 ++++++
.../jline/apidocs/src-html/jline/ANSIBuffer.html | 471 ++++++
...rgumentCompletor.AbstractArgumentDelimiter.html | 505 ++++++
.../jline/ArgumentCompletor.ArgumentDelimiter.html | 505 ++++++
.../jline/ArgumentCompletor.ArgumentList.html | 505 ++++++
...umentCompletor.WhitespaceArgumentDelimiter.html | 505 ++++++
.../apidocs/src-html/jline/ArgumentCompletor.html | 505 ++++++
.../jline/CandidateCycleCompletionHandler.html | 94 ++
.../jline/CandidateListCompletionHandler.html | 255 +++
.../apidocs/src-html/jline/ClassNameCompletor.html | 212 +++
.../apidocs/src-html/jline/CompletionHandler.html | 86 +
.../jline/apidocs/src-html/jline/Completor.html | 98 ++
.../apidocs/src-html/jline/ConsoleOperations.html | 342 ++++
.../apidocs/src-html/jline/ConsoleReader.html | 1690 ++++++++++++++++++++
.../src-html/jline/ConsoleReaderInputStream.html | 174 ++
.../apidocs/src-html/jline/ConsoleRunner.html | 152 ++
.../jline/apidocs/src-html/jline/CursorBuffer.html | 170 ++
.../apidocs/src-html/jline/FileNameCompletor.html | 199 +++
.../jline/apidocs/src-html/jline/History.html | 321 ++++
.../jline/apidocs/src-html/jline/JLineBuffer.html | 92 ++
.../apidocs/src-html/jline/JLineStringBuilder.html | 135 ++
.../apidocs/src-html/jline/MultiCompletor.html | 146 ++
.../apidocs/src-html/jline/NullCompletor.html | 93 ++
.../src-html/jline/SimpleCompletor.NoOpFilter.html | 260 +++
.../SimpleCompletor.SimpleCompletorFilter.html | 260 +++
.../apidocs/src-html/jline/SimpleCompletor.html | 260 +++
.../jline/apidocs/src-html/jline/Terminal.html | 246 +++
.../jline/apidocs/src-html/jline/UnixTerminal.html | 487 ++++++
.../src-html/jline/UnsupportedTerminal.html | 164 ++
.../apidocs/src-html/jline/WindowsTerminal.html | 487 ++++++
frysk-imports/jline/apidocs/stylesheet.css | 29 +
frysk-imports/jline/build.xml | 413 -----
.../jline/doc-build/javadoc/index-all.html | 1248 ---------------
frysk-imports/jline/doc-build/javadoc/index.html | 23 -
.../jline/CandidateListCompletionHandler.html | 275 ----
.../jline/doc-build/javadoc/jline/Terminal.html | 536 -------
.../doc-build/javadoc/jline/UnixTerminal.html | 560 -------
.../javadoc/jline/UnsupportedTerminal.html | 397 -----
.../doc-build/javadoc/jline/WindowsTerminal.html | 553 -------
.../doc-build/javadoc/jline/package-tree.html | 164 --
.../jline/doc-build/javadoc/overview-tree.html | 166 --
.../jline/doc-build/javadoc/packages.html | 37 -
.../jline/doc-build/javadoc/serialized-form.html | 130 --
.../src-html/jline/ANSIBuffer.ANSICodes.html | 567 -------
.../javadoc/src-html/jline/ANSIBuffer.html | 567 -------
...rgumentCompletor.AbstractArgumentDelimiter.html | 593 -------
.../jline/ArgumentCompletor.ArgumentDelimiter.html | 593 -------
.../jline/ArgumentCompletor.ArgumentList.html | 593 -------
...umentCompletor.WhitespaceArgumentDelimiter.html | 593 -------
.../javadoc/src-html/jline/ArgumentCompletor.html | 593 -------
.../jline/CandidateCycleCompletionHandler.html | 130 --
.../jline/CandidateListCompletionHandler.html | 289 ----
.../javadoc/src-html/jline/ClassNameCompletor.html | 241 ---
.../javadoc/src-html/jline/CompletionHandler.html | 117 --
.../javadoc/src-html/jline/Completor.html | 134 --
.../javadoc/src-html/jline/ConsoleOperations.html | 352 ----
.../javadoc/src-html/jline/ConsoleReader.html | 1601 ------------------
.../src-html/jline/ConsoleReaderInputStream.html | 231 ---
.../javadoc/src-html/jline/ConsoleRunner.html | 190 ---
.../javadoc/src-html/jline/CursorBuffer.html | 164 --
.../javadoc/src-html/jline/FileNameCompletor.html | 247 ---
.../doc-build/javadoc/src-html/jline/History.html | 351 ----
.../javadoc/src-html/jline/MultiCompletor.html | 188 ---
.../javadoc/src-html/jline/NullCompletor.html | 125 --
.../src-html/jline/SimpleCompletor.NoOpFilter.html | 326 ----
.../SimpleCompletor.SimpleCompletorFilter.html | 326 ----
.../javadoc/src-html/jline/SimpleCompletor.html | 326 ----
.../doc-build/javadoc/src-html/jline/Terminal.html | 259 ---
.../javadoc/src-html/jline/UnixTerminal.html | 349 ----
.../src-html/jline/UnsupportedTerminal.html | 148 --
.../javadoc/src-html/jline/WindowsTerminal.html | 434 -----
frysk-imports/jline/doc-build/javadoc/styles.css | 174 --
frysk-imports/jline/doc-build/manual.html | 338 ----
frysk-imports/jline/doc-build/manual.txt | 376 -----
frysk-imports/jline/doc-build/styles.css | 174 --
frysk-imports/jline/doc/html.xsl | 57 -
frysk-imports/jline/doc/index.html | 88 -
frysk-imports/jline/doc/styles.css | 174 --
.../jline/examples/jline/example/Example.java | 97 ++
.../examples/jline/example/PasswordReader.java | 32 +
.../{test => examples}/jline/example/english.gz | Bin 130975 -> 130975 bytes
frysk-imports/jline/jline-0.9.93.jar | Bin 0 -> 87325 bytes
frysk-imports/jline/project.properties | 20 -
frysk-imports/jline/src/jline/ANSIBuffer.java | 501 ------
.../jline/src/jline/ArgumentCompletor.java | 527 ------
.../src/jline/CandidateCycleCompletionHandler.java | 64 -
.../src/jline/CandidateListCompletionHandler.java | 218 ---
.../jline/src/jline/ClassNameCompletor.java | 175 --
.../jline/src/jline/CompletionHandler.java | 51 -
frysk-imports/jline/src/jline/Completor.java | 68 -
.../jline/src/jline/ConsoleOperations.java | 283 ----
frysk-imports/jline/src/jline/ConsoleReader.java | 1535 ------------------
.../jline/src/jline/ConsoleReaderInputStream.java | 165 --
frysk-imports/jline/src/jline/ConsoleRunner.java | 124 --
frysk-imports/jline/src/jline/CursorBuffer.java | 98 --
.../jline/src/jline/FileNameCompletor.java | 181 ---
frysk-imports/jline/src/jline/History.java | 285 ----
frysk-imports/jline/src/jline/MultiCompletor.java | 122 --
frysk-imports/jline/src/jline/NullCompletor.java | 59 -
frysk-imports/jline/src/jline/SimpleCompletor.java | 260 ---
frysk-imports/jline/src/jline/Terminal.java | 196 ---
frysk-imports/jline/src/jline/UnixTerminal.java | 285 ----
.../jline/src/jline/UnsupportedTerminal.java | 82 -
frysk-imports/jline/src/pom.xml | 212 +++
frysk-imports/jline/src/src/assembly/assembly.xml | 55 +
.../jline/src/src/main/java/jline/ANSIBuffer.java | 405 +++++
.../src/src/main/java/jline/ArgumentCompletor.java | 439 +++++
.../jline/CandidateCycleCompletionHandler.java | 28 +
.../java/jline/CandidateListCompletionHandler.java | 189 +++
.../src/main/java/jline/ClassNameCompletor.java | 146 ++
.../src/src/main/java/jline/CompletionHandler.java | 20 +
.../jline/src/src/main/java/jline/Completor.java | 32 +
.../src/src/main/java/jline/ConsoleOperations.java | 274 ++++
.../src/src/main/java/jline/ConsoleReader.java | 1624 +++++++++++++++++++
.../main/java/jline/ConsoleReaderInputStream.java | 108 ++
.../src/src/main/java/jline/ConsoleRunner.java | 86 +
.../src/src/main/java/jline/CursorBuffer.java | 104 ++
.../src/src/main/java/jline/FileNameCompletor.java | 133 ++
.../jline/src/src/main/java/jline/History.java | 255 +++
.../jline/src/src/main/java/jline/JLineBuffer.java | 26 +
.../src/main/java/jline/JLineStringBuilder.java | 69 +
.../src/src/main/java/jline/MultiCompletor.java | 80 +
.../src/src/main/java/jline/NullCompletor.java | 27 +
.../src/{ => src/main/java}/jline/PtyTerminal.java | 24 +
.../src/src/main/java/jline/SimpleCompletor.java | 194 +++
.../jline/src/src/main/java/jline/Terminal.java | 180 +++
.../src/src/main/java/jline/UnixTerminal.java | 421 +++++
.../src/main/java/jline/UnsupportedTerminal.java | 98 ++
.../src/{ => src/main/java}/jline/package.html | 0
.../jline/{ => src/src/main}/native/Makefile | 0
.../src/main}/native/jline_WindowsTerminal.c | 0
.../src/main}/native/jline_WindowsTerminal.h | 0
.../CandidateListCompletionHandler.properties | 1 +
.../src/main/resources/jline/jline32.dll} | Bin 16069 -> 16069 bytes
.../jline/src/src/main/resources/jline/jline64.dll | Bin 0 -> 48128 bytes
.../main/resources}/jline/keybindings.properties | 9 +-
.../resources/jline/windowsbindings.properties} | 16 +-
frysk-imports/jline/src/src/site/apt/building.apt | 39 +
frysk-imports/jline/src/src/site/apt/downloads.apt | 39 +
.../manual.xml => src/src/site/docbook/index.xml} | 147 ++-
frysk-imports/jline/src/src/site/fml/faq.fml | 26 +
.../jline/src/src/site/resources/css/site.css | 311 ++++
.../src/src/site/resources/images/collapsed.png | Bin 0 -> 222 bytes
.../jline/src/src/site/resources/images/dotted.png | Bin 0 -> 190 bytes
.../src/src/site/resources/images/expanded.png | Bin 0 -> 198 bytes
.../src/src/site/resources/images/external.png | Bin 0 -> 223 bytes
.../src/src/site/resources/images/ico_file_pdf.png | Bin 0 -> 280 bytes
.../jline/src/src/site/resources/images/logo.jpg | Bin 0 -> 4121 bytes
.../src/src/site/resources/images/newwindow.png | Bin 0 -> 224 bytes
frysk-imports/jline/src/src/site/site.xml | 40 +
.../src/src/test/java/jline/ConsoleReaderTest.java | 162 ++
.../src/src/test/java/jline/JLineTestCase.java | 140 ++
.../src/src/test/java/jline/TestCompletion.java | 71 +
.../src/src/test/java/jline/TestEditLine.java | 160 ++
.../jline/src/src/test/java/jline/TestHistory.java | 76 +
.../src/src/test/java/jline/example/Example.java | 97 ++
.../test/java/jline/example/PasswordReader.java | 32 +
.../src/test/resources}/jline/example/english.gz | Bin 130975 -> 130975 bytes
frysk-imports/jline/test/jline/JLineTestCase.java | 209 ---
frysk-imports/jline/test/jline/TestCompletion.java | 107 --
frysk-imports/jline/test/jline/TestEditLine.java | 223 ---
frysk-imports/jline/test/jline/TestHistory.java | 115 --
.../jline/test/jline/example/Example.java | 140 --
.../jline/test/jline/example/PasswordReader.java | 65 -
247 files changed, 30676 insertions(+), 25153 deletions(-)
delete mode 100644 frysk-imports/jline/.cvsignore
delete mode 100644 frysk-imports/jline/AUTHORS
delete mode 100644 frysk-imports/jline/CHANGELOG
rename frysk-imports/jline/{LICENSE => LICENSE.txt} (94%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/allclasses-frame.html (88%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/allclasses-noframe.html (87%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/constant-values.html (70%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/deprecated-list.html (78%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/help-doc.html (75%)
create mode 100644 frysk-imports/jline/apidocs/index-all.html
create mode 100644 frysk-imports/jline/apidocs/index.html
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ANSIBuffer.ANSICodes.html (50%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ANSIBuffer.html (68%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ArgumentCompletor.AbstractArgumentDelimiter.html (71%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ArgumentCompletor.ArgumentDelimiter.html (67%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ArgumentCompletor.ArgumentList.html (66%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ArgumentCompletor.WhitespaceArgumentDelimiter.html (66%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ArgumentCompletor.html (63%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/CandidateCycleCompletionHandler.html (61%)
create mode 100644 frysk-imports/jline/apidocs/jline/CandidateListCompletionHandler.html
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ClassNameCompletor.html (59%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/CompletionHandler.html (70%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/Completor.html (70%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ConsoleOperations.html (69%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ConsoleReader.html (52%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ConsoleReaderInputStream.html (52%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ConsoleRunner.html (61%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/CursorBuffer.html (52%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/FileNameCompletor.html (58%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/History.html (56%)
create mode 100644 frysk-imports/jline/apidocs/jline/JLineBuffer.html
create mode 100644 frysk-imports/jline/apidocs/jline/JLineStringBuilder.html
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/MultiCompletor.html (58%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/NullCompletor.html (61%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/SimpleCompletor.NoOpFilter.html (60%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/SimpleCompletor.SimpleCompletorFilter.html (68%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/SimpleCompletor.html (54%)
create mode 100644 frysk-imports/jline/apidocs/jline/Terminal.html
create mode 100644 frysk-imports/jline/apidocs/jline/UnixTerminal.html
create mode 100644 frysk-imports/jline/apidocs/jline/UnsupportedTerminal.html
create mode 100644 frysk-imports/jline/apidocs/jline/WindowsTerminal.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ANSIBuffer.ANSICodes.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ANSIBuffer.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ArgumentCompletor.AbstractArgumentDelimiter.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ArgumentCompletor.ArgumentDelimiter.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ArgumentCompletor.ArgumentList.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ArgumentCompletor.WhitespaceArgumentDelimiter.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ArgumentCompletor.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/CandidateCycleCompletionHandler.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/CandidateListCompletionHandler.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ClassNameCompletor.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/CompletionHandler.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/Completor.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ConsoleOperations.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ConsoleReader.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ConsoleReaderInputStream.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ConsoleRunner.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/CursorBuffer.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/FileNameCompletor.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/History.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/JLineBuffer.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/JLineStringBuilder.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/MultiCompletor.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/NullCompletor.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/SimpleCompletor.NoOpFilter.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/SimpleCompletor.SimpleCompletorFilter.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/SimpleCompletor.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/Terminal.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/UnixTerminal.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/UnsupportedTerminal.html
create mode 100644 frysk-imports/jline/apidocs/jline/class-use/WindowsTerminal.html
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/package-frame.html (89%)
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/package-summary.html (77%)
create mode 100644 frysk-imports/jline/apidocs/jline/package-tree.html
create mode 100644 frysk-imports/jline/apidocs/jline/package-use.html
create mode 100644 frysk-imports/jline/apidocs/options
create mode 100644 frysk-imports/jline/apidocs/overview-tree.html
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/package-list (100%)
create mode 100644 frysk-imports/jline/apidocs/packages
rename frysk-imports/jline/{doc-build/javadoc => apidocs}/resources/inherit.gif (100%)
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ANSIBuffer.ANSICodes.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ANSIBuffer.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ArgumentCompletor.AbstractArgumentDelimiter.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ArgumentCompletor.ArgumentDelimiter.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ArgumentCompletor.ArgumentList.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ArgumentCompletor.WhitespaceArgumentDelimiter.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ArgumentCompletor.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/CandidateCycleCompletionHandler.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/CandidateListCompletionHandler.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ClassNameCompletor.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/CompletionHandler.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/Completor.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ConsoleOperations.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ConsoleReader.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ConsoleReaderInputStream.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ConsoleRunner.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/CursorBuffer.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/FileNameCompletor.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/History.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/JLineBuffer.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/JLineStringBuilder.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/MultiCompletor.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/NullCompletor.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/SimpleCompletor.NoOpFilter.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/SimpleCompletor.SimpleCompletorFilter.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/SimpleCompletor.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/Terminal.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/UnixTerminal.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/UnsupportedTerminal.html
create mode 100644 frysk-imports/jline/apidocs/src-html/jline/WindowsTerminal.html
create mode 100644 frysk-imports/jline/apidocs/stylesheet.css
delete mode 100644 frysk-imports/jline/build.xml
delete mode 100644 frysk-imports/jline/doc-build/javadoc/index-all.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/index.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/CandidateListCompletionHandler.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/Terminal.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/UnixTerminal.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/UnsupportedTerminal.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/WindowsTerminal.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/package-tree.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/overview-tree.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/packages.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/serialized-form.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ANSIBuffer.ANSICodes.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ANSIBuffer.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ArgumentCompletor.AbstractArgumentDelimiter.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ArgumentCompletor.ArgumentDelimiter.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ArgumentCompletor.ArgumentList.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ArgumentCompletor.WhitespaceArgumentDelimiter.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ArgumentCompletor.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/CandidateCycleCompletionHandler.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/CandidateListCompletionHandler.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ClassNameCompletor.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/CompletionHandler.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/Completor.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ConsoleOperations.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ConsoleReader.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ConsoleReaderInputStream.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ConsoleRunner.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/CursorBuffer.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/FileNameCompletor.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/History.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/MultiCompletor.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/NullCompletor.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/SimpleCompletor.NoOpFilter.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/SimpleCompletor.SimpleCompletorFilter.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/SimpleCompletor.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/Terminal.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/UnixTerminal.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/UnsupportedTerminal.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/WindowsTerminal.html
delete mode 100644 frysk-imports/jline/doc-build/javadoc/styles.css
delete mode 100644 frysk-imports/jline/doc-build/manual.html
delete mode 100644 frysk-imports/jline/doc-build/manual.txt
delete mode 100644 frysk-imports/jline/doc-build/styles.css
delete mode 100644 frysk-imports/jline/doc/html.xsl
delete mode 100644 frysk-imports/jline/doc/index.html
delete mode 100644 frysk-imports/jline/doc/styles.css
create mode 100644 frysk-imports/jline/examples/jline/example/Example.java
create mode 100644 frysk-imports/jline/examples/jline/example/PasswordReader.java
copy frysk-imports/jline/{test => examples}/jline/example/english.gz (100%)
create mode 100644 frysk-imports/jline/jline-0.9.93.jar
delete mode 100644 frysk-imports/jline/project.properties
delete mode 100644 frysk-imports/jline/src/jline/ANSIBuffer.java
delete mode 100644 frysk-imports/jline/src/jline/ArgumentCompletor.java
delete mode 100644 frysk-imports/jline/src/jline/CandidateCycleCompletionHandler.java
delete mode 100644 frysk-imports/jline/src/jline/CandidateListCompletionHandler.java
delete mode 100644 frysk-imports/jline/src/jline/ClassNameCompletor.java
delete mode 100644 frysk-imports/jline/src/jline/CompletionHandler.java
delete mode 100644 frysk-imports/jline/src/jline/Completor.java
delete mode 100644 frysk-imports/jline/src/jline/ConsoleOperations.java
delete mode 100644 frysk-imports/jline/src/jline/ConsoleReader.java
delete mode 100644 frysk-imports/jline/src/jline/ConsoleReaderInputStream.java
delete mode 100644 frysk-imports/jline/src/jline/ConsoleRunner.java
delete mode 100644 frysk-imports/jline/src/jline/CursorBuffer.java
delete mode 100644 frysk-imports/jline/src/jline/FileNameCompletor.java
delete mode 100644 frysk-imports/jline/src/jline/History.java
delete mode 100644 frysk-imports/jline/src/jline/MultiCompletor.java
delete mode 100644 frysk-imports/jline/src/jline/NullCompletor.java
delete mode 100644 frysk-imports/jline/src/jline/SimpleCompletor.java
delete mode 100644 frysk-imports/jline/src/jline/Terminal.java
delete mode 100644 frysk-imports/jline/src/jline/UnixTerminal.java
delete mode 100644 frysk-imports/jline/src/jline/UnsupportedTerminal.java
create mode 100644 frysk-imports/jline/src/pom.xml
create mode 100644 frysk-imports/jline/src/src/assembly/assembly.xml
create mode 100644 frysk-imports/jline/src/src/main/java/jline/ANSIBuffer.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/ArgumentCompletor.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/CandidateCycleCompletionHandler.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/CandidateListCompletionHandler.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/ClassNameCompletor.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/CompletionHandler.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/Completor.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/ConsoleOperations.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/ConsoleReader.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/ConsoleReaderInputStream.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/ConsoleRunner.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/CursorBuffer.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/FileNameCompletor.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/History.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/JLineBuffer.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/JLineStringBuilder.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/MultiCompletor.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/NullCompletor.java
rename frysk-imports/jline/src/{ => src/main/java}/jline/PtyTerminal.java (93%)
create mode 100644 frysk-imports/jline/src/src/main/java/jline/SimpleCompletor.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/Terminal.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/UnixTerminal.java
create mode 100644 frysk-imports/jline/src/src/main/java/jline/UnsupportedTerminal.java
rename frysk-imports/jline/src/{ => src/main/java}/jline/package.html (100%)
rename frysk-imports/jline/{ => src/src/main}/native/Makefile (100%)
rename frysk-imports/jline/{ => src/src/main}/native/jline_WindowsTerminal.c (100%)
rename frysk-imports/jline/{ => src/src/main}/native/jline_WindowsTerminal.h (100%)
rename frysk-imports/jline/src/{ => src/main/resources}/jline/CandidateListCompletionHandler.properties (82%)
rename frysk-imports/jline/{native/jline.dll => src/src/main/resources/jline/jline32.dll} (100%)
create mode 100644 frysk-imports/jline/src/src/main/resources/jline/jline64.dll
copy frysk-imports/jline/src/{ => src/main/resources}/jline/keybindings.properties (82%)
rename frysk-imports/jline/src/{jline/keybindings.properties => src/main/resources/jline/windowsbindings.properties} (75%)
create mode 100644 frysk-imports/jline/src/src/site/apt/building.apt
create mode 100644 frysk-imports/jline/src/src/site/apt/downloads.apt
rename frysk-imports/jline/{doc/manual.xml => src/src/site/docbook/index.xml} (74%)
create mode 100644 frysk-imports/jline/src/src/site/fml/faq.fml
create mode 100644 frysk-imports/jline/src/src/site/resources/css/site.css
create mode 100644 frysk-imports/jline/src/src/site/resources/images/collapsed.png
create mode 100644 frysk-imports/jline/src/src/site/resources/images/dotted.png
create mode 100644 frysk-imports/jline/src/src/site/resources/images/expanded.png
create mode 100644 frysk-imports/jline/src/src/site/resources/images/external.png
create mode 100644 frysk-imports/jline/src/src/site/resources/images/ico_file_pdf.png
create mode 100644 frysk-imports/jline/src/src/site/resources/images/logo.jpg
create mode 100644 frysk-imports/jline/src/src/site/resources/images/newwindow.png
create mode 100644 frysk-imports/jline/src/src/site/site.xml
create mode 100644 frysk-imports/jline/src/src/test/java/jline/ConsoleReaderTest.java
create mode 100644 frysk-imports/jline/src/src/test/java/jline/JLineTestCase.java
create mode 100644 frysk-imports/jline/src/src/test/java/jline/TestCompletion.java
create mode 100644 frysk-imports/jline/src/src/test/java/jline/TestEditLine.java
create mode 100644 frysk-imports/jline/src/src/test/java/jline/TestHistory.java
create mode 100644 frysk-imports/jline/src/src/test/java/jline/example/Example.java
create mode 100644 frysk-imports/jline/src/src/test/java/jline/example/PasswordReader.java
rename frysk-imports/jline/{test => src/src/test/resources}/jline/example/english.gz (100%)
delete mode 100644 frysk-imports/jline/test/jline/JLineTestCase.java
delete mode 100644 frysk-imports/jline/test/jline/TestCompletion.java
delete mode 100644 frysk-imports/jline/test/jline/TestEditLine.java
delete mode 100644 frysk-imports/jline/test/jline/TestHistory.java
delete mode 100644 frysk-imports/jline/test/jline/example/Example.java
delete mode 100644 frysk-imports/jline/test/jline/example/PasswordReader.java
First 500 lines of diff:
diff --git a/frysk-core/frysk/util/PtyTerminal.java b/frysk-core/frysk/util/PtyTerminal.java
index 43d60c7..e781302 100644
--- a/frysk-core/frysk/util/PtyTerminal.java
+++ b/frysk-core/frysk/util/PtyTerminal.java
@@ -58,6 +58,7 @@ import frysk.sys.termios.Termios;
public class PtyTerminal
extends Terminal
{
+ private boolean echoEnabled;
private final FileDescriptor fd;
public FileDescriptor getFd()
@@ -105,6 +106,7 @@ public class PtyTerminal
// set the console to be character-buffered instead of line-buffered
termios.set(Local.CANONICAL, false);
termios.set(Local.ECHO_INPUT, false);
+ echoEnabled = false;
termios.set(Special.NON_CANONICAL_READ_MINIMUM, (char)1);
termios.set(fd);
// at exit, restore the original tty configuration
@@ -178,4 +180,21 @@ public class PtyTerminal
Size size = fd.getSize();
return size.getColumns();
}
+
+ public boolean isEchoEnabled() {
+ return echoEnabled;
+ }
+
+ public void enableEcho() {
+ final Termios termios = new Termios(fd);
+ termios.set(Local.ECHO_INPUT, true);
+ echoEnabled = true;
+ }
+
+ public void disableEcho() {
+ final Termios termios = new Termios(fd);
+ termios.set(Local.ECHO_INPUT, false);
+ echoEnabled = false;
+ }
+
}
\ No newline at end of file
diff --git a/frysk-imports/jline/.cvsignore b/frysk-imports/jline/.cvsignore
deleted file mode 100644
index 411f41f..0000000
--- a/frysk-imports/jline/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile.in
-Makefile
-jline
-jline.jar
diff --git a/frysk-imports/jline/AUTHORS b/frysk-imports/jline/AUTHORS
deleted file mode 100644
index 877c08c..0000000
--- a/frysk-imports/jline/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-Marc Prud'hommeaux <marc@apocalypse.org>
diff --git a/frysk-imports/jline/CHANGELOG b/frysk-imports/jline/CHANGELOG
deleted file mode 100644
index 7f4c431..0000000
--- a/frysk-imports/jline/CHANGELOG
+++ /dev/null
@@ -1,16 +0,0 @@
-2002-10-05 Marc Prud'hommeaux <marc@apocalypse.org>
-
- * Release 0.3
- * Initial release
-
-
-2003-07-08 Marc Prud'hommeaux <marc@apocalypse.org>
-
- * Release 0.6.0
- * Many bugfixes
- * Better release system
- * Automatically set terminal property by issueing stty on UNIX systems
- * Additional tab-completion handlers
- * Tested on Debian Linux and Mac OS 10.2
- * Example includes dictionary, filename, and simple completion
-
diff --git a/frysk-imports/jline/ChangeLog b/frysk-imports/jline/ChangeLog
index 8d6ef76..f2b4b3e 100644
--- a/frysk-imports/jline/ChangeLog
+++ b/frysk-imports/jline/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-16 Tim Moore <timoore@redhat.com>
+
+ * src/src/main/java/jline/PtyTerminal.java (isEchoEnabled,
+ enableEcho, disableEcho): Implement new abstract methods in
+ Terminal.
+
+ Import jline 0.9.93, which has a new file layout.
+
2007-11-01 Andrew Cagney <cagney@redhat.com>
Backport fix from upstream.
diff --git a/frysk-imports/jline/LICENSE b/frysk-imports/jline/LICENSE.txt
similarity index 94%
rename from frysk-imports/jline/LICENSE
rename to frysk-imports/jline/LICENSE.txt
index 7e7f94f..1cdc44c 100644
--- a/frysk-imports/jline/LICENSE
+++ b/frysk-imports/jline/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2002, 2003, 2004, 2005, Marc Prud'hommeaux <mwp1@cornell.edu>
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
All rights reserved.
Redistribution and use in source and binary forms, with or
diff --git a/frysk-imports/jline/Makefile.am b/frysk-imports/jline/Makefile.am
index 6be6c83..220333c 100644
--- a/frysk-imports/jline/Makefile.am
+++ b/frysk-imports/jline/Makefile.am
@@ -1,13 +1,14 @@
-jlinesrc=$(srcdir)/src/jline/
+jlinesrc=$(srcdir)/src/src/main/java/jline
+jlinepropsrc=$(srcdir)/src/src/main/resources/jline
all-local: jline.jar
EXTRA_DIST = $(jlinesrc)/*.java \
- $(jlinesrc)/*.properties
+ $(jlinepropsrc)/*.properties
CLEANFILES = jline.jar jline/*
jline.jar: $(jlinesrc)/*.java
$(JAVAC) $(JAVACFLAGS) -g -d . $(jlinesrc)/*.java
- cp $(jlinesrc)/*.properties ./jline
+ cp $(jlinepropsrc)/*.properties ./jline
$(JAR) cf jline.jar jline/*
diff --git a/frysk-imports/jline/doc-build/javadoc/allclasses-frame.html b/frysk-imports/jline/apidocs/allclasses-frame.html
similarity index 88%
rename from frysk-imports/jline/doc-build/javadoc/allclasses-frame.html
rename to frysk-imports/jline/apidocs/allclasses-frame.html
index 61dffa4..aac8644 100644
--- a/frysk-imports/jline/doc-build/javadoc/allclasses-frame.html
+++ b/frysk-imports/jline/apidocs/allclasses-frame.html
@@ -2,13 +2,14 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.4.2_05) on Sun Jan 30 01:04:19 EST 2005 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Nov 13 00:49:18 PST 2007 -->
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<TITLE>
-All Classes (API Documentation - jline 0.9.1)
+All Classes (JLine 0.9.93 API)
</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="styles.css" TITLE="Style">
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
</HEAD>
@@ -58,6 +59,10 @@ All Classes (API Documentation - jline 0.9.1)
<BR>
<A HREF="jline/History.html" title="class in jline" target="classFrame">History</A>
<BR>
+<A HREF="jline/JLineBuffer.html" title="interface in jline" target="classFrame"><I>JLineBuffer</I></A>
+<BR>
+<A HREF="jline/JLineStringBuilder.html" title="class in jline" target="classFrame">JLineStringBuilder</A>
+<BR>
<A HREF="jline/MultiCompletor.html" title="class in jline" target="classFrame">MultiCompletor</A>
<BR>
<A HREF="jline/NullCompletor.html" title="class in jline" target="classFrame">NullCompletor</A>
diff --git a/frysk-imports/jline/doc-build/javadoc/allclasses-noframe.html b/frysk-imports/jline/apidocs/allclasses-noframe.html
similarity index 87%
rename from frysk-imports/jline/doc-build/javadoc/allclasses-noframe.html
rename to frysk-imports/jline/apidocs/allclasses-noframe.html
index f6c370d..2dfdc59 100644
--- a/frysk-imports/jline/doc-build/javadoc/allclasses-noframe.html
+++ b/frysk-imports/jline/apidocs/allclasses-noframe.html
@@ -2,13 +2,14 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.4.2_05) on Sun Jan 30 01:04:19 EST 2005 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Nov 13 00:49:18 PST 2007 -->
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<TITLE>
-All Classes (API Documentation - jline 0.9.1)
+All Classes (JLine 0.9.93 API)
</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="styles.css" TITLE="Style">
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
</HEAD>
@@ -58,6 +59,10 @@ All Classes (API Documentation - jline 0.9.1)
<BR>
<A HREF="jline/History.html" title="class in jline">History</A>
<BR>
+<A HREF="jline/JLineBuffer.html" title="interface in jline"><I>JLineBuffer</I></A>
+<BR>
+<A HREF="jline/JLineStringBuilder.html" title="class in jline">JLineStringBuilder</A>
+<BR>
<A HREF="jline/MultiCompletor.html" title="class in jline">MultiCompletor</A>
<BR>
<A HREF="jline/NullCompletor.html" title="class in jline">NullCompletor</A>
diff --git a/frysk-imports/jline/doc-build/javadoc/constant-values.html b/frysk-imports/jline/apidocs/constant-values.html
similarity index 70%
rename from frysk-imports/jline/doc-build/javadoc/constant-values.html
rename to frysk-imports/jline/apidocs/constant-values.html
index a5bbaaf..5ed5664 100644
--- a/frysk-imports/jline/doc-build/javadoc/constant-values.html
+++ b/frysk-imports/jline/apidocs/constant-values.html
@@ -2,20 +2,23 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.4.2_05) on Sun Jan 30 01:04:18 EST 2005 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Nov 13 00:49:17 PST 2007 -->
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<TITLE>
-Constant Field Values (API Documentation - jline 0.9.1)
+Constant Field Values (JLine 0.9.93 API)
</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="styles.css" TITLE="Style">
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
<SCRIPT type="text/javascript">
function windowTitle()
{
- parent.document.title="Constant Field Values (API Documentation - jline 0.9.1)";
+ parent.document.title="Constant Field Values (JLine 0.9.93 API)";
}
</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
</HEAD>
@@ -27,12 +30,13 @@ function windowTitle()
<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
<A NAME="navbar_top_firstrow"><!-- --></A>
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
<TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT> </TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="jline/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT> </TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT> </TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="jline/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>
@@ -50,7 +54,7 @@ function windowTitle()
PREV
NEXT</FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html" target="_top"><B>FRAMES</B></A>
+ <A HREF="index.html?constant-values.html" target="_top"><B>FRAMES</B></A>
<A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>
<SCRIPT type="text/javascript">
<!--
@@ -63,6 +67,7 @@ function windowTitle()
<A HREF="allclasses-noframe.html"><B>All Classes</B></A>
</NOSCRIPT>
+
</FONT></TD>
</TR>
</TABLE>
@@ -82,118 +87,16 @@ Constant Field Values</H1>
<A NAME="jline"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD ALIGN="left"><FONT SIZE="+2">
-<B>jline.*</B></FONT></TD>
+<TH ALIGN="left"><FONT SIZE="+2">
+jline.*</FONT></TH>
</TR>
</TABLE>
<P>
-<TABLE BORDER="0" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=3><B>jline.<A HREF="jline/ANSIBuffer.ANSICodes.html" title="class in jline">ANSIBuffer.ANSICodes</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.BLINK"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#BLINK">BLINK</A></CODE></TD>
-<TD ALIGN="right"><CODE>5</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.BOLD"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#BOLD">BOLD</A></CODE></TD>
-<TD ALIGN="right"><CODE>1</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.CONCEALED"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#CONCEALED">CONCEALED</A></CODE></TD>
-<TD ALIGN="right"><CODE>8</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.ESC"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final char</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#ESC">ESC</A></CODE></TD>
-<TD ALIGN="right"><CODE>27</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.FG_BLACK"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#FG_BLACK">FG_BLACK</A></CODE></TD>
-<TD ALIGN="right"><CODE>30</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.FG_BLUE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#FG_BLUE">FG_BLUE</A></CODE></TD>
-<TD ALIGN="right"><CODE>34</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.FG_CYAN"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#FG_CYAN">FG_CYAN</A></CODE></TD>
-<TD ALIGN="right"><CODE>36</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.FG_GREEN"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#FG_GREEN">FG_GREEN</A></CODE></TD>
-<TD ALIGN="right"><CODE>32</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.FG_MAGENTA"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#FG_MAGENTA">FG_MAGENTA</A></CODE></TD>
-<TD ALIGN="right"><CODE>35</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.FG_RED"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#FG_RED">FG_RED</A></CODE></TD>
-<TD ALIGN="right"><CODE>31</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.FG_WHITE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#FG_WHITE">FG_WHITE</A></CODE></TD>
-<TD ALIGN="right"><CODE>37</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.FG_YELLOW"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#FG_YELLOW">FG_YELLOW</A></CODE></TD>
-<TD ALIGN="right"><CODE>33</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.OFF"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#OFF">OFF</A></CODE></TD>
-<TD ALIGN="right"><CODE>0</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.REVERSE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#REVERSE">REVERSE</A></CODE></TD>
-<TD ALIGN="right"><CODE>7</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="jline.ANSIBuffer.ANSICodes.UNDERSCORE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>static final int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="jline/ANSIBuffer.ANSICodes.html#UNDERSCORE">UNDERSCORE</A></CODE></TD>
-<TD ALIGN="right"><CODE>4</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-
-<TABLE BORDER="0" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=3><B>jline.<A HREF="jline/ConsoleOperations.html" title="interface in jline">ConsoleOperations</A></B></TD>
+<TH ALIGN="left" COLSPAN="3">jline.<A HREF="jline/ConsoleOperations.html" title="interface in jline">ConsoleOperations</A></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<A NAME="jline.ConsoleOperations.ADD"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
@@ -220,6 +123,12 @@ Constant Field Values</H1>
<TD ALIGN="right"><CODE>-44</CODE></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="jline.ConsoleOperations.CLEAR_LINE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final short</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CLEAR_LINE">CLEAR_LINE</A></CODE></TD>
+<TD ALIGN="right"><CODE>-63</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<A NAME="jline.ConsoleOperations.CLEAR_SCREEN"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
<CODE>public static final short</CODE></FONT></TD>
<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CLEAR_SCREEN">CLEAR_SCREEN</A></CODE></TD>
@@ -232,30 +141,84 @@ Constant Field Values</H1>
<TD ALIGN="right"><CODE>-58</CODE></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="jline.ConsoleOperations.CTRL_A"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final char</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_A">CTRL_A</A></CODE></TD>
+<TD ALIGN="right"><CODE>1</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<A NAME="jline.ConsoleOperations.CTRL_B"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
<CODE>public static final char</CODE></FONT></TD>
<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_B">CTRL_B</A></CODE></TD>
<TD ALIGN="right"><CODE>2</CODE></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="jline.ConsoleOperations.CTRL_C"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final char</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_C">CTRL_C</A></CODE></TD>
+<TD ALIGN="right"><CODE>3</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="jline.ConsoleOperations.CTRL_D"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final char</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_D">CTRL_D</A></CODE></TD>
+<TD ALIGN="right"><CODE>4</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="jline.ConsoleOperations.CTRL_E"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final char</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_E">CTRL_E</A></CODE></TD>
+<TD ALIGN="right"><CODE>5</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<A NAME="jline.ConsoleOperations.CTRL_F"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
<CODE>public static final char</CODE></FONT></TD>
<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_F">CTRL_F</A></CODE></TD>
<TD ALIGN="right"><CODE>6</CODE></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="jline.ConsoleOperations.CTRL_K"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final char</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_K">CTRL_K</A></CODE></TD>
+<TD ALIGN="right"><CODE>11</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="jline.ConsoleOperations.CTRL_L"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final char</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_L">CTRL_L</A></CODE></TD>
+<TD ALIGN="right"><CODE>12</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<A NAME="jline.ConsoleOperations.CTRL_N"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
<CODE>public static final char</CODE></FONT></TD>
<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_N">CTRL_N</A></CODE></TD>
<TD ALIGN="right"><CODE>14</CODE></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="jline.ConsoleOperations.CTRL_OB"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final char</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_OB">CTRL_OB</A></CODE></TD>
+<TD ALIGN="right"><CODE>27</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<A NAME="jline.ConsoleOperations.CTRL_P"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
<CODE>public static final char</CODE></FONT></TD>
<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_P">CTRL_P</A></CODE></TD>
<TD ALIGN="right"><CODE>16</CODE></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="jline.ConsoleOperations.CTRL_QM"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final char</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#CTRL_QM">CTRL_QM</A></CODE></TD>
+<TD ALIGN="right"><CODE>127</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="jline.ConsoleOperations.DELETE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final char</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#DELETE">DELETE</A></CODE></TD>
+<TD ALIGN="right"><CODE>127</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<A NAME="jline.ConsoleOperations.DELETE_META"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
<CODE>public static final short</CODE></FONT></TD>
<TD ALIGN="left"><CODE><A HREF="jline/ConsoleOperations.html#DELETE_META">DELETE_META</A></CODE></TD>
@@ -280,6 +243,12 @@ Constant Field Values</H1>
<TD ALIGN="right"><CODE>-16</CODE></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="jline.ConsoleOperations.END_OF_HISTORY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public static final short</CODE></FONT></TD>
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-02-05 21:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-05 21:08 [SCM] master: Merge commit 'origin' mark
-- strict thread matches above, loose matches on Subject: below --
2008-01-17 17:30 moore
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).