From: Volker Holfeld <volker.holfeld@e-technik.tu-chemnitz.de>
Date: Wed, 11 Apr 2001 19:57:23 +0000 (+0000)
Subject: windows-compile-fixes-20010411
X-Git-Tag: openafs-stable-1_1_0~214
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=d065b7fc5184fe5d12332a399c4314ba2f653957

windows-compile-fixes-20010411


ignore serverLog on nt

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

correct typo for nt

====================

update volinfo -filenames feature for nt
---

diff --git a/src/rx/rx_lwp.c b/src/rx/rx_lwp.c
index a5bfb4e..63ad212 100644
--- a/src/rx/rx_lwp.c
+++ b/src/rx/rx_lwp.c
@@ -258,7 +258,7 @@ void rxi_ListenerProc(rfds, tnop, newcallp)
 				rxi_FreePacket(p);
 			    }
 			    if (swapNameProgram) {
-				(*swapNameProgram)(rx_listnerPid, &name, 0);
+				(*swapNameProgram)(rx_listenerPid, &name, 0);
 				rx_listenerPid = 0;
 			    }
 			    return;
diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index 240e457..079c7d2 100644
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -115,7 +115,7 @@ void FSLog (const char *format, ...)
 	    write(serverLogFD, tbuffer, len);
     UNLOCK_SERVERLOG();
 
-#if !defined(AFS_PTHREAD_ENV)
+#if !defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
     if ( ! serverLogSyslog ) {
         fflush(stdout);
         fflush(stderr);     /* in case they're sharing the same FD */
@@ -192,12 +192,12 @@ int OpenLog(const char *fileName)
     struct tm *TimeFields;
     char FileName[MAXPATHLEN]; 
 
-    if ( serverLogSyslog ) {
 #ifndef AFS_NT40_ENV
+    if ( serverLogSyslog ) {
 	openlog(NULL, LOG_PID, serverLogSyslogFacility);
 	return;
-#endif
     }
+#endif
 
     if (mrafsStyleLogs) {
         TM_GetTimeOfDay(&Start, 0);
@@ -254,9 +254,11 @@ int ReOpenLog(const char *fileName)
     if (access(fileName, F_OK)==0)
 	return 0; /* exists, no need to reopen. */
 
+#if !defined(AFS_NT40_ENV)
     if ( serverLogSyslog ) {
 	return 0;
     }
+#endif
 
 #if defined(AFS_PTHREAD_ENV)
     LOCK_SERVERLOG();
diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c
index 7bbc9c6..770f06d 100644
--- a/src/vol/vol-info.c
+++ b/src/vol/vol-info.c
@@ -807,7 +807,11 @@ void PrintVnode(int offset, VnodeDiskObject *vnode, int vnodeNumber, Inode ino)
 {
 #if defined(AFS_NAMEI_ENV)
     IHandle_t *ihtmpp;
+#if !defined(AFS_NT40_ENV)
     namei_t filename;
+#else
+    char filename[MAX_PATH];
+#endif
 #endif
     Vvnodesize += vnode->length;
     if (dsizeOnly) return;
@@ -821,8 +825,13 @@ void PrintVnode(int offset, VnodeDiskObject *vnode, int vnodeNumber, Inode ino)
 #if defined(AFS_NAMEI_ENV)
     if(PrintFileNames) {
 	    IH_INIT(ihtmpp, V_device(vp), V_parentId(vp), ino);
+#if !defined(AFS_NT40_ENV)
 	    namei_HandleToName(&filename, ihtmpp);
 	    printf(" UFS-Filename: %s",filename.n_path);
+#else
+	    nt_HandleToName(filename, ihtmpp);
+	    printf(" NTFS-Filename: %s",filename);
+#endif
     }
 #endif
     printf("\n");