various bugfixes

Author: bbonev

yacli.c

@@ -1,4 +1,4 @@
-// $Id: yacli.c,v 4.12 2026/04/29 23:03:05 bbonev Exp $
+// $Id: yacli.c,v 4.13 2026/04/30 06:59:53 bbonev Exp $
 //
 // Copyright © 2015-2020 Boian Bonev (bbonev@ipacct.com) {{{
 //
@@ -140,6 +140,8 @@ struct _yacli {
 	int moresiz; // morebuf alloc size
 	int parsedcnt; // parsed command word count
 	int parsedsiz; // parsed command array size
+	int hstmax; // soft cap on history entries; 0 = unlimited
+	int hstcnt; // current history entry count
 	uint8_t more:1; // enable paged output
 	uint8_t redraw:1; // prompt needs redraw
 	uint8_t wastab:1; // control for double tab
@@ -214,32 +216,39 @@ inline void yacli_set_showtermsize(yacli *cli,int v) { // {{{
 	cli->showtsize=!!v;
 } // }}}
 
-static char myver[]="\0Yet another command line interface library (https://github.com/bbonev/yacli) $Revision: 4.12 $\n\n"; // {{{
+static char myver[]="\0Yet another command line interface library (https://github.com/bbonev/yacli) $Revision: 4.13 $\n\n"; // {{{
 // }}}
 
 inline const char *yacli_ver(void) { // {{{
 	return myver;
 } // }}}
 
+static inline void yacli_buf_zeroterm(yacli *cli);
+
 static inline int yacli_buf_inc(char **buf,int *siz,int *len,int add) { // {{{
-	// increase buffer by len, if needed
+	// ensure *siz can hold *len+add bytes (strictly above, so a trailing null fits); growth rounded to BUFFER_STEP
 	// return 0 on success, non-zero on error
+	int needed,alloclen;
+	char *n;
+
 	if (add<=0)
 		return 0; // ok
-	if (*siz<=*len+add) { // need to realloc
-		int alloclen=*siz+(*len/BUFFER_STEP+1)*BUFFER_STEP;
-		char *n=calloc(1,alloclen);
-
-		if (!n) // no free mem, nothing more to do
-			return -1;
+	needed=*len+add;
+	if (*siz>needed) // already enough
+		return 0;
+	alloclen=((needed+BUFFER_STEP)/BUFFER_STEP)*BUFFER_STEP; // next BUFFER_STEP-aligned size strictly above needed
+	if (alloclen<=*siz) // assure progress when needed lands exactly at a BUFFER_STEP boundary
+		alloclen=*siz+BUFFER_STEP;
+	n=calloc(1,alloclen);
+	if (!n) // no free mem, nothing more to do
+		return -1;
 
-		if (*siz&&*buf)
-			memcpy(n,*buf,*siz);
-		if (*buf)
-			free(*buf);
-		*buf=n;
-		*siz=alloclen;
-	}
+	if (*len&&*buf) // copy only valid contents, not slack
+		memcpy(n,*buf,*len);
+	if (*buf)
+		free(*buf);
+	*buf=n;
+	*siz=alloclen;
 	return 0;
 } // }}}
 
@@ -459,7 +468,7 @@ static inline int yacli_filter_feed_include(filter_inst *fltr,const char *line,i
 	if (!fltr->next->fltr->feed)
 		return -1;
 
-	if (yacli_buf_inc(&fltr->buf,&fltr->bufsiz,&fltr->buflen,fltr->buflen+len+1)) // +1 for zero term
+	if (yacli_buf_inc(&fltr->buf,&fltr->bufsiz,&fltr->buflen,len+1)) // additional bytes beyond current contents (+1 for zero term)
 		return -1; // no memory
 
 	memcpy(fltr->buf+fltr->buflen,line,len);
@@ -519,7 +528,7 @@ static inline int yacli_filter_feed_exclude(filter_inst *fltr,const char *line,i
 	if (!fltr->next->fltr->feed)
 		return -1;
 
-	if (yacli_buf_inc(&fltr->buf,&fltr->bufsiz,&fltr->buflen,fltr->buflen+len+1)) // +1 for zero term
+	if (yacli_buf_inc(&fltr->buf,&fltr->bufsiz,&fltr->buflen,len+1)) // additional bytes beyond current contents (+1 for zero term)
 		return -1; // no memory
 
 	memcpy(fltr->buf+fltr->buflen,line,len);
@@ -598,7 +607,10 @@ static inline void yacli_filter_done_count(filter_inst *fltr) { // {{{
 } // }}}
 
 inline yacli *yacli_init(yascreen *s) { // {{{
+	static volatile int verfmt_state=0; // 0=untouched, 1=formatting in progress, 2=done; serializes the one-time reformat of myver
 	yacli *cli=calloc(1,sizeof *cli);
+	char *rev;
+	int vermaj,vermin;
 
 	if (!cli)
 		return NULL;
@@ -612,18 +624,20 @@ inline yacli *yacli_init(yascreen *s) { // {{{
 	// we use explicit flush, tell yascreen not to do it
 	yascreen_line_flush(cli->s,0);
 
-	if (myver[0]==0) { // reformat the static version string
-		char *rev=strstr(myver+1,"$Revision: ");
-		int vermaj,vermin;
-
+	if (__sync_bool_compare_and_swap(&verfmt_state,0,1)) { // first caller wins, reformats the static version string
+		rev=strstr(myver+1,"$Revision: ");
 		if (rev) {
 			sscanf(rev+strlen("$Revision: "),"%d.%d",&vermaj,&vermin);
 			vermaj+=vermin/100;
 			vermin=vermin%100;
 			memmove(myver,myver+1,strlen(myver+1)+1);
 			snprintf(rev-1,sizeof myver-(rev-1-myver),"%d.%02d\n\n",vermaj,vermin);
 		}
-	}
+		__sync_synchronize();
+		verfmt_state=2;
+	} else
+		while (verfmt_state!=2) // another thread is formatting; wait for it to finish before reading myver
+			__sync_synchronize();
 
 	cli->hostname=strdup("none");
 	if (!cli->hostname)
@@ -759,8 +773,10 @@ static inline void yacli_clear_parsed(yacli *cli) { // {{{
 		return;
 	}
 
-	for (i=0;i<cli->parsedcnt;i++)
+	for (i=0;i<cli->parsedcnt;i++) {
 		free(cli->parsedcmd[i]);
+		cli->parsedcmd[i]=NULL;
+	}
 	cli->parsedcnt=0;
 } // }}}
 
@@ -834,6 +850,8 @@ inline void yacli_set_banner(yacli *cli,const char *banner) { // {{{
 
 	if (!cli)
 		return;
+	if (!banner)
+		return;
 
 	t=cli->banner;
 	cli->banner=strdup(banner);
@@ -848,6 +866,8 @@ inline void yacli_set_level(yacli *cli,const char *level) { // {{{
 
 	if (!cli)
 		return;
+	if (!level)
+		return;
 
 	t=cli->level;
 	cli->level=strdup(level);
@@ -863,6 +883,8 @@ inline void yacli_set_hostname(yacli *cli,const char *hostname) { // {{{
 
 	if (!cli)
 		return;
+	if (!hostname)
+		return;
 
 	t=cli->hostname;
 	cli->hostname=strdup(hostname);
@@ -1205,10 +1227,12 @@ inline int yacli_add_hist(yacli *cli,const char *buf) { // {{{
 
 	if (!cli)
 		return 0;
+	if (!buf)
+		return 0;
 
 	cli->hst_p=NULL;
 
-	if (!strlen(buf)) // skip empty command
+	if (!*buf) // skip empty command
 		return 0;
 	if (cli->hst&&!strcmp(buf,cli->hst->prev->command)) // skip repeated command
 		return 0;
@@ -1233,9 +1257,32 @@ inline int yacli_add_hist(yacli *cli,const char *buf) { // {{{
 		cli->hst->prev=h;
 		h->prev->next=h;
 	}
+	cli->hstcnt++;
+	while (cli->hstmax>0&&cli->hstcnt>cli->hstmax&&cli->hst) { // evict oldest entries until under cap
+		history *t=cli->hst; // hst points to the OLDEST item; hst->prev is the newest
+
+		if (t->next==t) { // single item — should not happen if we just added one
+			free(t->command);
+			free(t);
+			cli->hst=NULL;
+		} else {
+			cli->hst=t->next;
+			cli->hst->prev=t->prev;
+			t->prev->next=cli->hst;
+			free(t->command);
+			free(t);
+		}
+		cli->hstcnt--;
+	}
 	return 0;
 } // }}}
 
+inline void yacli_set_hist_max(yacli *cli,int n) { // {{{
+	if (!cli)
+		return;
+	cli->hstmax=n<0?0:n;
+} // }}}
+
 static inline void yacli_moveleft(yacli *cli) { // {{{
 	if (!cli)
 		return;
@@ -1266,6 +1313,8 @@ static inline void yacli_moveleftw(yacli *cli) { // {{{
 	if (!cli)
 		return;
 
+	yacli_buf_zeroterm(cli); // assure buffer[buflen]=='\0' so walks past valid data terminate cleanly
+
 	if (cli->cursor) {
 		if (cli->buffer[cli->cursor]!=' '&&cli->buffer[cli->cursor-1]==' ') // if we are at word begin, step left
 			cli->cursor--;
@@ -1287,6 +1336,8 @@ static inline void yacli_moverightw(yacli *cli) { // {{{
 	if (!cli)
 		return;
 
+	yacli_buf_zeroterm(cli); // assure buffer[buflen]=='\0'
+
 	if (cli->cursor<cli->buflen) {
 		int shiftr=yacli_bufpos_shiftr(cli);
 
@@ -1369,6 +1420,8 @@ static inline void yacli_delword(yacli *cli) { // {{{
 	if (cli->cursor>=cli->buflen) // nothing to delete
 		return;
 
+	yacli_buf_zeroterm(cli); // assure buffer[buflen]=='\0'
+
 	if (cli->buffer[cli->cursor]==' ')
 		while (cli->buffer[cli->cursor]==' '&&cli->cursor<cli->buflen)
 			yacli_del(cli);
@@ -1383,6 +1436,8 @@ static inline void yacli_delprevword(yacli *cli) { // {{{
 	if (!cli->cursor) // nothing to delete
 		return;
 
+	yacli_buf_zeroterm(cli); // assure buffer[buflen]=='\0'
+
 	if (cli->cursor>0&&cli->buffer[cli->cursor-1]==' ')
 		while (cli->buffer[cli->cursor-1]==' '&&cli->cursor)
 			yacli_bsp(cli);
@@ -1406,14 +1461,17 @@ static inline void yacli_setbuf(yacli *cli,const char *buf) { // {{{
 
 	if (!cli)
 		return;
+	if (!buf)
+		return;
 
 	len=strlen(buf);
-	add=len+1-cli->bufsiz; // add 1 for zero term by strcpy
+	add=len+1-cli->buflen; // additional bytes beyond current valid contents (+1 for trailing null)
 
 	if (yacli_buf_inc(&cli->buffer,&cli->bufsiz,&cli->buflen,add)) // error in malloc
 		return;
 
-	strncpy(cli->buffer,buf,cli->bufsiz);
+	memcpy(cli->buffer,buf,len);
+	cli->buffer[len]=0;
 	cli->buflen=len;
 	cli->cursor=len;
 	cli->redraw=1;
@@ -1858,11 +1916,12 @@ static inline void yacli_cmd_dump(yacli *cli) { // {{{
 static inline void yacli_replace(yacli *cli,int pos,int len,const char *word) { // {{{
 	int wlen=strlen(word);
 	int add=wlen-len;
+	int grow=add>0?add+1:1; // need add extra bytes for the new content + 1 for trailing null safety
 
 	if (!cli)
 		return;
 
-	if (yacli_buf_inc(&cli->buffer,&cli->bufsiz,&cli->buflen,1)) // assure buffer can hold what is needed
+	if (yacli_buf_inc(&cli->buffer,&cli->bufsiz,&cli->buflen,grow))
 		return;
 	memmove(cli->buffer+pos+wlen,cli->buffer+pos+len,cli->buflen-pos-len);
 	memcpy(cli->buffer+pos,word,wlen);
@@ -1988,15 +2047,25 @@ static inline int yacli_trycomplete(yacli *cli,int docomplete) { // {{{
 		}
 
 		if (strlen(word)) { // ignore trailing ws yielding empty word
+			cmnode *dyn_resume=NULL; // sibling after a @-node we just stepped into; revisit if nothing in the dyn list matches
+
 			for (;;) {
 				int cmp;
 
 				if (cn->cmd[0]=='@') { // dynamic command
 					yacli_dyn_upd(cli,cn,word);
 					dyn=1;
+					dyn_resume=cn->next; // any literal/^ sibling sitting after the @ — try it if dyn list yields nothing
 					cn=cn->dyn;
-					if (!cn)
+					if (!cn) { // empty dyn list; resume from the saved sibling, if any
+						if (dyn_resume) {
+							cn=dyn_resume;
+							dyn_resume=NULL;
+							lastcn=cn;
+							continue;
+						}
 						break;
+					}
 					cmp=strcmp(word,cn->cmd);
 				} else if (cn->cmd[0]=='^') { // regex
 					cmp=yacli_regx(cn->cmd,word);
@@ -2051,6 +2120,12 @@ static inline int yacli_trycomplete(yacli *cli,int docomplete) { // {{{
 							lastcn=cn;
 							continue;
 						}
+						if (dyn_resume) { // exhausted dyn list without a match; retry the saved sibling chain
+							cn=dyn_resume;
+							dyn_resume=NULL;
+							lastcn=cn;
+							continue;
+						}
 						yacli_print_nof(cli,"\nNo matched command (2)\n");
 						cli->redraw=1;
 						free(fb);
@@ -2161,6 +2236,10 @@ static inline int yacli_trycomplete(yacli *cli,int docomplete) { // {{{
 					break;
 				} else { // regex match always returns 1 on no match
 					cn=cn->next;
+					if (!cn&&dyn_resume) { // exhausted dyn list (or chain past @) without matching; retry from saved sibling
+						cn=dyn_resume;
+						dyn_resume=NULL;
+					}
 					if (cn)
 						lastcn=cn;
 					if (!cn) {
@@ -2231,7 +2310,7 @@ static inline int yacli_trycomplete(yacli *cli,int docomplete) { // {{{
 						havenextfltr=1;
 					*worde=0;
 				}
-				while (worde[-1]==' ') { // sooner or later we will hit \0 or |
+				while (worde>word&&worde[-1]==' ') { // strip trailing ws of filter args; bounded by start of args
 					worde[-1]=0;
 					worde--;
 				}
@@ -2957,6 +3036,14 @@ inline void *yacli_add_cmd(yacli *cli,void *parent,const char *cmd,const char *h
 	if (par&&par->cli!=cli) // parent node must match cli
 		return NULL;
 
+	if (cmd[0]=='^') { // validate the regex up-front; reject malformed patterns now rather than silently failing every match later
+		regex_t re;
+
+		if (regcomp(&re,cmd,REG_EXTENDED)!=0)
+			return NULL;
+		regfree(&re);
+	}
+
 	if (par) // find proper place in the tree
 		place=&par->child;
 	else
@@ -3035,7 +3122,7 @@ inline void yacli_list(yacli *cli,void *ctx,const char *item) { // {{{
 
 static inline void yacli_gen_modes(yacli *cli) { // {{{
 	int modelen=0;
-	cmstack *s,*l;
+	cmstack *s,*l=NULL;
 	int first=1;
 
 	if (!cli)
@@ -3078,6 +3165,8 @@ inline void yacli_enter_mode(yacli *cli,const char *mode,void *hint) { // {{{
 
 	if (!cli)
 		return;
+	if (!mode)
+		return;
 
 	s=calloc(1,sizeof *s);
 	if (!s) // crit err - no memory
@@ -3087,6 +3176,12 @@ inline void yacli_enter_mode(yacli *cli,const char *mode,void *hint) { // {{{
 	if (s->next)
 		s->next->prev=s;
 	s->mode=strdup(mode);
+	if (!s->mode) { // alloc failure: undo the partial push
+		if (s->next)
+			s->next->prev=NULL;
+		free(s);
+		return;
+	}
 	s->cmdt=cli->cmdt;
 	s->hint=hint;
 	cli->cmdt=NULL;