From: mmj Date: Fri, 23 Apr 2004 14:15:52 +0000 (+1000) Subject: dirname(argv[0]) -> dirname(argv0); X-Git-Tag: RELEASE_1_0_0~291 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ed167f098fc4a711e12b6837c7edcff3a042b39;p=thirdparty%2Fmlmmj.git dirname(argv[0]) -> dirname(argv0); --- diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c index 2467adb3..471daf10 100644 --- a/src/mlmmj-process.c +++ b/src/mlmmj-process.c @@ -39,9 +39,8 @@ int main(int argc, char **argv) char *listdir = NULL, *mailfile = NULL, *headerfilename = NULL; char *footerfilename = NULL, *donemailname = NULL; char *randomstr = random_str(); - char *mlmmjsend = concatstr(2, dirname(argv[0]), "/mlmmj-send"); - char *mlmmjsub = concatstr(2, dirname(argv[0]), "/mlmmj-sub"); - char *mlmmjunsub = concatstr(2, dirname(argv[0]), "/mlmmj-unsub"); + char *mlmmjsend, *mlmmjsub, *mlmmjunsub; + char *argv0 = strdup(argv[0]); FILE *headerfile, *footerfile, *rawmailfile, *donemailfile; struct email_container toemails = { 0, NULL }; const char *badheaders[] = { "From ", "Return-Path:", NULL }; @@ -50,6 +49,15 @@ int main(int argc, char **argv) { "Cc:", NULL }, { NULL, NULL } }; + + mlmmjsend = concatstr(2, dirname(argv0), "/mlmmj-send"); + free(argv0); + argv0 = strdup(argv[0]); + mlmmjsub = concatstr(2, dirname(argv0), "/mlmmj-sub"); + free(argv0); + argv0 = strdup(argv[0]); + mlmmjunsub = concatstr(2, dirname(argv0), "/mlmmj-unsub"); + free(argv0); while ((opt = getopt(argc, argv, "hVPm:L:")) != -1) { switch(opt) { diff --git a/src/mlmmj-recieve.c b/src/mlmmj-recieve.c index 14e6535e..84f09747 100644 --- a/src/mlmmj-recieve.c +++ b/src/mlmmj-recieve.c @@ -35,7 +35,10 @@ int main(int argc, char **argv) char *infilename = NULL, *listdir = NULL, *line = NULL; char *randomstr = random_str(); int fd, opt, noprocess = 0; - char *mlmmjprocess = concatstr(2, dirname(argv[0]), "/mlmmj-process"); + char *mlmmjprocess, *argv0 = strdup(argv[0]); + + mlmmjprocess = concatstr(2, dirname(argv0), "/mlmmj-process"); + free(argv0); while ((opt = getopt(argc, argv, "hPVL:")) != -1) { switch(opt) { diff --git a/src/mlmmj-sub.c b/src/mlmmj-sub.c index 43a3b67e..2f97c41b 100644 --- a/src/mlmmj-sub.c +++ b/src/mlmmj-sub.c @@ -229,9 +229,12 @@ int main(int argc, char **argv) int opt, subfilefd, lock; char listaddr[READ_BUFSIZE]; char *listdir = NULL, *address = NULL, *subfilename = NULL; - char *mlmmjsend = concatstr(2, dirname(argv[0]), "/mlmmj-send"); + char *mlmmjsend, *argv0 = strdup(argv[0]); int subconfirm = 0, confirmsub = 0; + mlmmjsend = concatstr(2, dirname(argv0), "/mlmmj-send"); + free(argv0); + log_set_name(argv[0]); while ((opt = getopt(argc, argv, "hcCVL:a:")) != -1) { diff --git a/src/mlmmj-unsub.c b/src/mlmmj-unsub.c index edb8a638..c9639838 100644 --- a/src/mlmmj-unsub.c +++ b/src/mlmmj-unsub.c @@ -245,7 +245,10 @@ int main(int argc, char **argv) int confirmunsub = 0, unsubconfirm = 0; char listaddr[READ_BUFSIZE]; char *listdir = NULL, *address = NULL, *subreadname = NULL; - char *mlmmjsend = concatstr(2, dirname(argv[0]), "/mlmmj-send"); + char *mlmmjsend, *argv0 = strdup(argv[0]); + + mlmmjsend = concatstr(2, dirname(argv0), "/mlmmj-send"); + free(argv0); log_set_name(argv[0]);