mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
b590a9f155
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.
72 lines
2.7 KiB
C
72 lines
2.7 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 TEST_ARITH
|
|
/*
|
|
* UNIX shell
|
|
* David Korn
|
|
* AT&T Labs
|
|
*
|
|
*/
|
|
|
|
#include "FEATURE/options"
|
|
#include "defs.h"
|
|
#include "shtable.h"
|
|
/*
|
|
* These are the binary test operators
|
|
* See also shtab_testops[] in data/testops.c
|
|
*/
|
|
|
|
#define TEST_ARITH 040 /* arithmetic operators */
|
|
#define TEST_ANDOR 0200 /* logical operators: -a, -o */
|
|
#define TEST_STRCMP 0100 /* literal string comparison; turn off bit for pattern matching */
|
|
|
|
#define TEST_NE (TEST_ARITH|9)
|
|
#define TEST_EQ (TEST_ARITH|4)
|
|
#define TEST_GE (TEST_ARITH|5)
|
|
#define TEST_GT (TEST_ARITH|6)
|
|
#define TEST_LE (TEST_ARITH|7)
|
|
#define TEST_LT (TEST_ARITH|8)
|
|
#define TEST_OR (TEST_ANDOR|1)
|
|
#define TEST_AND (TEST_ANDOR|2)
|
|
#define TEST_SNE (TEST_STRCMP|TEST_PNE)
|
|
#define TEST_SEQ (TEST_STRCMP|TEST_PEQ)
|
|
#define TEST_PNE 1
|
|
#define TEST_PEQ 14
|
|
#define TEST_EF 3
|
|
#define TEST_NT 10
|
|
#define TEST_OT 12
|
|
#define TEST_SLT 16
|
|
#define TEST_SGT 17
|
|
#define TEST_REP 20
|
|
|
|
extern int test_unop(int, const char*);
|
|
extern int test_inode(const char*, const char*);
|
|
extern int test_binop(int, const char*, const char*);
|
|
|
|
extern const char sh_opttest[];
|
|
extern const char test_opchars[];
|
|
extern const char e_argument[];
|
|
extern const char e_missing[];
|
|
extern const char e_badop[];
|
|
extern const char e_tstbegin[];
|
|
extern const char e_tstend[];
|
|
|
|
#endif /* TEST_ARITH */
|