mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
a1f5c99204
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'.
92 lines
3.4 KiB
C
92 lines
3.4 KiB
C
/***********************************************************************
|
|
* *
|
|
* This software is part of the ast package *
|
|
* Copyright (c) 1985-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 *
|
|
* *
|
|
* Glenn Fowler <gsf@research.att.com> *
|
|
* David Korn <dgk@research.att.com> *
|
|
* Phong Vo <kpv@research.att.com> *
|
|
* *
|
|
***********************************************************************/
|
|
/*
|
|
* Glenn Fowler
|
|
* AT&T Research
|
|
*
|
|
* xargs/tw command arg list interface definitions
|
|
*/
|
|
|
|
#ifndef _CMDARG_H
|
|
#define _CMDARG_H 1
|
|
|
|
#include <error.h>
|
|
|
|
#define CMD_VERSION 20120411L
|
|
|
|
#define CMD_CHECKED (1<<9) /* cmdopen() argv[0] ok */
|
|
#define CMD_EMPTY (1<<0) /* run once, even if no args */
|
|
#define CMD_EXACT (1<<1) /* last command must have argmax*/
|
|
#define CMD_EXIT (1<<11) /* fatal error_info.exit() */
|
|
#define CMD_IGNORE (1<<2) /* ignore EXIT_QUIT exit */
|
|
#define CMD_INSERT (1<<3) /* argpat for insertion */
|
|
#define CMD_MINIMUM (1<<4) /* argmax is a minimum */
|
|
#define CMD_NEWLINE (1<<5) /* echo separator is newline */
|
|
#define CMD_POST (1<<6) /* argpat is post arg position */
|
|
#define CMD_QUERY (1<<7) /* trace and query each command */
|
|
#define CMD_SILENT (1<<10) /* no error messages */
|
|
#define CMD_TRACE (1<<8) /* trace each command */
|
|
|
|
#define CMD_USER (1<<12)
|
|
|
|
#define CMDDISC(d,f,e) (memset(d,0,sizeof(*(d))),(d)->version=CMD_VERSION,(d)->flags=(f),(d)->errorf=(e))
|
|
|
|
struct Cmddisc_s;
|
|
typedef struct Cmddisc_s Cmddisc_t;
|
|
|
|
typedef int (*Cmdrun_f)(int, char**, Cmddisc_t*);
|
|
|
|
struct Cmddisc_s
|
|
{
|
|
uint32_t version; /* CMD_VERSION */
|
|
uint32_t flags; /* CMD_* flags */
|
|
Error_f errorf; /* optional error function */
|
|
Cmdrun_f runf; /* optional exec function */
|
|
};
|
|
|
|
typedef struct Cmdarg_s /* cmdopen() handle */
|
|
{
|
|
const char* id; /* library id string */
|
|
|
|
#ifdef _CMDARG_PRIVATE_
|
|
_CMDARG_PRIVATE_
|
|
#endif
|
|
|
|
} Cmdarg_t;
|
|
|
|
#if _BLD_ast && defined(__EXPORT__)
|
|
#define extern __EXPORT__
|
|
#endif
|
|
|
|
#ifndef cmdopen
|
|
extern Cmdarg_t* cmdopen(char**, int, int, const char*, int);
|
|
#endif
|
|
extern Cmdarg_t* cmdopen_20110505(char**, int, int, const char*, int, Error_f);
|
|
extern Cmdarg_t* cmdopen_20120411(char**, int, int, const char*, Cmddisc_t*);
|
|
extern int cmdflush(Cmdarg_t*);
|
|
extern int cmdarg(Cmdarg_t*, const char*, int);
|
|
extern int cmdclose(Cmdarg_t*);
|
|
|
|
#undef extern
|
|
|
|
#endif
|