Release 950727
Sat Jul 22 22:39:09 IDT 1995 Michael Veksler <e1678223@tochnapc2.technion.ac.il>
* [ipc/*]
New directory. This directory contains the new inter-wine
communications support. It enables DDE protocols between two wine
instances. Currently it is limited to DDE, but can be enhanced to
support OLE between 2 different wine instances. This is very
important for libwine.a DDE/OLE support.
* [tools/ipcl]
A script to delete garbage IPC handles (shared memory, semaphores
and message queues). The current inter-wine communication is not
perfect, and sometimes leaves garbage behind.
* [if1632/relay.c] [include/atom.h] [include/global.h]
[loader/selector.c] [loader/task.c] [loader/module.c]
[loader/signal.c] [memory/global.c] [misc/atom.c]
[windows/class.c] [windows/message.c] [windows/win.c]
[Imakefile]
Hooks for inter-wine DDE support, current Global.*Atom functions
renamed to Local.*Atom since Global.*Atom are used for Inter-Wine
DDE communication. (The first call to these functions sets up the
IPC structures - which otherwise cause unneeded overhead.
Mon Jul 17 19:55:21 1995 Alexandre Julliard <julliard@sunsite.unc.edu>
* [controls/menu.c]
Don't crash if a NULL string is passed to menu functions.
* [memory/selector.c]
We now use a bit in ldt_flags_copy to indicate free LDT entries.
Fixed a bug in SELECTOR_ReallocBlock that could cause it to
overwrite valid LDT entries when growing a block.
* [miscemu/instr.c]
Emulate int xx instruction by storing the interrupt vector in
CS:IP and returning directly. This allows a program to install an
interrupt vector.
* [windows/win.c]
Added function WIN_GetTopParent to get the top-level parent of a
window.
Sun Jul 16 18:17:17 1995 Gregory Trubetskoy <grisha@mira.com>
* [loader/resource.c]
Added LoadIconHandler. It doesn't do anything yet, but now you
can use borland help files with winhelp.exe.
Sun Jul 16 11:58:45 1995 Anand Kumria <akumria@ozemail.com.au>
* [misc/main.c]
Fixed to return 386 Enhanced mode correctly. Also return the same
type of CPU, for both Enhanced and Standard mode, namely a 386.
Sun Jul 16 00:02:04 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [Configure] [include/options.h] [include/wineopts.h]
[misc/main.c][misc/spy.c]
Removed support of spy file. Redirected spy messages to stddeb.
Removed -spy option. Added -debugmsg +spy option.
* [debugger/dbg.y][debugger/debug.l]
Enabled segmented addresses (seg:offs) for break and x commands.
* [if1632/gdi.spec] [objects/region.c] [windows/graphics.c]
[include/region.h]
FrameRgn, REGION_FrameRgn: New functions
* [if1632/kernel.spec]
IsWinOldApTask: Return false
* [if1632/mouse.spec]
CplApplet: Removed
* [if1632/user.spec] [windows/win.c]
ShowOwnedPopups: New function
* [if1632/winsock.spec] [misc/winsocket.c]
inet_addr, select: New prototypes in relay code
Fixed memory layout for netdb functions (getXbyY).
WINSOCK_ioctlsocket: Translated FIONREAD, FIONBIO, and FIOASYNC
* [objects/clipping.c]
RectVisible: Fixed call to LPToDP
* [rc/winerc.c]
main: Removed extra argument to getopt for Linux.
Tue Jul 11 00:14:41 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/listbox.c]
Yet another fix for ListBoxDirectory().
* [loader/module.c] [if1632/kernel.spec]
Make GetModuleHandle() accept instance handles as parameter.
* [if1632/relay.c] [loader/task.c]
Put a magic cookie at the bottom of the 32 bit stack, and check on
each return from a 32 bit function whether it's still there. Complain
if it's not.
* [if1632/user.spec]
Wrong entry for CloseDriver().
* [misc/dos_fs.c] [loader/task.c] [include/dos_fs.h] [misc/file.c]
[miscemu/int21.c]
Large parts of dos_fs.c simplified. Changed it to use one
current drive/directory per task, which is set to the module path on
task creation.
Prevent CorelPaint from closing stdin.
open() with O_CREAT set must be passed three parameters.
DOS FindFirst()/FindNext() could crash when FA_LABEL was set. Fixed,
it's in DOS_readdir() now.
* [misc/profile.c]
Some badly written software (Lotus Freelance Graphics) passes a bogus
size parameter that caused Wine to write off the end of a segment.
Fixed. (It's probably too paranoid now.)
* [multimedia/mmsystem.c] [multimedia/time.c] [multimedia/joystick.c]
[multimedia/Imakefile] [if1632/winprocs.spec]
16 bit entry point for MMSysTimeCallback.
Split off time.c and joystick.c from mmsystem.c.
* [objects/dib.c]
GetDIBits(): call XGetImage() via CallTo32_LargeStack.
* [windows/cursor.c]
DestroyCursor(): do nothing for builtin cursors.
* [windows/mdi.c]
Half of WM_MDISETMENU implemented.
* [windows/win.c]
EnumWindows() and EnumTaskWindows() never enumerated any windows.
Fixed.
* [windows/*.c]
Fixed GetParent() to return correct values for owned windows.
* [windows/message.c]
Don't try to activate disabled top-level windows.
* [windows/nonclient.c]
Work around a bug in gcc-2.7.0.
* [tools/build.c] [include/stackframe.h] [memory/global.c]
[loader/task.c] [memory/selector.c]
Some Visual Basic programs (and possibly others, too) expect ES to be
preserved by a call to an API function, so we have to save it.
In GlobalFree() and FreeSelector(), we must clear CURRENT_STACK16->es
to prevent segfaults if ES contained the selector to be freed.
Sun Jul 9 20:21:20 1995 Jon Tombs <jon@gtex02.us.es>
* [*/*]
Added missing prototypes to header files and relevant includes
to reduce compile time warnings.
Sun Jul 9 18:32:56 1995 Michael Patra <micky@marie.physik.tu-berlin.de>
* [configure.in] [include/config.h] [*/Makefile.in]
New configuration scheme based on autoconf.
Sat Jul 8 14:12:45 1995 Morten Welinder <terra+@cs.cmu.edu>
* [miscemu/ioports.c]
Revamp to have only one in- and one out- variant, both really
implemented.
* [miscemu/instr.c]
INSTR_EmulateInstruction: Use new ioport interface. Implement
string io. Correct instruction pointer for 32-bit code.
* [include/miscemu.h]
Update port function prototypes.
* [include/registers.h]
Defined FS and GS.
Sat Jul 8 13:38:54 1995 Hans de Graaff <graaff@twi72.twi.tudelft.nl>
* [misc/dos_fs.c]
ChopOffSlash(): A path consisting off a single slash is left
intact, and multiple slashes are all removed.
diff --git a/debugger/Makefile.in b/debugger/Makefile.in
new file mode 100644
index 0000000..39cada3
--- /dev/null
+++ b/debugger/Makefile.in
@@ -0,0 +1,68 @@
+CC = @CC@
+CFLAGS = @CFLAGS@
+TOPSRC = @top_srcdir@
+DIVINCL = -I$(TOPSRC)/include
+BISON = @YACC@
+FLEX = @LEX@
+DIVDEFS = -DUSE_READLINE
+COMPILE = $(CC) $(CFLAGS) $(DIVINCL) $(DIVDEFS)
+LD = @LD@
+LDCOMBINEFLAGS = @LDCOMBINEFLAGS@
+@SET_MAKE@
+
+
+MODULE = debugger
+
+SRCS = break.c db_disasm.c hash.c info.c registers.c stack.c
+
+OBJS = $(SRCS:.c=.o) dbg.tab.o lex.yy.o
+
+all: $(MODULE).o dbg.tab.o lex.yy.o
+
+dbg.tab.c: dbg.y
+ $(BISON) -b dbg -d dbg.y
+
+dbg.tab.h: dbg.y
+ $(BISON) -b dbg -d dbg.y
+
+lex.yy.c: debug.l dbg.tab.h dbg.tab.h
+ $(FLEX) -8 -I debug.l
+
+.c.o:
+ $(COMPILE) -c -o $*.o $<
+
+$(MODULE).o: $(OBJS)
+ (cd readline; $(MAKE) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'LD=$(LD)' 'LDCOMBINEFLAGS=$(LDCOMBINEFLAGS)')
+ $(LD) $(LDCOMBINEFLAGS) $(OBJS) readline/readline.o -o $(MODULE).o
+
+depend:
+ sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
+ $(CC) $(DIVINCL) $(XINCL) -MM *.c >> tmp_make
+ cp tmp_make Makefile
+ rm tmp_make
+
+clean:
+ (cd readline; $(MAKE) clean)
+ rm -f *.o \#*\# *~ dbg.tab.c dbg.tab.h lex.yy.c y.tab.c y.tab.h tmp_make
+
+distclean: clean
+ (cd readline; $(MAKE) distclean)
+ rm Makefile
+
+countryclean:
+
+NAMES = $(SRCS:.c=)
+
+winelibclean:
+ for i in $(NAMES); do \
+ if test `grep -c WINELIB $$i.c` -ne 0; then \
+ rm $$i.o; \
+ fi; \
+ done
+
+dbg.tab.o: dbg.tab.c
+lex.yy.o: lex.yy.c
+
+dummy:
+
+### Dependencies:
diff --git a/debugger/dbg.y b/debugger/dbg.y
index c9a5585..7d0022f 100644
--- a/debugger/dbg.y
+++ b/debugger/dbg.y
@@ -72,7 +72,8 @@
| MODE NUM '\n' { mode_command($2); }
| ENABLE NUM '\n' { DEBUG_EnableBreakpoint( $2, TRUE ); }
| DISABLE NUM '\n' { DEBUG_EnableBreakpoint( $2, FALSE ); }
- | BREAK '*' expr { DEBUG_AddBreakpoint( 0xffffffff, $3 ); }
+ | BREAK '*' expr '\n' { DEBUG_AddBreakpoint( 0xffffffff, $3 ); }
+ | BREAK '*' expr ':' expr '\n' { DEBUG_AddBreakpoint( $3, $5); }
| BREAK '\n' { DEBUG_AddBreakpoint( 0xffffffff, EIP ); }
| DELETE BREAK NUM '\n' { DEBUG_DelBreakpoint( $3 ); }
| BACKTRACE '\n' { DEBUG_BackTrace(); }
@@ -90,6 +91,9 @@
EXAM expr '\n' { examine_memory( 0xffffffff, $2, 1, 'x'); }
| EXAM FORMAT expr '\n' { examine_memory( 0xffffffff, $3,
$2 >> 8, $2 & 0xff ); }
+ | EXAM expr ':' expr '\n' { examine_memory( $2, $4, 1, 'x' ); }
+ | EXAM FORMAT expr ':' expr'\n' { examine_memory( $3, $5,
+ $2 >> 8, $2 & 0xff ); }
print_command:
PRINT expr '\n' { examine_memory( 0, ((unsigned int) &$2 ), 1,'x'); }
diff --git a/debugger/debug.l b/debugger/debug.l
index 4b8ccf1..862c1f8 100644
--- a/debugger/debug.l
+++ b/debugger/debug.l
@@ -37,7 +37,7 @@
\n { syntax_error = 0; return '\n'; } /*Indicate end of command*/
-[-+=()*] { return *yytext; }
+[-+=()*:] { return *yytext; }
"0x"{HEXDIGIT}+ { sscanf(yytext, "%x", &yylval); return NUM; }
{DIGIT}+ { sscanf(yytext, "%d", &yylval); return NUM; }
diff --git a/debugger/info.c b/debugger/info.c
index 65f8bbd..109161d 100644
--- a/debugger/info.c
+++ b/debugger/info.c
@@ -10,11 +10,6 @@
extern char * find_nearest_symbol( unsigned int seg, unsigned int addr );
-void application_not_running()
-{
- fprintf(stderr,"Application not running\n");
-}
-
void print_address( unsigned int segment, unsigned int addr, int addrlen )
{
char *name = find_nearest_symbol( segment, addr );
diff --git a/debugger/readline/Imakefile b/debugger/readline/Imakefile
index aebd03a..6678bcb 100644
--- a/debugger/readline/Imakefile
+++ b/debugger/readline/Imakefile
@@ -2,12 +2,9 @@
MODULE = readline
-YACC = yacc -b dbg -d
-
-EXTRA_DEFINES= -DANSI_ARROWS -DHAVE_TCGETATTR -DHIDE -DUSE_DIRENT -DSYS_UNIX
+EXTRA_DEFINES= -DANSI_ARROWS -DHAVE_TCGETATTR -DHIDE
SRCS = \
- complete.c \
editline.c \
sysunix.c
diff --git a/debugger/readline/Makefile.in b/debugger/readline/Makefile.in
new file mode 100644
index 0000000..9f2023e
--- /dev/null
+++ b/debugger/readline/Makefile.in
@@ -0,0 +1,50 @@
+CC = @CC@
+CFLAGS = @CFLAGS@
+XINCL = @x_includes@
+TOPSRC = @top_srcdir@
+DIVINCL = -I$(TOPSRC)/include
+LD = @LD@
+LDCOMBINEFLAGS = @LDCOMBINEFLAGS@
+DIVDEFS = -DHIDE -DANSI_ARROWS
+
+
+MODULE = readline
+
+SRCS = editline.c sysunix.c
+
+OBJS = $(SRCS:.c=.o)
+
+.c.o:
+ $(CC) -c $(DIVDEFS) $(CFLAGS) $(XINCL) $(DIVINCL) -o $*.o $<
+
+all: $(MODULE).o
+
+$(MODULE).o: $(OBJS)
+ $(LD) $(LDCOMBINEFLAGS) $(OBJS) -o $(MODULE).o
+
+depend:
+ sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
+ $(CC) $(DIVINCL) $(XINCL) -MM *.c >> tmp_make
+ cp tmp_make Makefile
+ rm tmp_make
+
+clean:
+ rm -f *.o \#*\# *~ tmp_make
+
+distclean: clean
+ rm Makefile
+
+countryclean:
+
+NAMES = $(SRCS:.c=)
+
+winelibclean:
+ for i in $(NAMES); do \
+ if test `grep -c WINELIB $$i.c` -ne 0; then \
+ rm $$i.o; \
+ fi; \
+ done
+
+dummy:
+
+### Dependencies:
diff --git a/debugger/readline/complete.c b/debugger/readline/complete.c
deleted file mode 100644
index c5cbaaa..0000000
--- a/debugger/readline/complete.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* $Revision: 1.3 $
-**
-** History and file completion functions for editline library.
-*/
-#include <stdlib.h>
-#include "editline.h"
-
-#if defined(NEED_STRDUP)
-/*
-** Return an allocated copy of a string.
-*/
-char *
-strdup(p)
- char *p;
-{
- char *new;
-
- if ((new = NEW(char, strlen(p) + 1)) != NULL)
- (void)strcpy(new, p);
- return new;
-}
-#endif /* defined(NEED_STRDUP) */
-
-/*
-** strcmp-like sorting predicate for qsort.
-*/
-STATIC int
-compare(p1, p2)
- CONST void *p1;
- CONST void *p2;
-{
- CONST char **v1;
- CONST char **v2;
-
- v1 = (CONST char **)p1;
- v2 = (CONST char **)p2;
- return strcmp(*v1, *v2);
-}
-
-/*
-** Fill in *avp with an array of names that match file, up to its length.
-** Ignore . and .. .
-*/
-STATIC int
-FindMatches(dir, file, avp)
- char *dir;
- char *file;
- char ***avp;
-{
- char **av;
- char **new;
- char *p;
- DIR *dp;
- DIRENTRY *ep;
- SIZE_T ac;
- SIZE_T len;
-
- if ((dp = opendir(dir)) == NULL)
- return 0;
-
- av = NULL;
- ac = 0;
- len = strlen(file);
- while ((ep = readdir(dp)) != NULL) {
- p = ep->d_name;
- if (p[0] == '.' && (p[1] == '\0' || (p[1] == '.' && p[2] == '\0')))
- continue;
- if (len && strncmp(p, file, len) != 0)
- continue;
-
- if ((ac % MEM_INC) == 0) {
- if ((new = NEW(char*, ac + MEM_INC)) == NULL)
- break;
- if (ac) {
- COPYFROMTO(new, av, ac * sizeof (char **));
- DISPOSE(av);
- }
- *avp = av = new;
- }
-
- if ((av[ac] = strdup(p)) == NULL) {
- if (ac == 0)
- DISPOSE(av);
- break;
- }
- ac++;
- }
-
- /* Clean up and return. */
- (void)closedir(dp);
- if (ac)
- qsort(av, ac, sizeof (char **), compare);
- return ac;
-}
-
-/*
-** Split a pathname into allocated directory and trailing filename parts.
-*/
-STATIC int
-SplitPath(path, dirpart, filepart)
- char *path;
- char **dirpart;
- char **filepart;
-{
- static char DOT[] = ".";
- char *dpart;
- char *fpart;
-
- if ((fpart = strrchr(path, '/')) == NULL) {
- if ((dpart = strdup(DOT)) == NULL)
- return -1;
- if ((fpart = strdup(path)) == NULL) {
- DISPOSE(dpart);
- return -1;
- }
- }
- else {
- if ((dpart = strdup(path)) == NULL)
- return -1;
- dpart[fpart - path] = '\0';
- if ((fpart = strdup(++fpart)) == NULL) {
- DISPOSE(dpart);
- return -1;
- }
- }
- *dirpart = dpart;
- *filepart = fpart;
- return 0;
-}
-
-/*
-** Attempt to complete the pathname, returning an allocated copy.
-** Fill in *unique if we completed it, or set it to 0 if ambiguous.
-*/
-char *
-rl_complete(pathname, unique)
- char *pathname;
- int *unique;
-{
- char **av;
- char *dir;
- char *file;
- char *new;
- char *p;
- SIZE_T ac;
- SIZE_T end;
- SIZE_T i;
- SIZE_T j;
- SIZE_T len;
-
- if (SplitPath(pathname, &dir, &file) < 0)
- return NULL;
- if ((ac = FindMatches(dir, file, &av)) == 0) {
- DISPOSE(dir);
- DISPOSE(file);
- return NULL;
- }
-
- p = NULL;
- len = strlen(file);
- if (ac == 1) {
- /* Exactly one match -- finish it off. */
- *unique = 1;
- j = strlen(av[0]) - len + 2;
- if ((p = NEW(char, j + 1)) != NULL) {
- COPYFROMTO(p, av[0] + len, j);
- if ((new = NEW(char, strlen(dir) + strlen(av[0]) + 2)) != NULL) {
- (void)strcpy(new, dir);
- (void)strcat(new, "/");
- (void)strcat(new, av[0]);
- rl_add_slash(new, p);
- DISPOSE(new);
- }
- }
- }
- else {
- *unique = 0;
- if (len) {
- /* Find largest matching substring. */
- for (i = len, end = strlen(av[0]); i < end; i++)
- for (j = 1; j < ac; j++)
- if (av[0][i] != av[j][i])
- goto breakout;
- breakout:
- if (i > len) {
- j = i - len + 1;
- if ((p = NEW(char, j)) != NULL) {
- COPYFROMTO(p, av[0] + len, j);
- p[j - 1] = '\0';
- }
- }
- }
- }
-
- /* Clean up and return. */
- DISPOSE(dir);
- DISPOSE(file);
- for (i = 0; i < ac; i++)
- DISPOSE(av[i]);
- DISPOSE(av);
- return p;
-}
-
-/*
-** Return all possible completions.
-*/
-int
-rl_list_possib(pathname, avp)
- char *pathname;
- char ***avp;
-{
- char *dir;
- char *file;
- int ac;
-
- if (SplitPath(pathname, &dir, &file) < 0)
- return 0;
- ac = FindMatches(dir, file, avp);
- DISPOSE(dir);
- DISPOSE(file);
- return ac;
-}
diff --git a/debugger/readline/editline.c b/debugger/readline/editline.c
index cd20bbb..eea22d7 100644
--- a/debugger/readline/editline.c
+++ b/debugger/readline/editline.c
@@ -78,8 +78,8 @@
STATIC int Point;
STATIC int PushBack;
STATIC int Pushed;
-FORWARD KEYMAP Map[33];
-FORWARD KEYMAP MetaMap[16];
+STATIC KEYMAP Map[33];
+STATIC KEYMAP MetaMap[16];
STATIC SIZE_T Length;
STATIC SIZE_T ScreenCount;
STATIC SIZE_T ScreenSize;
@@ -243,41 +243,6 @@
}
-/*
-** Print an array of words in columns.
-*/
-STATIC void
-columns(ac, av)
- int ac;
- CHAR **av;
-{
- CHAR *p;
- int i;
- int j;
- int k;
- int len;
- int skip;
- int longest;
- int cols;
-
- /* Find longest name, determine column count from that. */
- for (longest = 0, i = 0; i < ac; i++)
- if ((j = strlen((char *)av[i])) > longest)
- longest = j;
- cols = TTYwidth / (longest + 3);
-
- TTYputs((CHAR *)NEWLINE);
- for (skip = ac / cols + 1, i = 0; i < skip; i++) {
- for (j = i; j < ac; j += skip) {
- for (p = av[j], len = strlen((char *)p), k = len; --k >= 0; p++)
- TTYput(*p);
- if (j + skip < ac)
- while (++len < longest + 3)
- TTYput(' ');
- }
- TTYputs((CHAR *)NEWLINE);
- }
-}
STATIC void
reposition()
@@ -1026,71 +991,6 @@
return CSstay;
}
-/*
-** Move back to the beginning of the current word and return an
-** allocated copy of it.
-*/
-STATIC CHAR *
-find_word()
-{
- static char SEPS[] = "#;&|^$=`'{}()<>\n\t ";
- CHAR *p;
- CHAR *new;
- SIZE_T len;
-
- for (p = &Line[Point]; p > Line && strchr(SEPS, (char)p[-1]) == NULL; p--)
- continue;
- len = Point - (p - Line) + 1;
- if ((new = NEW(CHAR, len)) == NULL)
- return NULL;
- COPYFROMTO(new, p, len);
- new[len - 1] = '\0';
- return new;
-}
-
-STATIC STATUS
-c_complete()
-{
- CHAR *p;
- CHAR *word;
- int unique;
- STATUS s;
-
- word = find_word();
- p = (CHAR *)rl_complete((char *)word, &unique);
- if (word)
- DISPOSE(word);
- if (p && *p) {
- s = insert_string(p);
- if (!unique)
- (void)ring_bell();
- DISPOSE(p);
- return s;
- }
- return ring_bell();
-}
-
-STATIC STATUS
-c_possible()
-{
- CHAR **av;
- CHAR *word;
- int ac;
-
- word = find_word();
- ac = rl_list_possib((char *)word, (char ***)&av);
- if (word)
- DISPOSE(word);
- if (ac) {
- columns(ac, av);
- while (--ac >= 0)
- DISPOSE(av[ac]);
- DISPOSE(av);
- return CSmove;
- }
- return ring_bell();
-}
-
STATIC STATUS
accept_line()
{
@@ -1335,7 +1235,7 @@
{ CTL('F'), fd_char },
{ CTL('G'), ring_bell },
{ CTL('H'), bk_del_char },
- { CTL('I'), c_complete },
+ { CTL('I'), ring_bell },
{ CTL('J'), accept_line },
{ CTL('K'), kill_line },
{ CTL('L'), redisplay },
@@ -1367,7 +1267,7 @@
{ '.', last_argument },
{ '<', h_first },
{ '>', h_last },
- { '?', c_possible },
+ { '?', ring_bell },
{ 'b', bk_word },
{ 'd', fd_kill_word },
{ 'f', fd_word },
diff --git a/debugger/readline/editline.h b/debugger/readline/editline.h
index 40a2025..fa16f3b 100644
--- a/debugger/readline/editline.h
+++ b/debugger/readline/editline.h
@@ -3,20 +3,17 @@
** Internal header file for editline library.
*/
#include <stdio.h>
-#if defined(HAVE_STDLIB)
#include <stdlib.h>
#include <string.h>
-#endif /* defined(HAVE_STDLIB) */
-#if defined(SYS_UNIX)
-#include "unix.h"
-#endif /* defined(SYS_UNIX) */
-#if defined(SYS_OS9)
-#include "os9.h"
-#endif /* defined(SYS_OS9) */
+#include <sys/types.h>
+#include <sys/stat.h>
-#if !defined(SIZE_T)
-#define SIZE_T unsigned int
-#endif /* !defined(SIZE_T) */
+
+#define CRLF "\r\n"
+
+
+#define SIZE_T size_t
+#define CONST const
typedef unsigned char CHAR;
@@ -26,15 +23,6 @@
#define STATIC /* NULL */
#endif /* !defined(HIDE) */
-#if !defined(CONST)
-#if defined(__STDC__)
-#define CONST const
-#else
-#define CONST
-#endif /* defined(__STDC__) */
-#endif /* !defined(CONST) */
-
-
#define MEM_INC 64
#define SCREEN_INC 256
@@ -59,18 +47,3 @@
extern int rl_list_possib();
extern void rl_ttyset();
extern void rl_add_slash();
-
-#if !defined(HAVE_STDLIB)
-extern char *getenv();
-extern char *malloc();
-extern char *realloc();
-extern char *memcpy();
-extern char *strcat();
-extern char *strchr();
-extern char *strrchr();
-extern char *strcpy();
-extern char *strdup();
-extern int strcmp();
-extern int strlen();
-extern int strncmp();
-#endif /* !defined(HAVE_STDLIB) */
diff --git a/debugger/readline/sysunix.c b/debugger/readline/sysunix.c
index 010744e1..e2b72e1 100644
--- a/debugger/readline/sysunix.c
+++ b/debugger/readline/sysunix.c
@@ -3,6 +3,7 @@
** Unix system-dependant routines for editline library.
*/
#include "editline.h"
+#include "config.h"
#if defined(HAVE_TCGETATTR)
#include <termios.h>
diff --git a/debugger/readline/testit.c b/debugger/readline/testit.c
deleted file mode 100644
index e6384b8..0000000
--- a/debugger/readline/testit.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $Revision: 1.2 $
-**
-** A "micro-shell" to test editline library.
-** If given any arguments, commands aren't executed.
-*/
-#include <stdio.h>
-#if defined(HAVE_STDLIB)
-#include <stdlib.h>
-#endif /* defined(HAVE_STDLIB) */
-
-const char version_string[] = "4.321";
-
-
-extern char *readline();
-extern void add_history();
-
-#if !defined(HAVE_STDLIB)
-extern int chdir();
-extern int free();
-extern int strncmp();
-extern int system();
-extern void exit();
-#endif /* !defined(HAVE_STDLIB) */
-
-
-#if defined(NEED_PERROR)
-void
-perror(s)
- char *s;
-{
- extern int errno;
-
- (voidf)printf(stderr, "%s: error %d\n", s, errno);
-}
-#endif /* defined(NEED_PERROR) */
-
-
-/* ARGSUSED1 */
-int
-main(ac, av)
- int ac;
- char *av[];
-{
- char *p;
- int doit;
-
- doit = ac == 1;
- while ((p = readline("testit> ")) != NULL) {
- (void)printf("\t\t\t|%s|\n", p);
- if (doit)
- if (strncmp(p, "cd ", 3) == 0) {
- if (chdir(&p[3]) < 0)
- perror(&p[3]);
- }
- else if (system(p) != 0)
- perror(p);
- add_history(p);
- free(p);
- }
- exit(0);
- /* NOTREACHED */
-}
diff --git a/debugger/readline/unix.h b/debugger/readline/unix.h
deleted file mode 100644
index fe6beed..0000000
--- a/debugger/readline/unix.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $Revision: 1.1 $
-**
-** Editline system header file for Unix.
-*/
-
-#define CRLF "\r\n"
-#define FORWARD STATIC
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined(USE_DIRENT)
-#include <dirent.h>
-typedef struct dirent DIRENTRY;
-#else
-#include <sys/dir.h>
-typedef struct direct DIRENTRY;
-#endif /* defined(USE_DIRENT) */
-
-#if !defined(S_ISDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif /* !defined(S_ISDIR) */
