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

Another round of accumulated minor fixes and cleanups

Browse source 
Only notable changes listed below.

**/Mamfile:
- Do not bother redirecting standard error for 'cmp -s' to
  /dev/null. Normally, 'cmp -s' on Linux, macOS, *BSD, or Solaris
  do not not print any message. If it does, something unusual is
  going on and I would want to see the message.
- Since we now require a POSIX shell, we can use '!'.

src/cmd/ksh93/include/defs.h,
src/cmd/ksh93/sh/init.c:
- Remove SH_TYPE_PROFILE symbol, unused after the removal of the
  SHOPT_PFSH code. (re: eabd6453)

src/cmd/ksh93/sh/io.c:
- piperead(), slowread(): Replace redundant sffileno() calls by
  the variables already containing their results. (re: 50d342e4)

src/cmd/ksh93/bltins/mkservice.c,
rc/lib/libcmd/vmstate.c:
- If these aren't compiled, define a stub function to silence the
  ranlib(1) warning that the .o file does not contain symbols.
This commit is contained in:
Martijn Dekker 2022-03-01 21:10:38 +01:00
parent 8fc8c2f51c
commit b398f33c49
42 changed files with 352 additions and 523 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/cmd/ksh93/sh/io.c
View file

@ -211,7 +211,6 @@ static int onintr(struct addrinfo*);
* return <protocol>/<host>/<service> fd
* If called with flags==O_NONBLOCK return 1 if protocol is supported
*/
static int
inetopen(const char* path, int flags)
{
@ -1927,7 +1926,7 @@ static ssize_t piperead(Sfio_t *iop,void *buff,register size_t size,Sfdisc_t *ha
errno = EINTR;
return(-1);
}
if(sh_isstate(SH_INTERACTIVE) && sffileno(iop)==0 && io_prompt(iop,sh.nextprompt)<0 && errno==EIO)
if(sh_isstate(SH_INTERACTIVE) && fd==0 && io_prompt(iop,sh.nextprompt)<0 && errno==EIO)
return(0);
sh_onstate(SH_TTYWAIT);
if(!(sh.fdstatus[fd]&IOCLEX) && (sfset(iop,0,0)&SF_SHARE))
@ -1983,7 +1982,7 @@ static ssize_t slowread(Sfio_t *iop,void *buff,register size_t size,Sfdisc_t *ha
return(0);
if(sh.timeout)
timeout = (void*)sh_timeradd(sh_isstate(SH_GRACE)?1000L*TGRACE:1000L*sh.timeout,0,time_grace,&sh);
rsize = (*readf)(sh.ed_context, sffileno(iop), (char*)buff, size, reedit);
rsize = (*readf)(sh.ed_context, fno, (char*)buff, size, reedit);
if(timeout)
timerdel(timeout);
timeout=0;
@ -2040,7 +2039,6 @@ static ssize_t slowread(Sfio_t *iop,void *buff,register size_t size,Sfdisc_t *ha
/*
* check and return the attributes for a file descriptor
*/
int sh_iocheckfd(register int fd)
{
register int flags, n;
@ -2117,7 +2115,6 @@ int sh_iocheckfd(register int fd)
/*
* Display prompt PS<flag> on standard error
*/
static int io_prompt(Sfio_t *iop,register int flag)
{
register char *cp;
@ -2319,7 +2316,6 @@ struct eval
/*
* Create a stream consisting of a space separated argv[] list
*/
Sfio_t *sh_sfeval(register char *argv[])
{
register Sfio_t *iop;
@ -2345,7 +2341,6 @@ Sfio_t *sh_sfeval(register char *argv[])
/*
* This code gets called whenever an end of string is found with eval
*/
static int eval_exceptf(Sfio_t *iop,int type, void *data, Sfdisc_t *handle)
{
register struct eval *ep = (struct eval*)handle;
@ -2385,7 +2380,6 @@ static int eval_exceptf(Sfio_t *iop,int type, void *data, Sfdisc_t *handle)
* the stream <sp> starting at offset <offset>
* The stream can be read with the normal stream operations
*/
static Sfio_t *subopen(Sfio_t* sp, off_t offset, long size)
{
register struct subfile *disp;
@ -2604,7 +2598,6 @@ mode_t sh_umask(mode_t m)
* <fd> must be a non-negative number ofr SH_IOCOPROCESS or SH_IOHISTFILE.
* returns NULL on failure and may set errno.
*/
Sfio_t *sh_iogetiop(int fd, int mode)
{
int n;