projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
src
/
termcap.c
diff --git
a/src/termcap.c
b/src/termcap.c
index
6beecc5
..
4720506
100644
(file)
--- a/
src/termcap.c
+++ b/
src/termcap.c
@@
-26,18
+26,9
@@
Boston, MA 02111-1307, USA. */
#include "lisp.h" /* For encapsulated open, close, read */
#include "device.h" /* For DEVICE_BAUD_RATE */
#else /* not emacs */
#include "lisp.h" /* For encapsulated open, close, read */
#include "device.h" /* For DEVICE_BAUD_RATE */
#else /* not emacs */
-#if defined(USG) || defined(STDC_HEADERS)
-#define memcpy(d, s, n) memcpy ((d), (s), (n))
-#endif
-#ifdef STDC_HEADERS
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#else
-char *getenv ();
-char *malloc ();
-char *realloc ();
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@
-103,16
+94,16
@@
xrealloc (ptr, size)
for tgetnum, tgetflag and tgetstr to find. */
static char *term_entry;
for tgetnum, tgetflag and tgetstr to find. */
static char *term_entry;
-static CONST char *tgetst1 (CONST char *ptr, char **area);
+static const char *tgetst1 (const char *ptr, char **area);
/* Search entry BP for capability CAP.
Return a pointer to the capability (in BP) if found,
0 if not found. */
/* Search entry BP for capability CAP.
Return a pointer to the capability (in BP) if found,
0 if not found. */
-static CONST char *
+static const char *
find_capability (bp, cap)
find_capability (bp, cap)
- CONST char *bp;
- CONST char *cap;
+ const char *bp;
+ const char *cap;
{
for (; *bp; bp++)
if (bp[0] == ':'
{
for (; *bp; bp++)
if (bp[0] == ':'
@@
-124,9
+115,9
@@
find_capability (bp, cap)
int
tgetnum (cap)
int
tgetnum (cap)
- CONST char *cap;
+ const char *cap;
{
{
- CONST char *ptr = find_capability (term_entry, cap);
+ const char *ptr = find_capability (term_entry, cap);
if (!ptr || ptr[-1] != '#')
return -1;
return atoi (ptr);
if (!ptr || ptr[-1] != '#')
return -1;
return atoi (ptr);
@@
-134,9
+125,9
@@
tgetnum (cap)
int
tgetflag (cap)
int
tgetflag (cap)
- CONST char *cap;
+ const char *cap;
{
{
- CONST char *ptr = find_capability (term_entry, cap);
+ const char *ptr = find_capability (term_entry, cap);
return 0 != ptr && ptr[-1] == ':';
}
return 0 != ptr && ptr[-1] == ':';
}
@@
-145,12
+136,12
@@
tgetflag (cap)
to store the string. That pointer is advanced over the space used.
If AREA is zero, space is allocated with `malloc'. */
to store the string. That pointer is advanced over the space used.
If AREA is zero, space is allocated with `malloc'. */
-CONST char *
+const char *
tgetstr (cap, area)
tgetstr (cap, area)
- CONST char *cap;
+ const char *cap;
char **area;
{
char **area;
{
- CONST char *ptr = find_capability (term_entry, cap);
+ const char *ptr = find_capability (term_entry, cap);
if (!ptr || (ptr[-1] != '=' && ptr[-1] != '~'))
return 0;
return tgetst1 (ptr, area);
if (!ptr || (ptr[-1] != '=' && ptr[-1] != '~'))
return 0;
return tgetst1 (ptr, area);
@@
-171,12
+162,12
@@
static char esctab[]
into the block that *AREA points to,
or to newly allocated storage if AREA is 0. */
into the block that *AREA points to,
or to newly allocated storage if AREA is 0. */
-static CONST char *
+static const char *
tgetst1 (ptr, area)
tgetst1 (ptr, area)
- CONST char *ptr;
+ const char *ptr;
char **area;
{
char **area;
{
- CONST char *p;
+ const char *p;
char *r;
int c;
int size;
char *r;
int c;
int size;
@@
-259,7
+250,7
@@
static short speeds[] =
void
tputs (string, nlines, outfun)
void
tputs (string, nlines, outfun)
- CONST char *string;
+ const char *string;
int nlines;
void (*outfun) (int);
{
int nlines;
void (*outfun) (int);
{
@@
-278,7
+269,7
@@
tputs (string, nlines, outfun)
if (string == (char *) 0)
return;
if (string == (char *) 0)
return;
- while (isdigit (* (CONST unsigned char *) string))
+ while (isdigit (* (const unsigned char *) string))
{
padcount += *string++ - '0';
padcount *= 10;
{
padcount += *string++ - '0';
padcount *= 10;
@@
-337,23
+328,21
@@
static int name_match ();
If BP is zero, space is dynamically allocated. */
If BP is zero, space is dynamically allocated. */
-extern char *getenv ();
-
int
tgetent (bp, name)
char *bp;
int
tgetent (bp, name)
char *bp;
- CONST char *name;
+ const char *name;
{
char *tem;
int fd;
struct buffer buf;
char *bp1;
char *bp2;
{
char *tem;
int fd;
struct buffer buf;
char *bp1;
char *bp2;
- CONST char *term;
+ const char *term;
int malloc_size = 0;
int c;
int malloc_size = 0;
int c;
- char *tcenv; /* TERMCAP value, if it contais :tc=. */
- CONST char *indirect = 0; /* Terminal type in :tc= in TERMCAP value. */
+ char *tcenv; /* TERMCAP value, if it contains :tc=. */
+ const char *indirect = 0; /* Terminal type in :tc= in TERMCAP value. */
tem = getenv ("TERMCAP");
if (tem && *tem == 0) tem = 0;
tem = getenv ("TERMCAP");
if (tem && *tem == 0) tem = 0;
@@
-365,7
+354,7
@@
tgetent (bp, name)
it is the entry itself, but only if
the name the caller requested matches the TERM variable. */
it is the entry itself, but only if
the name the caller requested matches the TERM variable. */
- if (tem && !IS_DIRECTORY_SEP (*tem) && !strcmp (name, (char *) getenv ("TERM")))
+ if (tem && !IS_DIRECTORY_SEP (*tem) && !strcmp (name, getenv ("TERM")))
{
indirect = tgetst1 (find_capability (tem, "tc"), 0);
if (!indirect)
{
indirect = tgetst1 (find_capability (tem, "tc"), 0);
if (!indirect)
@@
-648,7
+637,7
@@
main (argc, argv)
}
tprint (cap)
}
tprint (cap)
- CONST char *cap;
+ const char *cap;
{
char *x = tgetstr (cap, 0);
char *y;
{
char *x = tgetstr (cap, 0);
char *y;