* kdestroy.c: Fix GET_PROGNAME macro to properly return program

name under Win32.  Re-indent, turning spaces that should be tabs
into tabs.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12048 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 17 insertions, 11 deletions

diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index df85f99e5f..a97da45449 100644
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-16  Danilo Almeida  <dalmeida@mit.edu>
+
+	* kdestroy.c: Fix GET_PROGNAME macro to properly return program
+	name under Win32.  Re-indent, turning spaces that should be tabs
+	into tabs.
+
 2000-02-04  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in (kdestroy): Fix to build under Unix again.
diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index ccc6ecf709..5c9e77275c 100644
--- a/src/clients/kdestroy/kdestroy.c
+++ b/src/clients/kdestroy/kdestroy.c
@@ -53,7 +53,7 @@ extern char *optarg;
 #ifndef _WIN32
 #define GET_PROGNAME(x) (strrchr((x), '/') ? strrchr((x), '/')+1 : (x))
 #else
-#define GET_PROGNAME(x) (max(strrchr((x), '/'), strrchr((x), '\\')) + 1, (x))
+#define GET_PROGNAME(x) max(max(strrchr((x), '/'), strrchr((x), '\\')) + 1,(x))
 #endif
 
 int
@@ -99,12 +99,12 @@ main(argc, argv)
 	    }
 	    break;
 #ifdef KRB5_KRB4_COMPAT
-        case '4':
-            use_k4_only = 1;
-            break;
-        case '5':
-            use_k5_only = 1;
-            break;
+	case '4':
+	    use_k4_only = 1;
+	    break;
+	case '5':
+	    use_k5_only = 1;
+	    break;
 #endif
 	case '?':
 	default:
@@ -115,8 +115,8 @@ main(argc, argv)
 
     if (use_k4_only && use_k5_only)
     {
-        fprintf(stderr, "Only one of -4 and -5 allowed\n");
-        errflg++;
+	fprintf(stderr, "Only one of -4 and -5 allowed\n");
+	errflg++;
     }
 
     if (optind != argc)
@@ -129,9 +129,9 @@ main(argc, argv)
     }
 
     if (use_k4_only)
-        got_k5 = 0;
+	got_k5 = 0;
     if (use_k5_only)
-        got_k4 = 0;
+	got_k4 = 0;
 
     if (got_k5) {
 	retval = krb5_init_context(&kcontext);