mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Another round of accumulated minor fixes and cleanups
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
parent
8fc8c2f51c
commit
b398f33c49
42 changed files with 352 additions and 523 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -94,7 +94,7 @@ static ssize_t filterread(Sfio_t* f, /* stream reading from */
|
|||
}
|
||||
|
||||
static ssize_t filterwrite(Sfio_t* f, /* stream writing to */
|
||||
void* buf, /* buffer to write into */
|
||||
const void* buf, /* buffer to write into */
|
||||
size_t n, /* number of bytes requested */
|
||||
Sfdisc_t* disc) /* discipline */
|
||||
{
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ typedef struct _skable_s
|
|||
} Seek_t;
|
||||
|
||||
static ssize_t skwrite(Sfio_t* f, /* stream involved */
|
||||
void* buf, /* buffer to read into */
|
||||
const void* buf, /* buffer to read into */
|
||||
size_t n, /* number of bytes to read */
|
||||
Sfdisc_t* disc) /* discipline */
|
||||
{
|
||||
|
|
|
|||
|
|
@ -429,7 +429,7 @@ make install
|
|||
exec - ${PACKAGEROOT}/src/lib/libcmd/cmdinit.c ${PACKAGEROOT}/src/lib/libcmd/basename.c ${PACKAGEROOT}/src/lib/libcmd/cat.c ${PACKAGEROOT}/src/lib/libcmd/chgrp.c ${PACKAGEROOT}/src/lib/libcmd/chmod.c ${PACKAGEROOT}/src/lib/libcmd/chown.c ${PACKAGEROOT}/src/lib/libcmd/cksum.c ${PACKAGEROOT}/src/lib/libcmd/cmp.c ${PACKAGEROOT}/src/lib/libcmd/comm.c ${PACKAGEROOT}/src/lib/libcmd/cp.c ${PACKAGEROOT}/src/lib/libcmd/cut.c ${PACKAGEROOT}/src/lib/libcmd/dirname.c ${PACKAGEROOT}/src/lib/libcmd/date.c ${PACKAGEROOT}/src/lib/libcmd/expr.c ${PACKAGEROOT}/src/lib/libcmd/fds.c ${PACKAGEROOT}/src/lib/libcmd/fmt.c ${PACKAGEROOT}/src/lib/libcmd/fold.c ${PACKAGEROOT}/src/lib/libcmd/getconf.c ${PACKAGEROOT}/src/lib/libcmd/head.c ${PACKAGEROOT}/src/lib/libcmd/id.c ${PACKAGEROOT}/src/lib/libcmd/join.c ${PACKAGEROOT}/src/lib/libcmd/ln.c ${PACKAGEROOT}/src/lib/libcmd/logname.c ${PACKAGEROOT}/src/lib/libcmd/md5sum.c ${PACKAGEROOT}/src/lib/libcmd/mkdir.c ${PACKAGEROOT}/src/lib/libcmd/mkfifo.c ${PACKAGEROOT}/src/lib/libcmd/mktemp.c ${PACKAGEROOT}/src/lib/libcmd/mv.c ${PACKAGEROOT}/src/lib/libcmd/paste.c ${PACKAGEROOT}/src/lib/libcmd/pathchk.c ${PACKAGEROOT}/src/lib/libcmd/pids.c ${PACKAGEROOT}/src/lib/libcmd/rev.c ${PACKAGEROOT}/src/lib/libcmd/rm.c ${PACKAGEROOT}/src/lib/libcmd/rmdir.c ${PACKAGEROOT}/src/lib/libcmd/stty.c ${PACKAGEROOT}/src/lib/libcmd/sum.c ${PACKAGEROOT}/src/lib/libcmd/sync.c ${PACKAGEROOT}/src/lib/libcmd/tail.c ${PACKAGEROOT}/src/lib/libcmd/tee.c ${PACKAGEROOT}/src/lib/libcmd/tty.c ${PACKAGEROOT}/src/lib/libcmd/uname.c ${PACKAGEROOT}/src/lib/libcmd/uniq.c ${PACKAGEROOT}/src/lib/libcmd/vmstate.c ${PACKAGEROOT}/src/lib/libcmd/wc.c ${PACKAGEROOT}/src/lib/libcmd/revlib.c ${PACKAGEROOT}/src/lib/libcmd/wclib.c ${PACKAGEROOT}/src/lib/libcmd/lib.c |
|
||||
exec - sort -u
|
||||
exec - } > 1.${COTEMP}.h
|
||||
exec - if cmp 2>/dev/null -s 1.${COTEMP}.h cmdext.h
|
||||
exec - if cmp -s 1.${COTEMP}.h cmdext.h
|
||||
exec - then rm -f 1.${COTEMP}.h
|
||||
exec - else mv 1.${COTEMP}.h cmdext.h
|
||||
exec - fi
|
||||
|
|
@ -762,16 +762,14 @@ make install
|
|||
make ${PACKAGE_ast_INCLUDE}/cmd.h
|
||||
prev ${PACKAGE_ast_INCLUDE}
|
||||
prev cmd.h
|
||||
exec - if cmp 2>/dev/null -s cmd.h ${PACKAGE_ast_INCLUDE}/cmd.h
|
||||
exec - then :
|
||||
exec - else ${STDCP} cmd.h ${PACKAGE_ast_INCLUDE}/cmd.h
|
||||
exec - if ! cmp -s cmd.h ${PACKAGE_ast_INCLUDE}/cmd.h
|
||||
exec - then ${STDCP} cmd.h ${PACKAGE_ast_INCLUDE}/cmd.h
|
||||
exec - fi
|
||||
done ${PACKAGE_ast_INCLUDE}/cmd.h generated
|
||||
make ${PACKAGE_ast_INCLUDE}/cmdext.h
|
||||
prev cmdext.h
|
||||
exec - if cmp 2>/dev/null -s cmdext.h ${PACKAGE_ast_INCLUDE}/cmdext.h
|
||||
exec - then :
|
||||
exec - else ${STDCP} cmdext.h ${PACKAGE_ast_INCLUDE}/cmdext.h
|
||||
exec - if ! cmp -s cmdext.h ${PACKAGE_ast_INCLUDE}/cmdext.h
|
||||
exec - then ${STDCP} cmdext.h ${PACKAGE_ast_INCLUDE}/cmdext.h
|
||||
exec - fi
|
||||
done ${PACKAGE_ast_INCLUDE}/cmdext.h generated
|
||||
make ${PACKAGE_ast_INCLUDE}/cmdlist.h
|
||||
|
|
@ -838,14 +836,13 @@ make install
|
|||
exec - |
|
||||
exec - sort -u
|
||||
exec - } > 1.${COTEMP}.h
|
||||
exec - if cmp 2>/dev/null -s 1.${COTEMP}.h cmdlist.h
|
||||
exec - if cmp -s 1.${COTEMP}.h cmdlist.h
|
||||
exec - then rm -f 1.${COTEMP}.h
|
||||
exec - else mv 1.${COTEMP}.h cmdlist.h
|
||||
exec - fi
|
||||
done cmdlist.h generated
|
||||
exec - if cmp 2>/dev/null -s cmdlist.h ${PACKAGE_ast_INCLUDE}/cmdlist.h
|
||||
exec - then :
|
||||
exec - else ${STDCP} cmdlist.h ${PACKAGE_ast_INCLUDE}/cmdlist.h
|
||||
exec - if ! cmp -s cmdlist.h ${PACKAGE_ast_INCLUDE}/cmdlist.h
|
||||
exec - then ${STDCP} cmdlist.h ${PACKAGE_ast_INCLUDE}/cmdlist.h
|
||||
exec - fi
|
||||
done ${PACKAGE_ast_INCLUDE}/cmdlist.h generated
|
||||
done install virtual
|
||||
|
|
|
|||
|
|
@ -24,7 +24,9 @@
|
|||
#include <vmalloc.h>
|
||||
#include <sfdisc.h>
|
||||
|
||||
#if !_std_malloc /* do not pointlessly compile this if vmalloc is disabled */
|
||||
#if _std_malloc /* do not pointlessly compile this if vmalloc is disabled */
|
||||
void _STUB_vmstate(){}
|
||||
#else
|
||||
|
||||
#define FORMAT "region=%(region)p method=%(method)s flags=%(flags)s size=%(size)d segments=%(segments)d busy=(%(busy_size)d,%(busy_blocks)d,%(busy_max)d) free=(%(free_size)d,%(free_blocks)d,%(free_max)d)"
|
||||
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ make install
|
|||
bind -last
|
||||
exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdl} ${mam_libast} : run features/dll
|
||||
done FEATURE/dll generated
|
||||
exec - cmp 2>/dev/null -s FEATURE/dll dlldefs.h || { rm -f dlldefs.h; silent test -d . || mkdir .; cp FEATURE/dll dlldefs.h; }
|
||||
exec - cmp -s FEATURE/dll dlldefs.h || { rm -f dlldefs.h; silent test -d . || mkdir .; cp FEATURE/dll dlldefs.h; }
|
||||
done dlldefs.h generated
|
||||
prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
|
||||
done dlfcn.c
|
||||
|
|
@ -285,9 +285,8 @@ make install
|
|||
make ${PACKAGE_ast_INCLUDE}/dlldefs.h
|
||||
prev ${PACKAGE_ast_INCLUDE}
|
||||
prev dlldefs.h
|
||||
exec - if cmp 2>/dev/null -s dlldefs.h ${PACKAGE_ast_INCLUDE}/dlldefs.h
|
||||
exec - then :
|
||||
exec - else ${STDCP} dlldefs.h ${PACKAGE_ast_INCLUDE}/dlldefs.h
|
||||
exec - if ! cmp -s dlldefs.h ${PACKAGE_ast_INCLUDE}/dlldefs.h
|
||||
exec - then ${STDCP} dlldefs.h ${PACKAGE_ast_INCLUDE}/dlldefs.h
|
||||
exec - fi
|
||||
done ${PACKAGE_ast_INCLUDE}/dlldefs.h generated
|
||||
done install virtual
|
||||
|
|
|
|||
|
|
@ -212,9 +212,8 @@ make install
|
|||
make ${PACKAGE_ast_INCLUDE}/sum.h
|
||||
prev ${PACKAGE_ast_INCLUDE}
|
||||
prev sum.h
|
||||
exec - if cmp 2>/dev/null -s sum.h ${PACKAGE_ast_INCLUDE}/sum.h
|
||||
exec - then :
|
||||
exec - else ${STDCP} sum.h ${PACKAGE_ast_INCLUDE}/sum.h
|
||||
exec - if ! cmp -s sum.h ${PACKAGE_ast_INCLUDE}/sum.h
|
||||
exec - then ${STDCP} sum.h ${PACKAGE_ast_INCLUDE}/sum.h
|
||||
exec - fi
|
||||
done ${PACKAGE_ast_INCLUDE}/sum.h generated
|
||||
done install virtual
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue