2603. [port] win32: handle .exe extension of named-checkzone and

                        named-comilezone argv[0] names under windows.
                        [RT #19767]

diff --git a/CHANGES b/CHANGES
index f8eaa62a85c107299ba5a0c810156176ad33949b..575b1baf40c64d91c4b9dedb0b336ec14e52cfb3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2603.  [port]          win32: handle .exe extension of named-checkzone and
+                       named-comilezone argv[0] names under windows.
+                       [RT #19767]
+
 2602.  [port]          win32: fix debugging command line build of libisccfg.
                        [RT #19767]
 

diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index 5232e0f3b132ebe651276cf407a5b2489078e55f..88f3347480983c9056e72c45e0781b68c3597c3d 100644 (file)
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkzone.c,v 1.53 2009/02/16 23:48:04 tbox Exp $ */
+/* $Id: named-checkzone.c,v 1.54 2009/05/29 02:14:31 marka Exp $ */
 
 /*! \file */
 
@@ -123,9 +123,13 @@ main(int argc, char **argv) {
         */
        if (strncmp(prog_name, "lt-", 3) == 0)
                prog_name += 3;
-       if (strcmp(prog_name, "named-checkzone") == 0)
+
+#define PROGCMP(X) \
+       (strcasecmp(prog_name, X) == 0 || strcasecmp(prog_name, X ".exe") == 0)
+
+       if (PROGCMP("named-checkzone"))
                progmode = progmode_check;
-       else if (strcmp(prog_name, "named-compilezone") == 0)
+       else if (PROGCMP("named-compilezone"))
                progmode = progmode_compile;
        else
                INSIST(0);