]> cloudbase.mooo.com Git - z180-stamp.git/blame - avr/env.c
New command 'loadcpm3' - load 'CPM3.SYS' file. setenv() bugfix
[z180-stamp.git] / avr / env.c
CommitLineData
35edb766
L
1/*
2 * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
3 *
4 * SPDX-License-Identifier: GPL-2.0+
5 */
6
d684c216
L
7#include "common.h"
8#include <string.h>
9#include <stdlib.h>
d684c216
L
10#include <avr/eeprom.h>
11
12#include "config.h"
13#include "debug.h"
14#include "xmalloc.h"
15#include "crc.h"
16#include "command.h"
d684c216
L
17#include "env.h"
18
19
323398b1
L
20#define ENV_SIZE (CONFIG_ENV_SIZE - sizeof(uint16_t) -1)
21#define ACTIVE_FLAG 1
22#define OBSOLETE_FLAG 0
d684c216 23
7e24905c
L
24#define ENVLIST_DELETE (1<<0)
25
d684c216 26
534e1dfc
L
27/*
28 * Default Environment
29 */
1da3acc4
L
30
31#define DELIM "\0"
32
534e1dfc 33const FLASH char default_env[] = {
c0abd68b
L
34 ENV_BAUDRATE "=" "115200" DELIM
35 ENV_BOOTDELAY "=" "3" DELIM
36 ENV_BOOTCMD "=" "reset; loadf; go ${startaddr}" DELIM
37 ENV_PATH_CPM3SYS "=" CONFIG_PATH_CPM3SYS DELIM
38 ENV_PINALIAS "=" "0:PG5,1:PG4,2:PB4,3:PB5,4:PB6,5:PB7,"
39 "6:PG3,7:PG2,8:PG1,9:PG0,10:PE7" DELIM
40 ENV_STARTADDRESS "=" "0" DELIM
534e1dfc
L
41 DELIM
42};
43
c0abd68b 44
1da3acc4 45/* EEPROM storage */
d684c216
L
46typedef struct environment_s {
47 uint16_t crc; /* CRC16 over data bytes */
323398b1 48 uint8_t flags; /* active/obsolete flags */
d684c216
L
49 char data[ENV_SIZE]; /* Environment data */
50} env_t;
51
52
1da3acc4 53/* */
d684c216 54typedef struct env_item_s {
55027f3b 55 char * envvar;
d684c216
L
56} env_item_t;
57
1da3acc4 58
323398b1 59static uint8_t env_valid;
d684c216
L
60static env_item_t env_list[CONFIG_ENVVAR_MAX];
61static int entrycount;
62
63
1da3acc4
L
64static
65char env_get_char(uint16_t index)
d684c216
L
66{
67 unsigned int off = CONFIG_ENV_OFFSET;
55027f3b 68 char ret;
d684c216 69
55027f3b
L
70 switch (env_valid) {
71 case 2:
72 off += CONFIG_ENV_SIZE;
73 case 1:
74 ret = (char) eeprom_read_byte((const uint8_t *)off + index +
d684c216 75 offsetof(env_t, data));
55027f3b 76 break;
d684c216 77
55027f3b
L
78 default:
79 ret = default_env[index];
d684c216 80 }
d684c216 81
55027f3b 82 return ret;
d684c216
L
83}
84
d684c216 85
04cffff0
L
86static const FLASH char *comp_key;
87
d684c216
L
88static
89int comp_env_items(const void *m1, const void *m2)
90{
d684c216
L
91 env_item_t *ep1 = (env_item_t *) m1;
92 env_item_t *ep2 = (env_item_t *) m2;
7e24905c 93
04cffff0
L
94 if (ep1 == NULL)
95 return - strcmp_P(ep2->envvar, comp_key);
96 else
97 return strcmp(ep1->envvar, ep2->envvar);
d684c216
L
98}
99
1da3acc4 100
7e24905c
L
101env_item_t *envlist_search(const MEMX char *name)
102{
7e24905c 103#ifdef __MEMX
7e24905c 104 if (__builtin_avr_flash_segment(name) != -1) {
04cffff0
L
105 comp_key = name;
106 return bsearch(0, env_list, entrycount,
107 sizeof(env_item_t), comp_env_items);
108 } else {
109
110 env_item_t e;
111 e.envvar = (char *) name;
112
113 return bsearch(&e, env_list, entrycount,
114 sizeof(env_item_t), comp_env_items);
7e24905c 115 }
04cffff0
L
116#else
117 env_item_t e;
118 e.envvar = (char *) name;
7e24905c 119
55027f3b
L
120 return bsearch(&e, env_list, entrycount,
121 sizeof(env_item_t), comp_env_items);
04cffff0 122#endif /* __MEMX */
7e24905c
L
123}
124
125
126static
127env_item_t *envlist_enter(env_item_t *e)
128{
7e24905c
L
129 const size_t size = sizeof(env_item_t);
130 env_item_t *ep;
131
55027f3b
L
132 ep = bsearch(e, env_list, entrycount,
133 size, comp_env_items);
7e24905c
L
134
135 if (ep == NULL) {
136 if (entrycount < CONFIG_ENVVAR_MAX) {
137
138 env_list[entrycount++] = *e;
139 qsort(env_list, entrycount, size, comp_env_items);
55027f3b
L
140 ep = bsearch(e, env_list, entrycount,
141 size, comp_env_items);
7e24905c
L
142 }
143 } else {
55027f3b
L
144 free(ep->envvar);
145 ep->envvar = e->envvar;
7e24905c
L
146 }
147
148 return ep;
149}
150
151
152static
153int env_item_delete(env_item_t *ep)
154{
155 if (entrycount == 0)
156 return -1;
55027f3b
L
157
158 free(ep->envvar);
7e24905c
L
159
160 entrycount--;
161 size_t size = sizeof(env_item_t);
162 memmove(ep, ep + 1, (env_list - ep)*size + entrycount*size);
163
164 return 0;
165}
166
167static
04cffff0 168int envlist_delete(const MEMX char *name)
7e24905c 169{
04cffff0 170 env_item_t *ep = envlist_search(name);
7e24905c
L
171
172 if (ep != NULL)
173 return env_item_delete(ep);
174
175 return 1;
176}
177
178
7e24905c
L
179
180static
181int envlist_import(uint8_t flags)
d684c216 182{
55027f3b
L
183 uint16_t index;
184
185 int len;
1da3acc4 186 env_item_t e;
55027f3b
L
187 char *np, c;
188 uint_fast8_t ef;
7e24905c
L
189
190 if ((flags & ENVLIST_DELETE) != 0)
191 while (entrycount != 0)
192 env_item_delete(&env_list[entrycount-1]);
193
55027f3b
L
194 for (index = 0; env_get_char(index) != '\0'; ) {
195 for (len = 0; env_get_char(index + len) != '\0'; ++len) {
196 if ((index + len) >= ENV_SIZE)
197 return -1;
1da3acc4 198 }
d684c216 199
55027f3b
L
200 np = (char *) xmalloc(len+1);
201 if (np == NULL) {
202 printf_P(PSTR("## Can't malloc %d bytes\n"), len+1);
203 return 1;
d684c216 204 }
55027f3b
L
205 e.envvar = np;
206 ef = 0;
207 while ((c = env_get_char(index++)) != '\0') {
208 if (!ef && (c == '=')) {
209 *np = '\0';
210 ef = 1;
211 } else
212 *np = c;
213 np++;
214 }
215 *np = '\0';
216 envlist_enter(&e);
d684c216 217 }
d684c216 218
55027f3b 219
1da3acc4
L
220 return 0;
221}
d684c216
L
222
223
1da3acc4
L
224static
225uint16_t env_crc(uint16_t data_offset)
323398b1 226{
7e24905c 227 uint16_t crc;
1da3acc4
L
228 uint16_t i;
229 char c, c0;
323398b1 230
1da3acc4
L
231 crc = 0xffff;
232 c = 0xff;
233 for (i = 0; !(c == 0 && c0 == 0) && i < ENV_SIZE; i++)
234 {
7e24905c 235 c0 = c;
1da3acc4
L
236 c = eeprom_read_byte((const uint8_t *) data_offset + i);
237 crc = crc16(crc, c);
323398b1 238 }
1da3acc4
L
239 return crc ;
240}
323398b1
L
241
242
1da3acc4
L
243/**
244 * return valid env
323398b1 245 */
1da3acc4
L
246static
247int env_check_valid(void)
248{
249 const uint16_t offset[2] = {CONFIG_ENV_OFFSET,
250 CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE};
251 uint_fast8_t flags[2], crc_ok[2];
252 int rc;
253
254 /* read FLAGS */
255 flags[0] = eeprom_read_byte ((uint8_t *) offset[0] +
256 offsetof(env_t, flags));
257 flags[1] = eeprom_read_byte ((uint8_t *) offset[1] +
258 offsetof(env_t, flags));
259
260 /* check CRC */
261 crc_ok[0] = (
262 eeprom_read_word((uint16_t *) offset[0] +
263 offsetof(env_t, crc))
264 == env_crc(offset[0] + offsetof(env_t, data))
265 );
266 crc_ok[1] = (
267 eeprom_read_word((uint16_t *) offset[1] +
268 offsetof(env_t, crc))
269 == env_crc(offset[1] + offsetof(env_t, data))
270 );
323398b1 271
1da3acc4
L
272 if (!crc_ok[0] && !crc_ok[1]) {
273 rc = 0;
323398b1 274
1da3acc4
L
275 } else if (crc_ok[0] && !crc_ok[1]) {
276 rc = 1;
277 } else if (!crc_ok[0] && crc_ok[1]) {
278 rc = 2;
279 } else {
280 /* both ok - check serial */
281#if 1
282 if (flags[1] == ACTIVE_FLAG && flags[0] != ACTIVE_FLAG)
283 rc = 2;
284 else if (flags[1] == OBSOLETE_FLAG && flags[0] == 0xFF)
285 rc = 2;
286 else
287 rc = 1;
288#else
289 if (flags[0] == ACTIVE_FLAG && flags[1] == OBSOLETE_FLAG)
290 rc = 1;
291 else if (flags[0] == OBSOLETE_FLAG && flags[1] == ACTIVE_FLAG)
292 rc = 2;
293 else if (flags[0] == 0xFF && flags[1] == 0)
294 rc = 2;
295 else if (flags[1] == 0xFF && flags[0] == 0)
296 rc = 1;
297 else /* flags are equal - almost impossible */
298 rc = 1;
299#endif
323398b1 300 }
7e24905c 301
1da3acc4
L
302 return rc;
303}
323398b1
L
304
305
1da3acc4 306int env_init(void)
323398b1 307{
1da3acc4
L
308 env_valid = env_check_valid();
309 if (env_valid == 0) {
55027f3b 310 printf_P(PSTR("*** Warning - bad CRC, "
1da3acc4 311 "using default environment\n\n"));
d684c216 312 }
55027f3b 313
7e24905c
L
314 envlist_import(ENVLIST_DELETE);
315 return 0;
323398b1 316}
d684c216 317
1da3acc4 318
fc30b18e 319char *getenv(const MEMX char *name)
d684c216
L
320{
321 env_item_t *ep;
322 char *ret = NULL;
323
55027f3b 324 ep = envlist_search(name);
d684c216 325 if (ep != NULL)
55027f3b 326 ret = ep->envvar + strlen(ep->envvar) +1;
d684c216
L
327 return ret;
328}
329
1da3acc4
L
330static
331int env_item_save(env_item_t *ep, uint16_t offset, int space_left)
323398b1 332{
55027f3b
L
333 int nlen, vlen;
334 char *var = ep->envvar;
323398b1 335
55027f3b
L
336 nlen = strlen(var);
337 if (nlen == 0)
1da3acc4 338 return 0;
55027f3b
L
339 vlen = strlen(var + nlen + 1);
340 if (vlen == 0)
341 return 0;
342 if (nlen + vlen + 2 > space_left)
1da3acc4 343 return 0;
7e24905c 344
55027f3b
L
345 eeprom_update_block(var, (uint8_t *) offset, nlen);
346 offset += nlen;
347 eeprom_update_byte((uint8_t *) offset++, '=');
348 eeprom_update_block(var + nlen +1, (uint8_t *) offset, vlen+1);
349
350 return nlen + vlen + 2;
7e24905c 351}
1da3acc4 352
323398b1 353
1da3acc4 354static
d684c216
L
355int saveenv(void)
356{
323398b1
L
357 unsigned int off = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE;
358 unsigned int off_red = CONFIG_ENV_OFFSET;
359 unsigned int pos;
360 int len, left;
361 uint16_t crc;
362 int rc = 0;
d684c216 363
323398b1
L
364 if (env_valid == 2) {
365 off = CONFIG_ENV_OFFSET;
366 off_red = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE;
367 }
368
7e24905c 369 eeprom_update_byte((uint8_t *) off + offsetof(env_t, flags), 0xff);
d684c216 370
323398b1
L
371 pos = off + offsetof(env_t, data);
372 left = ENV_SIZE - 1;
373 for (int i = 0 ; i < entrycount; i++) {
374 len = env_item_save(&env_list[i], pos, left);
375 if (len == 0) {
376 return 1;
377 }
378 pos += len;
379 left -= len;
380 }
381 /* terminate list */
382 eeprom_update_byte((uint8_t *) pos, 0);
383 crc = env_crc(off + offsetof(env_t, data));
384 eeprom_update_word((uint16_t *) off + offsetof(env_t, crc), crc);
7e24905c 385 eeprom_update_byte((uint8_t *) off + offsetof(env_t, flags),
323398b1
L
386 ACTIVE_FLAG);
387
388 if (rc == 0) {
7e24905c 389 eeprom_update_byte((uint8_t *) off_red + offsetof(env_t, flags),
323398b1
L
390 OBSOLETE_FLAG);
391 env_valid = (env_valid == 2) ? 1 : 2;
323398b1 392 }
7e24905c 393
d684c216
L
394 return rc;
395}
396
d684c216 397
1da3acc4
L
398static
399int env_item_print(env_item_t *ep)
d684c216 400{
1da3acc4 401 int len;
55027f3b
L
402 char *ev = ep->envvar;
403
404 len = printf_P(PSTR("%s="), ev);
405 len += printf_P(PSTR("%s\n"), ev + len);
1da3acc4
L
406
407 return len;
7e24905c 408}
323398b1
L
409
410
d684c216
L
411/*
412 * Command interface: print one or all environment variables
413 *
414 * Returns -1 in case of error, or length of printed string
415 */
7e24905c 416static
fc30b18e 417int env_print(const MEMX char *name)
d684c216
L
418{
419 int len = -1;
420
421 if (name) { /* print a single name */
7e24905c 422
d684c216
L
423 env_item_t *ep = envlist_search(name);
424 if (ep != NULL)
425 len = env_item_print(ep);
426
427 } else { /* print whole list */
428 len = 0;
429 for (int i = 0 ; i < entrycount; i++) {
430 len += env_item_print(&env_list[i]);
431 }
432 }
433 return len;
434}
435
1da3acc4 436
72f58822
L
437/**
438 * Set or delete environment variable
439 *
d684c216
L
440 * Set a new environment variable,
441 * or replace or delete an existing one.
72f58822
L
442 *
443 * @param flag (not used)
444 * @param argc
445 * @param argv[1] Environment variable to set or delete
446 * if no more args
447 * @param argv[2] ... Value to set it to
448 *
449 * @return 0 if ok, 1 on error
d684c216 450 */
1da3acc4 451static
d0581f88 452command_ret_t _do_env_set(int flag, int argc, char * const argv[])
d684c216 453{
72f58822 454 int i, len;
55027f3b 455 char *name, *value, *valp, *p;
d684c216
L
456 env_item_t e, *ep;
457
458 (void) flag;
d684c216
L
459
460 name = argv[1];
461 value = argv[2];
462
463 if (strchr(name, '=')) {
464 printf_P(PSTR("## Error: illegal character '='"
465 "in variable name \"%s\"\n"), name);
d0581f88 466 return CMD_RET_FAILURE;
d684c216 467 }
55027f3b
L
468 len = strlen(name);
469 if (len > CONFIG_SYS_ENV_NAMELEN) {
d684c216
L
470 printf_P(PSTR("## Error: Variable name \"%s\" too long. "
471 "(max %d characters)\n"), name, CONFIG_SYS_ENV_NAMELEN);
d0581f88 472 return CMD_RET_FAILURE;
d684c216
L
473 }
474/*
475 env_id++;
476*/
477 /* Delete only ? */
478 if (argc < 3 || argv[2] == NULL) {
479 int rc = envlist_delete(name);
d0581f88 480 return rc ? CMD_RET_FAILURE : CMD_RET_SUCCESS;
d684c216
L
481 }
482
483 /*
484 * Insert / replace new value
485 */
55027f3b 486 for (i = 2, len += 1; i < argc; ++i)
d684c216
L
487 len += strlen(argv[i]) + 1;
488
489 value = xmalloc(len);
490 if (value == NULL) {
491 printf_P(PSTR("## Can't malloc %d bytes\n"), len);
d0581f88 492 return CMD_RET_FAILURE;
d684c216 493 }
55027f3b
L
494 strcpy(value, name);
495 valp = value + strlen(name) + 1;
496 for (i = 2, p = valp; i < argc; ++i) {
d684c216
L
497 char *v = argv[i];
498
55027f3b 499 while ((*p++ = *v++) != '\0')
d684c216 500 ;
55027f3b 501 *(p - 1) = ' ';
d684c216 502 }
55027f3b
L
503 if (p != valp)
504 *--p = '\0';
d684c216 505
55027f3b 506 e.envvar = value;
d684c216
L
507 ep = envlist_enter(&e);
508 if (!ep) {
509 printf_P(PSTR("## Error inserting \"%s\" variable.\n"),
510 name);
d0581f88 511 return CMD_RET_FAILURE;
d684c216
L
512 }
513
d0581f88 514 return CMD_RET_SUCCESS;
d684c216
L
515}
516
72f58822
L
517/**
518 * Set an environment variable
519 *
520 * @param varname Environment variable to set
521 * @param varvalue Value to set it to
522 * @return 0 if ok, 1 on error
523 */
1da3acc4 524static
c0abd68b 525int setenv(const MEMX char *varname, const char *varvalue)
d684c216 526{
c0abd68b
L
527 int rc;
528
529#ifdef __MEMX
530 char *tmpname = NULL;
531 if (__builtin_avr_flash_segment(varname) != -1) {
532 tmpname = malloc(strlen_P(varname)+1);
533 if (tmpname == NULL) {
534 printf_P(PSTR("setenv: Out of Memory!\n"));
535 return 1;
536 }
537 strcpy_P(tmpname, varname);
538 } else
539 tmpname = (char *) varname;
540#endif
541
542 const char * const argv[3] = { NULL, tmpname, varvalue };
d684c216
L
543 int argc = 3;
544
545 if (varvalue == NULL || varvalue[0] == '\0')
546 --argc;
7e24905c 547
c0abd68b
L
548 rc = (int) _do_env_set(0, argc, (char * const *)argv);
549
550#ifdef __MEMX
551 free(tmpname);
552#endif
553 return rc;
d684c216
L
554}
555
d684c216
L
556/**
557 * Set an environment variable to an integer value
558 *
f76ca346
L
559 * @param name Environment variable to set
560 * @param value Value to set it to
561 * @param radix Base
d684c216
L
562 * @return 0 if ok, 1 on error
563 */
f76ca346
L
564static
565int setenv_intval(const MEMX char *name, unsigned long value, int radix)
d684c216 566{
f76ca346 567 char buf[11];
d684c216 568
f76ca346 569 ultoa(value, buf, radix);
d684c216 570
f76ca346
L
571 return setenv(name, buf);
572}
d684c216
L
573
574/**
f76ca346 575 * Set an environment variable to a decimal integer value
d684c216 576 *
f76ca346
L
577 * @param name Environment variable to set
578 * @param value Value to set it to
d684c216
L
579 * @return 0 if ok, 1 on error
580 */
f76ca346 581int setenv_ulong(const MEMX char *name, unsigned long value)
d684c216 582{
f76ca346
L
583 return setenv_intval(name, value, 10);
584}
585
d684c216 586
f76ca346
L
587/**
588 * Set an environment variable to a value in hex
589 *
590 * @param name Environment variable to set
591 * @param value Value to set it to
592 * @return 0 if ok, 1 on error
593 */
594int setenv_hex(const MEMX char *name, unsigned long value)
595{
596 return setenv_intval(name, value, 16);
d684c216
L
597}
598
35e9ec0c 599
72f58822 600/**
35e9ec0c 601 * Decode the integer value of an environment variable and return it.
72f58822 602 *
35e9ec0c
L
603 * @param name Name of environemnt variable
604 * @param base Number base to use (normally 10, or 16 for hex)
605 * @param default_val Default value to return if the variable is not
606 * found
607 * @return the decoded value, or default_val if not found
72f58822 608 */
fc30b18e 609unsigned long getenv_ulong(const MEMX char *name, int base, unsigned long default_val)
d684c216 610{
d684c216 611 unsigned long value;
35e9ec0c
L
612 char *vp, *endp;
613
614 env_item_t *ep = envlist_search(name);
d684c216 615
35e9ec0c 616 if (ep != NULL ) {
55027f3b
L
617 vp = ep->envvar + strlen(ep->envvar) +1;
618 value = strtoul(vp, &endp, base);
619 if (endp != vp)
620 return value;
35e9ec0c 621 }
d684c216 622
35e9ec0c 623 return default_val;
d684c216
L
624}
625
35e9ec0c 626
f76ca346
L
627command_ret_t do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
628{
629 command_ret_t rc = CMD_RET_SUCCESS;
630
631 (void) cmdtp; (void) flag;
632
633 if (argc == 1) {
634 /* print all env vars */
635 int size = env_print(NULL);
636 if (size < 0)
637 return CMD_RET_FAILURE;
638 printf_P(PSTR("\nEnvironment size: %d/%d bytes\n"),
639 size, ENV_SIZE);
640 return CMD_RET_SUCCESS;
641 }
642
643 /* print selected env vars */
644 for (int i = 1; i < argc; ++i) {
645 int rc = env_print(argv[i]);
646 if (rc < 0) {
647 printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[i]);
648 rc = CMD_RET_FAILURE;
649 }
650 }
651
652 return rc;
653}
654
655
d0581f88 656command_ret_t do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
d684c216
L
657{
658 (void) cmdtp;
659
660 if (argc < 2)
661 return CMD_RET_USAGE;
662
663 return _do_env_set(flag, argc, argv);
664}
665
666
7e24905c
L
667command_ret_t do_env_default(cmd_tbl_t *cmdtp, int flag,
668 int argc, char * const argv[])
669{
670 (void) cmdtp; (void) flag; (void) argc; (void) argv;
671
55027f3b
L
672 uint8_t tmp = env_valid;
673 env_valid = 0;
674
7e24905c 675 /* Reset the whole environment */
55027f3b 676 printf_P(PSTR("## Resetting to default environment\n"));
7e24905c
L
677 envlist_import(ENVLIST_DELETE);
678
55027f3b
L
679 env_valid = tmp;
680
7e24905c
L
681 return CMD_RET_SUCCESS;
682}
683
55027f3b 684
d0581f88 685command_ret_t do_env_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
323398b1
L
686{
687 (void) cmdtp; (void) flag; (void) argc; (void) argv;
688
689 printf_P(PSTR("Saving Environment ...\n"));
d0581f88 690 return saveenv() ? CMD_RET_FAILURE : CMD_RET_SUCCESS;
323398b1
L
691}
692
55027f3b 693
7e24905c 694#if defined(CONFIG_AUTO_COMPLETE)
d684c216
L
695int env_complete(char *var, int maxv, char *cmdv[], int bufsz, char *buf)
696{
697 ENTRY *match;
698 int found, idx;
699
700 idx = 0;
701 found = 0;
702 cmdv[0] = NULL;
703
704 while ((idx = hmatch_r(var, idx, &match, &env_htab))) {
705 int vallen = strlen(match->key) + 1;
706
707 if (found >= maxv - 2 || bufsz < vallen)
708 break;
709
710 cmdv[found++] = buf;
711 memcpy(buf, match->key, vallen);
712 buf += vallen;
713 bufsz -= vallen;
714 }
715
716 qsort(cmdv, found, sizeof(cmdv[0]), strcmp_compar);
717
718 if (idx)
719 cmdv[found++] = "...";
720
721 cmdv[found] = NULL;
722 return found;
723}
724#endif