diff --git a/src/cmd/ksh93/include/defs.h b/src/cmd/ksh93/include/defs.h index 5158be0ab..2dafc4b97 100644 --- a/src/cmd/ksh93/include/defs.h +++ b/src/cmd/ksh93/include/defs.h @@ -156,8 +156,6 @@ extern int sh_trace(char*[],int); extern void sh_trim(char*); extern int sh_type(const char*); extern void sh_unscope(void); -extern void sh_utol(const char*, char*); -extern int sh_whence(char**,int); #if SHOPT_NAMESPACE extern Namval_t *sh_fsearch(const char *,int); #endif /* SHOPT_NAMESPACE */ diff --git a/src/cmd/ksh93/include/io.h b/src/cmd/ksh93/include/io.h index dadb1205f..b6821541d 100644 --- a/src/cmd/ksh93/include/io.h +++ b/src/cmd/ksh93/include/io.h @@ -72,7 +72,6 @@ extern void sh_iounsave(void); extern void sh_iounpipe(void); extern int sh_chkopen(const char*); extern int sh_ioaccess(int,int); -extern int sh_devtofd(const char*); extern int sh_isdevfd(const char*); /* the following are readonly */ diff --git a/src/cmd/ksh93/include/name.h b/src/cmd/ksh93/include/name.h index 0328a799f..3dc73694d 100644 --- a/src/cmd/ksh93/include/name.h +++ b/src/cmd/ksh93/include/name.h @@ -187,10 +187,7 @@ extern int nv_arrayisset(Namval_t*, Namarr_t*); extern int nv_arraysettype(Namval_t*, Namval_t*,const char*,int); extern int nv_aimax(Namval_t*); extern int nv_atypeindex(Namval_t*, const char*); -extern int nv_setnotify(Namval_t*,char **); -extern int nv_unsetnotify(Namval_t*,char **); extern void nv_setlist(struct argnod*, int, Namval_t*); -extern struct argnod* nv_onlist(struct argnod*, const char*); extern void nv_optimize(Namval_t*); extern void nv_outname(Sfio_t*,char*, int); extern void nv_unref(Namval_t*); @@ -208,7 +205,6 @@ extern Namval_t *nv_bfsearch(const char*, Dt_t*, Namval_t**, char**); extern Namval_t *nv_mktype(Namval_t**, int); extern Namval_t *nv_addnode(Namval_t*, int); extern Namval_t *nv_parent(Namval_t*); -extern char *nv_getbuf(size_t); extern Namval_t *nv_mount(Namval_t*, const char *name, Dt_t*); extern Namval_t *nv_arraychild(Namval_t*, Namval_t*, int); extern int nv_compare(Dt_t*, void*, void*, Dtdisc_t*); diff --git a/src/cmd/ksh93/include/nval.h b/src/cmd/ksh93/include/nval.h index e2238259d..459a35455 100644 --- a/src/cmd/ksh93/include/nval.h +++ b/src/cmd/ksh93/include/nval.h @@ -243,7 +243,6 @@ struct Namval /* prototype for array interface */ extern Namarr_t *nv_arrayptr(Namval_t*); extern Namarr_t *nv_setarray(Namval_t*,void*(*)(Namval_t*,const char*,int)); -extern int nv_arraynsub(Namarr_t*); extern void *nv_associative(Namval_t*,const char*,int); extern int nv_aindex(Namval_t*); extern int nv_nextsub(Namval_t*); diff --git a/src/cmd/ksh93/include/shell.h b/src/cmd/ksh93/include/shell.h index abf23a68b..9b3fc21ae 100644 --- a/src/cmd/ksh93/include/shell.h +++ b/src/cmd/ksh93/include/shell.h @@ -449,7 +449,6 @@ extern int sh_fcntl(int, int, ...); extern Sfio_t *sh_fd2sfio(int); extern int (*sh_fdnotify(int(*)(int,int)))(int,int); extern int sh_open(const char*, int, ...); -extern int sh_openmax(void); extern Sfio_t *sh_pathopen(const char*); extern ssize_t sh_read(int, void*, size_t); extern ssize_t sh_write(int, const void*, size_t); @@ -463,7 +462,6 @@ extern void sh_sigcheck(void); extern unsigned long sh_isoption(int); extern unsigned long sh_onoption(int); extern unsigned long sh_offoption(int); -extern int sh_waitsafe(void); extern int sh_exec(const Shnode_t*,int); /* diff --git a/src/cmd/ksh93/sh/array.c b/src/cmd/ksh93/sh/array.c index 19b362bec..1c6b34600 100644 --- a/src/cmd/ksh93/sh/array.c +++ b/src/cmd/ksh93/sh/array.c @@ -1633,11 +1633,6 @@ int nv_aindex(register Namval_t* np) return(((struct index_array*)(ap))->cur&ARRAY_MASK); } -int nv_arraynsub(register Namarr_t* ap) -{ - return(array_elem(ap)); -} - int nv_aimax(register Namval_t* np) { struct index_array *ap = (struct index_array*)nv_arrayptr(np); diff --git a/src/cmd/ksh93/sh/jobs.c b/src/cmd/ksh93/sh/jobs.c index 36f17518e..f60dbc675 100644 --- a/src/cmd/ksh93/sh/jobs.c +++ b/src/cmd/ksh93/sh/jobs.c @@ -1917,11 +1917,6 @@ void job_subrestore(void* ptr) job_unlock(); } -int sh_waitsafe(void) -{ - return(job.waitsafe); -} - void job_fork(pid_t parent) { #ifdef DEBUG diff --git a/src/cmd/ksh93/sh/name.c b/src/cmd/ksh93/sh/name.c index d2285830e..d841f9139 100644 --- a/src/cmd/ksh93/sh/name.c +++ b/src/cmd/ksh93/sh/name.c @@ -235,26 +235,6 @@ Namval_t *nv_addnode(Namval_t* np, int remove) return(np); } -/* - * given a list of assignments, determine is on the list - returns a pointer to the argnod on the list or NULL - */ -struct argnod *nv_onlist(struct argnod *arg, const char *name) -{ - char *cp; - int len = strlen(name); - for(;arg; arg=arg->argnxt.ap) - { - if(*arg->argval==0 && arg->argchn.ap && !(arg->argflag&~(ARG_APPEND|ARG_QUOTED|ARG_MESSAGE))) - cp = ((struct fornod*)arg->argchn.ap)->fornam; - else - cp = arg->argval; - if(memcmp(cp,name,len)==0 && (cp[len]==0 || cp[len]=='=')) - return(arg); - } - return(0); -} - /* * Perform parameter assignment for a linked list of parameters * contains attributes for the parameters diff --git a/src/cmd/ksh93/sh/nvdisc.c b/src/cmd/ksh93/sh/nvdisc.c index 038a418eb..0e5b53b0e 100644 --- a/src/cmd/ksh93/sh/nvdisc.c +++ b/src/cmd/ksh93/sh/nvdisc.c @@ -809,51 +809,6 @@ Namfun_t *nv_hasdisc(Namval_t *np, const Namdisc_t *dp) return(0); } -struct notify -{ - Namfun_t hdr; - char **ptr; -}; - -static void put_notify(Namval_t* np,const char *val,int flags,Namfun_t *fp) -{ - struct notify *pp = (struct notify*)fp; - nv_putv(np,val,flags,fp); - nv_stack(np,fp); - nv_stack(np,(Namfun_t*)0); - *pp->ptr = 0; - if(!(fp->nofree&1)) - free((void*)fp); -} - -static const Namdisc_t notify_disc = { 0, put_notify }; - -int nv_unsetnotify(Namval_t *np, char **addr) -{ - register Namfun_t *fp; - for(fp=np->nvfun;fp;fp=fp->next) - { - if(fp->disc->putval==put_notify && ((struct notify*)fp)->ptr==addr) - { - nv_stack(np,fp); - nv_stack(np,(Namfun_t*)0); - if(!(fp->nofree&1)) - free((void*)fp); - return(1); - } - } - return(0); -} - -int nv_setnotify(Namval_t *np, char **addr) -{ - struct notify *pp = sh_newof(0,struct notify, 1,0); - pp->ptr = addr; - pp->hdr.disc = ¬ify_disc; - nv_stack(np,&pp->hdr); - return(1); -} - static void *newnode(const char *name) { register int s; diff --git a/src/cmd/ksh93/sh/string.c b/src/cmd/ksh93/sh/string.c index 582f1fc07..df82fb3b0 100644 --- a/src/cmd/ksh93/sh/string.c +++ b/src/cmd/ksh93/sh/string.c @@ -260,28 +260,6 @@ void sh_trim(register char *sp) } } -/* - * copy to changing upper case to lower case - * must be big enough to hold - * and may point to the same place. - */ -void sh_utol(register char const *str1,register char *str2) -/*@ - assume str1!=0 && str2!=0 - return x satisfying strlen(in str1)==strlen(in str2); -@*/ -{ - register int c; - for(; c= *((unsigned char*)str1); str1++,str2++) - { - if(isupper(c)) - *str2 = tolower(c); - else - *str2 = c; - } - *str2 = 0; -} - /* * format string as a csv field */