From: Jeffrey Altman Date: Thu, 26 Jun 2008 15:38:23 +0000 (+0000) Subject: DEVEL15-windows-no-more-djgpp-20080626 X-Git-Tag: openafs-devel-1_5_50~81 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4af511a43aecf7649cc90627f8c02ef7af3cf2df;p=packages%2Fo%2Fopenafs.git DEVEL15-windows-no-more-djgpp-20080626 LICENSE MIT This patch is only for the 1.5 branch and just for the afsd directory. Remove all references to DJGPP preprocessor symbol in order to make application of commits from head easier. --- diff --git a/src/WINNT/afsd/afsd.h b/src/WINNT/afsd/afsd.h index 43d7a1792..0067a7ced 100644 --- a/src/WINNT/afsd/afsd.h +++ b/src/WINNT/afsd/afsd.h @@ -14,22 +14,13 @@ #include -#ifndef DJGPP BOOL InitClass(HANDLE); BOOL InitInstance(HANDLE, int); LONG APIENTRY MainWndProc(HWND, unsigned int, unsigned int, long); BOOL APIENTRY About(HWND, unsigned int, unsigned int, long); -#endif /* !DJGPP */ -#ifndef DJGPP #include -#else /* DJGPP */ -#include -#include -#include "dosdefs95.h" -#include "largeint95.h" -#endif /* !DJGPP */ #include "cm.h" @@ -67,11 +58,7 @@ BOOL APIENTRY About(HWND, unsigned int, unsigned int, long); #include "cm_nls.h" #include "smb_ioctl.h" #include "afsd_init.h" -#ifdef DJGPP -#include "afs/afsmsg95.h" -#else #include "afsd_eventlog.h" -#endif #define AFS_DAEMON_SERVICE_NAME AFSREG_CLT_SVC_NAME diff --git a/src/WINNT/afsd/afsd95.c b/src/WINNT/afsd/afsd95.c index 2b77da329..a1eabb384 100644 --- a/src/WINNT/afsd/afsd95.c +++ b/src/WINNT/afsd/afsd95.c @@ -113,13 +113,7 @@ BOOL InitInstance(struct cmd_syndesc *as, char *arock) long code; char *reason; -#ifdef DJGPP - osi_Init(); -#endif - -#ifndef DJGPP osi_InitPanic(afsd_notifier); -#endif /*sleep(10);*/ @@ -149,20 +143,6 @@ BOOL InitInstance(struct cmd_syndesc *as, char *arock) afs_current_status = AFS_STATUS_RUNNING; afsMsg_StatusChange(afs_current_status, 0, NULL); -#ifdef DJGPP - /* Keep the process from just terminating */ - while(afs_shutdown == 0) - { - /*IOMGR_Sleep(180);*/ - IOMGR_Sleep(8); - /* workaround: WaitForKeystroke(nonzero num) calls - IOMGR_Select, though Win95 select works only on sockets */ - /* so, we poll instead */ - /*if (LWP_WaitForKeystroke(0)) - break;*/ - } - afsd_shutdown(0); -#endif afs_exit(0); return (TRUE); diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c index d1aaaba00..bef18a152 100644 --- a/src/WINNT/afsd/afsd_init.c +++ b/src/WINNT/afsd/afsd_init.c @@ -390,7 +390,6 @@ configureBackConnectionHostNames(void) } -#if !defined(DJGPP) static void afsd_InitServerPreferences(void) { HKEY hkPrefs = 0; @@ -540,7 +539,6 @@ static void afsd_InitServerPreferences(void) RegCloseKey(hkPrefs); } } -#endif /* DJGPP */ /* * AFSD Initialization @@ -1354,9 +1352,7 @@ int afsd_InitCM(char **reasonP) /* Initialize the RPC server for session keys */ RpcInit(); -#if !defined(DJGPP) afsd_InitServerPreferences(); -#endif return 0; } diff --git a/src/WINNT/afsd/afsd_init.h b/src/WINNT/afsd/afsd_init.h index 67c5646f6..c022b5dc1 100644 --- a/src/WINNT/afsd/afsd_init.h +++ b/src/WINNT/afsd/afsd_init.h @@ -9,15 +9,10 @@ void afsi_start(); -#ifndef DJGPP int afsd_InitCM(char **reasonP); int afsd_InitSMB(char **reasonP, void *aMBfunc); void GenerateMiniDump(PEXCEPTION_POINTERS ep); -#else /* DJGPP */ -int afsd_InitCM(char **reasonP, struct cmd_syndesc *as, char *arock); -int afsd_InitSMB(char **reasonP); -#endif /* !DJGPP */ int afsd_InitDaemons(char **reasonP); int afsd_ShutdownCM(void); void afsd_ForceTrace(BOOL flush); diff --git a/src/WINNT/afsd/afsd_init95.c b/src/WINNT/afsd/afsd_init95.c index 7ae3e0851..11acadbe4 100644 --- a/src/WINNT/afsd/afsd_init95.c +++ b/src/WINNT/afsd/afsd_init95.c @@ -324,7 +324,6 @@ int afsd_InitCM(char **reasonP, struct cmd_syndesc *as, char *arock) WSAStartup(0x0101, &WSAjunk);*/ -#ifndef DJGPP /* setup osidebug server at RPC slot 1000 */ osi_LongToUID(1000, &debugID); code = osi_InitDebug(&debugID); @@ -334,18 +333,9 @@ int afsd_InitCM(char **reasonP, struct cmd_syndesc *as, char *arock) *reasonP = "unknown error"; return -1; } -#endif /* who are we ? */ gethostname(cm_HostName, sizeof(cm_HostName)); -#ifdef DJGPP - /* For some reason, we may be getting space-padded hostnames. - If so, we take out the padding so that we can append -AFS later. */ - { - char *space = strchr(cm_HostName,' '); - if (space) *space = '\0'; - } -#endif afsi_log("gethostname %s", cm_HostName); thp = gethostbyname(cm_HostName); memcpy(&cm_HostAddr, thp->h_addr_list[0], 4); diff --git a/src/WINNT/afsd/cm_access.c b/src/WINNT/afsd/cm_access.c index dc4ce7c00..85ba6c8a9 100644 --- a/src/WINNT/afsd/cm_access.c +++ b/src/WINNT/afsd/cm_access.c @@ -10,16 +10,12 @@ #include #include -#ifndef DJGPP #include #include -#endif #include #include #include -#ifndef DJGPP #include -#endif #include #include "afsd.h" diff --git a/src/WINNT/afsd/cm_aclent.c b/src/WINNT/afsd/cm_aclent.c index cc60e9b19..c010982f0 100644 --- a/src/WINNT/afsd/cm_aclent.c +++ b/src/WINNT/afsd/cm_aclent.c @@ -10,9 +10,7 @@ #include #include -#ifndef DJGPP #include -#endif #include #include #include diff --git a/src/WINNT/afsd/cm_buf.c b/src/WINNT/afsd/cm_buf.c index 9f14fe3af..2689a8e44 100644 --- a/src/WINNT/afsd/cm_buf.c +++ b/src/WINNT/afsd/cm_buf.c @@ -12,9 +12,7 @@ #include #include -#ifndef DJGPP #include -#endif #include #include #include @@ -225,12 +223,8 @@ void buf_IncrSyncer(long parm) while (buf_ShutdownFlag == 0) { if (!wasDirty) { -#ifndef DJGPP i = SleepEx(5000, 1); if (i != 0) continue; -#else - thrd_Sleep(5000); -#endif /* DJGPP */ } wasDirty = 0; @@ -481,9 +475,7 @@ long buf_Init(int newFile, cm_buf_ops_t *opsp, afs_uint64 nbuffers) "buf_IncrSyncer"); osi_assertx(phandle != NULL, "buf: can't create incremental sync proc"); -#ifndef DJGPP CloseHandle(phandle); -#endif /* !DJGPP */ } #ifdef TESTING diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c index 60dd6a05f..16494231c 100644 --- a/src/WINNT/afsd/cm_callback.c +++ b/src/WINNT/afsd/cm_callback.c @@ -11,12 +11,8 @@ #include #include -#ifndef DJGPP #include #include -#else -#include -#endif /* !DJGPP */ #include #include #include diff --git a/src/WINNT/afsd/cm_cell.c b/src/WINNT/afsd/cm_cell.c index 59cbd23ce..bd605e381 100644 --- a/src/WINNT/afsd/cm_cell.c +++ b/src/WINNT/afsd/cm_cell.c @@ -10,11 +10,9 @@ #include #include -#ifndef DJGPP #include #include #include -#endif /* !DJGPP */ #include #include #include diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c index a1e940b38..c41380122 100644 --- a/src/WINNT/afsd/cm_conn.c +++ b/src/WINNT/afsd/cm_conn.c @@ -10,9 +10,7 @@ #include #include -#ifndef DJGPP #include -#endif /* !DJGPP */ #include #include #include @@ -113,11 +111,7 @@ void cm_InitConn(void) void cm_InitReq(cm_req_t *reqp) { memset((char *)reqp, 0, sizeof(cm_req_t)); -#ifndef DJGPP reqp->startTime = GetTickCount(); -#else - gettimeofday(&reqp->startTime, NULL); -#endif } static long cm_GetServerList(struct cm_fid *fidp, struct cm_user *userp, @@ -216,12 +210,7 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp, * and retry */ /* timeleft - get if from reqp the same way as cmXonnByMServers does */ -#ifndef DJGPP timeUsed = (GetTickCount() - reqp->startTime) / 1000; -#else - gettimeofday(&now, NULL); - timeUsed = sub_time(now, reqp->startTime) / 1000; -#endif /* leave 5 seconds margin for sleep */ if (reqp->flags & CM_REQ_NORETRY) @@ -429,44 +418,30 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp, { char addr[16]; char *format; -#ifndef DJGPP DWORD msgID; -#endif switch ( errorCode ) { case VNOVOL: -#ifndef DJGPP msgID = MSG_SERVER_REPORTS_VNOVOL; -#endif format = "Server %s reported volume %d as not attached."; break; case VMOVED: -#ifndef DJGPP msgID = MSG_SERVER_REPORTS_VMOVED; -#endif format = "Server %s reported volume %d as moved."; break; case VOFFLINE: -#ifndef DJGPP msgID = MSG_SERVER_REPORTS_VOFFLINE; -#endif format = "Server %s reported volume %d as offline."; break; case VSALVAGE: -#ifndef DJGPP msgID = MSG_SERVER_REPORTS_VSALVAGE; -#endif format = "Server %s reported volume %d as needs salvage."; break; case VNOSERVICE: -#ifndef DJGPP msgID = MSG_SERVER_REPORTS_VNOSERVICE; -#endif format = "Server %s reported volume %d as not in service."; break; case VIO: -#ifndef DJGPP msgID = MSG_SERVER_REPORTS_VIO; -#endif format = "Server %s reported volume %d as temporarily unaccessible."; break; } @@ -480,9 +455,7 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp, ((serverp->addr.sin_addr.s_addr & 0xff000000)>> 24)); osi_Log2(afsd_logp, format, osi_LogSaveString(afsd_logp,addr), fidp->volume); -#ifndef DJGPP LogEvent(EVENTLOG_WARNING_TYPE, msgID, addr, fidp->volume); -#endif } /* Mark server offline for this volume */ @@ -584,9 +557,7 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp, ((serverp->addr.sin_addr.s_addr & 0xff0000)>> 16), ((serverp->addr.sin_addr.s_addr & 0xff000000)>> 24)); -#ifndef DJGPP LogEvent(EVENTLOG_WARNING_TYPE, MSG_RX_HARD_DEAD_TIME_EXCEEDED, addr); -#endif /* !DJGPP */ osi_Log1(afsd_logp, "cm_Analyze: hardDeadTime exceeded addr[%s]", osi_LogSaveString(afsd_logp,addr)); @@ -794,9 +765,6 @@ long cm_ConnByMServers(cm_serverRef_t *serversp, cm_user_t *usersp, long firstError = 0; int someBusy = 0, someOffline = 0, allOffline = 1, allBusy = 1, allDown = 1; long timeUsed, timeLeft, hardTimeLeft; -#ifdef DJGPP - struct timeval now; -#endif /* DJGPP */ *connpp = NULL; @@ -805,12 +773,7 @@ long cm_ConnByMServers(cm_serverRef_t *serversp, cm_user_t *usersp, return CM_ERROR_ALLDOWN; } -#ifndef DJGPP timeUsed = (GetTickCount() - reqp->startTime) / 1000; -#else - gettimeofday(&now, NULL); - timeUsed = sub_time(now, reqp->startTime) / 1000; -#endif /* leave 5 seconds margin of safety */ timeLeft = ConnDeadtimeout - timeUsed - 5; diff --git a/src/WINNT/afsd/cm_daemon.c b/src/WINNT/afsd/cm_daemon.c index 1c94ee235..a49c2891c 100644 --- a/src/WINNT/afsd/cm_daemon.c +++ b/src/WINNT/afsd/cm_daemon.c @@ -10,13 +10,9 @@ #include #include -#ifndef DJGPP #include #include #include -#else -#include -#endif /* !DJGPP */ #include #include #include @@ -58,7 +54,6 @@ static EVENT_HANDLE cm_IPAddrDaemon_ShutdownEvent = NULL; static EVENT_HANDLE cm_BkgDaemon_ShutdownEvent[CM_MAX_DAEMONS] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -#ifndef DJGPP void cm_IpAddrDaemon(long parm) { extern void smb_CheckVCs(void); @@ -85,7 +80,6 @@ void cm_IpAddrDaemon(long parm) thrd_SetEvent(cm_IPAddrDaemon_ShutdownEvent); } -#endif void cm_BkgDaemon(void * parm) { @@ -610,13 +604,11 @@ void cm_InitDaemon(int nDaemons) lock_InitializeRWLock(&cm_daemonLock, "cm_daemonLock"); osi_EndOnce(&once); -#ifndef DJGPP /* creating IP Address Change monitor daemon */ phandle = thrd_Create((SecurityAttrib) 0, 0, (ThreadFunc) cm_IpAddrDaemon, 0, 0, &pid, "cm_IpAddrDaemon"); osi_assertx(phandle != NULL, "cm_IpAddrDaemon thread creation failure"); thrd_CloseHandle(phandle); -#endif /* DJGPP */ /* creating pinging daemon */ phandle = thrd_Create((SecurityAttrib) 0, 0, diff --git a/src/WINNT/afsd/cm_dcache.c b/src/WINNT/afsd/cm_dcache.c index 38d64289e..3b7ffb358 100644 --- a/src/WINNT/afsd/cm_dcache.c +++ b/src/WINNT/afsd/cm_dcache.c @@ -10,11 +10,9 @@ #include #include -#ifndef DJGPP #include #include #include -#endif /* !DJGPP */ #ifdef COMMENT #include #endif diff --git a/src/WINNT/afsd/cm_dir.c b/src/WINNT/afsd/cm_dir.c index 6ae867309..a49872de1 100644 --- a/src/WINNT/afsd/cm_dir.c +++ b/src/WINNT/afsd/cm_dir.c @@ -10,9 +10,7 @@ #include #include -#ifndef DJGPP #include -#endif /* !DJGPP */ #include #include #include diff --git a/src/WINNT/afsd/cm_dnlc.c b/src/WINNT/afsd/cm_dnlc.c index acb9029d9..7cb8afce4 100644 --- a/src/WINNT/afsd/cm_dnlc.c +++ b/src/WINNT/afsd/cm_dnlc.c @@ -18,10 +18,8 @@ #include #include -#ifndef DJGPP #include #include -#endif /* !DJGPP */ #include #include #include diff --git a/src/WINNT/afsd/cm_dns.c b/src/WINNT/afsd/cm_dns.c index cc390e512..2cd822fa4 100644 --- a/src/WINNT/afsd/cm_dns.c +++ b/src/WINNT/afsd/cm_dns.c @@ -11,10 +11,8 @@ #include #include #include -#ifndef DJGPP #include #include -#endif #include "cm_dns_private.h" #include "cm_dns.h" #include "cm_nls.h" @@ -29,9 +27,6 @@ /*extern void afsi_log(char *pattern, ...);*/ static char dns_addr[30]; -#ifdef DJGPP -extern char cm_confDir[]; -#endif static int cm_dnsEnabled = -1; void DNSlowerCase(char *str) @@ -60,16 +55,8 @@ int cm_InitDNS(int enabled) strcpy(dns_addr, addr); } else { /* Now check for the AFSDNS.INI file */ -#ifdef DJGPP - strcpy(configpath, cm_confDir); -#elif defined(AFS_WIN95_ENV) - char *path = getenv("AFSCONF"); - if (path) strcpy(configpath, path); - else strcpy(configpath, "c:\\afscli"); -#else /* nt */ code = GetWindowsDirectory(configpath, sizeof(configpath)); if (code == 0 || code > sizeof(configpath)) return -1; -#endif strcat(configpath, "\\afsdns.ini"); /* Currently we only get (and query) the first nameserver. Getting @@ -666,14 +653,6 @@ int getAFSServer(char *cellName, int *cellHostAddrs, char cellHostNames[][MAXHOS return (-1); } -#ifdef DJGPP - /* the win95 sock.vxd will not allow sendto for unbound sockets, - * so just bind to nothing and it works */ - - __djgpp_set_socket_blocking_mode(commSock, 0); - bind(commSock,0,sizeof( SOCKADDR_IN ) ); -#endif /* DJGPP */ - strncpy(query, cellName, 1024); query[1023] = 0; if (query[strlen(query)-1] != '.') { diff --git a/src/WINNT/afsd/cm_dns_private.h b/src/WINNT/afsd/cm_dns_private.h index 1344fe0dc..d1c44cb2b 100644 --- a/src/WINNT/afsd/cm_dns_private.h +++ b/src/WINNT/afsd/cm_dns_private.h @@ -9,15 +9,6 @@ #ifndef __DNS_AFS_private_h_env_ #define __DNS_AFS_private_h_env_ -#ifdef DJGPP -#include -#include -#include -#include -/*#else - #include */ -#endif - #ifdef KERNEL #define SOCKET struct osi_socket * #else @@ -29,80 +20,6 @@ #include #include - -#ifdef DJGPP - -char *inet_ntoa(struct in_addr in) -{ - static char out[256]; - char temp[20]; - unsigned long sVal,pVal; - - out[0] = '\0'; - - - pVal = ntohl(in.s_addr); - - sVal = pVal; - sVal >>= 24; - sprintf(out,"%ld",sVal); - - sVal = pVal; - sVal <<= 8; - sVal >>= 24; - sprintf(out,"%s.%ld",out,sVal); - - sVal = pVal; - sVal <<= 16; - sVal >>= 24; - sprintf(out,"%s.%ld",out,sVal); - - sVal = pVal; - sVal <<= 24; - sVal >>= 24; - sprintf(out,"%s.%ld",out,sVal); - - return(&out[0]); -} - -unsigned long inet_addr(const char *cp) -{ - - unsigned long val=0; - unsigned char sVal; - - char cp2[256]; - - char* ptr = cp2; - int i; - int len; - - strcpy(cp2,cp); - - for (i=0; i<=strlen(cp); i++) - { - if (cp2[i] == '.') - { - cp2[i] = '\0'; - sVal = atoi(ptr); - ptr = &cp2[i+1]; - val = val << 8; - val &= 0xffffff00; - val |= sVal; - //printf("%x\t%lx\n",sVal,val); - }; - }; - sVal = atoi(ptr); - val = val << 8; - val &= 0xffffff00; - val |= sVal; - //printf("%x\t%lx\n",sVal,val); - - return htonl(val); -} - -#endif /* DJGPP */ - #define BUFSIZE 2048 /* diff --git a/src/WINNT/afsd/cm_freelance.c b/src/WINNT/afsd/cm_freelance.c index f5c5a2c24..70290899f 100644 --- a/src/WINNT/afsd/cm_freelance.c +++ b/src/WINNT/afsd/cm_freelance.c @@ -1,13 +1,9 @@ #include #include -#ifndef DJGPP #include #include #include -#else -#include -#endif /* !DJGPP */ #include #include #include @@ -34,14 +30,11 @@ int cm_freelanceEnabled = 1; time_t FakeFreelanceModTime = 0x3b49f6e2; static int freelance_ShutdownFlag = 0; -#if !defined(DJGPP) static HANDLE hFreelanceChangeEvent = 0; static HANDLE hFreelanceSymlinkChangeEvent = 0; -#endif void cm_InitFakeRootDir(); -#if !defined(DJGPP) void cm_FreelanceChangeNotifier(void * parmp) { HKEY hkFreelance = 0; @@ -131,25 +124,20 @@ void cm_FreelanceSymlinkChangeNotifier(void * parmp) { } } } -#endif void cm_FreelanceShutdown(void) { freelance_ShutdownFlag = 1; -#if !defined(DJGPP) if (hFreelanceChangeEvent != 0) thrd_SetEvent(hFreelanceChangeEvent); if (hFreelanceSymlinkChangeEvent != 0) thrd_SetEvent(hFreelanceSymlinkChangeEvent); -#endif } void cm_InitFreelance() { -#if !defined(DJGPP) thread_t phandle; int lpid; -#endif lock_InitializeMutex(&cm_Freelance_Lock, "Freelance Lock"); @@ -162,7 +150,6 @@ void cm_InitFreelance() { cm_InitFakeRootDir(); // --- end of yj code -#if !defined(DJGPP) /* Start the registry monitor */ phandle = thrd_Create(NULL, 65536, (ThreadFunc) cm_FreelanceChangeNotifier, NULL, 0, &lpid, "cm_FreelanceChangeNotifier"); @@ -173,7 +160,6 @@ void cm_InitFreelance() { NULL, 0, &lpid, "cm_FreelanceSymlinkChangeNotifier"); osi_assertx(phandle != NULL, "cm_FreelanceSymlinkChangeNotifier thread create failure"); thrd_CloseHandle(phandle); -#endif } /* yj: Initialization of the fake root directory */ @@ -469,16 +455,13 @@ long cm_InitLocalMountPoints() { char hdir[260]; long code; char rootCellName[256]; -#if !defined(DJGPP) HKEY hkFreelance = 0, hkFreelanceSymlinks = 0; DWORD dwType, dwSize; DWORD dwMountPoints = 0; DWORD dwIndex; DWORD dwSymlinks = 0; FILETIME ftLastWriteTime; -#endif -#if !defined(DJGPP) if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, AFSREG_CLT_OPENAFS_SUBKEY "\\Freelance", 0, @@ -670,7 +653,6 @@ long cm_InitLocalMountPoints() { RegCloseKey(hkFreelance); return 0; } -#endif /* What follows is the old code to read freelance mount points * out of a text file modified to copy the data into the registry @@ -687,7 +669,6 @@ long cm_InitLocalMountPoints() { fp = fopen(hdir, "r"); } -#if !defined(DJGPP) RegCreateKeyEx( HKEY_LOCAL_MACHINE, AFSREG_CLT_OPENAFS_SUBKEY "\\Freelance", 0, @@ -698,12 +679,9 @@ long cm_InitLocalMountPoints() { &hkFreelance, NULL); dwIndex = 0; -#endif if (!fp) { -#if !defined(DJGPP) RegCloseKey(hkFreelance); -#endif rootCellName[0] = '.'; code = cm_GetRootCellName(&rootCellName[1]); if (code == 0) { @@ -760,7 +738,6 @@ long cm_InitLocalMountPoints() { if (t2) *(t2+1) = '\0'; -#if !defined(DJGPP) if ( hkFreelance ) { char szIndex[16]; /* we are migrating to the registry */ @@ -769,7 +746,6 @@ long cm_InitLocalMountPoints() { dwSize = (DWORD)strlen(line) + 1; RegSetValueEx( hkFreelance, szIndex, 0, dwType, line, dwSize); } -#endif // line is not empty, so let's parse it t = strchr(line, '#'); @@ -796,12 +772,10 @@ long cm_InitLocalMountPoints() { aLocalMountPoint++; } fclose(fp); -#if !defined(DJGPP) if ( hkFreelance ) { RegCloseKey(hkFreelance); DeleteFile(hdir); } -#endif return 0; } @@ -809,7 +783,6 @@ int cm_getNoLocalMountPoints() { return cm_noLocalMountPoints; } -#if !defined(DJGPP) long cm_FreelanceMountPointExists(char * filename, int prefix_ok) { char* cp; @@ -969,7 +942,6 @@ long cm_FreelanceSymlinkExists(char * filename, int prefix_ok) return found; } -#endif long cm_FreelanceAddMount(char *filename, char *cellname, char *volume, int rw, cm_fid_t *fidp) { @@ -979,12 +951,10 @@ long cm_FreelanceAddMount(char *filename, char *cellname, char *volume, int rw, char fullname[200]; int n; int alias = 0; -#if !defined(DJGPP) HKEY hkFreelance = 0; DWORD dwType, dwSize; DWORD dwMountPoints; DWORD dwIndex; -#endif /* before adding, verify the cell name; if it is not a valid cell, don't add the mount point. @@ -1007,18 +977,15 @@ long cm_FreelanceAddMount(char *filename, char *cellname, char *volume, int rw, return -1; } -#if !defined(DJGPP) if ( cm_FreelanceMountPointExists(filename, 0) || cm_FreelanceSymlinkExists(filename, 0) ) return -1; -#endif osi_Log1(afsd_logp,"Freelance Adding Mount for Cell: %s", osi_LogSaveString(afsd_logp,cellname)); lock_ObtainMutex(&cm_Freelance_Lock); -#if !defined(DJGPP) if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, AFSREG_CLT_OPENAFS_SUBKEY "\\Freelance", 0, @@ -1073,7 +1040,6 @@ long cm_FreelanceAddMount(char *filename, char *cellname, char *volume, int rw, } RegCloseKey(hkFreelance); } else -#endif { cm_GetConfigDir(hfile, sizeof(hfile)); strcat(hfile, AFS_FREELANCE_INI); @@ -1110,16 +1076,13 @@ long cm_FreelanceRemoveMount(char *toremove) char hfile[260], hfile2[260]; FILE *fp1, *fp2; int found=0; -#if !defined(DJGPP) HKEY hkFreelance = 0; DWORD dwType, dwSize; DWORD dwMountPoints; DWORD dwIndex; -#endif lock_ObtainMutex(&cm_Freelance_Lock); -#if !defined(DJGPP) if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, AFSREG_CLT_OPENAFS_SUBKEY "\\Freelance", 0, @@ -1161,7 +1124,6 @@ long cm_FreelanceRemoveMount(char *toremove) } RegCloseKey(hkFreelance); } else -#endif { cm_GetConfigDir(hfile, sizeof(hfile)); strcat(hfile, AFS_FREELANCE_INI); @@ -1217,12 +1179,10 @@ long cm_FreelanceAddSymlink(char *filename, char *destination, cm_fid_t *fidp) char line[512]; char fullname[200]; int alias = 0; -#if !defined(DJGPP) HKEY hkFreelanceSymlinks = 0; DWORD dwType, dwSize; DWORD dwSymlinks; DWORD dwIndex; -#endif /* before adding, verify the filename. If it is already in use, either as * as mount point or a cellname, do not permit the creation of the symlink. @@ -1245,15 +1205,12 @@ long cm_FreelanceAddSymlink(char *filename, char *destination, cm_fid_t *fidp) return CM_ERROR_EXISTS; } -#if !defined(DJGPP) if ( cm_FreelanceMountPointExists(filename, 0) || cm_FreelanceSymlinkExists(filename, 0) ) return CM_ERROR_EXISTS; -#endif lock_ObtainMutex(&cm_Freelance_Lock); -#if !defined(DJGPP) if (RegCreateKeyEx( HKEY_LOCAL_MACHINE, AFSREG_CLT_OPENAFS_SUBKEY "\\Freelance\\Symlinks", 0, @@ -1308,7 +1265,6 @@ long cm_FreelanceAddSymlink(char *filename, char *destination, cm_fid_t *fidp) } RegCloseKey(hkFreelanceSymlinks); } -#endif lock_ReleaseMutex(&cm_Freelance_Lock); /* cm_reInitLocalMountPoints(); */ @@ -1324,16 +1280,13 @@ long cm_FreelanceRemoveSymlink(char *toremove) char line[512]; char shortname[200]; int found=0; -#if !defined(DJGPP) HKEY hkFreelanceSymlinks = 0; DWORD dwType, dwSize; DWORD dwSymlinks; DWORD dwIndex; -#endif lock_ObtainMutex(&cm_Freelance_Lock); -#if !defined(DJGPP) if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, AFSREG_CLT_OPENAFS_SUBKEY "\\Freelance\\Symlinks", 0, @@ -1373,7 +1326,6 @@ long cm_FreelanceRemoveSymlink(char *toremove) } RegCloseKey(hkFreelanceSymlinks); } -#endif lock_ReleaseMutex(&cm_Freelance_Lock); if (found) { diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c index 2dd945de2..2f0cb7356 100644 --- a/src/WINNT/afsd/cm_ioctl.c +++ b/src/WINNT/afsd/cm_ioctl.c @@ -13,11 +13,7 @@ #include #include -#ifndef DJGPP #include -#else -#include -#endif /* !DJGPP */ #include #include #include @@ -33,13 +29,8 @@ #include "smb.h" -#ifndef DJGPP #include #include "afsrpc.h" -#else -#include -#include "afsrpc95.h" -#endif #include "cm_rpc.h" #include @@ -193,19 +184,10 @@ void cm_ResetACLCache(cm_user_t *userp) */ void TranslateExtendedChars(char *str) { -#ifdef DJGPP - char *p; -#endif - if (!str || !*str) return; -#ifndef DJGPP CharToOem(str, str); -#else - p = str; - while (*p) *p++ &= 0x7f; /* turn off high bit; probably not right */ -#endif } /* parse the passed-in file name and do a namei on it. If we fail, @@ -2585,12 +2567,11 @@ long cm_IoctlSetToken(struct smb_ioctl *ioctlp, struct cm_user *userp) osi_LogSaveString(smb_logp, uname)); } -#ifndef DJGPP /* for win95, session key is back in pioctl */ - /* uuid */ + /* for win95, session key is back in pioctl */ + /* uuid */ memcpy(&uuid, tp, sizeof(uuid)); if (!cm_FindTokenEvent(uuid, sessionKey)) return CM_ERROR_INVAL; -#endif /* !DJGPP */ } else { cellp = cm_data.rootCellp; osi_Log0(smb_logp,"cm_IoctlSetToken - no name specified"); @@ -2611,7 +2592,6 @@ long cm_IoctlSetToken(struct smb_ioctl *ioctlp, struct cm_user *userp) free(ucellp->ticketp); /* Discard old token if any */ ucellp->ticketp = malloc(ticketLen); memcpy(ucellp->ticketp, ticket, ticketLen); -#ifndef DJGPP /* * Get the session key from the RPC, rather than from the pioctl. */ @@ -2619,10 +2599,6 @@ long cm_IoctlSetToken(struct smb_ioctl *ioctlp, struct cm_user *userp) memcpy(&ucellp->sessionKey, ct.HandShakeKey, sizeof(ct.HandShakeKey)); */ memcpy(ucellp->sessionKey.data, sessionKey, sizeof(sessionKey)); -#else - /* for win95, we are getting the session key from the pioctl */ - memcpy(&ucellp->sessionKey, ct.HandShakeKey, sizeof(ct.HandShakeKey)); -#endif /* !DJGPP */ ucellp->kvno = ct.AuthHandle; ucellp->expirationTime = ct.EndTimestamp; ucellp->gen++; @@ -2700,7 +2676,6 @@ long cm_IoctlGetTokenIter(struct smb_ioctl *ioctlp, struct cm_user *userp) /* clear token */ ct.AuthHandle = ucellp->kvno; -#ifndef DJGPP /* * Don't give out a real session key here */ @@ -2708,9 +2683,6 @@ long cm_IoctlGetTokenIter(struct smb_ioctl *ioctlp, struct cm_user *userp) memcpy(ct.HandShakeKey, &ucellp->sessionKey, sizeof(ct.HandShakeKey)); */ memset(ct.HandShakeKey, 0, sizeof(ct.HandShakeKey)); -#else - memcpy(ct.HandShakeKey, &ucellp->sessionKey, sizeof(ct.HandShakeKey)); -#endif /* !DJGPP */ ct.ViceId = 37; /* XXX */ ct.BeginTimestamp = 0; /* XXX */ ct.EndTimestamp = ucellp->expirationTime; @@ -2745,9 +2717,7 @@ long cm_IoctlGetToken(struct smb_ioctl *ioctlp, struct cm_user *userp) cm_ucell_t *ucellp; struct ClearToken ct; char *tp; -#ifndef DJGPP afs_uuid_t uuid; -#endif /* !DJGPP */ cm_SkipIoctlPath(ioctlp); @@ -2761,10 +2731,8 @@ long cm_IoctlGetToken(struct smb_ioctl *ioctlp, struct cm_user *userp) return CM_ERROR_NOSUCHCELL; tp += strlen(tp) + 1; -#ifndef DJGPP /* uuid */ memcpy(&uuid, tp, sizeof(uuid)); -#endif /* !DJGPP */ lock_ObtainMutex(&userp->mx); @@ -2789,7 +2757,6 @@ long cm_IoctlGetToken(struct smb_ioctl *ioctlp, struct cm_user *userp) /* clear token */ ct.AuthHandle = ucellp->kvno; -#ifndef DJGPP /* * Don't give out a real session key here */ @@ -2797,9 +2764,6 @@ long cm_IoctlGetToken(struct smb_ioctl *ioctlp, struct cm_user *userp) memcpy(ct.HandShakeKey, &ucellp->sessionKey, sizeof(ct.HandShakeKey)); */ memset(ct.HandShakeKey, 0, sizeof(ct.HandShakeKey)); -#else - memcpy(ct.HandShakeKey, &ucellp->sessionKey, sizeof(ct.HandShakeKey)); -#endif /* !DJGPP */ ct.ViceId = 37; /* XXX */ ct.BeginTimestamp = 0; /* XXX */ ct.EndTimestamp = ucellp->expirationTime; @@ -2823,9 +2787,7 @@ long cm_IoctlGetToken(struct smb_ioctl *ioctlp, struct cm_user *userp) lock_ReleaseMutex(&userp->mx); -#ifndef DJGPP cm_RegisterNewTokenEvent(uuid, ucellp->sessionKey.data); -#endif /* !DJGPP */ return 0; } @@ -3149,16 +3111,6 @@ long cm_IoctlRxStatPeer(struct smb_ioctl *ioctlp, struct cm_user *userp) return 0; } -#ifdef DJGPP -extern int afsd_shutdown(int); -extern int afs_shutdown; - -long cm_IoctlShutdown(smb_ioctl_t *ioctlp, cm_user_t *userp) { - afs_shutdown = 1; /* flag to shut down */ - return 0; -} -#endif /* DJGPP */ - long cm_IoctlGetSMBName(smb_ioctl_t *ioctlp, cm_user_t *userp) { smb_user_t *uidp = ioctlp->uidp; diff --git a/src/WINNT/afsd/cm_rpc.c b/src/WINNT/afsd/cm_rpc.c index ad4d2a136..1fca2784f 100644 --- a/src/WINNT/afsd/cm_rpc.c +++ b/src/WINNT/afsd/cm_rpc.c @@ -15,11 +15,7 @@ #include #include -#ifndef DJGPP #include "afsrpc.h" -#else -#include "afsrpc95.h" -#endif #include "afsd.h" #include "afsd_init.h" diff --git a/src/WINNT/afsd/cm_rpc.h b/src/WINNT/afsd/cm_rpc.h index 8571ad782..89a3393ae 100644 --- a/src/WINNT/afsd/cm_rpc.h +++ b/src/WINNT/afsd/cm_rpc.h @@ -10,11 +10,7 @@ #ifndef __CM_RPC_H__ #define __CM_RPC_H__ -#ifndef DJGPP #include "afsrpc.h" -#else -#include "afsrpc95.h" -#endif void cm_RegisterNewTokenEvent(afs_uuid_t uuid, char sessionKey[8]); BOOL cm_FindTokenEvent(afs_uuid_t uuid, char sessionKey[8]); diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c index 357f74492..1f023af2e 100644 --- a/src/WINNT/afsd/cm_scache.c +++ b/src/WINNT/afsd/cm_scache.c @@ -10,11 +10,9 @@ #include #include -#ifndef DJGPP #include #include #include -#endif /* !DJGPP */ #include #include #include diff --git a/src/WINNT/afsd/cm_scache.h b/src/WINNT/afsd/cm_scache.h index cdf4419a5..ac4990b28 100644 --- a/src/WINNT/afsd/cm_scache.h +++ b/src/WINNT/afsd/cm_scache.h @@ -10,10 +10,6 @@ #ifndef __CM_SCACHE_H_ENV__ #define __CM_SCACHE_H_ENV__ 1 -#ifdef DJGPP -#include "largeint95.h" -#endif /* DJGPP */ - #define MOUNTPOINTLEN 1024 /* max path length for symlink; same as AFSPATHMAX */ typedef struct cm_fid { diff --git a/src/WINNT/afsd/cm_server.c b/src/WINNT/afsd/cm_server.c index cbf0cda9d..be2b7fd75 100644 --- a/src/WINNT/afsd/cm_server.c +++ b/src/WINNT/afsd/cm_server.c @@ -10,13 +10,9 @@ #include #include -#ifndef DJGPP #include #include #include -#else -#include -#endif /* !DJGPP */ #include #include #include diff --git a/src/WINNT/afsd/cm_server.h b/src/WINNT/afsd/cm_server.h index affaa6f67..143ff4cb2 100644 --- a/src/WINNT/afsd/cm_server.h +++ b/src/WINNT/afsd/cm_server.h @@ -10,11 +10,7 @@ #ifndef __CM_SERVER_H_ENV__ #define __CM_SERVER_H_ENV__ 1 -#ifndef DJGPP #include -#else /* DJGPP */ -#include -#endif /* !DJGPP */ #include /* this value is set to 1022 in order to */ diff --git a/src/WINNT/afsd/cm_user.c b/src/WINNT/afsd/cm_user.c index f5f33a977..d90169273 100644 --- a/src/WINNT/afsd/cm_user.c +++ b/src/WINNT/afsd/cm_user.c @@ -10,9 +10,7 @@ #include #include -#ifndef DJGPP #include -#endif /* !DJGPP */ #include #include diff --git a/src/WINNT/afsd/cm_utils.c b/src/WINNT/afsd/cm_utils.c index b86c999e2..68b03defb 100644 --- a/src/WINNT/afsd/cm_utils.c +++ b/src/WINNT/afsd/cm_utils.c @@ -11,7 +11,6 @@ #include #include -#ifndef DJGPP #include #include #ifndef EWOULDBLOCK @@ -62,7 +61,6 @@ #define ESTALE WSAESTALE #define EREMOTE WSAEREMOTE #endif /* EWOULDBLOCK */ -#endif /* !DJGPP */ #include #include diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c index bd98f5eae..8d5336154 100644 --- a/src/WINNT/afsd/cm_vnodeops.c +++ b/src/WINNT/afsd/cm_vnodeops.c @@ -10,10 +10,8 @@ #include #include -#ifndef DJGPP #include #include -#endif /* !DJGPP */ #include #include #include diff --git a/src/WINNT/afsd/cm_volume.c b/src/WINNT/afsd/cm_volume.c index b0667c155..2ed1e3cc0 100644 --- a/src/WINNT/afsd/cm_volume.c +++ b/src/WINNT/afsd/cm_volume.c @@ -10,13 +10,9 @@ #include #include -#ifndef DJGPP #include #include #include -#else -#include -#endif /* !DJGPP */ #include #include #include "afsd.h" diff --git a/src/WINNT/afsd/rawops.c b/src/WINNT/afsd/rawops.c index d999a21c0..73de291f1 100644 --- a/src/WINNT/afsd/rawops.c +++ b/src/WINNT/afsd/rawops.c @@ -321,12 +321,7 @@ long WriteData(cm_scache_t *scp, osi_hyper_t offset, long count, char *op, nbytes = count; /* don't go past end of request */ /* now copy the data */ -#ifdef DJGPP - if (dosflag) - dosmemget((dos_ptr)op, nbytes, bufferp->datap + bufIndex); - else -#endif /* DJGPP */ - memcpy(bufferp->datap + bufIndex, op, nbytes); + memcpy(bufferp->datap + bufIndex, op, nbytes); buf_SetDirty(bufferp, bufIndex, nbytes); /* and record the last writer */ diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index 33de83a8b..530aece46 100644 --- a/src/WINNT/afsd/smb.c +++ b/src/WINNT/afsd/smb.c @@ -10,16 +10,11 @@ #include #include -#ifndef DJGPP #include #pragma warning(push) #pragma warning(disable: 4005) #include #pragma warning(pop) -#else -#include -#include -#endif /* !DJGPP */ #include #include #include @@ -116,13 +111,7 @@ BOOL dead_sessions[SESSION_MAX]; LANA_ENUM lana_list; /* for raw I/O */ osi_mutex_t smb_RawBufLock; -#ifdef DJGPP -#define SMB_RAW_BUFS 4 -dos_ptr smb_RawBufs; -int smb_RawBufSel[SMB_RAW_BUFS]; -#else char *smb_RawBufs; -#endif /* DJGPP */ #define SMB_MASKFLAG_TILDE 1 #define SMB_MASKFLAG_CASEFOLD 2 @@ -134,11 +123,7 @@ typedef struct raw_write_cont { long code; osi_hyper_t offset; long count; -#ifndef DJGPP char *buf; -#else - dos_ptr buf; -#endif /* DJGPP */ int writeMode; long alreadyWritten; } raw_write_cont_t; @@ -157,11 +142,9 @@ LONG smb_UseUnicode; /* global state about V3 protocols */ int smb_useV3; /* try to negotiate V3 */ -#ifndef DJGPP static showErrors = 0; /* MessageBox or something like it */ int (_stdcall *smb_MBfunc)(HWND, LPCTSTR, LPCTSTR, UINT) = NULL; -#endif /* DJGPP */ /* GMT time info: * Time in Unix format of midnight, 1/1/1970 local time. @@ -191,21 +174,6 @@ DWORD smb_TlsRequestSlot = -1; void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, NCB *ncbp, raw_write_cont_t *rwcp); int smb_NetbiosInit(int); -#ifdef DJGPP -#ifndef AFS_WIN95_ENV -DWORD smb_ServerExceptionFilter(void); -#endif - -extern char cm_HostName[]; -extern char cm_confDir[]; -#endif - -#ifdef DJGPP -#define LPTSTR char * -#define GetComputerName(str, sizep) \ - strcpy((str), cm_HostName); \ - *(sizep) = strlen(cm_HostName) -#endif /* DJGPP */ #ifdef LOG_PACKET void smb_LogPacket(smb_packet_t *packet); @@ -560,7 +528,6 @@ static int ExtractBits(WORD bits, short start, short len) return (int)num; } -#ifndef DJGPP void ShowUnixTime(char *FuncName, time_t unixTime) { FILETIME ft; @@ -586,9 +553,7 @@ void ShowUnixTime(char *FuncName, time_t unixTime) osi_Log1(smb_logp, "%s", osi_LogSaveString(smb_logp, msg)); } } -#endif /* DJGPP */ -#ifndef DJGPP /* Determine if we are observing daylight savings time */ void GetTimeZoneInfo(BOOL *pDST, LONG *pDstBias, LONG *pBias) { @@ -631,18 +596,6 @@ void GetTimeZoneInfo(BOOL *pDST, LONG *pDstBias, LONG *pBias) */ *pDST = localDST.wHour != local.wHour; } -#else -/* Determine if we are observing daylight savings time */ -void GetTimeZoneInfo(BOOL *pDST, LONG *pDstBias, LONG *pBias) -{ - struct timeb t; - - ftime(&t); - *pDST = t.dstflag; - *pDstBias = -60; /* where can this be different? */ - *pBias = t.timezone; -} -#endif /* DJGPP */ void CompensateForSmbClientLastWriteTimeBugs(afs_uint32 *pLastWriteTime) @@ -706,7 +659,6 @@ smb_CalculateNowTZ() } #endif /* USE_NUMERIC_TIME_CONV */ -#ifndef DJGPP #ifdef USE_NUMERIC_TIME_CONV void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, time_t unixTime) { @@ -758,29 +710,7 @@ void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, time_t unixTime) SystemTimeToFileTime(&stm, largeTimep); } #endif /* USE_NUMERIC_TIME_CONV */ -#else /* DJGPP */ -void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, time_t unixTime) -{ - /* unixTime: seconds since 1/1/1970 00:00:00 GMT */ - /* FILETIME: 100ns intervals since 1/1/1601 00:00:00 ??? */ - LARGE_INTEGER *ft = (LARGE_INTEGER *) largeTimep; - LARGE_INTEGER ut; - int leap_years = 89; /* leap years betw 1/1/1601 and 1/1/1970 */ - - /* set ft to number of 100ns intervals betw 1/1/1601 and 1/1/1970 GMT */ - *ft = ConvertLongToLargeInteger(((EPOCH_YEAR-1601) * 365 + leap_years) - * 24 * 60); - *ft = LargeIntegerMultiplyByLong(*ft, 60); - *ft = LargeIntegerMultiplyByLong(*ft, 10000000); - - /* add unix time */ - ut = ConvertLongToLargeInteger(unixTime); - ut = LargeIntegerMultiplyByLong(ut, 10000000); - *ft = LargeIntegerAdd(*ft, ut); -} -#endif /* !DJGPP */ -#ifndef DJGPP #ifdef USE_NUMERIC_TIME_CONV void smb_UnixTimeFromLargeSearchTime(time_t *unixTimep, FILETIME *largeTimep) { @@ -820,27 +750,6 @@ void smb_UnixTimeFromLargeSearchTime(time_t *unixTimep, FILETIME *largeTimep) _timezone = save_timezone; } #endif /* USE_NUMERIC_TIME_CONV */ -#else /* DJGPP */ -void smb_UnixTimeFromLargeSearchTime(time_t *unixTimep, FILETIME *largeTimep) -{ - /* unixTime: seconds since 1/1/1970 00:00:00 GMT */ - /* FILETIME: 100ns intervals since 1/1/1601 00:00:00 GMT? */ - LARGE_INTEGER *ft = (LARGE_INTEGER *) largeTimep; - LARGE_INTEGER a; - int leap_years = 89; - - /* set to number of 100ns intervals betw 1/1/1601 and 1/1/1970 */ - a = ConvertLongToLargeInteger(((EPOCH_YEAR-1601) * 365 + leap_years) * 24 * 60); - a = LargeIntegerMultiplyByLong(a, 60); - a = LargeIntegerMultiplyByLong(a, 10000000); - - /* subtract it from ft */ - a = LargeIntegerSubtract(*ft, a); - - /* divide down to seconds */ - *unixTimep = LargeIntegerDivideByLong(a, 10000000); -} -#endif /* !DJGPP */ void smb_SearchTimeFromUnixTime(afs_uint32 *searchTimep, time_t unixTime) { @@ -899,12 +808,7 @@ void smb_DosUTimeFromUnixTime(afs_uint32 *dosUTimep, time_t unixTime) void smb_UnixTimeFromDosUTime(time_t *unixTimep, afs_uint32 dosTime) { -#ifndef DJGPP *unixTimep = dosTime + smb_localZero; -#else /* DJGPP */ - /* dosTime seems to be already adjusted for GMT */ - *unixTimep = dosTime; -#endif /* !DJGPP */ } smb_vc_t *smb_FindVC(unsigned short lsn, int flags, int lana) @@ -1666,72 +1570,6 @@ char VNLCUserName[] = "%LCUSERNAME%"; char VNComputerName[] = "%COMPUTERNAME%"; char VNLCComputerName[] = "%LCCOMPUTERNAME%"; -#ifdef DJGPP -/* List available shares */ -int smb_ListShares() -{ - char sbmtpath[AFSPATHMAX]; - char pathName[AFSPATHMAX]; - char shareBuf[4096]; - int num_shares=0; - char *this_share; - int len; - char *p; - int print_afs = 0; - int code; - - /*strcpy(shareNameList[num_shares], "all"); - strcpy(pathNameList[num_shares++], "/afs");*/ - fprintf(stderr, "The following shares are available:\n"); - fprintf(stderr, "Share Name (AFS Path)\n"); - fprintf(stderr, "---------------------\n"); - fprintf(stderr, "\\\\%s\\%-16s (%s)\n", smb_localNamep, "ALL", cm_mountRoot); - -#ifndef DJGPP - code = GetWindowsDirectory(sbmtpath, sizeof(sbmtpath)); - if (code == 0 || code > sizeof(sbmtpath)) return -1; -#else - strcpy(sbmtpath, cm_confDir); -#endif /* !DJGPP */ - strcat(sbmtpath, "/afsdsbmt.ini"); - len = GetPrivateProfileString("AFS Submounts", NULL, NULL, - shareBuf, sizeof(shareBuf), - sbmtpath); - if (len == 0) { - return num_shares; - } - - this_share = shareBuf; - do - { - print_afs = 0; - /*strcpy(shareNameList[num_shares], this_share);*/ - len = GetPrivateProfileString("AFS Submounts", this_share, - NULL, - pathName, AFSPATHMAX, - sbmtpath); - if (!len) - return num_shares; - p = pathName; - if (strncmp(p, cm_mountRoot, strlen(cm_mountRoot)) != 0) - print_afs = 1; - while (*p) { - if (*p == '\\') *p = '/'; /* change to / */ - p++; - } - - fprintf(stderr, "\\\\%s\\%-16s (%s%s)\n", - smb_localNamep, this_share, (print_afs ? cm_mountRoot : "\0"), - pathName); - num_shares++; - while (*this_share != 0) this_share++; /* find next NUL */ - this_share++; /* skip past the NUL */ - } while (*this_share != 0); /* stop at final NUL */ - - return num_shares; -} -#endif /* DJGPP */ - typedef struct smb_findShare_rock { char * shareName; char * match; @@ -1775,9 +1613,6 @@ int smb_FindShare(smb_vc_t *vcp, smb_user_t *uidp, char *shareName, char *var; char temp[1024]; DWORD sizeTemp; -#ifdef DJGPP - char sbmtpath[MAX_PATH]; -#endif char *p, *q; HKEY parmKey; DWORD code; @@ -1853,7 +1688,6 @@ int smb_FindShare(smb_vc_t *vcp, smb_user_t *uidp, char *shareName, } } -#ifndef DJGPP code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_OPENAFS_SUBKEY "\\Submounts", 0, KEY_QUERY_VALUE, &parmKey); if (code == ERROR_SUCCESS) { @@ -1866,12 +1700,6 @@ int smb_FindShare(smb_vc_t *vcp, smb_user_t *uidp, char *shareName, } else { len = 0; } -#else /* DJGPP */ - strcpy(sbmtpath, cm_confDir); - strcat(sbmtpath, "/afsdsbmt.ini"); - len = GetPrivateProfileString("AFS Submounts", shareName, "", - pathName, sizeof(pathName), sbmtpath); -#endif /* !DJGPP */ if (len != 0 && len != sizeof(pathName) - 1) { /* We can accept either unix or PC style AFS pathnames. Convert * Unix-style to PC style here for internal use. @@ -2239,9 +2067,6 @@ smb_dirSearch_t *smb_NewDirSearch(int isV3) static smb_packet_t *GetPacket(void) { smb_packet_t *tbp; -#ifdef DJGPP - unsigned int npar, seg, tb_sel; -#endif lock_ObtainWrite(&smb_globalLock); tbp = smb_packetFreeListp; @@ -2249,11 +2074,7 @@ static smb_packet_t *GetPacket(void) smb_packetFreeListp = tbp->nextp; lock_ReleaseWrite(&smb_globalLock); if (!tbp) { -#ifndef DJGPP tbp = calloc(sizeof(*tbp),1); -#else /* DJGPP */ - tbp = malloc(sizeof(smb_packet_t)); -#endif /* !DJGPP */ tbp->magic = SMB_PACKETMAGIC; tbp->ncbp = NULL; tbp->vcp = NULL; @@ -2267,25 +2088,6 @@ static smb_packet_t *GetPacket(void) tbp->flags = 0; tbp->spacep = NULL; tbp->stringsp = NULL; -#ifdef DJGPP - npar = SMB_PACKETSIZE >> 4; /* number of paragraphs */ - { - signed int retval = - __dpmi_allocate_dos_memory(npar, &tb_sel); /* DOS segment */ - if (retval == -1) { - osi_Log1(smb_logp, "Cannot allocate %d paragraphs of DOS memory", - npar); - osi_panic("",__FILE__,__LINE__); - } - else { - osi_Log2(smb_logp, "Allocated %d paragraphs of DOS mem at 0x%X", - npar, retval); - seg = retval; - } - } - tbp->dos_pkt = (seg * 16) + 0; /* DOS physical address */ - tbp->dos_pkt_sel = tb_sel; -#endif /* DJGPP */ } osi_assertx(tbp->magic == SMB_PACKETMAGIC, "invalid smb_packet_t magic"); @@ -2308,9 +2110,6 @@ static NCB *GetNCB(void) { smb_ncb_t *tbp; NCB *ncbp; -#ifdef DJGPP - unsigned int npar, seg, tb_sel; -#endif /* DJGPP */ lock_ObtainWrite(&smb_globalLock); tbp = smb_ncbFreeListp; @@ -2318,27 +2117,7 @@ static NCB *GetNCB(void) smb_ncbFreeListp = tbp->nextp; lock_ReleaseWrite(&smb_globalLock); if (!tbp) { -#ifndef DJGPP tbp = calloc(sizeof(*tbp),1); -#else /* DJGPP */ - tbp = malloc(sizeof(*tbp)); - npar = (sizeof(NCB)+15) >> 4; /* number of paragraphs */ - { - signed int retval = - __dpmi_allocate_dos_memory(npar, &tb_sel); /* DOS segment */ - if (retval == -1) { - osi_Log1(smb_logp, "Cannot allocate %d paragraphs of DOS mem in GetNCB", - npar); - osi_panic("",__FILE__,__LINE__); - } else { - osi_Log2(smb_logp, "Allocated %d paragraphs of DOS mem at 0x%X in GetNCB", - npar, retval); - seg = retval; - } - } - tbp->dos_ncb = (seg * 16) + 0; /* DOS physical address */ - tbp->dos_ncb_sel = tb_sel; -#endif /* !DJGPP */ tbp->magic = SMB_NCBMAGIC; } @@ -2346,9 +2125,6 @@ static NCB *GetNCB(void) memset(&tbp->ncb, 0, sizeof(NCB)); ncbp = &tbp->ncb; -#ifdef DJGPP - dos_memset(tbp->dos_ncb, 0, sizeof(NCB)); -#endif /* DJGPP */ return ncbp; } @@ -2452,10 +2228,8 @@ unsigned short smb_GetSMBParm(smb_packet_t *smbp, int parm) parm, parmCount, smbp->ncb_length); osi_Log3(smb_logp,"Bad SMB param %d out of %d, ncb len %d", parm, parmCount, smbp->ncb_length); -#ifndef DJGPP LogEvent(EVENTLOG_ERROR_TYPE, MSG_BAD_SMB_PARAM, __FILE__, __LINE__, parm, parmCount, smbp->ncb_length); -#endif /* !DJGPP */ osi_panic(s, __FILE__, __LINE__); } parmDatap = smbp->wctp + (2*parm) + 1; @@ -2502,10 +2276,8 @@ unsigned int smb_GetSMBParmLong(smb_packet_t *smbp, int parm) parm, parmCount, smbp->ncb_length); osi_Log3(smb_logp,"Bad SMB param %d out of %d, ncb len %d", parm, parmCount, smbp->ncb_length); -#ifndef DJGPP LogEvent(EVENTLOG_ERROR_TYPE, MSG_BAD_SMB_PARAM, __FILE__, __LINE__, parm, parmCount, smbp->ncb_length); -#endif /* !DJGPP */ osi_panic(s, __FILE__, __LINE__); } parmDatap = smbp->wctp + (2*parm) + 1; @@ -2526,10 +2298,8 @@ unsigned int smb_GetSMBOffsetParm(smb_packet_t *smbp, int parm, int offset) sprintf(s, "Bad SMB param %d offset %d out of %d, ncb len %d", parm, offset, parmCount, smbp->ncb_length); -#ifndef DJGPP LogEvent(EVENTLOG_ERROR_TYPE, MSG_BAD_SMB_PARAM_WITH_OFFSET, __FILE__, __LINE__, parm, offset, parmCount, smbp->ncb_length); -#endif /* !DJGPP */ osi_Log4(smb_logp, "Bad SMB param %d offset %d out of %d, ncb len %d", parm, offset, parmCount, smbp->ncb_length); osi_panic(s, __FILE__, __LINE__); @@ -2990,18 +2760,12 @@ void smb_SendPacket(smb_vc_t *vcp, smb_packet_t *inp) long code = 0; unsigned char *tp; int localNCB = 0; -#ifdef DJGPP - dos_ptr dos_ncb; -#endif /* DJGPP */ ncbp = inp->ncbp; if (ncbp == NULL) { ncbp = GetNCB(); localNCB = 1; } -#ifdef DJGPP - dos_ncb = ((smb_ncb_t *)ncbp)->dos_ncb; -#endif /* DJGPP */ memset((char *)ncbp, 0, sizeof(NCB)); @@ -3015,24 +2779,13 @@ void smb_SendPacket(smb_vc_t *vcp, smb_packet_t *inp) ncbp->ncb_lsn = (unsigned char) vcp->lsn; /* vc to use */ ncbp->ncb_lana_num = vcp->lana; ncbp->ncb_command = NCBSEND; /* op means send data */ -#ifndef DJGPP ncbp->ncb_buffer = (char *) inp;/* packet */ code = Netbios(ncbp); -#else /* DJGPP */ - ncbp->ncb_buffer = inp->dos_pkt;/* packet */ - ((smb_ncb_t*)ncbp)->orig_pkt = inp; - - /* copy header information from virtual to DOS address space */ - dosmemput((char*)inp, SMB_PACKETSIZE, inp->dos_pkt); - code = Netbios(ncbp, dos_ncb); -#endif /* !DJGPP */ if (code != 0) { const char * s = ncb_error_string(code); osi_Log2(smb_logp, "SendPacket failure code %d \"%s\"", code, s); -#ifndef DJGPP LogEvent(EVENTLOG_WARNING_TYPE, MSG_SMB_SEND_PACKET_FAILURE, s); -#endif /* !DJGPP */ lock_ObtainMutex(&vcp->mx); if (!(vcp->flags & SMB_VCFLAG_ALREADYDEAD)) { @@ -3430,12 +3183,7 @@ long smb_ReceiveCoreReadRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp cm_user_t *userp = NULL; NCB *ncbp; int rc; -#ifndef DJGPP char *rawBuf = NULL; -#else - dos_ptr rawBuf = NULL; - dos_ptr dos_ncb; -#endif /* DJGPP */ rawBuf = NULL; finalCount = 0; @@ -3505,11 +3253,7 @@ long smb_ReceiveCoreReadRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp if (smb_RawBufs) { /* Get a raw buf, from head of list */ rawBuf = smb_RawBufs; -#ifndef DJGPP smb_RawBufs = *(char **)smb_RawBufs; -#else /* DJGPP */ - smb_RawBufs = _farpeekl(_dos_ds, smb_RawBufs); -#endif /* !DJGPP */ } lock_ReleaseMutex(&smb_RawBufLock); if (!rawBuf) @@ -3519,19 +3263,11 @@ long smb_ReceiveCoreReadRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp if (fidp->flags & SMB_FID_IOCTL) { lock_ReleaseMutex(&fidp->mx); -#ifndef DJGPP rc = smb_IoctlReadRaw(fidp, vcp, inp, outp); -#else - rc = smb_IoctlReadRaw(fidp, vcp, inp, outp, rawBuf); -#endif if (rawBuf) { /* Give back raw buffer */ lock_ObtainMutex(&smb_RawBufLock); -#ifndef DJGPP *((char **) rawBuf) = smb_RawBufs; -#else /* DJGPP */ - _farpokel(_dos_ds, rawBuf, smb_RawBufs); -#endif /* !DJGPP */ smb_RawBufs = rawBuf; lock_ReleaseMutex(&smb_RawBufLock); @@ -3545,13 +3281,7 @@ long smb_ReceiveCoreReadRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp userp = smb_GetUserFromVCP(vcp, inp); -#ifndef DJGPP code = smb_ReadData(fidp, &offset, count, rawBuf, userp, &finalCount); -#else /* DJGPP */ - /* have to give ReadData flag so it will treat buffer as DOS mem. */ - code = smb_ReadData(fidp, &offset, count, (unsigned char *)rawBuf, - userp, &finalCount, TRUE /* rawFlag */); -#endif /* !DJGPP */ if (code != 0) goto send; @@ -3564,9 +3294,6 @@ long smb_ReceiveCoreReadRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp send1: ncbp = outp->ncbp; -#ifdef DJGPP - dos_ncb = ((smb_ncb_t *)ncbp)->dos_ncb; -#endif /* DJGPP */ memset((char *)ncbp, 0, sizeof(NCB)); ncbp->ncb_length = (unsigned short) finalCount; @@ -3575,22 +3302,14 @@ long smb_ReceiveCoreReadRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp ncbp->ncb_command = NCBSEND; ncbp->ncb_buffer = rawBuf; -#ifndef DJGPP code = Netbios(ncbp); -#else /* DJGPP */ - code = Netbios(ncbp, dos_ncb); -#endif /* !DJGPP */ if (code != 0) osi_Log1(smb_logp, "ReadRaw send failure code %d", code); if (rawBuf) { /* Give back raw buffer */ lock_ObtainMutex(&smb_RawBufLock); -#ifndef DJGPP *((char **) rawBuf) = smb_RawBufs; -#else /* DJGPP */ - _farpokel(_dos_ds, rawBuf, smb_RawBufs); -#endif /* !DJGPP */ smb_RawBufs = rawBuf; lock_ReleaseMutex(&smb_RawBufLock); @@ -6647,13 +6366,8 @@ long smb_ReceiveCoreClose(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) /* * smb_ReadData -- common code for Read, Read And X, and Raw Read */ -#ifndef DJGPP long smb_ReadData(smb_fid_t *fidp, osi_hyper_t *offsetp, afs_uint32 count, char *op, cm_user_t *userp, long *readp) -#else /* DJGPP */ -long smb_ReadData(smb_fid_t *fidp, osi_hyper_t *offsetp, afs_uint32 count, char *op, - cm_user_t *userp, long *readp, int dosflag) -#endif /* !DJGPP */ { osi_hyper_t offset; long code = 0; @@ -6792,12 +6506,7 @@ long smb_ReadData(smb_fid_t *fidp, osi_hyper_t *offsetp, afs_uint32 count, char if (nbytes > count) nbytes = count; /* don't go past EOF */ /* now copy the data */ -#ifdef DJGPP - if (dosflag) - dosmemput(bufferp->datap + bufIndex, nbytes, (dos_ptr)op); - else -#endif /* DJGPP */ - memcpy(op, bufferp->datap + bufIndex, nbytes); + memcpy(op, bufferp->datap + bufIndex, nbytes); /* adjust counters, pointers, etc. */ op += nbytes; @@ -6826,13 +6535,8 @@ long smb_ReadData(smb_fid_t *fidp, osi_hyper_t *offsetp, afs_uint32 count, char /* * smb_WriteData -- common code for Write and Raw Write */ -#ifndef DJGPP long smb_WriteData(smb_fid_t *fidp, osi_hyper_t *offsetp, afs_uint32 count, char *op, cm_user_t *userp, long *writtenp) -#else /* DJGPP */ -long smb_WriteData(smb_fid_t *fidp, osi_hyper_t *offsetp, afs_uint32 count, char *op, - cm_user_t *userp, long *writtenp, int dosflag) -#endif /* !DJGPP */ { osi_hyper_t offset = *offsetp; long code = 0; @@ -7026,12 +6730,7 @@ long smb_WriteData(smb_fid_t *fidp, osi_hyper_t *offsetp, afs_uint32 count, char nbytes = count; /* don't go past end of request */ /* now copy the data */ -#ifdef DJGPP - if (dosflag) - dosmemget((dos_ptr)op, nbytes, bufferp->datap + bufIndex); - else -#endif /* DJGPP */ - memcpy(bufferp->datap + bufIndex, op, nbytes); + memcpy(bufferp->datap + bufIndex, op, nbytes); buf_SetDirty(bufferp, bufIndex, nbytes); /* and record the last writer */ @@ -7213,11 +6912,7 @@ long smb_ReceiveCoreWrite(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) code = 0; while ( code == 0 && count > 0 ) { -#ifndef DJGPP code = smb_WriteData(fidp, &offset, count, op, userp, &written); -#else /* DJGPP */ - code = smb_WriteData(fidp, &offset, count, op, userp, &written, FALSE); -#endif /* !DJGPP */ if (code == 0 && written == 0) code = CM_ERROR_PARTIALWRITE; @@ -7252,11 +6947,7 @@ void smb_CompleteWriteRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, unsigned short fd; smb_fid_t *fidp; cm_user_t *userp; -#ifndef DJGPP char *rawBuf; -#else /* DJGPP */ - dos_ptr rawBuf; -#endif /* !DJGPP */ long written = 0; long code = 0; @@ -7274,16 +6965,9 @@ void smb_CompleteWriteRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, userp = smb_GetUserFromVCP(vcp, inp); -#ifndef DJGPP rawBuf = rwcp->buf; code = smb_WriteData(fidp, &rwcp->offset, rwcp->count, rawBuf, userp, &written); -#else /* DJGPP */ - rawBuf = (dos_ptr) rwcp->buf; - code = smb_WriteData(fidp, &rwcp->offset, rwcp->count, - (unsigned char *) rawBuf, userp, - &written, TRUE); -#endif /* !DJGPP */ if (rwcp->writeMode & 0x1) { /* synchronous */ smb_t *op; @@ -7306,11 +6990,7 @@ void smb_CompleteWriteRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, /* Give back raw buffer */ lock_ObtainMutex(&smb_RawBufLock); -#ifndef DJGPP *((char **)rawBuf) = smb_RawBufs; -#else /* DJGPP */ - _farpokel(_dos_ds, rawBuf, smb_RawBufs); -#endif /* !DJGPP */ smb_RawBufs = rawBuf; lock_ReleaseMutex(&smb_RawBufLock); @@ -7336,11 +7016,7 @@ long smb_ReceiveCoreWriteRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out cm_user_t *userp; char *op; unsigned short writeMode; -#ifndef DJGPP char *rawBuf; -#else /* DJGPP */ - dos_ptr rawBuf; -#endif /* !DJGPP */ fd = smb_GetSMBParm(inp, 0); totalCount = smb_GetSMBParm(inp, 1); @@ -7441,11 +7117,7 @@ long smb_ReceiveCoreWriteRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out code = 0; while ( code == 0 && count > 0 ) { -#ifndef DJGPP code = smb_WriteData(fidp, &offset, count, op, userp, &written); -#else /* DJGPP */ - code = smb_WriteData(fidp, &offset, count, op, userp, &written, FALSE); -#endif /* !DJGPP */ if (code == 0 && written == 0) code = CM_ERROR_PARTIALWRITE; @@ -7464,11 +7136,7 @@ long smb_ReceiveCoreWriteRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out if (smb_RawBufs) { /* Get a raw buf, from head of list */ rawBuf = smb_RawBufs; -#ifndef DJGPP smb_RawBufs = *(char **)smb_RawBufs; -#else /* DJGPP */ - smb_RawBufs = _farpeekl(_dos_ds, smb_RawBufs); -#endif /* !DJGPP */ } else code = CM_ERROR_USESTD; @@ -7601,11 +7269,7 @@ long smb_ReceiveCoreRead(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) *op++ = (unsigned char) (count & 0xff); *op++ = (unsigned char) ((count >> 8) & 0xff); -#ifndef DJGPP code = smb_ReadData(fidp, &offset, count, op, userp, &finalCount); -#else /* DJGPP */ - code = smb_ReadData(fidp, &offset, count, op, userp, &finalCount, FALSE); -#endif /* !DJGPP */ /* fix some things up */ smb_SetSMBParm(outp, 0, finalCount); @@ -8045,10 +7709,8 @@ void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, /* Sanity check */ if (ncbp->ncb_length < offsetof(struct smb, vdata)) { /* log it and discard it */ -#ifndef DJGPP LogEvent(EVENTLOG_WARNING_TYPE, MSG_BAD_SMB_TOO_SHORT, __FILE__, __LINE__, ncbp->ncb_length); -#endif /* !DJGPP */ osi_Log1(smb_logp, "SMB message too short, len %d", ncbp->ncb_length); return; } @@ -8126,10 +7788,8 @@ void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, osi_Log2(smb_logp, "Dispatch %s duration %d ms", opName, newTime - oldTime); if (oldGen != sessionGen) { -#ifndef DJGPP LogEvent(EVENTLOG_WARNING_TYPE, MSG_BAD_SMB_WRONG_SESSION, newTime - oldTime, ncbp->ncb_length); -#endif /* !DJGPP */ osi_Log3(smb_logp, "Request %s straddled session startup, " "took %d ms, ncb length %d", opName, newTime - oldTime, ncbp->ncb_length); } @@ -8142,7 +7802,6 @@ void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, smb_LogPacket(inp); #endif /* LOG_PACKET */ -#ifndef DJGPP if (showErrors) { sprintf(tbuffer, "Received bad SMB req 0x%x", inp->inCom); code = (*smb_MBfunc)(NULL, tbuffer, "Cancel: don't show again", @@ -8150,16 +7809,13 @@ void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, if (code == IDCANCEL) showErrors = 0; } -#endif /* DJGPP */ code = CM_ERROR_BADOP; } /* catastrophic failure: log as much as possible */ if (code == CM_ERROR_BADSMB) { -#ifndef DJGPP LogEvent(EVENTLOG_WARNING_TYPE, MSG_BAD_SMB_INVALID, ncbp->ncb_length); -#endif /* !DJGPP */ #ifdef LOG_PACKET smb_LogPacket(inp); #endif /* LOG_PACKET */ @@ -8270,7 +7926,6 @@ void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, return; } -#ifndef DJGPP /* Wait for Netbios() calls to return, and make the results available to server * threads. Note that server threads can't wait on the NCBevents array * themselves, because NCB events are manual-reset, and the servers would race @@ -8324,7 +7979,6 @@ void smb_ClientWaiter(void *parmp) thrd_SetEvent(NCBreturns[0][idx]); } } -#endif /* !DJGPP */ /* * Try to have one NCBRECV request waiting for every live session. Not more @@ -8335,9 +7989,6 @@ void smb_ServerWaiter(void *parmp) DWORD code; int idx_session, idx_NCB; NCB *ncbp; -#ifdef DJGPP - dos_ptr dos_ncb; -#endif /* DJGPP */ while (smbShutdownFlag == 0) { /* Get a session */ @@ -8430,19 +8081,10 @@ void smb_ServerWaiter(void *parmp) ncbp->ncb_lsn = (unsigned char) LSNs[idx_session]; ncbp->ncb_command = NCBRECV | ASYNCH; ncbp->ncb_lana_num = lanas[idx_session]; -#ifndef DJGPP ncbp->ncb_buffer = (unsigned char *) bufs[idx_NCB]; ncbp->ncb_event = NCBevents[idx_NCB]; ncbp->ncb_length = SMB_PACKETSIZE; Netbios(ncbp); -#else /* DJGPP */ - ncbp->ncb_buffer = bufs[idx_NCB]->dos_pkt; - ((smb_ncb_t*)ncbp)->orig_pkt = bufs[idx_NCB]; - ncbp->ncb_event = NCBreturns[0][idx_NCB]; - ncbp->ncb_length = SMB_PACKETSIZE; - dos_ncb = ((smb_ncb_t *)ncbp)->dos_ncb; - Netbios(ncbp, dos_ncb); -#endif /* !DJGPP */ } } @@ -8468,9 +8110,6 @@ void smb_Server(VOID *parmp) UCHAR rc; smb_vc_t *vcp = NULL; smb_t *smbp; -#ifdef DJGPP - dos_ptr dos_ncb; -#endif /* DJGPP */ rx_StartClientThread(); @@ -8532,9 +8171,6 @@ void smb_Server(VOID *parmp) } ncbp = NCBs[idx_NCB]; -#ifdef DJGPP - dos_ncb = ((smb_ncb_t *)ncbp)->dos_ncb; -#endif /* DJGPP */ idx_session = NCBsessions[idx_NCB]; rc = ncbp->ncb_retcode; @@ -8553,10 +8189,8 @@ void smb_Server(VOID *parmp) case NRC_SNUMOUT: case NRC_SABORT: -#ifndef DJGPP LogEvent(EVENTLOG_WARNING_TYPE, MSG_UNEXPECTED_SMB_SESSION_CLOSE, ncb_error_string(rc)); /* fallthrough */ -#endif /* !DJGPP */ case NRC_SCLOSED: /* Client closed session */ vcp = smb_FindVC(ncbp->ncb_lsn, 0, lanas[idx_session]); @@ -8581,10 +8215,8 @@ void smb_Server(VOID *parmp) case NRC_INCOMP: /* Treat as transient error */ -#ifndef DJGPP LogEvent(EVENTLOG_WARNING_TYPE, MSG_BAD_SMB_INCOMPLETE, ncbp->ncb_length); -#endif /* !DJGPP */ osi_Log1(smb_logp, "dispatch smb recv failed, message incomplete, ncb_length %d", ncbp->ncb_length); @@ -8680,19 +8312,10 @@ void smb_Server(VOID *parmp) vcp->errorCount = 0; bufp = (struct smb_packet *) ncbp->ncb_buffer; -#ifdef DJGPP - bufp = ((smb_ncb_t *) ncbp)->orig_pkt; - /* copy whole packet to virtual memory */ - /*fprintf(stderr, "smb_Server: copying dos packet at 0x%x, " - "bufp=0x%x\n", - bufp->dos_pkt / 16, bufp);*/ - fflush(stderr); - dosmemget(bufp->dos_pkt, ncbp->ncb_length, bufp->data); -#endif /* DJGPP */ smbp = (smb_t *)bufp->data; outbufp->flags = 0; -#if !defined(DJGPP) && !defined(AFS_WIN32_ENV) +#if !defined(AFS_WIN32_ENV) #ifndef NOTRACE __try { @@ -8715,11 +8338,7 @@ void smb_Server(VOID *parmp) ncbp->ncb_buffer = rwc.buf; ncbp->ncb_length = 65535; ncbp->ncb_event = rwevent; -#ifndef DJGPP Netbios(ncbp); -#else - Netbios(ncbp, dos_ncb); -#endif /* !DJGPP */ rcode = thrd_WaitForSingleObject_Event(rwevent, RAWTIMEOUT); thrd_CloseHandle(rwevent); } @@ -8739,7 +8358,7 @@ void smb_Server(VOID *parmp) /* TODO: what else needs to be serialized? */ smb_DispatchPacket(vcp, bufp, outbufp, ncbp, NULL); } -#if !defined(DJGPP) && !defined(AFS_WIN95_ENV) +#if !defined(AFS_WIN95_ENV) #ifndef NOTRACE } __except( smb_ServerExceptionFilter() ) { @@ -8762,7 +8381,7 @@ void smb_Server(VOID *parmp) * force trace and give control to upstream exception handlers. Useful for * debugging. */ -#if !defined(DJGPP) && !defined(AFS_WIN95_ENV) +#if !defined(AFS_WIN95_ENV) DWORD smb_ServerExceptionFilter(void) { /* While this is not the best time to do a trace, if it succeeds, then * we have a trace (assuming tracing was enabled). Otherwise, this should @@ -8795,12 +8414,10 @@ void InitNCBslot(int idx) NCBavails[idx] = thrd_CreateEvent(NULL, FALSE, TRUE, eventName); if ( GetLastError() == ERROR_ALREADY_EXISTS ) osi_Log1(smb_logp, "Event Object Already Exists: %s", osi_LogSaveString(smb_logp, eventName)); -#ifndef DJGPP sprintf(eventName,"NCBevents[%d]", idx); NCBevents[idx] = thrd_CreateEvent(NULL, TRUE, FALSE, eventName); if ( GetLastError() == ERROR_ALREADY_EXISTS ) osi_Log1(smb_logp, "Event Object Already Exists: %s", osi_LogSaveString(smb_logp, eventName)); -#endif /* !DJGPP */ sprintf(eventName,"NCBReturns[0<=idos_ncb; -#endif /* DJGPP */ /* retrieve computer name */ GetComputerName(cname, &cnamelen); @@ -8864,11 +8474,7 @@ void smb_Listener(void *parmp) ncbp->ncb_lana_num = (UCHAR)lana; -#ifndef DJGPP code = Netbios(ncbp); -#else /* DJGPP */ - code = Netbios(ncbp, dos_ncb); -#endif if (code == NRC_NAMERR) { /* An smb shutdown or Vista resume must have taken place */ osi_Log2(smb_logp, @@ -8917,9 +8523,7 @@ void smb_Listener(void *parmp) } #if 0 else if (code != 0) { -#ifndef DJGPP char tbuffer[AFSPATHMAX]; -#endif /* terminate silently if shutdown flag is set */ while (!lock_TryMutex(&smb_StartedLock)) { @@ -8934,7 +8538,6 @@ void smb_Listener(void *parmp) osi_Log0(smb_logp, "Client exiting due to network failure. Please restart client.\n"); -#ifndef DJGPP sprintf(tbuffer, "Client exiting due to network failure. Please restart client.\n" "NCBLISTEN lana=%d failed with code %d [%s]", @@ -8943,14 +8546,6 @@ void smb_Listener(void *parmp) code = (*smb_MBfunc)(NULL, tbuffer, "AFS Client Service: Fatal Error", MB_OK|MB_SERVICE_NOTIFICATION); osi_panic(tbuffer, __FILE__, __LINE__); -#else - fprintf(stderr, "NCBLISTEN lana=%d failed with code %d\n", - ncbp->ncb_lana_num, code); - fprintf(stderr, "\nClient exiting due to network failure " - "(possibly due to power-saving mode)\n"); - fprintf(stderr, "Please restart client.\n"); - afs_exit(AFS_EXITCODE_NETWORK_FAILURE); -#endif /* !DJGPP */ lock_ReleaseMutex(&smb_StartedLock); break; @@ -8994,14 +8589,7 @@ void smb_Listener(void *parmp) ncbp->ncb_lsn,ncbp->ncb_lana_num, osi_LogSaveString(smb_logp, rname), ongoingOps); if (reportSessionStartups) { -#ifndef DJGPP LogEvent(EVENTLOG_INFORMATION_TYPE, MSG_SMB_SESSION_START, ongoingOps); -#else /* DJGPP */ - time(&now); - fprintf(stderr, "%s: New session %d starting from host %s\n", - asctime(localtime(&now)), ncbp->ncb_lsn, rname); - fflush(stderr); -#endif /* !DJGPP */ } lock_ObtainMutex(&vcp->mx); @@ -9037,14 +8625,7 @@ void smb_Listener(void *parmp) ncbp->ncb_lsn,ncbp->ncb_lana_num, osi_LogSaveString(smb_logp, rname), ongoingOps); if (reportSessionStartups) { -#ifndef DJGPP LogEvent(EVENTLOG_INFORMATION_TYPE, MSG_SMB_SESSION_START, ongoingOps); -#else /* DJGPP */ - time(&now); - fprintf(stderr, "%s: Re-using session %d starting from host %s\n", - asctime(localtime(&now)), ncbp->ncb_lsn, rname); - fflush(stderr); -#endif /* !DJGPP */ } } @@ -9244,9 +8825,6 @@ void smb_LanAdapterChange(int locked) { int smb_NetbiosInit(int locked) { NCB *ncbp; -#ifdef DJGPP - dos_ptr dos_ncb; -#endif /* DJGPP */ int i, lana, code, l; char s[100]; int delname_tried=0; @@ -9266,9 +8844,6 @@ int smb_NetbiosInit(int locked) } /* setup the NCB system */ ncbp = GetNCB(); -#ifdef DJGPP - dos_ncb = ((smb_ncb_t *)ncbp)->dos_ncb; -#endif /* DJGPP */ /* Call lanahelper to get Netbios name, lan adapter number and gateway flag */ if (SUCCEEDED(code = lana_GetUncServerNameEx(cm_NetbiosName, &lanaNum, &isGateway, LANA_NETBIOS_NAME_FULL))) { @@ -9299,7 +8874,6 @@ int smb_NetbiosInit(int locked) afsi_log("smb_localNamep is >%s<", smb_localNamep); -#ifndef DJGPP if (smb_LANadapter == LANA_INVALID) { ncbp->ncb_command = NCBENUM; ncbp->ncb_buffer = (PUCHAR)&lana_list; @@ -9333,19 +8907,6 @@ int smb_NetbiosInit(int locked) afsi_log("Netbios NCBRESET lana %d succeeded", lana_list.lana[i]); } } -#else - /* for DJGPP, there is no NCBENUM and NCBRESET is a real reset. so - we will just fake the LANA list */ - if (smb_LANadapter == LANA_INVALID) { - for (i = 0; i < 8; i++) - lana_list.lana[i] = i; - lana_list.length = 8; - } - else { - lana_list.length = 1; - lana_list.lana[0] = smb_LANadapter; - } -#endif /* !DJGPP */ /* and declare our name so we can receive connections */ memset(ncbp, 0, sizeof(*ncbp)); @@ -9361,11 +8922,7 @@ int smb_NetbiosInit(int locked) ncbp->ncb_command = NCBADDNAME; ncbp->ncb_lana_num = lana; memcpy(ncbp->ncb_name,smb_sharename,NCBNAMSZ); -#ifndef DJGPP code = Netbios(ncbp); -#else /* DJGPP */ - code = Netbios(ncbp, dos_ncb); -#endif /* !DJGPP */ afsi_log("Netbios NCBADDNAME lana=%d code=%d retcode=%d complete=%d", lana, code, ncbp->ncb_retcode, ncbp->ncb_cmd_cplt); @@ -9381,11 +8938,6 @@ int smb_NetbiosInit(int locked) if (code == 0) { afsi_log("Netbios NCBADDNAME succeeded on lana %d\n", lana); -#ifdef DJGPP - /* we only use one LANA with djgpp */ - lana_list.lana[0] = lana; - lana_list.length = 1; -#endif } else { afsi_log("Netbios NCBADDNAME lana %d error code %d", lana, code); @@ -9399,11 +8951,7 @@ int smb_NetbiosInit(int locked) ncbp->ncb_command = NCBDELNAME; memcpy(ncbp->ncb_name,smb_sharename,NCBNAMSZ); ncbp->ncb_lana_num = lana; -#ifndef DJGPP code = Netbios(ncbp); -#else - code = Netbios(ncbp, dos_ncb); -#endif /* DJGPP */ if (code == 0) code = ncbp->ncb_retcode; else { @@ -9428,9 +8976,6 @@ int smb_NetbiosInit(int locked) if (code == 0) { smb_LANadapter = lana; lana_found = 1; /* at least one worked */ -#ifdef DJGPP - break; -#endif } } @@ -9590,31 +9135,19 @@ void smb_StopListeners(int locked) lock_ReleaseMutex(&smb_StartedLock); } -void smb_Init(osi_log_t *logp, int useV3, - int nThreads -#ifndef DJGPP - , void *aMBfunc -#endif - ) - +void smb_Init(osi_log_t *logp, int useV3, int nThreads, void *aMBfunc) { thread_t phandle; int lpid; INT_PTR i; struct tm myTime; -#ifdef DJGPP - int npar, seg, sel; - dos_ptr rawBuf; -#endif /* DJGPP */ EVENT_HANDLE retHandle; char eventName[MAX_PATH]; int startListeners = 0; smb_TlsRequestSlot = TlsAlloc(); -#ifndef DJGPP smb_MBfunc = aMBfunc; -#endif /* DJGPP */ smb_useV3 = useV3; @@ -9651,7 +9184,6 @@ void smb_Init(osi_log_t *logp, int useV3, lock_InitializeMutex(&smb_StartedLock, "smb started lock"); /* 4 Raw I/O buffers */ -#ifndef DJGPP smb_RawBufs = calloc(65536,1); *((char **)smb_RawBufs) = NULL; for (i=0; i<3; i++) { @@ -9659,39 +9191,6 @@ void smb_Init(osi_log_t *logp, int useV3, *((char **)rawBuf) = smb_RawBufs; smb_RawBufs = rawBuf; } -#else /* DJGPP */ - npar = 65536 >> 4; /* number of paragraphs */ - seg = __dpmi_allocate_dos_memory(npar, &smb_RawBufSel[0]); - if (seg == -1) { - afsi_log("Cannot allocate %d paragraphs of DOS memory", - npar); - osi_panic("",__FILE__,__LINE__); - } - else { - afsi_log("Allocated %d paragraphs of DOS mem at 0x%X", - npar, seg); - } - smb_RawBufs = (seg * 16) + 0; /* DOS physical address */ - - _farpokel(_dos_ds, smb_RawBufs, NULL); - for (i=0; i> 4; /* number of paragraphs */ - seg = __dpmi_allocate_dos_memory(npar, &smb_RawBufSel[i+1]); - if (seg == -1) { - afsi_log("Cannot allocate %d paragraphs of DOS memory", - npar); - osi_panic("",__FILE__,__LINE__); - } - else { - afsi_log("Allocated %d paragraphs of DOS mem at 0x%X", - npar, seg); - } - rawBuf = (seg * 16) + 0; /* DOS physical address */ - /*_farpokel(_dos_ds, smb_RawBufs, smb_RawBufs);*/ - _farpokel(_dos_ds, rawBuf, smb_RawBufs); - smb_RawBufs = rawBuf; - } -#endif /* !DJGPP */ /* global free lists */ smb_ncbFreeListp = NULL; @@ -9968,12 +9467,10 @@ void smb_Init(osi_log_t *logp, int useV3, if (startListeners) smb_StartListeners(1); -#ifndef DJGPP phandle = thrd_Create(NULL, 65536, (ThreadFunc) smb_ClientWaiter, NULL, 0, &lpid, "smb_ClientWaiter"); osi_assertx(phandle != NULL, "smb_ClientWaiter thread creation failure"); thrd_CloseHandle(phandle); -#endif /* !DJGPP */ phandle = thrd_Create(NULL, 65536, (ThreadFunc) smb_ServerWaiter, NULL, 0, &lpid, "smb_ServerWaiter"); @@ -9997,10 +9494,6 @@ void smb_Init(osi_log_t *logp, int useV3, osi_assertx(phandle != NULL, "smb_WaitingLocksDaemon thread creation failure"); thrd_CloseHandle(phandle); -#ifdef DJGPP - smb_ListShares(); -#endif - lock_ReleaseMutex(&smb_StartedLock); return; } @@ -10008,9 +9501,6 @@ void smb_Init(osi_log_t *logp, int useV3, void smb_Shutdown(void) { NCB *ncbp; -#ifdef DJGPP - dos_ptr dos_ncb; -#endif long code = 0; afs_uint32 i; smb_vc_t *vcp; @@ -10019,9 +9509,6 @@ void smb_Shutdown(void) /* setup the NCB system */ ncbp = GetNCB(); -#ifdef DJGPP - dos_ncb = ((smb_ncb_t *)ncbp)->dos_ncb; -#endif /* Block new sessions by setting shutdown flag */ smbShutdownFlag = 1; @@ -10037,11 +9524,7 @@ void smb_Shutdown(void) ncbp->ncb_command = NCBHANGUP; ncbp->ncb_lana_num = lanas[i]; /*smb_LANadapter;*/ ncbp->ncb_lsn = (UCHAR)LSNs[i]; -#ifndef DJGPP code = Netbios(ncbp); -#else - code = Netbios(ncbp, dos_ncb); -#endif /*fprintf(stderr, "returned from NCBHANGUP session %d LSN %d\n", i, LSNs[i]);*/ if (code == 0) code = ncbp->ncb_retcode; if (code != 0) { @@ -10075,11 +9558,7 @@ void smb_Shutdown(void) ncbp->ncb_command = NCBDELNAME; ncbp->ncb_lana_num = lana_list.lana[i]; memcpy(ncbp->ncb_name,smb_sharename,NCBNAMSZ); -#ifndef DJGPP code = Netbios(ncbp); -#else - code = Netbios(ncbp, dos_ncb); -#endif if (code == 0) code = ncbp->ncb_retcode; if (code != 0) { diff --git a/src/WINNT/afsd/smb.h b/src/WINNT/afsd/smb.h index 6bce76126..1b033c2b0 100644 --- a/src/WINNT/afsd/smb.h +++ b/src/WINNT/afsd/smb.h @@ -10,10 +10,6 @@ #ifndef __SMB_H_ENV__ #define __SMB_H_ENV__ 1 -#ifdef DJGPP -#include "netbios95.h" -#endif /* DJGPP */ - #if _WIN32_WINNT < 0x0501 #undef _WIN32_WINNT #define _WIN32_WINNT 0x0501 @@ -194,10 +190,6 @@ typedef struct smb_packet { unsigned short ncb_length; unsigned char flags; cm_space_t *stringsp; /* decoded strings from this packet */ -#ifdef DJGPP - dos_ptr dos_pkt; - unsigned int dos_pkt_sel; -#endif /* DJGPP */ } smb_packet_t; /* smb_packet flags */ @@ -210,11 +202,6 @@ typedef struct myncb { NCB ncb; /* ncb to use */ struct myncb *nextp; /* when on free list */ long magic; -#ifdef DJGPP - dos_ptr dos_ncb; - smb_packet_t *orig_pkt; - unsigned int dos_ncb_sel; -#endif /* DJGPP */ } smb_ncb_t; /* structures representing environments from kernel / SMB network. @@ -539,12 +526,7 @@ typedef struct smb_dispatch { /* prototypes */ -extern void smb_Init(osi_log_t *logp, int useV3, - int nThreads -#ifndef DJGPP - , void *aMBfunc -#endif - ); +extern void smb_Init(osi_log_t *logp, int useV3, int nThreads, void *aMBfunc); extern void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, time_t unixTime); @@ -759,21 +741,11 @@ extern unsigned char *smb_ParseVblBlock(unsigned char *inp, char **chainpp, int extern int smb_SUser(cm_user_t *userp); -#ifndef DJGPP long smb_WriteData(smb_fid_t *fidp, osi_hyper_t *offsetp, afs_uint32 count, char *op, cm_user_t *userp, long *writtenp); -#else /* DJGPP */ -long smb_WriteData(smb_fid_t *fidp, osi_hyper_t *offsetp, afs_uint32 count, char *op, - cm_user_t *userp, long *writtenp, int dosflag); -#endif /* !DJGPP */ -#ifndef DJGPP extern long smb_ReadData(smb_fid_t *fidp, osi_hyper_t *offsetp, afs_uint32 count, char *op, cm_user_t *userp, long *readp); -#else /* DJGPP */ -extern long smb_ReadData(smb_fid_t *fidp, osi_hyper_t *offsetp, afs_uint32 count, - char *op, cm_user_t *userp, long *readp, int dosflag); -#endif /* !DJGPP */ extern long smb_Rename(smb_vc_t *vcp, smb_packet_t *inp, char *oldPathp, char *newPathp, int attrs); diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c index f06b03b82..a1ed7f060 100644 --- a/src/WINNT/afsd/smb3.c +++ b/src/WINNT/afsd/smb3.c @@ -10,7 +10,6 @@ #include #include -#ifndef DJGPP #include #pragma warning(push) #pragma warning(disable: 4005) @@ -19,7 +18,6 @@ #include #include #pragma warning(pop) -#endif /* !DJGPP */ #include #include #include @@ -1391,9 +1389,7 @@ long smb_ReceiveV3Trans(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) /* We sometimes see 0 word count. What to do? */ if (*inp->wctp == 0) { osi_Log0(smb_logp, "Transaction2 word count = 0"); -#ifndef DJGPP LogEvent(EVENTLOG_WARNING_TYPE, MSG_SMB_ZERO_TRANSACTION_COUNT); -#endif /* !DJGPP */ smb_SetSMBDataLength(outp, 0); smb_SendPacket(vcp, outp); @@ -2111,9 +2107,7 @@ long smb_ReceiveV3Tran2A(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) /* We sometimes see 0 word count. What to do? */ if (*inp->wctp == 0) { osi_Log0(smb_logp, "Transaction2 word count = 0"); -#ifndef DJGPP LogEvent(EVENTLOG_WARNING_TYPE, MSG_SMB_ZERO_TRANSACTION_COUNT); -#endif /* !DJGPP */ smb_SetSMBDataLength(outp, 0); smb_SendPacket(vcp, outp); @@ -6549,11 +6543,7 @@ long smb_ReceiveV3WriteX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) code = 0; while ( code == 0 && count > 0 ) { -#ifndef DJGPP code = smb_WriteData(fidp, &offset, count, op, userp, &written); -#else /* DJGPP */ - code = smb_WriteData(fidp, &offset, count, op, userp, &written, FALSE); -#endif /* !DJGPP */ if (code == 0 && written == 0) code = CM_ERROR_PARTIALWRITE; @@ -6696,11 +6686,7 @@ long smb_ReceiveV3ReadX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) /* set the packet data length the count of the # of bytes */ smb_SetSMBDataLength(outp, count); -#ifndef DJGPP code = smb_ReadData(fidp, &offset, count, op, userp, &finalCount); -#else /* DJGPP */ - code = smb_ReadData(fidp, &offset, count, op, userp, &finalCount, FALSE); -#endif /* !DJGPP */ /* fix some things up */ smb_SetSMBParm(outp, 5, finalCount); diff --git a/src/WINNT/afsd/smb3.h b/src/WINNT/afsd/smb3.h index e1ce5f8fa..99209dfb1 100644 --- a/src/WINNT/afsd/smb3.h +++ b/src/WINNT/afsd/smb3.h @@ -404,16 +404,6 @@ extern cm_user_t *smb_FindCMUserByName(char *usern, char *machine, afs_uint32 fl /* SMB auth related functions */ extern void smb_NegotiateExtendedSecurity(void ** secBlob, int * secBlobLength); -#ifdef DJGPP -#define DELETE (0x00010000) -#define READ_CONTROL (0x00020000) -#define SYNCHRONIZE (0x00100000) -#define FILE_WRITE_ATTRIBUTES ( 0x0100 ) -#define FILE_GENERIC_READ (0x00120089) -#define FILE_GENERIC_WRITE (0x00120116) -#define FILE_GENERIC_EXECUTE (0x001200a0) -#endif /* DJGPP */ - /* Some of the FILE_NOTIFY_CHANGE values are undefined in winnt.h */ #define FILE_NOTIFY_CHANGE_EA 0x00000080 #define FILE_NOTIFY_CHANGE_STREAM_NAME 0x00000200 diff --git a/src/WINNT/afsd/smb_ioctl.c b/src/WINNT/afsd/smb_ioctl.c index 5dc6a6c60..2425dcee2 100644 --- a/src/WINNT/afsd/smb_ioctl.c +++ b/src/WINNT/afsd/smb_ioctl.c @@ -10,9 +10,7 @@ #include #include -#ifndef DJGPP #include -#endif /* !DJGPP */ #include #include #include @@ -73,9 +71,6 @@ void smb_InitIoctl(void) smb_ioctlProcsp[VIOC_GETRXKCRYPT] = cm_IoctlGetRxkcrypt; smb_ioctlProcsp[VIOC_SETRXKCRYPT] = cm_IoctlSetRxkcrypt; smb_ioctlProcsp[VIOC_ISSYMLINK] = cm_IoctlIslink; -#ifdef DJGPP - smb_ioctlProcsp[VIOC_SHUTDOWN] = cm_IoctlShutdown; -#endif smb_ioctlProcsp[VIOC_TRACEMEMDUMP] = cm_IoctlMemoryDump; smb_ioctlProcsp[VIOC_ISSYMLINK] = cm_IoctlIslink; smb_ioctlProcsp[VIOC_FLUSHALL] = cm_IoctlFlushAllVolumes; @@ -417,26 +412,13 @@ long smb_IoctlV3Read(smb_fid_t *fidp, smb_vc_t *vcp, smb_packet_t *inp, smb_pack /* called from Read Raw to handle IOCTL descriptor reads */ long smb_IoctlReadRaw(smb_fid_t *fidp, smb_vc_t *vcp, smb_packet_t *inp, - smb_packet_t *outp -#ifdef DJGPP - , dos_ptr rawBuf -#endif /* DJGPP */ - ) + smb_packet_t *outp) { smb_ioctl_t *iop; long leftToCopy; NCB *ncbp; long code; cm_user_t *userp; -#ifdef DJGPP - dos_ptr dos_ncb; - - if (rawBuf == 0) - { - osi_Log0(afsd_logp, "Failed to get raw buf for smb_IoctlReadRaw"); - return -1; - } -#endif /* DJGPP */ iop = fidp->ioctlp; @@ -485,15 +467,8 @@ long smb_IoctlReadRaw(smb_fid_t *fidp, smb_vc_t *vcp, smb_packet_t *inp, /*ncbp->ncb_lana_num = smb_LANadapter;*/ ncbp->ncb_lana_num = vcp->lana; -#ifndef DJGPP ncbp->ncb_buffer = iop->outCopied + iop->outAllocp; code = Netbios(ncbp); -#else /* DJGPP */ - dosmemput(iop->outCopied + iop->outAllocp, ncbp->ncb_length, rawBuf); - ncbp->ncb_buffer = rawBuf; - dos_ncb = ((smb_ncb_t *)ncbp)->dos_ncb; - code = Netbios(ncbp, dos_ncb); -#endif /* !DJGPP */ if (code != 0) osi_Log1(afsd_logp, "ReadRaw send failure code %d", code);