- char *orig, *repl, *sub, *val, port[20];
- int i, rc, r;
- size_t s, l;
-
- rc = snprintf(port, sizeof port, "%d", config->httpdPort);
- if (rc < 0 || rc >= (int)(sizeof port))
- return -1;
-
- for (i = 0 ; (orig = config->exec[i]) ; i++) {
- repl = 0;
- s = 0;
- for(;;) {
- sub = strchrnul(orig, SUBST_CHAR);
- l = sub - orig;
- if (repl)
- repl = mempcpy(repl, orig, l);
- else
- s += l;
- if (!*sub) {
- /* at end */
- if (repl || orig == config->exec[i])
- break;
- repl = malloc(1 + s);
- if (!repl)
- return -1;
- orig = config->exec[i];
- config->exec[i] = repl;
- repl[s] = 0;
- } else {
- r = 2;
- switch(sub[1]) {
- case 'p': val = port; break;
- case 't': val = config->token ? : ""; break;
- default: r = 1;
- case SUBST_CHAR: val = SUBST_STR; break;
- }
- orig = &sub[r];
- l = strlen(val);
- if (repl)
- repl = mempcpy(repl, val, l);
- else
- s += l;
- }
+ char *resu, *it, *wr;
+ int chg, dif;
+
+ /* get the changes */
+ chg = 0;
+ dif = 0;
+ it = strchrnul(arg, SUBST_CHAR);
+ while (*it) {
+ switch(*++it) {
+ case 'p': chg++; dif += (int)strlen(port) - 2; break;
+ case 't': chg++; dif += (int)strlen(token) - 2; break;
+ case SUBST_CHAR: it++; chg++; dif--; break;
+ default: break;
+ }
+ it = strchrnul(it, SUBST_CHAR);
+ }
+
+ /* return arg when no change */
+ if (!chg)
+ return arg;
+
+ /* allocates the result */
+ resu = malloc((it - arg) + dif + 1);
+ if (!resu) {
+ ERROR("out of memory");
+ return NULL;
+ }
+
+ /* instanciate the arguments */
+ wr = resu;
+ for (;;) {
+ it = strchrnul(arg, SUBST_CHAR);
+ wr = mempcpy(wr, arg, it - arg);
+ if (!*it)
+ break;
+ switch(*++it) {
+ case 'p': wr = stpcpy(wr, port); break;
+ case 't': wr = stpcpy(wr, token); break;
+ default: *wr++ = SUBST_CHAR;
+ case SUBST_CHAR: *wr++ = *it;