From ff8554593ffb580a43b3d0e45d9b8ee1455a8fac Mon Sep 17 00:00:00 2001
From: Eric Williams <ericjw@umich.edu>
Date: Wed, 15 Jun 2005 19:51:54 +0000
Subject: [PATCH] afsifs-both-20050615

this patchset makes it build both ways.
---
 src/WINNT/afsd/cm_ioctl.c |  2 +-
 src/sys/pioctl_nt.c       | 23 +----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c
index 29b83c9b8..bd1cd6368 100644
--- a/src/WINNT/afsd/cm_ioctl.c
+++ b/src/WINNT/afsd/cm_ioctl.c
@@ -42,7 +42,7 @@
 #include "cm_rpc.h"
 #include <strsafe.h>
 #include <winioctl.h>
-#include <WINNT\afsrdr\kif.h>
+#include <..\afsrdr\kif.h>
 
 #ifdef _DEBUG
 #include <crtdbg.h>
diff --git a/src/sys/pioctl_nt.c b/src/sys/pioctl_nt.c
index 333c3dca6..67da815e8 100644
--- a/src/sys/pioctl_nt.c
+++ b/src/sys/pioctl_nt.c
@@ -66,7 +66,7 @@ RCSID
 #include <pioctl_nt.h>
 #include <WINNT/afsreg.h>
 #include <lanahelper.h>
-#include <WINNT/afsrdr/kif.h>
+#include <../WINNT/afsrdr/kif.h>
 
 #include <loadfuncs-krb5.h>
 #include <krb5.h>
@@ -824,7 +824,6 @@ fs_GetFullPath(char *pathp, char *outPathp, long outSize)
     /* now get the absolute path to the current wdir in this drive */
     GetCurrentDirectory(sizeof(tpath), tpath);
     if (tpath[1] == ':')
-#ifndef AFSIFS
         strcpy(outPathp, tpath + 2);	/* skip drive letter */
     else if ( tpath[0] == '\\' && tpath[1] == '\\') {
         /* UNC path - strip off the server and sharename */
@@ -839,26 +838,6 @@ fs_GetFullPath(char *pathp, char *outPathp, long outSize)
         } else {
             strcpy(outPathp,&tpath[--i]);
         }
-#else
-		{
-		HANDLE rootDir;
-
-        strcpy(outPathp, tpath);
-
-		sprintf(outPathp, "%c:\\", tpath[0]);
-		rootDir = CreateFile(outPathp, 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
-
-		if (!DeviceIoControl(rootDir, IOCTL_AFSRDR_GET_PATH, NULL, 0, absRoot_w, 100*sizeof(wchar_t), &length, NULL))
-			{
-			CloseHandle(rootDir);
-			return CM_ERROR_NOSUCHPATH;
-			}
-		CloseHandle(rootDir);
-
-		ifs_ConvertFileName(absRoot_w, length/sizeof(wchar_t), absRoot, 100);
-
-		}
-#endif
     } else {
         /* this should never happen */
         strcpy(outPathp, tpath);
-- 
2.39.5