oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Allow unlimited number of arguments.

Browse Source 
Use `strtok_r' to divide up string into arguments.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1049 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1996-11-19 03:57:59 +00:00
parent f90079df1a
commit 57644d9c33
1 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/sl/sl.c
View File

@@ -117,35 +117,48 @@ int
sl_loop (SL_cmd *cmds, char *prompt) sl_loop (SL_cmd *cmds, char *prompt)
{ {
char *buf; char *buf;
int count; unsigned max_count;
char *ptr[17]; char **ptr;
int i;
max_count = 17;
ptr = malloc(max_count * sizeof(*ptr));
if (ptr == NULL) {
printf ("sl_loop: failed to allocate %u bytes of memory\n",
max_count * sizeof(*ptr));
return -1;
}
for (;;) { for (;;) {
char *p; char *buf;
char **a = ptr; unsigned count;
SL_cmd *c; SL_cmd *c;
buf = readline(prompt); buf = readline(prompt);
if(buf == NULL) if(buf == NULL)
break; break;
p = buf;
count = 0;
if(*buf) if(*buf)
add_history(buf); add_history(buf);
for (;;) { count = 0;
while (*p == ' ' || *p == '\t') {
p++; char *foo;
if (*p == '\0') char *p;
break;
*a++ = p; for(p = strtok_r (buf, " \t", &foo);
++count; p;
while (*p != '\0' && *p != ' ' && *p != '\t') p = strtok_r (NULL, " \t", &foo)) {
p++; if(count == max_count) {
if (*p == '\0') max_count *= 2;
break; ptr = realloc (ptr, max_count * sizeof(*ptr));
*p++ = '\0'; if (ptr == NULL) {
printf ("sl_loop: failed to allocate %u "
"bytes of memory\n",
max_count * sizeof(*ptr));
return -1;
}
}
ptr[count++] = p;
}
} }
if (count > 0) { if (count > 0) {
c = sl_match (cmds, ptr[0], 0); c = sl_match (cmds, ptr[0], 0);
@@ -156,6 +169,6 @@ sl_loop (SL_cmd *cmds, char *prompt)
} }
free(buf); free(buf);
} }
free (ptr);
return 0; return 0;
} }