Changeset 3898 for trunk/src

Timestamp:

Jul 29, 2000, 4:10:09 PM (25 years ago)

Author:

bird

Message:

Added the CVS Id keyword to the header.

Location:

trunk/src/wininet

Files:

• ftp.c (modified) (30 diffs)
• internet.c (modified) (13 diffs)
• utility.c (modified) (3 diffs)

trunk/src/wininet/ftp.c

@@ -1 @@
-/*
+/* $Id: ftp.c,v 1.2 2000-07-29 14:10:08 bird Exp $
+ *
  * WININET - Ftp implementation
  *
@@ -40 +41 @@
 typedef enum {
   /* FTP commands with arguments. */
-  FTP_CMD_ACCT, 
-  FTP_CMD_CWD,  
-  FTP_CMD_DELE, 
-  FTP_CMD_MKD,  
-  FTP_CMD_PASS, 
-  FTP_CMD_PORT, 
-  FTP_CMD_RETR, 
-  FTP_CMD_RMD,  
-  FTP_CMD_RNFR, 
-  FTP_CMD_RNTO, 
-  FTP_CMD_STOR, 
-  FTP_CMD_TYPE, 
-  FTP_CMD_USER, 
+  FTP_CMD_ACCT,
+  FTP_CMD_CWD,
+  FTP_CMD_DELE,
+  FTP_CMD_MKD,
+  FTP_CMD_PASS,
+  FTP_CMD_PORT,
+  FTP_CMD_RETR,
+  FTP_CMD_RMD,
+  FTP_CMD_RNFR,
+  FTP_CMD_RNTO,
+  FTP_CMD_STOR,
+  FTP_CMD_TYPE,
+  FTP_CMD_USER,
 
   /* FTP commands without arguments. */
@@ -58 +59 @@
   FTP_CMD_LIST,
   FTP_CMD_NLST,
-  FTP_CMD_PWD, 
+  FTP_CMD_PWD,
   FTP_CMD_QUIT,
-} FTP_COMMAND; 
+} FTP_COMMAND;
 
 static const char *szFtpCommands[] = {
@@ -147 +148 @@
 
                 /* Accept connection from ftp server */
-                if (FTP_InitDataSocket(lpwfs, &nDataSocket)) 
+                if (FTP_InitDataSocket(lpwfs, &nDataSocket))
                 {
                         FTP_SendData(lpwfs, nDataSocket, hFile);
@@ -159 +160 @@
         {
                 INTERNET_ASYNC_RESULT iar;
-               
+
                 iar.dwResult = (DWORD)bSuccess;
                 iar.dwError = nRC;
@@ -217 +218 @@
         {
                 INTERNET_ASYNC_RESULT iar;
-               
+
                 iar.dwResult = (DWORD)bSuccess;
                 iar.dwError = nRC;
@@ -348 +349 @@
  *
  */
-BOOLAPI FtpGetCurrentDirectoryA(HINTERNET hFtpSession, LPSTR lpszCurrentDirectory, 
+BOOLAPI FtpGetCurrentDirectoryA(HINTERNET hFtpSession, LPSTR lpszCurrentDirectory,
         LPDWORD lpdwCurrentDirectory)
 {
@@ -401 +402 @@
         {
                 INTERNET_ASYNC_RESULT iar;
-               
+
                 iar.dwResult = (DWORD)bSuccess;
                 iar.dwError = bSuccess ? ERROR_SUCCESS : ERROR_SUCCESS;
@@ -450 +451 @@
         }
 
-        /* Accept connection from server */ 
-        if (nSuccess && FTP_InitDataSocket(lpwfs, &nDataSocket)) 
+        /* Accept connection from server */
+        if (nSuccess && FTP_InitDataSocket(lpwfs, &nDataSocket))
         {
                 hFile = HeapAlloc(GetProcessHeap(), 0, sizeof(WININETFILE));
@@ -492 +493 @@
 
         /* Ensure we can write to lpszNewfile by opening it */
-        hFile = CreateFileA(lpszNewFile, GENERIC_WRITE, 0, 0, fFailIfExists ? 
+        hFile = CreateFileA(lpszNewFile, GENERIC_WRITE, 0, 0, fFailIfExists ?
                 CREATE_NEW : CREATE_ALWAYS, dwLocalFlagsAttribute, 0);
         if (INVALID_HANDLE_VALUE == hFile)
@@ -505 +506 @@
 
                 /* Accept connection from ftp server */
-                if (FTP_InitDataSocket(lpwfs, &nDataSocket)) 
+                if (FTP_InitDataSocket(lpwfs, &nDataSocket))
                 {
                         int nResCode;
@@ -523 +524 @@
 
         if (hFile)
-                CloseHandle(hFile);    
+                CloseHandle(hFile);
         return bSuccess;
 }
@@ -539 +540 @@
  */
 
-HINTERNET FTP_Connect(HINTERNET hInternet, LPCSTR lpszServerName, 
+HINTERNET FTP_Connect(HINTERNET hInternet, LPCSTR lpszServerName,
         INTERNET_PORT nServerPort, LPCSTR lpszUserName,
         LPCSTR lpszPassword, DWORD dwFlags, DWORD dwContext)
@@ -583 +584 @@
         if (!result)
         {
-                TRACE("Connected to server\n"); 
+                TRACE("Connected to server\n");
                 lpwfs = HeapAlloc(GetProcessHeap(), 0, sizeof(WININETFTPSESSIONA));
                 if (NULL == lpwfs)
@@ -654 +655 @@
         {
                 INTERNET_ASYNC_RESULT iar;
-               
+
                 iar.dwResult = (DWORD)lpwfs;
                 iar.dwError = bSuccess ? ERROR_SUCCESS : ERROR_INTERNET_CANNOT_CONNECT;
@@ -735 +736 @@
             return FALSE;
         }
-        sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], bParamHasLen ? " " : "", 
+        sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], bParamHasLen ? " " : "",
                 bParamHasLen ? lpszParam : "", szCRLF);
 
@@ -787 +788 @@
                 nRecv = 0;
         }
-                   
+
         if (nRecv > 0)
         {
@@ -820 +821 @@
         if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_PASS, lpwfs->lpszPassword))
             goto lend;
-           
+
         nResCode = FTP_ReceiveResponse(lpwfs->sndSocket, lpwfs->lpszResponseBuffer, MAX_REPLY_LEN);
         if (nResCode)
@@ -844 +845 @@
  *           FTP_SendAccount (internal)
  *
- * 
+ *
  *
  * RETURNS
@@ -943 +944 @@
         lpwfs->lstnSocketAddress.sin_family = AF_INET;
         lpwfs->lstnSocketAddress.sin_port = htons((u_short) 0);
-        lpwfs->lstnSocketAddress.sin_addr.s_addr = htonl(INADDR_ANY); 
+        lpwfs->lstnSocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);
         if (SOCKET_ERROR == bind(lpwfs->lstnSocket,&lpwfs->lstnSocketAddress, sizeof(struct sockaddr_in)))
         {
@@ -1061 +1062 @@
  *           FTP_InitDataSocket (internal)
  *
- * 
+ *
  *
  * RETURNS
@@ -1128 +1129 @@
                 }
 
-                nLen = DATA_PACKET_SIZE < nBytesToSend ? 
+                nLen = DATA_PACKET_SIZE < nBytesToSend ?
                     DATA_PACKET_SIZE : nBytesToSend;
                 nRC  = send(nDataSocket, lpszBuffer, nLen, 0);
@@ -1145 +1146 @@
 /*
                         TRACE( "%d bytes of %d bytes (%d%%) in %d min %d sec estimated remainig time %d sec\t\t\r",
-                                nTotalSent, fi.nFileSizeLow, nTotalSent*100/st.st_size, nSeconds / 60, 
+                                nTotalSent, fi.nFileSizeLow, nTotalSent*100/st.st_size, nSeconds / 60,
                                 nSeconds % 60, (st.st_size - nTotalSent) * nSeconds / nTotalSent );
 */
@@ -1269 +1270 @@
                         if (nRC == 0)
                                 goto recv_end;
-                        WriteFile(hFile, lpszBuffer, nRC, &nBytesWritten, NULL); 
+                        WriteFile(hFile, lpszBuffer, nRC, &nBytesWritten, NULL);
                         nBytesReceived += nRC;
                 }
 
-                TRACE("%d bytes of %ld (%ld%%)\r", nBytesReceived, nBytes, 
+                TRACE("%d bytes of %ld (%ld%%)\r", nBytesReceived, nBytes,
                   nBytesReceived * 100 / nBytes);
         }
@@ -1331 +1332 @@
 BOOL FTP_CloseFindNextHandle(LPWININETFINDNEXTA lpwfn)
 {
-    int i; 
+    int i;
 
     for (i = 0; i < lpwfn->size; i++)
@@ -1367 +1368 @@
         {
                 DWORD access = mktime(&lpafp->tmLastModified);
-                
+
                 /* Not all fields are filled in */
                 lpFindFileData->ftLastAccessTime.dwHighDateTime = HIWORD(access);
@@ -1384 +1385 @@
                     lpwfn->lpafp = lpafp;
                 }
-        } 
+        }
 
         return (HINTERNET)lpwfn;
@@ -1451 +1452 @@
 
                         sizeFilePropArray *= 2;
-                        tmpafp = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *lpafp, 
+                        tmpafp = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *lpafp,
                                 sizeof(FILEPROPERTIESA)*sizeFilePropArray);
                         if (NULL == tmpafp)
@@ -1542 +1543 @@
                         LPFILEPROPERTIESA tmpafp;
 
-                        tmpafp = HeapReAlloc(GetProcessHeap(), 0, *lpafp, 
+                        tmpafp = HeapReAlloc(GetProcessHeap(), 0, *lpafp,
                                 sizeof(FILEPROPERTIESA)*indexFilePropArray);
                         if (NULL == tmpafp)
@@ -1554 +1555 @@
         }
 
-lend:   
+lend:
   return bSuccess;
 }

trunk/src/wininet/internet.c

@@ -1 @@
-/*
+/* $Id: internet.c,v 1.2 2000-07-29 14:10:09 bird Exp $
+ *
  * Wininet
  *
@@ -70 +71 @@
  *
  */
-INTERNETAPI HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent, 
+INTERNETAPI HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent,
         DWORD dwAccessType, LPCSTR lpszProxy,
         LPCSTR lpszProxyBypass, DWORD dwFlags)
@@ -199 +200 @@
         lpFindFileData = (LPWIN32_FIND_DATAA) lpvFindData;
         access = mktime(&lpwh->lpafp[lpwh->index].tmLastModified);
-                
+
         /* Not all fields are filled in */
         lpFindFileData->ftLastAccessTime.dwHighDateTime = HIWORD(access);
@@ -245 +246 @@
                         retval = FTP_CloseFindNextHandle((LPWININETFINDNEXTA) lpwh);
                         break;
-                
+
                 default:
                         break;
@@ -264 +265 @@
  *
  */
-BOOLAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, 
+BOOLAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags,
                 LPURL_COMPONENTSA lpUrlComponents)
 {
@@ -372 +373 @@
         // [<user>[<:password>]@]<host>[:<port>]
         // First find the user and password if they exist...
-                        
+
         szHost = strchr( szNetLoc, '@' );
         if( szHost == NULL )
@@ -458 +459 @@
  *
  * Sets up a callback function which is called as progress is made
- * during an operation. 
+ * during an operation.
  *
  * RETURNS
@@ -473 +474 @@
         TRACE("\n");
         if (lpwai->hdr.htype != WH_HINIT)
-                return INTERNET_INVALID_STATUS_CALLBACK; 
+                return INTERNET_INVALID_STATUS_CALLBACK;
 
         retVal = lpwai->lpfnStatusCB;
@@ -485 +486 @@
  *           InternetWriteFile (WININET.138)
  *
- * Write data to an open internet file 
+ * Write data to an open internet file
  *
  * RETURNS
@@ -506 +507 @@
         {
                 case WH_HHTTPREQ:
-                        nSocket = ((LPWININETHTTPREQA)hFile)->nSocketFD; 
+                        nSocket = ((LPWININETHTTPREQA)hFile)->nSocketFD;
                         break;
 
@@ -533 +534 @@
  *           InternetReadFile (WININET.121)
  *
- * Read data from an open internet file 
+ * Read data from an open internet file
  *
  * RETURNS
@@ -540 +541 @@
  *
  */
-BOOLAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, 
+BOOLAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer,
         DWORD dwNumOfBytesToRead, LPDWORD dwNumOfBytesRead)
 {
@@ -554 +555 @@
         {
                 case WH_HHTTPREQ:
-                        nSocket = ((LPWININETHTTPREQA)hFile)->nSocketFD; 
+                        nSocket = ((LPWININETHTTPREQA)hFile)->nSocketFD;
                         break;
 

trunk/src/wininet/utility.c

@@ -1 @@
-/* 
+/* $Id: utility.c,v 1.2 2000-07-29 14:10:09 bird Exp $
+ *
  * Wininet - Utility functions
  *
@@ -38 +39 @@
         //Assert that the string is the expected length
         if (tmpChar[TIME_STRING_LEN] != '\0')
-        { 
+        {
                 tmpChar[TIME_STRING_LEN] = '\0';
                 FIXME("\n");
@@ -59 +60 @@
         SystemTime.tm_min = atoi(tmpChar+20);
         SystemTime.tm_sec = atoi(tmpChar+23);
-        
+
         //and month
         tmpChar2 = tmpChar + 8;