Eliminate some use of concatstr

diff --git a/contrib/receivestrip/mlmmj-receive-strip.c b/contrib/receivestrip/mlmmj-receive-strip.c
index b03442ea183e6842885e4f788644ab35a8f7a5c9..49f0e20120cd9c3009822d45a0c0213cc779d524 100644 (file)
--- a/contrib/receivestrip/mlmmj-receive-strip.c
+++ b/contrib/receivestrip/mlmmj-receive-strip.c
@@ -145,6 +145,7 @@ static void extract_boundary(strlist *allhdrs, char** mime_type, char** boundary
 static int read_hdrs(int fd, strlist *allhdrs, strlist* delmime, strlist* denymime,int* deny,char** boundary) {
        int result = MIME_OK;
        char* mime_type = NULL;
+       char *tmp;
        /* read headers */
        while(1) {
                char* line = mygetline(fd);
@@ -159,7 +160,7 @@ static int read_hdrs(int fd, strlist *allhdrs, strlist* delmime, strlist* denymi
                if(!tll_length(*allhdrs) || ((line[0] != '\t') && (line[0] != ' '))) /* first header line or no more unfolding */
                        tll_push_back(*allhdrs, line);
                else{
-                       char* tmp = concatstr(2, tll_back(*allhdrs), line);
+                       xasprintf(&tmp, "%s%s", tll_back(*allhdrs), line);
                        free(tll_pop_back(*allhdrs));
                        tll_push_back(*allhdrs, tmp);
                }
@@ -388,7 +389,7 @@ int main(int argc, char **argv)
        log_set_name(argv[0]);
 
        bindir = mydirname(argv[0]);
-       mlmmjprocess = concatstr(2, bindir, "/mlmmj-process");
+       xasprintf(&mlmmjprocess, "%s/mlmmj-process", bindir);
        free(bindir);
 
        while ((opt = getopt(argc, argv, "hPVL:F")) != -1) {
@@ -434,13 +435,13 @@ int main(int argc, char **argv)
                }
        }
 
-       infilename = concatstr(3, listdir, "/incoming/", randomstr);
+       xasprintf(&infilename, "%s/incoming/%s", listdir, randomstr);
        free(randomstr);
        fd = open(infilename, O_RDWR|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR);
        while(fd < 0 && errno == EEXIST) {
                free(infilename);
                randomstr = random_str();
-               infilename = concatstr(3, listdir, "/incoming/", randomstr);
+               xasprintf(&infilename, "%s/incoming/%s", listdir, randomstr);
                free(randomstr);
                fd = open(infilename, O_RDWR|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR);
        }

diff --git a/src/mlmmj-bounce.c b/src/mlmmj-bounce.c
index ce5aaa869b93f74a0815f9908a4b17290de61bd4..0caa74b1c78968ace507aec92c0ba51186f3abac 100644 (file)
--- a/src/mlmmj-bounce.c
+++ b/src/mlmmj-bounce.c
@@ -69,8 +69,8 @@ void do_probe(const char *listdir, const char *mlmmjsend, const char *addr,
        listname = genlistname(listaddr);
        listfqdn = genlistfqdn(listaddr);
 
-       from = concatstr(6, listname, listdelim, "bounces-probe-", myaddr, "@",
-                        listfqdn);
+       xasprintf(&from, "%s%sbounces-probe-%s@%s", listname, listdelim, myaddr,
+           listfqdn);
 
        free(listaddr);
        free(listdelim);
@@ -99,8 +99,7 @@ void do_probe(const char *listdir, const char *mlmmjsend, const char *addr,
 
        finish_file_lines(fls);
 
-       probefile = concatstr(4, listdir, "/bounce/", addr, "-probe");
-       MY_ASSERT(probefile);
+       xasprintf(&probefile, "%s/bounce/%s-probe", listdir, addr);
        t = time(NULL);
        unlink(probefile);
        fd = open(probefile, O_WRONLY|O_TRUNC|O_CREAT, S_IRUSR|S_IWUSR);
@@ -149,7 +148,7 @@ int main(int argc, char **argv)
        CHECKFULLPATH(argv[0]);
 
        bindir = mydirname(argv[0]);
-       mlmmjsend = concatstr(2, bindir, "/mlmmj-send");
+       xasprintf(&mlmmjsend, "%s/mlmmj-send");
        free(bindir);
 
        while ((opt = getopt(argc, argv, "hdVL:a:n:m:p")) != -1) {