mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
This takes another step towards cleaning up the build system. We now do not even pretend to be theoretically compatible with pre-1989 K&R C compilers or with C++ compilers. In practice, this had already been broken for many years due to bit rot. Commit46593a89already removed the license handling enormity that depended on proto, so now we can cleanly remove it altogether. But we do need to leave some backwards compatibility stubs to keep the build system compatible with older AST code; it should remain possible to build older ksh versions with the current build system (the bin/ and src/cmd/INIT/ directories) for testing purposes. So as of now there is no more __MANGLE__d rubbish in your generated header files. This is only about a quarter of a century overdue... This commit also includes a huge amount of code cleanup to remove thousands of unused K&R C fallbacks and other cruft, particularly in libast. This code base should now be a little easier to understand for people who are familiar with a modern(ish) C standard. ratz is now also removed; this was a standalone and simplified 2005 version of gunzip. As of6137b99a, none of our code uses it, even theoretically. And the real g(un)zip is now everywhere. src/cmd/INIT/proto.c, src/cmd/INIT/ratz.c: - Removed. COPYRIGHT: - Remove zlib license; this only applied to ratz. bin/package, src/cmd/INIT/package.sh: - Related cleanups. - Unset LC_ALL before invoking a new shell, respecting the user's locale again and avoiding multibyte character corruption on the command line. src/cmd/INIT/proto.sh: - Add stub for backwards compatibility with Mamfiles that depend on proto. It does nothing but pass input without modification and is now installed as the new arch/*/bin/proto by src/cmd/INIT/Mamfile. src/cmd/INIT/iffe.sh: - Ignore the proto-related -e (--package) and -p (--prototyped) options; keep parsing them for backwards compatibility. - Trim the macros passed to every test to their standard C versions, removing K&R C and C++ versions. These are now considered to be for backwards compatibility only. src/cmd/INIT/iffe.tst: - Remove proto(1) mangling code. By the way, iffe can be regression-tested as follows: $ bin/package use # set up environment in a child shell $ regress src/cmd/INIT/iffe.tst $ exit # leave package environment src/cmd/INIT/make.probe, src/cmd/INIT/probe.win32: - Remove code to handle C++. src/lib/libast/features/common: - As in iffe.sh above, trim macros designed for compatibility with C++ and ancient C compilers to their standard C versions and comment that they are for backwards compatibility with AST code. This is needed to keep all the old ast and ksh code compiling. src/cmd/ksh93/sh/init.c, src/cmd/ksh93/sh/name.c: - Clarify libshell ABI compatibility function versions of macros. A "proto workaround" comment in the original code mislead me into thinking this had something to do with the removed proto(1), but it's unrelated. Call the workaround macro BYPASS_MACRO instead. src/cmd/ksh93/include/defs.h: - sh_sigcheck() macro: allow &sh as an argument: parenthesise shp. src/cmd/ksh93/sh/nvtype.c: - Remove unused nv_mkstruct() function. (re:d0a5cab1) **/features/*: - Remove obsolete iffe 'set prototyped' option. **/Mamfile: - Remove all references to the ast/prototyped.h header. - Remove all use of the proto command. Simply copy instead. *** 850-ish source files: *** - Remove all '#pragma prototyped' directives. - Remove all C++ compat code conditional upon defined(__cplusplus). - Remove all use of the _ARG_ macro, which on standard C expands to its argument: #define _ARG_(x) x (on K&R C, it expanded to nothing) - Remove all use of _BEGIN_EXTERNS_ and _END_EXTERNS_ macros (empty on standard C; this was for C++ compatibility) - Reduce all #if __STD_C (standard code) #else (K&R code) #endif blocks to the standard code only, without use of the macro. - Same for _STD_ macro which seems to have had the same function. - Change all instances of 'Void_t' to standard 'void'.
142 lines
4.2 KiB
C
142 lines
4.2 KiB
C
/***********************************************************************
|
|
* *
|
|
* This software is part of the ast package *
|
|
* Copyright (c) 1982-2011 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 ARG_RAW
|
|
/*
|
|
* struct to hold a word argument
|
|
* Written by David Korn
|
|
*
|
|
*/
|
|
|
|
#include <stak.h>
|
|
|
|
struct ionod
|
|
{
|
|
unsigned iofile;
|
|
char *ioname;
|
|
struct ionod *ionxt;
|
|
struct ionod *iolst;
|
|
char *iodelim;
|
|
off_t iooffset;
|
|
long iosize;
|
|
char *iovname;
|
|
};
|
|
|
|
struct comnod
|
|
{
|
|
int comtyp;
|
|
struct ionod *comio;
|
|
struct argnod *comarg;
|
|
struct argnod *comset;
|
|
void *comnamp;
|
|
void *comnamq;
|
|
void *comstate;
|
|
int comline;
|
|
};
|
|
|
|
#define COMBITS 4
|
|
#define COMMSK ((1<<COMBITS)-1)
|
|
#define COMSCAN (01<<COMBITS)
|
|
#define COMFIXED (02<<COMBITS)
|
|
|
|
struct slnod /* struct for link list of stacks */
|
|
{
|
|
struct slnod *slnext;
|
|
struct slnod *slchild;
|
|
Stak_t *slptr;
|
|
/* slpad aligns struct functnod = struct slnod + 1 on some architectures */
|
|
struct slnod *slpad;
|
|
};
|
|
|
|
/*
|
|
* This struct is used to hold $* lists and arrays
|
|
*/
|
|
|
|
struct dolnod
|
|
{
|
|
int dolrefcnt; /* reference count */
|
|
int dolmax; /* size of dolval array */
|
|
int dolnum; /* number of elements */
|
|
int dolbot; /* current first element */
|
|
struct dolnod *dolnxt; /* used when list are chained */
|
|
char *dolval[1]; /* array of value pointers */
|
|
};
|
|
|
|
/*
|
|
* This struct is used to hold word arguments of variable size during
|
|
* parsing and during expansion. The flags indicate what processing
|
|
* is required on the argument.
|
|
*/
|
|
|
|
struct argnod
|
|
{
|
|
union
|
|
{
|
|
struct argnod *ap;
|
|
char *cp;
|
|
} argnxt;
|
|
union
|
|
{
|
|
struct argnod *ap;
|
|
char *cp;
|
|
int len;
|
|
} argchn;
|
|
unsigned char argflag;
|
|
char argval[4];
|
|
};
|
|
|
|
|
|
|
|
/* The following should evaluate to the offset of argval in argnod */
|
|
#define ARGVAL offsetof(struct argnod,argval[0])
|
|
#define sh_argstr(ap) ((ap)->argflag&ARG_RAW?sh_fmtq((ap)->argval):(ap)->argval)
|
|
#define ARG_SPARE 1
|
|
|
|
|
|
/* legal argument flags */
|
|
#define ARG_RAW 0x1 /* string needs no processing */
|
|
#define ARG_MAKE 0x2 /* bit set during argument expansion */
|
|
#define ARG_COMSUB 0x2 /* command sub */
|
|
#define ARG_MAC 0x4 /* string needs macro expansion */
|
|
#define ARG_EXP 0x8 /* string needs file expansion */
|
|
#define ARG_ASSIGN 0x10 /* argument is an assignment */
|
|
#define ARG_QUOTED 0x20 /* word contained quote characters */
|
|
#define ARG_MESSAGE 0x40 /* contains international string */
|
|
#define ARG_APPEND 0x80 /* for += assignment */
|
|
/* The following can be passed as options to sh_macexpand() */
|
|
#define ARG_ARITH 0x100 /* arithmetic expansion */
|
|
#define ARG_OPTIMIZE 0x200 /* try to optimize */
|
|
#define ARG_NOGLOB 0x400 /* no file name expansion */
|
|
#define ARG_ARRAYOK 0x1000 /* $x[sub] ==> ${x[sub]} */
|
|
|
|
extern struct dolnod *sh_argcreate(char*[]);
|
|
extern char *sh_argdolminus(void*);
|
|
extern int sh_argopts(int,char*[],void*);
|
|
|
|
|
|
extern const char e_heading[];
|
|
extern const char e_sptbnl[];
|
|
extern const char e_subst[];
|
|
extern const char e_option[];
|
|
extern const char e_exec[];
|
|
extern const char e_devfdNN[];
|
|
extern const char e_devfdstd[];
|
|
|
|
#endif /* ARG_RAW */
|