Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
- DOCKER_IMAGE: ubuntu:bionic
- DOCKER_IMAGE: ubuntu:focal
- DOCKER_IMAGE: debian:stretch
- DOCKER_IMAGE: debian:sid
- DOCKER_IMAGE: ubuntu:trusty
ROS_DISTRO: indigo
- DOCKER_IMAGE: ubuntu:xenial
Expand Down
24 changes: 6 additions & 18 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,15 @@ function travis_time_end {
if [ "$TRAVIS_OS_NAME" == "linux" ]; then

travis_time_start setup.apt-get_update
if [[ "$DOCKER_IMAGE" == *"jessie" ]] ; then
# Jessie is EOL, rewrite sources.list and configure apt
# http://archive.debian.org/debian-archive/
DIST_NAME="jessie"
echo "Rewriting /etc/apt/sources.list for ${DIST_NAME}"
echo "deb http://archive.debian.org/debian/ ${DIST_NAME} main" > /etc/apt/sources.list
echo "deb http://archive.debian.org/debian-security/ ${DIST_NAME}/updates main" >> /etc/apt/sources.list
printf 'Acquire::AllowInsecureRepositories "true";\nAcquire::Check-Valid-Until "false";\n' > /etc/apt/apt.conf.d/99-force-apt-update
fi
if [[ "$DOCKER_IMAGE" == *"stretch" ]] ; then
cat /etc/apt/sources.list
sed -i s@httpredir.debian.org@archive.debian.org@ /etc/apt/sources.list;
sed -i s@deb.debian.org@archive.debian.org@ /etc/apt/sources.list;
sed -i s@security.debian.org/debian-security@archive.debian.org/debian-security@ /etc/apt/sources.list
sed -i '/-updates/ s/^#*/#/' /etc/apt/sources.list
fi
if [[ "$DOCKER_IMAGE" == *"buster" ]] ; then
if [[ "$DOCKER_IMAGE" == *"jessie" || "$DOCKER_IMAGE" == *"stretch" || "$DOCKER_IMAGE" == *"buster" ]] ; then
# Busteris EOL, rewrite sources.list and configure apt
cat /etc/apt/sources.list
sed -i 's@deb.debian.org/debian buster@archive.debian.org/debian buster@' /etc/apt/sources.list;
echo "Rewriting /etc/apt/sources.list"
sed -i 's@deb.debian.org/debian@archive.debian.org/debian@' /etc/apt/sources.list;
sed -i 's@security.debian.org/debian@archive.debian.org/debian@' /etc/apt/sources.list
sed -i '/-updates/ s/^#*/#/' /etc/apt/sources.list
cat /etc/apt/sources.list
printf 'Acquire::AllowInsecureRepositories "true";\nAcquire::Check-Valid-Until "false";\n' > /etc/apt/apt.conf.d/99-force-apt-update
fi
if [ ! -e /usr/bin/sudo ] ; then apt-get update && apt-get install -y --force-yes sudo; else sudo apt-get update; fi
travis_time_end
Expand Down
14 changes: 13 additions & 1 deletion lisp/c/eusioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@ static char *rcsid="@(#)$Id$";
#include <sys/termios.h>
#include <sys/ioctl.h>
#ifndef Darwin
#include <termio.h>
#include <features.h>
#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 42))
#warning "Since glibc 2.42, termio.h is no longer supported. Dropping TCGETA TCSETA TCSETAW TCSETAF"
#define USE_TERMIOS
#include <termios.h>
#else
#define USE_TERMIO
#include <termio.h>
#endif
#endif
/* #include <sgtty.h> */

Expand Down Expand Up @@ -200,6 +208,7 @@ pointer argv[];
{ return(ioctl_struct(n,argv,TCSETSF,sizeof(struct termios)));}
#endif

#ifdef USE_TERMIO
pointer IOCTL_TCGETA(ctx,n,argv)
register context *ctx;
int n;
Expand All @@ -223,6 +232,7 @@ int n;
pointer argv[];
{ return(ioctl_struct(n,argv,TCSETAW,sizeof(struct termio)));}
#endif
#endif

pointer TCGETATTR(ctx,n,argv)
register context *ctx;
Expand Down Expand Up @@ -281,10 +291,12 @@ register pointer mod;
defunpkg(ctx,"TCSETSW",mod,IOCTL_TCSETSW,unixpkg);
defunpkg(ctx,"TCSETSF",mod,IOCTL_TCSETSF,unixpkg);
#endif
#ifdef USE_TERMIO
defunpkg(ctx,"TCGETA",mod,IOCTL_TCGETA,unixpkg);
defunpkg(ctx,"TCSETA",mod,IOCTL_TCSETA,unixpkg);
defunpkg(ctx,"TCSETAW",mod,(pointer(*)(context*,int,pointer*))IOCTL_TCSETAW,unixpkg);
defunpkg(ctx,"TCSETAF",mod,IOCTL_TCSETAF,unixpkg);
#endif
#endif
defunpkg(ctx,"TCGETATTR",mod,TCGETATTR,unixpkg);
defunpkg(ctx,"TCSETATTR",mod,TCSETATTR,unixpkg);
Expand Down
37 changes: 19 additions & 18 deletions lisp/tool/eustags.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ struct nd_st { /* sorting structure */
struct nd_st *left,*right; /* left and right sons */
};

long ftell();
long ftell(FILE *);
typedef struct nd_st NODE;

int number; /* tokens found so far on line starting with # (including #) */
Expand Down Expand Up @@ -204,21 +204,22 @@ void find_entries (char *file);
void free_tree (NODE *node);
void put_entries (NODE *node);

char *savestr();
char *savenstr ();
char *_rindex();
char *_index();
char *concat ();
void initbuffer ();
long readline ();

int total_size_of_entries ();
int PF_funcs ();
int xmalloc ();
int consider_token ();
int tail ();
int TEX_Token ();
int xrealloc ();
struct linebuffer; /* Forward declaration of 'struct linebuffer' */
char *savestr(char *cp);
char *savenstr (char *cp, int len);
char *_rindex(char *sp, char c);
char *_index(char *sp, char c);
char *concat (char *s1, char *s2, char *s3);
void initbuffer (struct linebuffer *);
long readline (struct linebuffer *, register FILE *);

int total_size_of_entries (NODE *node);
int PF_funcs (FILE *fi);
int xmalloc (int size);
int consider_token (char **lpp, char *token, int *f, int level);
int tail (char *cp);
int TEX_Token (char *cp);
int xrealloc (char *ptr, int size);

/* A `struct linebuffer' is a structure which holds a line of text.
`readline' reads a line from a stream into a linebuffer
Expand Down Expand Up @@ -1395,7 +1396,7 @@ struct TEX_tabent *TEX_toktab = NULL; /* Table with tag tokens */
static char *TEX_defenv =
":chapter:section:subsection:subsubsection:eqno:label:ref:cite:bibitem:typeout";

struct TEX_tabent *TEX_decode_env ();
struct TEX_tabent *TEX_decode_env (char *evarname, char *defenv);

static char TEX_esc = '\\';
static char TEX_opgrp = '{';
Expand Down Expand Up @@ -1498,7 +1499,7 @@ TEX_decode_env (evarname, defenv)
char *defenv;
{
register char *env, *p;
extern char *savenstr (), *_index ();
extern char *savenstr (char *cp, int len), *_index (char *sp, char c);

struct TEX_tabent *tab;
int size, i;
Expand Down