mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
This combines 20 cleanup commits from the dev branch. All changed files: - Clean up pointer defererences to sh. - Remove shp arguments from functions. Other notable changes: src/cmd/ksh93/include/shell.h, src/cmd/ksh93/sh/init.c: - On second thought, get rid of the function version of sh_getinterp() as libshell ABI compatibility is moot. We've already been breaking that by reordering the sh struct, so there is no way it's going to work without recompiling. src/cmd/ksh93/sh/name.c: - De-obfuscate the relationship between nv_scan() and scanfilter(). The former just calls the latter as a static function, there's no need to do that via a function pointer and void* type conversions. src/cmd/ksh93/bltins/typeset.c, src/cmd/ksh93/sh/name.c, src/cmd/ksh93/sh/nvdisc.c: - 'struct adata' and 'struct tdata', defined as local struct types in these files, need to have their first three fields in common, the first being a pointer to sh. This is because scanfilter() in name.c accesses these fields via a type conversion. So the sh field needed to be removed in all three at the same time. TODO: de-obfuscate: good practice definition via a header file. src/cmd/ksh93/sh/path.c: - Naming consistency: reserve the path_ function name prefix for externs and rename statics with that prefix. - The default path was sometimes referred to as the standard path. To use one term, rename std_path to defpath and onstdpath() to ondefpath(). - De-obfuscate SHOPT_PFSH conditional code by only calling pf_execve() (was path_pfexecve()) if that is compiled in. src/cmd/ksh93/include/streval.h, src/cmd/ksh93/sh/streval.c: - Rename extern strval() to arith_strval() for consistency. src/cmd/ksh93/sh/string.c: - Remove outdated/incorrect isxdigit() fallback; '#ifnded isxdigit' is not a correct test as isxdigit() is specified as a function. Plus, it's part of C89/C90 which we now require. (re:ac8991e5) src/cmd/ksh93/sh/suid_exec.c: - Replace an incorrect reference to shgd->current_pid with getpid(); it cannot work as (contrary to its misleading directory placement) suid_exec is an independent libast program with no link to ksh or libshell at all. However, no one noticed because this was in fallback code for ancient systems without setreuid(2). Since that standard function was specified in POSIX Issue 4 Version 2 from 1994, we should remove that fallback code sometime as part of another obsolete code cleanup operation to avoid further bit rot. (re:843b546c) src/cmd/ksh93/bltins/print.c: genformat(): - Remove preformat[] which was always empty and had no effect. src/cmd/ksh93/shell.3: - Minor copy-edit. - Remove documentation for nonexistent sh.infile_name. A search through ast-open-archive[*] reveals this never existed at all. - Document sh.savexit (== $?). src/cmd/ksh93/shell.3, src/cmd/ksh93/include/shell.h, src/cmd/ksh93/sh/init.c: - Remove sh.gd/shgd; this is now unused and was never documented or exposed in the shell.h public interface. - sh_sigcheck() was documented in shell.3 as taking no arguments whereas in the actual code it took a shp argument. I decided to go with the documentation. - That leaves sh_parse() as the only documented function that still takes an shp argument. I'm just going to go ahead and remove it for consistency, reverting sh_parse() to its pre-2003 spec. - Remove undocumented/unused sh_bltin_tree() function which simply returned sh.bltin_tree. - Bump SH_VERSION to 20220106.
221 lines
5.6 KiB
C
221 lines
5.6 KiB
C
/***********************************************************************
|
|
* *
|
|
* This software is part of the ast package *
|
|
* Copyright (c) 1982-2012 AT&T Intellectual Property *
|
|
* Copyright (c) 2020-2021 Contributors to ksh 93u+m *
|
|
* 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> *
|
|
* *
|
|
***********************************************************************/
|
|
#ifndef _SHNODES_H
|
|
#define _SHNODES_H 1
|
|
/*
|
|
* UNIX shell
|
|
* Written by David Korn
|
|
*
|
|
*/
|
|
|
|
|
|
#include <ast.h>
|
|
#include "argnod.h"
|
|
|
|
/* command tree for tretyp */
|
|
#define FINT (02<<COMBITS) /* non-interruptible */
|
|
#define FAMP (04<<COMBITS) /* background */
|
|
#define FPIN (010<<COMBITS) /* input is a pipe */
|
|
#define FPOU (040<<COMBITS) /* output is a pipe */
|
|
#define FPCL (0100<<COMBITS) /* close the pipe */
|
|
#define FCOOP (0200<<COMBITS) /* cooperating process */
|
|
#define FSHOWME (0400<<COMBITS) /* set for showme commands */
|
|
#define FALTPIPE (02000<<COMBITS) /* alternate pipes &| */
|
|
#define FPOSIX (02<<COMBITS) /* POSIX semantics function */
|
|
#define FLINENO (04<<COMBITS) /* for/case has line number */
|
|
#define FOPTGET (0200<<COMBITS) /* function calls getopts */
|
|
|
|
#define TNEGATE (01<<COMBITS) /* ! inside [[ ... ]] */
|
|
#define TBINARY (02<<COMBITS) /* binary operator in [[ ... ]] */
|
|
#define TUNARY (04<<COMBITS) /* unary operator in [[ ... ]] */
|
|
#define TTEST (010<<COMBITS)
|
|
#define TPAREN (TBINARY|TUNARY)
|
|
#define TSHIFT (COMBITS+4)
|
|
#define TNSPACE (TFUN|COMSCAN)
|
|
|
|
#define TCOM 0
|
|
#define TPAR 1
|
|
#define TFIL 2
|
|
#define TLST 3
|
|
#define TIF 4
|
|
#define TWH 5
|
|
#define TUN (TWH|COMSCAN)
|
|
#define TTST 6
|
|
#define TSW 7
|
|
#define TAND 8
|
|
#define TORF 9
|
|
#define TFORK 10
|
|
#define TFOR 11
|
|
#define TSELECT (TFOR|COMSCAN)
|
|
#define TARITH 12
|
|
#define TTIME 13
|
|
#define TSETIO 14
|
|
#define TFUN 15
|
|
|
|
/* this node is a proforma for those that follow */
|
|
|
|
struct trenod
|
|
{
|
|
int tretyp;
|
|
struct ionod *treio;
|
|
};
|
|
|
|
|
|
struct forknod
|
|
{
|
|
int forktyp;
|
|
struct ionod *forkio;
|
|
Shnode_t *forktre;
|
|
int forkline;
|
|
};
|
|
|
|
|
|
struct ifnod
|
|
{
|
|
int iftyp;
|
|
Shnode_t *iftre;
|
|
Shnode_t *thtre;
|
|
Shnode_t *eltre;
|
|
};
|
|
|
|
struct whnod
|
|
{
|
|
int whtyp;
|
|
Shnode_t *whtre;
|
|
Shnode_t *dotre;
|
|
struct arithnod *whinc;
|
|
};
|
|
|
|
struct fornod
|
|
{
|
|
int fortyp;
|
|
char *fornam;
|
|
Shnode_t *fortre;
|
|
struct comnod *forlst;
|
|
int forline;
|
|
};
|
|
|
|
struct swnod
|
|
{
|
|
int swtyp;
|
|
struct argnod *swarg;
|
|
struct regnod *swlst;
|
|
struct ionod *swio;
|
|
int swline;
|
|
};
|
|
|
|
struct regnod
|
|
{
|
|
struct argnod *regptr;
|
|
Shnode_t *regcom;
|
|
struct regnod *regnxt;
|
|
char regflag;
|
|
};
|
|
|
|
struct parnod
|
|
{
|
|
int partyp;
|
|
Shnode_t *partre;
|
|
};
|
|
|
|
struct lstnod
|
|
{
|
|
int lsttyp;
|
|
Shnode_t *lstlef;
|
|
Shnode_t *lstrit;
|
|
};
|
|
|
|
/* tst is same as lst, but with extra field for line number */
|
|
struct tstnod
|
|
{
|
|
struct lstnod tstlst;
|
|
int tstline;
|
|
};
|
|
|
|
struct functnod
|
|
{
|
|
int functtyp;
|
|
char *functnam;
|
|
Shnode_t *functtre;
|
|
int functline;
|
|
off_t functloc;
|
|
struct slnod *functstak;
|
|
struct comnod *functargs;
|
|
};
|
|
|
|
struct arithnod
|
|
{
|
|
int artyp;
|
|
int arline;
|
|
struct argnod *arexpr;
|
|
void *arcomp;
|
|
};
|
|
|
|
|
|
/* types of ionodes stored in iofile */
|
|
#define IOUFD 0x3f /* file descriptor number mask */
|
|
#define IOPUT 0x40 /* > redirection operator */
|
|
#define IOAPP 0x80 /* >> redirection operator */
|
|
#define IODOC 0x100 /* << redirection operator */
|
|
#define IOMOV 0x200 /* <& or >& operators */
|
|
#define IOCLOB 0x400 /* noclobber bit */
|
|
#define IORDW 0x800 /* <> redirection operator */
|
|
#define IORAW 0x1000 /* no expansion needed for filename */
|
|
#define IOSTRG 0x2000 /* here-document stored as incore string */
|
|
#define IOSTRIP 0x4000 /* strip leading tabs for here-document */
|
|
#define IOQUOTE 0x8000 /* here-document delimiter was quoted */
|
|
#define IOVNM 0x10000 /* iovname field is non-zero */
|
|
#define IOLSEEK 0x20000 /* seek operators <# or ># */
|
|
#define IOARITH 0x40000 /* arithmetic seek <# ((expr)) */
|
|
#define IOREWRITE 0x80000 /* arithmetic seek <# ((expr)) */
|
|
#define IOCOPY IOCLOB /* copy skipped lines onto standard output */
|
|
#define IOPROCSUB IOARITH /* process substitution redirection */
|
|
|
|
union Shnode_u
|
|
{
|
|
struct argnod arg;
|
|
struct ionod io;
|
|
struct whnod wh;
|
|
struct swnod sw;
|
|
struct ifnod if_;
|
|
struct dolnod dol;
|
|
struct comnod com;
|
|
struct trenod tre;
|
|
struct forknod fork;
|
|
struct fornod for_;
|
|
struct regnod reg;
|
|
struct parnod par;
|
|
struct lstnod lst;
|
|
struct tstnod tst;
|
|
struct functnod funct;
|
|
struct arithnod ar;
|
|
};
|
|
|
|
extern void sh_freeup(void);
|
|
extern void sh_funstaks(struct slnod*,int);
|
|
extern Sfio_t *sh_subshell(Shnode_t*, volatile int, int);
|
|
#if defined(__EXPORT__) && defined(_BLD_DLL)
|
|
__EXPORT__
|
|
#endif
|
|
extern int sh_tdump(Sfio_t*, const Shnode_t*);
|
|
extern Shnode_t *sh_trestore(Sfio_t*);
|
|
|
|
#endif /* _SHNODES_H */
|