external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity
cde/src/cmd/ksh93/include/edit.h
Martijn Dekker 2182ecfa08 Fix compile/regress fails on compiling without SHOPT_* options 
Many compile-time options were broken so that they could not be
turned off without causing compile errors and/or regression test
failures. This commit now allows the following to be disabled:

SHOPT_2DMATCH    # two dimensional ${.sh.match} for ${var//pat/str}
SHOPT_BGX        # one SIGCHLD trap per completed job
SHOPT_BRACEPAT   # C-shell {...,...} expansions (, required)
SHOPT_ESH        # emacs/gmacs edit mode
SHOPT_HISTEXPAND # csh-style history file expansions
SHOPT_MULTIBYTE  # multibyte character handling
SHOPT_NAMESPACE  # allow namespaces
SHOPT_STATS      # add .sh.stats variable
SHOPT_VSH        # vi edit mode

The following still break ksh when disabled:

SHOPT_FIXEDARRAY # fixed dimension indexed array
SHOPT_RAWONLY    # make viraw the only vi mode
SHOPT_TYPEDEF    # enable typeset type definitions

Compiling without SHOPT_RAWONLY just gives four regression test
failures in pty.sh, but turning off SHOPT_FIXEDARRAY and
SHOPT_TYPEDEF causes compilation to fail. I've managed to tweak the
code to make it compile without those two options, but then dozens
of regression test failures occur, often in things nothing directly
to do with those options. It looks like the separation between the
code for these options and the rest was never properly maintained.
Making it possible to disable SHOPT_FIXEDARRAY and SHOPT_TYPEDEF
may involve major refactoring and testing and may not be worth it.

This commit has far too many tweaks to list. Notables fixes are:

src/cmd/ksh93/data/builtins.c,
src/cmd/ksh93/data/options.c:
- Do not compile in the shell options and documentation for
  disabled features (braceexpand, emacs/gmacs, vi/viraw), so the
  shell is not left with no-op options and inaccurate self-doc.

src/cmd/ksh93/data/lexstates.c:
- Comment the state tables to associte them with their IDs.
- In the ST_MACRO table (sh_lexstate9[]), do not make the S_BRACE
  state for position 123 (ASCII for '{') conditional upon
  SHOPT_BRACEPAT (brace expansion), otherwise disabling this causes
  glob patterns of the form {3}(x) (matching 3 x'es) to stop
  working as well -- and that is ksh globbing, not brace expansion.

src/cmd/ksh93/edit/edit.c: ed_read():
- Fixed a bug: SIGWINCH was not handled by the gmacs edit mode.

src/cmd/ksh93/sh/name.c: nv_putval():
- The -L/-R left/right adjustment options to typeset do not count
  zero-width characters. This is the behaviour with SHOPT_MULTIBYTE
  enabled, regardless of locale. Of course, what a zero-width
  character is depends on the locale, but control characters are
  always considered zero-width. So, to avoid a regression, add some
  fallback code for non-SHOPT_MULTIBYTE builds that skips ASCII
  control characters (as per iscntrl(3)) so they are still
  considered to have zero width.

src/cmd/ksh93/tests/shtests:
- Export the SHOPT_* macros from SHOPT.sh to the tests as
  environment variables, so the tests can check for them and decide
  whether or how to run tests based on the compile-time options
  that the tested binary was presumably compiled with.
- Do not run the C.UTF-8 tests if SHOPT_MULTIBYTE is not enabled.

src/cmd/ksh93/tests/*.sh:
- Add a bunch of checks for SHOPT_* env vars. Since most should
  have a value 0 (off) or 1 (on), the form ((SHOPT_FOO)) is a
  convenient way to use them as arithmetic booleans.

.github/workflows/ci.yml:
- Make GitHub do more testing: run two locale tests (Dutch and
  Japanese UTF-8 locales), then disable all the SHOPTs that we can
  currently disable, recompile ksh, and run the tests again.
2021-02-08 22:02:45 +00:00

273 lines
8.8 KiB
C
Raw Blame History

/***********************************************************************
* *
* This software is part of the ast package *
* Copyright (c) 1982-2012 AT&T Intellectual Property *
* and is licensed under the *
* Eclipse Public License, Version 1.0 *
* by AT&T Intellectual Property *
* *
* A copy of the License is available at *
* http://www.eclipse.org/org/documents/epl-v10.html *
* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
* Florham Park NJ *
* *
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef SEARCHSIZE
/*
* edit.h - common data structure for vi and emacs edit options
*
* David Korn
* AT&T Labs
*
*/
#define SEARCHSIZE 80
#include "FEATURE/options"
#include "FEATURE/locale"
#if !KSHELL
# include <setjmp.h>
# include <sig.h>
# include <ctype.h>
#endif /* KSHELL */
#include "FEATURE/setjmp"
#include "terminal.h"
#define STRIP 0377
#define LOOKAHEAD 80
#if SHOPT_MULTIBYTE
# ifndef ESS_MAXCHAR
# include "national.h"
# endif /* ESS_MAXCHAR */
typedef wchar_t genchar;
# define CHARSIZE (sizeof(wchar_t)<=2?3:sizeof(wchar_t))
#else
typedef char genchar;
# define CHARSIZE 1
#endif /* SHOPT_MULTIBYTE */
#define TABSIZE 8
#define PRSIZE 256
#define MAXLINE 1024 /* longest edit line permitted */
typedef struct _edit_pos
{
unsigned short line;
unsigned short col;
} Edpos_t;
#if SHOPT_EDPREDICT
typedef struct Histmatch
{
struct Histmatch *next;
int index;
short len;
short count;
char data[1];
} Histmatch_t;
#endif /* SHOPT_EDPREDICT */
typedef struct edit
{
sigjmp_buf e_env;
int e_intr;
int e_kill;
int e_erase;
int e_werase;
int e_eof;
int e_lnext;
int e_plen; /* length of prompt string */
char e_crlf; /* zero if cannot return to beginning of line */
char e_nocrnl; /* don't put a new-line with ^L */
char e_keytrap; /* set when in keytrap */
int e_llimit; /* line length limit */
int e_hline; /* current history line number */
int e_hloff; /* line number offset for command */
int e_hismin; /* minimum history line number */
int e_hismax; /* maximum history line number */
int e_raw; /* set when in raw mode or alt mode */
int e_cur; /* current line position */
int e_eol; /* end-of-line position */
int e_pcur; /* current physical line position */
int e_peol; /* end of physical line position */
int e_mode; /* edit mode */
int e_lookahead; /* index in look-ahead buffer */
int e_fcol; /* first column */
int e_wsize; /* width of display window */
char *e_outbase; /* pointer to start of output buffer */
char *e_outptr; /* pointer to position in output buffer */
char *e_outlast; /* pointer to end of output buffer */
genchar *e_inbuf; /* pointer to input buffer */
char *e_prompt; /* pointer to buffer containing the prompt */
genchar *e_killbuf; /* pointer to delete buffer */
char e_search[SEARCHSIZE]; /* search string */
genchar *e_physbuf; /* temporary workspace buffer */
int e_lbuf[LOOKAHEAD];/* pointer to look-ahead buffer */
int e_fd; /* file descriptor */
int e_ttyspeed; /* line speed, also indicates tty parms are valid */
int e_tabcount;
#ifdef _hdr_utime
ino_t e_tty_ino;
dev_t e_tty_dev;
char *e_tty;
#endif
#if SHOPT_OLDTERMIO
char e_echoctl;
char e_tcgeta;
struct termio e_ott;
#endif
int *e_globals; /* global variables */
genchar *e_window; /* display window image */
char e_inmacro; /* processing macro expansion */
#if KSHELL
char e_vi_insert[2]; /* for sh_keytrap */
int32_t e_col; /* for sh_keytrap */
#else
char e_prbuff[PRSIZE]; /* prompt buffer */
#endif /* KSHELL */
struct termios e_ttyparm; /* initial tty parameters */
struct termios e_nttyparm; /* raw tty parameters */
struct termios e_savetty; /* saved terminal state */
int e_savefd; /* file descriptor for saved terminal state */
char e_macro[4]; /* macro buffer */
void *e_vi; /* vi specific data */
void *e_emacs; /* emacs specific data */
Shell_t *sh; /* interpreter pointer */
char *e_stkptr; /* saved stack pointer */
int e_stkoff; /* saved stack offset */
char **e_clist; /* completion list after <ESC>= */
int e_nlist; /* number of elements on completion list */
int e_multiline; /* allow multiple lines for editing */
int e_winsz; /* columns in window */
Edpos_t e_curpos; /* cursor line and column */
Namval_t *e_default; /* variable containing default value */
Namval_t *e_term; /* TERM variable */
char e_termname[80]; /* terminal name */
#if SHOPT_EDPREDICT
Histmatch_t **hlist;
Histmatch_t *hfirst;
unsigned short nhlist;
unsigned short hoff;
unsigned short hmax;
char hpat[40];
#endif /* SHOPT_EDPREDICT */
} Edit_t;
#undef MAXWINDOW
#define MAXWINDOW 300 /* maximum width window */
#define FAST 2
#define SLOW 1
#define ESC cntl('[')
#define UEOF -2 /* user eof char synonym */
#define UINTR -3 /* user intr char synonym */
#define UERASE -4 /* user erase char synonym */
#define UKILL -5 /* user kill char synonym */
#define UWERASE -6 /* user word erase char synonym */
#define ULNEXT -7 /* user next literal char synonym */
#if ( 'a' == 97) /* ASCII? */
# define cntl(x) (x&037)
#else
# define cntl(c) (c=='D'?55:(c=='E'?45:(c=='F'?46:(c=='G'?'\a':(c=='H'?'\b': \
(c=='I'?'\t':(c=='J'?'\n':(c=='T'?60:(c=='U'?61:(c=='V'?50: \
(c=='W'?38:(c=='Z'?63:(c=='['?39:(c==']'?29: \
(c<'J'?c+1-'A':(c+10-'J'))))))))))))))))
#endif
#if !KSHELL
# define STRIP 0377
# define GMACS 1
# define EMACS 2
# define VIRAW 4
# define EDITVI 8
# define NOHIST 16
# define EDITMASK 15
# define is_option(m) (opt_flag&(m))
extern char opt_flag;
# ifdef SYSCALL
# define read(fd,buff,n) syscall(3,fd,buff,n)
# else
# define read(fd,buff,n) rEAd(fd,buff,n)
# endif /* SYSCALL */
#endif /* KSHELL */
extern void ed_crlf(Edit_t*);
extern void ed_putchar(Edit_t*, int);
extern void ed_ringbell(void);
extern void ed_setup(Edit_t*,int, int);
extern void ed_flush(Edit_t*);
extern int ed_getchar(Edit_t*,int);
extern int ed_virt_to_phys(Edit_t*,genchar*,genchar*,int,int,int);
extern int ed_window(void);
extern void ed_ungetchar(Edit_t*,int);
extern int ed_viread(void*, int, char*, int, int);
extern int ed_read(void*, int, char*, int, int);
extern int ed_emacsread(void*, int, char*, int, int);
extern Edpos_t ed_curpos(Edit_t*, genchar*, int, int, Edpos_t);
extern int ed_setcursor(Edit_t*, genchar*, int, int, int);
#if KSHELL
extern int ed_macro(Edit_t*,int);
extern int ed_expand(Edit_t*, char[],int*,int*,int,int);
extern int ed_fulledit(Edit_t*);
extern void *ed_open(Shell_t*);
#endif /* KSHELL */
# if SHOPT_MULTIBYTE
extern int ed_internal(const char*, genchar*);
extern int ed_external(const genchar*, char*);
extern void ed_gencpy(genchar*,const genchar*);
extern void ed_genncpy(genchar*,const genchar*,int);
extern int ed_genlen(const genchar*);
# endif /* SHOPT_MULTIBYTE */
#if SHOPT_EDPREDICT
extern int ed_histgen(Edit_t*, const char*);
# if SHOPT_ESH || SHOPT_VSH
extern void ed_histlist(Edit_t*, int);
# endif /* SHOPT_ESH || SHOPT_VSH */
#endif /* SHOPT_EDPREDICT */
extern const char e_runvi[];
#if !KSHELL
extern const char e_version[];
#endif /* KSHELL */
#if SHOPT_HISTEXPAND
/* flags */
#define HIST_EVENT 0x1 /* event designator seen */
#define HIST_QUESTION 0x2 /* question mark event designator */
#define HIST_HASH 0x4 /* hash event designator */
#define HIST_WORDDSGN 0x8 /* word designator seen */
#define HIST_QUICKSUBST 0x10 /* quick substitution designator seen */
#define HIST_SUBSTITUTE 0x20 /* for substitution loop */
#define HIST_NEWLINE 0x40 /* newline in squashed white space */
/* modifier flags */
#define HIST_PRINT 0x100 /* print new command */
#define HIST_QUOTE 0x200 /* quote resulting history line */
#define HIST_QUOTE_BR 0x400 /* quote every word on space break */
#define HIST_GLOBALSUBST 0x800 /* apply substitution globally */
#define HIST_ERROR 0x1000 /* an error occurred */
/* flags to be returned */
#define HIST_FLAG_RETURN_MASK (HIST_EVENT|HIST_PRINT|HIST_ERROR)
extern int hist_expand(const char *, char **);
#endif /* SHOPT_HISTEXPAND */
#endif /* !SEARCHSIZE */
Reference in a new issue View git blame Copy permalink