From 78e4b12f630b09d2ecc825fd8ed32045fb104d03 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 15 Mar 2012 17:39:07 -0400 Subject: [PATCH] Reworked some suboptimal logic found in create_script() --- webcit/sieve.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/webcit/sieve.c b/webcit/sieve.c index 3761b1131..668d5f894 100644 --- a/webcit/sieve.c +++ b/webcit/sieve.c @@ -429,22 +429,19 @@ void create_script(void) { serv_printf("MSIV getscript|%s", bstr("script_name")); serv_getln(buf, sizeof buf); - if (buf[0] == '1') { + if (buf[0] == '1') { // does script exist already? while (serv_getln(buf, sizeof(buf)), strcmp(buf, "000")) { - /* flush */ + // yes -- flush the output } - return; } - - serv_printf("MSIV putscript|%s", bstr("script_name")); - serv_getln(buf, sizeof buf); - if (buf[0] == '4') { - serv_puts("keep;"); - serv_puts("000"); - output_headers(1, 1, 2, 0, 0, 0); - do_template("sieve_add"); - wDumpContent(1); - return; + else { + // no -- safe to create a new one by this name + serv_printf("MSIV putscript|%s", bstr("script_name")); + serv_getln(buf, sizeof buf); + if (buf[0] == '4') { + serv_puts("keep;"); + serv_puts("000"); + } } output_headers(1, 1, 2, 0, 0, 0); -- 2.30.2