diff options
| -rw-r--r-- | cli.c | 13 | ||||
| -rw-r--r-- | include/asterisk/strings.h | 13 | ||||
| -rw-r--r-- | res/res_agi.c | 60 | ||||
| -rw-r--r-- | utils.c | 19 |
4 files changed, 52 insertions, 53 deletions
@@ -1019,17 +1019,8 @@ static struct ast_cli_entry *find_cli(char *cmds[], int exact) static void join(char *dest, size_t destsize, char *w[], int tws) { - int x; - /* Join words into a string */ - if (!dest || destsize < 1) { - return; - } - dest[0] = '\0'; - for (x=0;w[x];x++) { - if (x) - strncat(dest, " ", destsize - strlen(dest) - 1); - strncat(dest, w[x], destsize - strlen(dest) - 1); - } + ast_join(dest, destsize, w); + if (tws && !ast_strlen_zero(dest)) strncat(dest, " ", destsize - strlen(dest) - 1); } diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h index 13ecb3a5f..1a827e625 100644 --- a/include/asterisk/strings.h +++ b/include/asterisk/strings.h @@ -165,6 +165,7 @@ void ast_copy_string(char *dst, const char *src, size_t size), } ) + /*! \brief Build a string in a buffer, designed to be called repeatedly @@ -210,6 +211,18 @@ int ast_true(const char *val); */ int ast_false(const char *val); +/* + \brief Join an array of strings into a single string. + \param s the resulting string buffer + \param len the length of the result buffer, s + \param w an array of strings to join + + This function will join all of the strings in the array 'w' into a single + string. It will also place a space in the result buffer in between each + string from 'w'. +*/ +void ast_join(char *s, size_t len, char * const w[]); + /* The realloca lets us ast_restrdupa(), but you can't mix any other ast_strdup calls! */ struct ast_realloca { diff --git a/res/res_agi.c b/res/res_agi.c index 9ec6f5cb6..15b4c2a1e 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1627,22 +1627,6 @@ static agi_command commands[MAX_COMMANDS] = { { { "wait", "for", "digit", NULL }, handle_waitfordigit, "Waits for a digit to be pressed", usage_waitfordigit }, }; -static void join(char *s, size_t len, char *w[]) -{ - int x; - - /* Join words into a string */ - if (!s) { - return; - } - s[0] = '\0'; - for (x=0; w[x]; x++) { - if (x) - strncat(s, " ", len - strlen(s) - 1); - strncat(s, w[x], len - strlen(s) - 1); - } -} - static int help_workhorse(int fd, char *match[]) { char fullcmd[80]; @@ -1650,20 +1634,17 @@ static int help_workhorse(int fd, char *match[]) int x; struct agi_command *e; if (match) - join(matchstr, sizeof(matchstr), match); + ast_join(matchstr, sizeof(matchstr), match); for (x=0;x<sizeof(commands)/sizeof(commands[0]);x++) { - if (!commands[x].cmda[0]) break; e = &commands[x]; - if (e) - join(fullcmd, sizeof(fullcmd), e->cmda); + if (!e->cmda[0]) + break; /* Hide commands that start with '_' */ - if (fullcmd[0] == '_') + if ((e->cmda[0])[0] == '_') + continue; + ast_join(fullcmd, sizeof(fullcmd), e->cmda); + if (match && strncasecmp(matchstr, fullcmd, strlen(matchstr))) continue; - if (match) { - if (strncasecmp(matchstr, fullcmd, strlen(matchstr))) { - continue; - } - } ast_cli(fd, "%20.20s %s\n", fullcmd, e->summary); } return 0; @@ -1801,10 +1782,9 @@ normal: static int agi_handle_command(struct ast_channel *chan, AGI *agi, char *buf) { char *argv[MAX_ARGS]; - int argc = 0; + int argc = MAX_ARGS; int res; agi_command *c; - argc = MAX_ARGS; parse_args(buf, &argc, argv); #if 0 @@ -1929,7 +1909,7 @@ static int handle_showagi(int fd, int argc, char *argv[]) { if (find_command(argv + 2, -1)) { return help_workhorse(fd, argv + 1); } else { - join(fullcmd, sizeof(fullcmd), argv+1); + ast_join(fullcmd, sizeof(fullcmd), argv+1); ast_cli(fd, "No such command '%s'.\n", fullcmd); } } @@ -1942,7 +1922,6 @@ static int handle_showagi(int fd, int argc, char *argv[]) { static int handle_dumpagihtml(int fd, int argc, char *argv[]) { struct agi_command *e; char fullcmd[80]; - char *tempstr; int x; FILE *htmlfile; @@ -1961,29 +1940,27 @@ static int handle_dumpagihtml(int fd, int argc, char *argv[]) { fprintf(htmlfile, "<TABLE BORDER=\"0\" CELLSPACING=\"10\">\n"); for (x=0;x<sizeof(commands)/sizeof(commands[0]);x++) { - char *stringp=NULL; - if (!commands[x].cmda[0]) break; + char *stringp, *tempstr; + e = &commands[x]; - if (e) - join(fullcmd, sizeof(fullcmd), e->cmda); + if (!e->cmda[0]) /* end ? */ + break; /* Hide commands that start with '_' */ - if (fullcmd[0] == '_') + if ((e->cmda[0])[0] == '_') continue; + ast_join(fullcmd, sizeof(fullcmd), e->cmda); fprintf(htmlfile, "<TR><TD><TABLE BORDER=\"1\" CELLPADDING=\"5\" WIDTH=\"100%%\">\n"); fprintf(htmlfile, "<TR><TH ALIGN=\"CENTER\"><B>%s - %s</B></TD></TR>\n", fullcmd,e->summary); - stringp=e->usage; tempstr = strsep(&stringp, "\n"); fprintf(htmlfile, "<TR><TD ALIGN=\"CENTER\">%s</TD></TR>\n", tempstr); fprintf(htmlfile, "<TR><TD ALIGN=\"CENTER\">\n"); - while ((tempstr = strsep(&stringp, "\n")) != NULL) { - fprintf(htmlfile, "%s<BR>\n",tempstr); - - } + while ((tempstr = strsep(&stringp, "\n")) != NULL) + fprintf(htmlfile, "%s<BR>\n",tempstr); fprintf(htmlfile, "</TD></TR>\n"); fprintf(htmlfile, "</TABLE></TD></TR>\n\n"); @@ -2016,9 +1993,8 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int ast_copy_string(buf, data, sizeof(buf)); memset(&agi, 0, sizeof(agi)); - while ((stringp = strsep(&tmp, "|"))) { + while ((stringp = strsep(&tmp, "|")) && argc < MAX_ARGS-1) argv[argc++] = stringp; - } argv[argc] = NULL; LOCAL_USER_ADD(u); @@ -903,3 +903,22 @@ char *ast_process_quotes_and_slashes(char *start, char find, char replace_with) *dataPut = 0; return dataPut; } + +void ast_join(char *s, size_t len, char * const w[]) +{ + int x, ofs = 0; + const char *src; + + /* Join words into a string */ + if (!s) + return; + for (x=0; ofs < len && w[x]; x++) { + if (x > 0) + s[ofs++] = ' '; + for (src = w[x]; *src && ofs < len; src++) + s[ofs++] = *src; + } + if (ofs == len) + ofs--; + s[ofs] = '\0'; +} |