mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Various minor capitalization and typo fixes (#371)
This commit fixes various minor typos, punctuation errors and corrects the capitalization of many names.
This commit is contained in:
parent
cd562b16e2
commit
e54001d58b
204 changed files with 779 additions and 784 deletions
|
|
@ -1778,7 +1778,7 @@ void *nv_associative(register Namval_t *np,const char *sp,int mode)
|
|||
sh_assignok(np,1);
|
||||
/*
|
||||
* For enum types (NV_UINT16 with discipline ENUM_disc), nelem should not
|
||||
* not increased or 'unset' will fail to completely unset such an array.
|
||||
* increase or 'unset' will fail to completely unset such an array.
|
||||
*/
|
||||
if((!ap->header.scope || !nv_search(sp,dtvnext(ap->header.table),0))
|
||||
&& !(type==NV_UINT16 && nv_hasdisc(np, &ENUM_disc)))
|
||||
|
|
|
|||
|
|
@ -326,7 +326,7 @@ int job_reap(register int sig)
|
|||
sh_offstate(SH_TTYWAIT);
|
||||
|
||||
/*
|
||||
* some systems (linux 2.6) may return EINVAL
|
||||
* some systems (Linux 2.6) may return EINVAL
|
||||
* when there are no continued children
|
||||
*/
|
||||
|
||||
|
|
@ -1131,7 +1131,6 @@ int job_hup(struct process *pw, int sig)
|
|||
|
||||
/*
|
||||
* Get process structure from first letters of jobname
|
||||
*
|
||||
*/
|
||||
|
||||
static struct process *job_byname(char *name)
|
||||
|
|
|
|||
|
|
@ -2426,7 +2426,7 @@ static int alias_exceptf(Sfio_t *iop,int type,void *data, Sfdisc_t *handle)
|
|||
}
|
||||
if(ap->nextc)
|
||||
{
|
||||
/* if last character is a blank, then next word can be alias */
|
||||
/* if last character is a blank, then next word can be an alias */
|
||||
register int c = fcpeek(-1);
|
||||
if(isblank(c))
|
||||
lp->aliasok = 1;
|
||||
|
|
|
|||
|
|
@ -487,7 +487,7 @@ static void copyto(register Mac_t *mp,int endch, int newquote)
|
|||
case S_ESC:
|
||||
if(ansi_c)
|
||||
{
|
||||
/* process ANSI-C escape character */
|
||||
/* process ANSI C escape character */
|
||||
char *addr= --cp;
|
||||
if(c)
|
||||
sfwrite(stkp,first,c);
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ int sh_main(int ac, char *av[], Shinit_f userinit)
|
|||
}
|
||||
#if !_WINIX
|
||||
/*
|
||||
* try to undo effect of solaris 2.5+
|
||||
* try to undo effect of Solaris 2.5+
|
||||
* change for argv for setuid scripts
|
||||
*/
|
||||
if(shp->st.repl_index > 0)
|
||||
|
|
@ -344,7 +344,7 @@ int sh_main(int ac, char *av[], Shinit_f userinit)
|
|||
sh_accbegin(error_info.id);
|
||||
#endif /* SHOPT_ACCT */
|
||||
}
|
||||
/* If the shell is init'ed with std{in,out,err} closed, make the shell's FD state reflect that. */
|
||||
/* If the shell is initialised with std{in,out,err} closed, make the shell's FD state reflect that. */
|
||||
for(i=0; i<=2; i++)
|
||||
if(fcntl(i,F_GETFD,NiL)==-1 && errno==EBADF) /* closed at OS level? */
|
||||
sh_close(i); /* update shell FD state */
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#include "FEATURE/externs"
|
||||
|
||||
#if defined(__sun) && _sys_mman && _lib_memcntl && defined(MHA_MAPSIZE_STACK) && defined(MC_HAT_ADVISE)
|
||||
# undef VM_FLAGS /* solaris vs vmalloc.h symbol clash */
|
||||
# undef VM_FLAGS /* Solaris vs vmalloc.h symbol clash */
|
||||
# include <sys/mman.h>
|
||||
#else
|
||||
# undef _lib_memcntl
|
||||
|
|
|
|||
|
|
@ -855,7 +855,7 @@ again:
|
|||
}
|
||||
else
|
||||
d = chresc(pos+1,(char**)&vp->nextchr);
|
||||
/* posix allows the trailing ' to be optional */
|
||||
/* POSIX allows the trailing ' to be optional */
|
||||
if(*vp->nextchr=='\'')
|
||||
vp->nextchr++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
* This is a program to execute 'execute only' and suid/sgid shell scripts.
|
||||
* This program must be owned by root and must have the set uid bit set.
|
||||
* It must not have the set group id bit set. This program must be installed
|
||||
* where the define parameter THISPROG indicates to work correctly on system V
|
||||
* where the define parameter THISPROG indicates to work correctly on System V.
|
||||
*
|
||||
* Written by David Korn
|
||||
* AT&T Labs
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
*/
|
||||
|
||||
/* The file name of the script to execute is argv[0]
|
||||
* Argv[1] is the program name
|
||||
* argv[1] is the program name
|
||||
* The basic idea is to open the script as standard input, set the effective
|
||||
* user and group id correctly, and then exec the shell.
|
||||
* The complicated part is getting the effective uid of the caller and
|
||||
|
|
@ -372,7 +372,7 @@ static void setids(int mode,int owner,int group)
|
|||
/*
|
||||
* This version of setids creates a /tmp file and copies itself into it.
|
||||
* The "clone" file is made executable with appropriate suid/sgid bits.
|
||||
* Finally, the clone is exec'ed. This file is unlinked by a grandchild
|
||||
* Finally, the clone is exec'd. This file is unlinked by a grandchild
|
||||
* of this program, who waits around until the text is free.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ static void p_time(Shell_t *shp, Sfio_t *out, const char *format, clock_t *tm)
|
|||
if(c=='\0')
|
||||
{
|
||||
/* If a lone percent is the last character of the format pretend
|
||||
the user had written `%%` for a literal percent */
|
||||
the user had written '%%' for a literal percent */
|
||||
sfwrite(stkp, "%", 1);
|
||||
first = format + 1;
|
||||
break;
|
||||
|
|
@ -775,7 +775,7 @@ static void free_list(struct openlist *olist)
|
|||
|
||||
/*
|
||||
* set ${.sh.name} and ${.sh.subscript}
|
||||
* set _ to reference for ${.sh.name}[$.sh.subscript]
|
||||
* set _ to reference for ${.sh.name}[${.sh.subscript}]
|
||||
*/
|
||||
static int set_instance(Shell_t *shp,Namval_t *nq, Namval_t *node, struct Namref *nr)
|
||||
{
|
||||
|
|
@ -1104,7 +1104,7 @@ int sh_exec(register const Shnode_t *t, int flags)
|
|||
|
||||
}
|
||||
#endif /* SHOPT_TYPEDEF */
|
||||
if((shp->fn_depth && !shp->prefix))
|
||||
if(shp->fn_depth && !shp->prefix)
|
||||
flgs |= NV_NOSCOPE;
|
||||
}
|
||||
else if(np==SYSEXPORT)
|
||||
|
|
@ -1139,12 +1139,12 @@ int sh_exec(register const Shnode_t *t, int flags)
|
|||
}
|
||||
last_table = shp->last_table;
|
||||
shp->last_table = 0;
|
||||
if((io||argn))
|
||||
if(io || argn)
|
||||
{
|
||||
Shbltin_t *bp=0;
|
||||
static char *argv[2];
|
||||
int tflags = 1;
|
||||
if(np && nv_isattr(np,BLT_DCL))
|
||||
if(np && nv_isattr(np,BLT_DCL))
|
||||
tflags |= 2;
|
||||
if(execflg && !check_exec_optimization(io))
|
||||
execflg = 0;
|
||||
|
|
@ -2843,7 +2843,7 @@ int sh_trace(Shell_t *shp,register char *argv[], register int nl)
|
|||
|
||||
/*
|
||||
* This routine creates a subshell by calling fork() or vfork()
|
||||
* If ((flags&COMASK)==TCOM), then vfork() is permitted
|
||||
* If ((flags&COMMSK)==TCOM), then vfork() is permitted
|
||||
* If fork fails, the shell sleeps for exponentially longer periods
|
||||
* and tries again until a limit is reached.
|
||||
* SH_FORKLIM is the max period between forks - power of 2 usually.
|
||||
|
|
@ -2860,7 +2860,6 @@ static void timed_out(void *handle)
|
|||
timeout = 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* called by parent and child after fork by sh_fork()
|
||||
*/
|
||||
|
|
@ -3049,8 +3048,8 @@ static void local_exports(register Namval_t *np, void *data)
|
|||
}
|
||||
|
||||
/*
|
||||
* This routine executes .sh.math functions from within ((...)))
|
||||
*/
|
||||
* This routine executes .sh.math functions from within ((...))
|
||||
*/
|
||||
Sfdouble_t sh_mathfun(Shell_t *shp,void *fp, int nargs, Sfdouble_t *arg)
|
||||
{
|
||||
Sfdouble_t d;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue