Finally creating the PowerPC branch. Time to get some local edits out of here.

svn path=/branches/powerpc/; revision=14752

apps/testsets/loadlib/makefile

@@ -0,0 +1,24 @@
+#
+# $Id: makefile,v 1.0
+
+PATH_TO_TOP = ../../..
+
+TARGET_NORC = yes
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_NAME = loadlib
+
+TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -DUNICODE -D_UNICODE
+
+TARGET_SDKLIBS = kernel32.a ntdll.a 
+
+TARGET_OBJECTS = $(TARGET_NAME).o
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF

apps/utils/Makefile

@@ -0,0 +1,71 @@
+#
+# ReactOS system utilities makefile
+#
+
+PATH_TO_TOP = ../..
+
+include $(PATH_TO_TOP)/rules.mak
+
+
+# Console system utilities
+# cabman cat net objdir partinfo pice ps sc stats
+UTIL_APPS = cat objdir pnpdump sc shutdown stats tickcount ps
+
+UTIL_NET_APPS = arp finger ftp ipconfig netstat ping route telnet whois
+
+
+all: $(UTIL_APPS) $(UTIL_NET_APPS)
+
+depends: 
+
+implib: $(UTIL_APPS:%=%_implib) \
+	$(UTIL_NET_APPS:%=%_implib)
+
+clean: 	$(UTIL_APPS:%=%_clean) \
+	$(UTIL_NET_APPS:%=%_clean)
+
+install: $(UTIL_APPS:%=%_install) \
+	 $(UTIL_NET_APPS:%=%_install)
+
+.PHONY: all depends implib clean install
+
+
+#
+# Utility Applications
+#
+$(UTIL_APPS): %:
+	$(MAKE) -C $*
+
+$(UTIL_APPS:%=%_implib): %_implib:
+	$(MAKE) -C $* implib
+
+$(UTIL_APPS:%=%_clean): %_clean:
+	$(MAKE) -C $* clean
+
+$(UTIL_APPS:%=%_install): %_install:
+	$(MAKE) -C $* install
+
+.PHONY: $(UTIL_APPS) $(UTIL_APPS:%=%_implib) $(UTIL_APPS:%=%_clean) $(UTIL_APPS:%=%_install)
+
+#
+# GUI Utility Applications
+#
+$(UTIL_NET_APPS): %:
+	$(MAKE) -C net/$*
+
+$(UTIL_NET_APPS:%=%_implib): %_implib:
+	$(MAKE) -C net/$* implib
+
+$(UTIL_NET_APPS:%=%_clean): %_clean:
+	$(MAKE) -C net/$* clean
+
+$(UTIL_NET_APPS:%=%_install): %_install:
+	$(MAKE) -C net/$* install
+
+.PHONY: $(UTIL_NET_APPS) $(UTIL_NET_APPS:%=%_implib) $(UTIL_NET_APPS:%=%_clean) $(UTIL_NET_APPS:%=%_install)
+
+
+etags:
+	find . -name "*.[ch]" -print | etags --language=c -
+
+# EOF

apps/utils/binpatch/Makefile

@@ -0,0 +1,21 @@
+PATH_TO_TOP = ../../..
+
+TARGET_NORC = yes
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_NAME = binpatch
+
+TARGET_SDKLIBS = 
+
+TARGET_OBJECTS = patch.o
+
+TARGET_CFLAGS += -Wall -Werror
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF

apps/utils/binpatch/patch.c

@@ -0,0 +1,615 @@
+#include <conio.h>
+#include <io.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+/** DEFINES *******************************************************************/
+
+#define PATCH_BUFFER_SIZE           4096    /* Maximum size of a patch */
+#define PATCH_BUFFER_MAGIC          "\xde\xad\xbe\xef MaGiC MaRk "
+#define SIZEOF_PATCH_BUFFER_MAGIC   (sizeof (PATCH_BUFFER_MAGIC) - 1)
+
+/** TYPES *********************************************************************/
+
+typedef struct _PatchedByte
+{
+   int            offset;    /*!< File offset of the patched byte. */
+   unsigned char  expected;  /*!< Expected (original) value of the byte. */
+   unsigned char  patched;   /*!< Patched (new) value for the byte. */
+} PatchedByte;
+
+typedef struct _PatchedFile
+{
+   const char  *name;        /*!< Name of the file to be patched. */
+   int          fileSize;    /*!< Size of the file in bytes. */
+   int          patchCount;  /*!< Number of patches for the file. */
+   PatchedByte *patches;     /*!< Patches for the file. */
+} PatchedFile;
+
+typedef struct _Patch
+{
+   const char   *name;       /*!< Name of the patch. */
+   int           fileCount;  /*!< Number of files in the patch. */
+   PatchedFile  *files;      /*!< Files for the patch. */
+} Patch;
+
+/** FUNCTION PROTOTYPES *******************************************************/
+
+static void printUsage();
+
+/** GLOBALS *******************************************************************/
+
+static Patch m_patch = { NULL, 0, NULL };
+static int m_argc = 0;
+static char **m_argv = NULL;
+
+/* patch buffer where we put the patch info into */
+static unsigned char m_patchBuffer[SIZEOF_PATCH_BUFFER_MAGIC + PATCH_BUFFER_SIZE] =
+   PATCH_BUFFER_MAGIC;
+
+/** HELPER FUNCTIONS **********************************************************/
+
+static void *
+loadFile(const char *fileName, int *fileSize_)
+{
+   FILE *f;
+   struct stat sb;
+   int fileSize;
+   void *p;
+   
+   /* Open the file */
+   f = fopen(fileName, "rb");
+   if (f == NULL)
+   {
+      printf("Couldn't open file %s for reading!\n", fileName);
+      return NULL;
+   }
+   
+   /* Get file size */
+   if (fstat(fileno(f), &sb) < 0)
+   {
+      fclose(f);
+      printf("Couldn't get size of file %s!\n", fileName);
+      return NULL;
+   }
+   fileSize = sb.st_size;
+   
+   /* Load file */
+   p = malloc(fileSize);
+   if (p == NULL)
+   {
+      fclose(f);
+      printf("Couldn't allocate %d bytes for file %s!\n", fileSize, fileName);
+      return NULL;
+   }
+   
+   if (fread(p, fileSize, 1, f) != 1)
+   {
+      fclose(f);
+      free(p);
+      printf("Couldn't read file %s into memory!\n", fileName);
+      return NULL;
+   }
+   
+   /* Close file */
+   fclose(f);
+   
+   *fileSize_ = fileSize;
+   return p;
+}
+
+
+static int
+saveFile(const char *fileName, void *file, int fileSize)
+{
+   FILE *f;
+
+   /* Open the file */
+   f = fopen(fileName, "wb");
+   if (f == NULL)
+   {
+      printf("Couldn't open file %s for writing!\n", fileName);
+      return -1;
+   }
+
+   /* Write file */
+   if (fwrite(file, fileSize, 1, f) != 1)
+   {
+      fclose(f);
+      printf("Couldn't write file %s!\n", fileName);
+      return -1;
+   }
+
+   /* Close file */
+   fclose(f);
+   return 0;
+}
+
+
+static int
+compareFiles(
+   PatchedFile *patchedFile,
+   const char *originalFileName)
+{
+   const char *patchedFileName = patchedFile->name;
+   unsigned char *origChunk, *patchedChunk;
+   int origSize, patchedSize, i, patchCount;
+   PatchedByte *patches = NULL;
+   int patchesArrayCount = 0;
+   
+   /* Load both files */
+   origChunk = loadFile(originalFileName, &origSize);
+   if (origChunk == NULL)
+      return -1;
+   patchedChunk = loadFile(patchedFileName, &patchedSize);
+   if (patchedChunk == NULL)
+   {
+      free(origChunk);
+      return -1;
+   }
+   if (origSize != patchedSize)
+   {
+      free(origChunk);
+      free(patchedChunk);
+      printf("File size of %s and %s differs (%d != %d)\n",
+             originalFileName, patchedFileName,
+             origSize, patchedSize);
+      return -1;
+   }
+   
+   /* Compare the files and record any differences */
+   printf("Comparing %s to %s", originalFileName, patchedFileName);
+   for (i = 0, patchCount = 0; i < origSize; i++)
+   {
+      if (origChunk[i] != patchedChunk[i])
+      {
+         patchCount++;
+         
+         /* Resize patches array if needed */
+         if (patchesArrayCount < patchCount)
+         {
+            PatchedByte *newPatches;
+            newPatches = realloc(patches, patchCount * sizeof (PatchedByte));
+            if (newPatches == NULL)
+            {
+              if (patches != NULL)
+                free(patches);
+              free(origChunk);
+              free(patchedChunk);
+              printf("\nOut of memory (tried to allocated %d bytes)\n",
+                     patchCount * sizeof (PatchedByte));
+              return -1;
+            }
+            patches = newPatches;
+         }
+         
+         /* Fill in patch info */
+         patches[patchCount - 1].offset = i;
+         patches[patchCount - 1].expected = origChunk[i];
+         patches[patchCount - 1].patched = patchedChunk[i];
+      }
+      if ((i % (origSize / 40)) == 0)
+         printf(".");
+   }
+   printf(" %d changed bytes found.\n", patchCount);
+   
+   /* Unload the files */
+   free(origChunk);
+   free(patchedChunk);
+   
+   /* Save patch info */
+   patchedFile->fileSize = patchedSize;
+   patchedFile->patchCount = patchCount;
+   patchedFile->patches = patches;
+   
+   return 0;
+}
+
+
+static int
+outputPatch(const char *outputFileName)
+{
+   unsigned char *patchExe, *patchBuffer;
+   int i, size, patchExeSize, patchSize, stringSize, stringOffset, patchOffset;
+   Patch *patch;
+   PatchedFile *files;
+   
+   printf("Putting patch into %s...\n", outputFileName);
+   
+   /* Calculate size of the patch */
+   patchSize = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount;
+   stringSize = strlen(m_patch.name) + 1;
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      stringSize += strlen(m_patch.files[i].name) + 1;
+      patchSize += sizeof (PatchedByte) * m_patch.files[i].patchCount;
+   }
+   if ((stringSize + patchSize) > PATCH_BUFFER_SIZE)
+   {
+      printf("Patch is too big - %d bytes maximum, %d bytes needed\n",
+             PATCH_BUFFER_SIZE, stringSize + patchSize);
+      return -1;
+   }
+
+   /* Load patch.exe file into memory... */
+   patchExe = loadFile(m_argv[0], &patchExeSize);
+   if (patchExe == NULL)
+   {
+      return -1;
+   }
+   
+   /* Try to find the magic mark for the patch buffer */
+   for (i = 0; i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC); i++)
+   {
+      if (memcmp(patchExe + i, m_patchBuffer, SIZEOF_PATCH_BUFFER_MAGIC) == 0)
+      {
+         patchBuffer = patchExe + i + SIZEOF_PATCH_BUFFER_MAGIC;
+         
+         break;
+      }
+   }
+   if (!(i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC)))
+   {
+      free(patchExe);
+      printf("Couldn't find patch buffer magic in file %s - this shouldn't happen!!!\n", m_argv[0]);
+      return -1;
+   }
+   
+   /* Pack patch together and replace string pointers by offsets */
+   patch = (Patch *)patchBuffer;
+   files = (PatchedFile *)(patchBuffer + sizeof (Patch));
+   patchOffset = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount;
+   stringOffset = patchSize;
+   
+   patch->fileCount = m_patch.fileCount;
+   patch->files = (PatchedFile *)sizeof (Patch);
+
+   patch->name = (const char *)stringOffset;
+   strcpy(patchBuffer + stringOffset, m_patch.name);
+   stringOffset += strlen(m_patch.name) + 1;
+   
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      files[i].fileSize = m_patch.files[i].fileSize;
+      files[i].patchCount = m_patch.files[i].patchCount;
+      
+      files[i].name = (const char *)stringOffset;
+      strcpy(patchBuffer + stringOffset, m_patch.files[i].name);
+      stringOffset += strlen(m_patch.files[i].name) + 1;
+      
+      size = files[i].patchCount * sizeof (PatchedByte);
+      files[i].patches = (PatchedByte *)patchOffset;
+      memcpy(patchBuffer + patchOffset, m_patch.files[i].patches, size);
+      patchOffset += size;
+   }
+   size = patchSize + stringSize;
+   memset(patchBuffer + size, 0, PATCH_BUFFER_SIZE - size);
+
+   /* Save file */
+   if (saveFile(outputFileName, patchExe, patchExeSize) < 0)
+   {
+      free(patchExe);
+      return -1;
+   }
+   free(patchExe);
+
+   printf("Patch saved!\n");
+   return 0;
+}
+
+
+static int
+loadPatch()
+{
+   char *p;
+   Patch *patch;
+   int i;
+   
+   p = m_patchBuffer + SIZEOF_PATCH_BUFFER_MAGIC;
+   patch = (Patch *)p;
+   
+   if (patch->name == NULL)
+   {
+      return -1;
+   }
+   
+   m_patch.name = p + (int)patch->name;
+   m_patch.fileCount = patch->fileCount;
+   m_patch.files = (PatchedFile *)(p + (int)patch->files);
+
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      m_patch.files[i].name = p + (int)m_patch.files[i].name;
+      m_patch.files[i].patches = (PatchedByte *)(p + (int)m_patch.files[i].patches);
+   }
+   
+   printf("Patch %s loaded...\n", m_patch.name);
+   return 0;
+}
+
+
+/** MAIN FUNCTIONS ************************************************************/
+
+static int
+createPatch()
+{
+   int i, status;
+   const char *outputFileName;
+
+   /* Check argument count */
+   if (m_argc < 6 || (m_argc % 2) != 0)
+   {
+      printUsage();
+      return -1;
+   }
+
+   outputFileName = m_argv[3];
+   m_patch.name = m_argv[2];
+
+   /* Allocate PatchedFiles array */
+   m_patch.fileCount = (m_argc - 4) / 2;
+   m_patch.files = malloc(m_patch.fileCount * sizeof (PatchedFile));
+   if (m_patch.files == NULL)
+   {
+      printf("Out of memory!\n");
+      return -1;
+   }
+   memset(m_patch.files, 0, m_patch.fileCount * sizeof (PatchedFile));
+
+   /* Compare original to patched files and fill m_patch.files array */
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      m_patch.files[i].name = m_argv[4 + (i * 2) + 1];
+      status = compareFiles(m_patch.files + i, m_argv[4 + (i * 2) + 0]);
+      if (status < 0)
+      {
+         for (i = 0; i < m_patch.fileCount; i++)
+         {
+            if (m_patch.files[i].patches != NULL)
+               free(m_patch.files[i].patches);
+         }
+         free(m_patch.files);
+         m_patch.files = NULL;
+         m_patch.fileCount = 0;
+         return status;
+      }
+   }
+   
+   /* Output patch */
+   return outputPatch(outputFileName);
+}
+
+
+static int
+applyPatch()
+{
+   int c, i, j, fileSize, makeBackup;
+   unsigned char *file;
+   char *p;
+   const char *fileName;
+   char buffer[MAX_PATH];
+   
+
+   if (m_argc > 1 && strcmp(m_argv[1], "-d") != 0)
+   {
+      printUsage();
+      return -1;
+   }
+
+   /* Load patch */
+   if (loadPatch() < 0)
+   {
+      printf("This executable doesn't contain a patch, use -c to create one.\n");
+      return -1;
+   }
+
+   if (m_argc > 1)
+   {
+      /* Dump patch */
+      printf("Patch name: %s\n", m_patch.name);
+      printf("File count: %d\n", m_patch.fileCount);
+      for (i = 0; i < m_patch.fileCount; i++)
+      {
+         printf("----------------------\n"
+                "File name:   %s\n"
+                "File size:   %d bytes\n",
+                m_patch.files[i].name, m_patch.files[i].fileSize);
+         printf("Patch count: %d\n", m_patch.files[i].patchCount);
+         for (j = 0; j < m_patch.files[i].patchCount; j++)
+         {
+            printf("  Offset 0x%x   0x%02x -> 0x%02x\n",
+                   m_patch.files[i].patches[j].offset,
+                   m_patch.files[i].patches[j].expected,
+                   m_patch.files[i].patches[j].patched);
+         }
+      }
+   }
+   else
+   {
+      /* Apply patch */
+      printf("Applying patch...\n");
+      for (i = 0; i < m_patch.fileCount; i++)
+      {
+         /* Load original file */
+         fileName = m_patch.files[i].name;
+applyPatch_retry_file:
+         file = loadFile(fileName, &fileSize);
+         if (file == NULL)
+         {
+            printf("File %s not found! ", fileName);
+applyPatch_file_open_error:
+            printf("(S)kip, (R)etry, (A)bort, (M)anually enter filename");
+            do
+            {
+               c = getch();
+            }
+            while (c != 's' && c != 'r' && c != 'a' && c != 'm');
+            printf("\n");
+            if (c == 's')
+            {
+               continue;
+            }
+            else if (c == 'r')
+            {
+               goto applyPatch_retry_file;
+            }
+            else if (c == 'a')
+            {
+               return 0;
+            }
+            else if (c == 'm')
+            {
+               if (fgets(buffer, sizeof (buffer), stdin) == NULL)
+               {
+                  printf("fgets() failed!\n");
+                  return -1;
+               }
+               p = strchr(buffer, '\r');
+               if (p != NULL)
+                  *p = '\0';
+               p = strchr(buffer, '\n');
+               if (p != NULL)
+                  *p = '\0';
+
+               fileName = buffer;
+               goto applyPatch_retry_file;
+            }
+         }
+
+         /* Check file size */
+         if (fileSize != m_patch.files[i].fileSize)
+         {
+            free(file);
+            printf("File %s has unexpected filesize of %d bytes (%d bytes expected)\n",
+                   fileName, fileSize, m_patch.files[i].fileSize);
+            if (fileName != m_patch.files[i].name) /* manually entered filename */
+            {
+               goto applyPatch_file_open_error;
+            }
+            return -1;
+         }
+         
+         /* Ask for backup */
+         printf("Do you want to make a backup of %s? (Y)es, (N)o, (A)bort", fileName);
+         do
+         {
+            c = getch();
+         }
+         while (c != 'y' && c != 'n' && c != 'a');
+         printf("\n");
+         if (c == 'y')
+         {
+            char buffer[MAX_PATH];
+            snprintf(buffer, MAX_PATH, "%s.bak", fileName);
+            buffer[MAX_PATH-1] = '\0';
+            makeBackup = 1;
+            if (access(buffer, 0) >= 0) /* file exists */
+            {
+               printf("File %s already exists, overwrite? (Y)es, (N)o, (A)bort", buffer);
+               do
+               {
+                  c = getch();
+               }
+               while (c != 'y' && c != 'n' && c != 'a');
+               printf("\n");
+               if (c == 'n')
+                  makeBackup = 0;
+               else if (c == 'a')
+               {
+                  free(file);
+                  return 0;
+               }
+            }
+            if (makeBackup && saveFile(buffer, file, fileSize) < 0)
+            {
+               free(file);
+               return -1;
+            }
+         }
+         else if (c == 'a')
+         {
+            free(file);
+            return 0;
+         }
+         
+         /* Patch file */
+         for (j = 0; j < m_patch.files[i].patchCount; j++)
+         {
+            int offset = m_patch.files[i].patches[j].offset;
+            if (file[offset] != m_patch.files[i].patches[j].expected)
+            {
+               printf("Unexpected value in file %s at offset 0x%x: expected = 0x%02x, found = 0x%02x\n",
+                      fileName, offset, m_patch.files[i].patches[j].expected, file[offset]);
+               free(file);
+               return -1;
+            }
+            file[offset] = m_patch.files[i].patches[j].patched;
+         }
+         
+         /* Save file */
+         if (saveFile(fileName, file, fileSize) < 0)
+         {
+            free(file);
+            return -1;
+         }
+         free(file);
+      }
+      
+      printf("Patch applied sucessfully!\n");
+   }
+
+   return 0;
+}
+
+
+static void
+printUsage()
+{
+   printf("Usage:\n"
+          "%s -c     - Create patch\n"
+          "%s -d     - Dump patch\n"
+          "%s        - Apply patch\n"
+          "\n"
+          "A patch can be created like this:\n"
+          "%s -c \"patch name\" output.exe file1.orig file1.patched[ file2.orig file2.patched[ ...]]\n",
+          m_argv[0], m_argv[0], m_argv[0], m_argv[0]);
+}
+
+
+int
+main(
+   int argc,
+   char *argv[])
+{
+   m_argc = argc;
+   m_argv = argv;
+
+   if (argc >= 2 && (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0))
+   {
+      printUsage();
+      return 0;
+   }
+   else if (argc >= 2 && argv[1][0] == '-')
+   {
+      if (strcmp(argv[1], "-c") == 0)
+      {
+         return createPatch();
+      }
+      else if (strcmp(argv[1], "-d") == 0)
+      {
+         return applyPatch();
+      }
+      else
+      {
+         printf("Unknown option: %s\n"
+                "Use -h for help.\n",
+                argv[1]);
+         return -1;
+      }
+   }
+   
+   return applyPatch();
+}
+

apps/utils/net/finger/net.c

@@ -56,14 +56,14 @@ netfinger(char *name)
 	struct hostent *hp, def;
 	struct servent *sp;
 	struct sockaddr_in sin;
-	int s;
+	SOCKET s;
 	char *alist[1], *host;
 
 	/* If this is a local request */
 	if (!(host = rindex(name, '@')))
 		return;
 
-	*host++ = NULL;
+	*host++ = '\0';
 	if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1) {
 		def.h_name = host;
 		def.h_addr_list = alist;
@@ -84,7 +84,7 @@ netfinger(char *name)
 	sin.sin_family = hp->h_addrtype;
 	bcopy(hp->h_addr, (char *)&sin.sin_addr, hp->h_length);
 	sin.sin_port = sp->s_port;
-	if ((s = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
+	if ((s = socket(hp->h_addrtype, SOCK_STREAM, 0)) == INVALID_SOCKET) {
 		perror("finger: socket");
 		return;
 	}

apps/utils/net/ftp/domacro.c

@@ -19,7 +19,7 @@
 static char sccsid[] = "@(#)domacro.c	1.6 (Berkeley) 2/28/89";
 #endif /* not lint */
 
-#include "ftp_var.h"
+#include "ftp_var.h"
 #include "prototypes.h"
 
 #include <signal.h>

apps/utils/net/ftp/fake.c

@@ -1,344 +1,344 @@
-#include <stdio.h>
-#include <time.h>
-#include <winsock.h>
-#include "prototypes.h"
-
-#define MAX_ASCII 100
-
-int checkRecv(SOCKET s);
-
-int checkRecv(SOCKET s)
-{
-   int testVal;
-   fd_set sSet;
-   struct timeval timeout;
-   timeout.tv_sec = 60;
-
-   FD_ZERO(&sSet);
-
-   FD_SET(s, &sSet);
-
-   testVal = select(0, &sSet, NULL, NULL, &timeout);
-
-   if (testVal == SOCKET_ERROR)
-      fprintf(stderr, "Socket Error");
-
-   return testVal;
-}
-
-void blkfree(char **av0)
-{
-	register char **av = av0;
-
-	while (*av)
-		free(*av++);
-}
-
-char *glob(register char *v)
-{
-   return NULL;
-}
-
-
-int sleep(int time)
-{
-   return time;
-}
-
-int herror(char *string)
-{
-   return 0;
-}
-#if 0
-
-int gettimeofday(struct timeval *timenow,
-				 struct timezone *zone)
-{
-	time_t t;
-
-	t = clock();
-
-	timenow->tv_usec = t;
-	timenow->tv_sec = t / CLK_TCK;
-
-	return 0;
-}
-
-int fgetcSocket(int s)
-{
-   int c;
-   char buffer[10];
-
-//   checkRecv(s);
-
-   c = recv(s, buffer, 1, 0);
-
-#ifdef DEBUG_IN
-   printf("%c", buffer[0]);
-#endif
-
-   if (c == INVALID_SOCKET)
-      return c;
-
-   if (c == 0)
-      return EOF;
-
-   return buffer[0];
-}
-
-#else
-
-int fgetcSocket(int s)
-{
-   static int index = 0;
-   static int total = 0;
-   static unsigned char buffer[4096];
-
-   if (index == total)
-     {
-       index = 0;
-       total = recv(s, buffer, sizeof(buffer), 0);
-
-       if (total == INVALID_SOCKET)
-	 {
-	   total = 0;
-	   return ERROR;
-	 }
-
-       if (total == 0)
-	 return EOF;
-     }
-   return buffer[index++];
-}
-
-#endif
-
-char *fprintfSocket(int s, char *format, ...)
-{
-   va_list argptr;
-   char buffer[10009];
-
-   va_start(argptr, format);
-   vsprintf(buffer, format, argptr);
-   va_end(argptr);
-
-   send(s, buffer, strlen(buffer), 0);
-
-   return NULL;
-}
-
-char *fputsSocket(char *format, int s)
-{
-   send(s, format, strlen(format), 0);
-
-   return NULL;
-}
-
-int fputcSocket(int s, char putChar)
-{
-   char buffer[2];
-
-   buffer[0] = putChar;
-   buffer[1] = '\0';
-
-   if(SOCKET_ERROR==send(s, buffer, 1, 0)) {
-	   int iret=WSAGetLastError (); 
-	   fprintf(stdout,"fputcSocket: %d\n",iret);
-	   return 0;
-   }
-   else {
-	return putChar;
-   }
-}
-int fputSocket(int s, char *buffer, int len)
-{
-	int iret;
-	while(len) {
-		if(SOCKET_ERROR==(iret=send(s, buffer, len, 0))) 
-		{
-			iret=WSAGetLastError (); 
-			fprintf(stdout,"fputcSocket: %d\n",iret);
-			return 0;
-		}
-		else {
-			return len-=iret;
-		}
-	}
-	return 0;
-}
-
-char *fgetsSocket(int s, char *string)
-{
-   char buffer[2] = {0};
-   int i, count;
-
-   for (i = 0, count = 1; count != 0 && buffer[0] != '\n'; i++)
-   {
-      checkRecv(s);
-
-      count = recv(s, buffer, 1, 0);
-
-      if (count == SOCKET_ERROR)
-      {
-	 printf("Error in fgetssocket");
-	 return NULL;
-      }
-
-      if (count == 1)
-      {
-	 string[i] = buffer[0];
-	 
-	 if (i == MAX_ASCII - 3)
-	 {
-	    count = 0;
-	    string[++i] = '\n';
-	    string[++i] = '\0';
-	 }
-      }
-      else
-      {
-	 if (i == 0)
-	    return NULL;
-	 else
-	 {
-	    string[i] = '\n';
-	    string[i + 1] = '\0'; // This is risky
-	    return string;
-	 }
-
-      }
-
-   }
-   string[i] = '\0';
-
-#ifdef DEBUG_IN
-   printf("%s", string);
-#endif
-   return string;
-}
-
-
-#if 0
-char *getpass(const char *prompt)
-{
-   static char string[64];
-
-   printf("%s", prompt);
-
-   gets(string);
-
-   return string;
-}
-#endif
-char *getpass (const char * prompt)
-{
-  static char input[256];
-  HANDLE in;
-  HANDLE err;
-  int    count;
-
-  in = GetStdHandle (STD_INPUT_HANDLE);
-  err = GetStdHandle (STD_ERROR_HANDLE);
-
-  if (in == INVALID_HANDLE_VALUE || err == INVALID_HANDLE_VALUE)
-    return NULL;
-
-  if (WriteFile (err, prompt, strlen (prompt), &count, NULL))
-    {
-      int istty = (GetFileType (in) == FILE_TYPE_CHAR);
-      DWORD old_flags;
-      int rc;
-
-      if (istty)
-	{
-	  if (GetConsoleMode (in, &old_flags))
-	    SetConsoleMode (in, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
-	  else
-	    istty = 0;
-	}
-      /* Need to read line one byte at time to avoid blocking, if not a
-         tty, so always do it this way.  */
-      count = 0;
-      while (1)
-	{
-	  DWORD  dummy;
-	  char   one_char;
-
-	  rc = ReadFile (in, &one_char, 1, &dummy, NULL);
-	  if (rc == 0)
-	    break;
-	  if (one_char == '\r')
-	    {
-	      /* CR is always followed by LF if reading from tty.  */
-	      if (istty)
-		continue;
-	      else
-		break;
-	    }
-	  if (one_char == '\n')
-	    break;
-	  /* Silently truncate password string if overly long.  */
-	  if (count < sizeof (input) - 1)
-	    input[count++] = one_char;
-	}
-      input[count] = '\0';
-
-      WriteFile (err, "\r\n", 2, &count, NULL);
-      if (istty)
-	SetConsoleMode (in, old_flags);
-      if (rc)
-	return input;
-    }
-
-  return NULL;
-}
-
-// Stubbed out here. Should be changed in Source code...
-int access(const char *filename, int accessmethod)
-{
-   return 0;
-}
-
-#ifndef __GNUC__
-#define EPOCHFILETIME (116444736000000000i64)
-#else
-#define EPOCHFILETIME (116444736000000000LL)
-#endif
-
-struct timezone {
-    int tz_minuteswest; /* minutes W of Greenwich */
-    int tz_dsttime;     /* type of dst correction */
-};
-
-__inline int gettimeofday(struct timeval *tv, struct timezone *tz)
-{
-    FILETIME        ft;
-    LARGE_INTEGER   li;
-    __int64         t;
-    static int      tzflag;
-
-    if (tv)
-    {
-        GetSystemTimeAsFileTime(&ft);
-        //li.LowPart  = ft.dwLowDateTime;
-        //li.HighPart = ft.dwHighDateTime;
-        t  = li.QuadPart;       /* In 100-nanosecond intervals */
-        t -= EPOCHFILETIME;     /* Offset to the Epoch time */
-        t /= 10;                /* In microseconds */
-        tv->tv_sec  = (long)(t / 1000000);
-        tv->tv_usec = (long)(t % 1000000);
-    }
-
-    if (tz)
-    {
-        if (!tzflag)
-        {
-            _tzset();
-            tzflag++;
-        }
-        tz->tz_minuteswest = _timezone / 60;
-        tz->tz_dsttime = _daylight;
-    }
-
-    return 0;
-}
+#include <stdio.h>
+#include <time.h>
+#include <winsock.h>
+#include "prototypes.h"
+
+#define MAX_ASCII 100
+
+int checkRecv(SOCKET s);
+
+int checkRecv(SOCKET s)
+{
+   int testVal;
+   fd_set sSet;
+   struct timeval timeout;
+   timeout.tv_sec = 60;
+
+   FD_ZERO(&sSet);
+
+   FD_SET(s, &sSet);
+
+   testVal = select(0, &sSet, NULL, NULL, &timeout);
+
+   if (testVal == SOCKET_ERROR)
+      fprintf(stderr, "Socket Error");
+
+   return testVal;
+}
+
+void blkfree(char **av0)
+{
+	register char **av = av0;
+
+	while (*av)
+		free(*av++);
+}
+
+char *glob(register char *v)
+{
+   return NULL;
+}
+
+
+int sleep(int time)
+{
+   return time;
+}
+
+int herror(char *string)
+{
+   return 0;
+}
+#if 0
+
+int gettimeofday(struct timeval *timenow,
+				 struct timezone *zone)
+{
+	time_t t;
+
+	t = clock();
+
+	timenow->tv_usec = t;
+	timenow->tv_sec = t / CLK_TCK;
+
+	return 0;
+}
+
+int fgetcSocket(int s)
+{
+   int c;
+   char buffer[10];
+
+//   checkRecv(s);
+
+   c = recv(s, buffer, 1, 0);
+
+#ifdef DEBUG_IN
+   printf("%c", buffer[0]);
+#endif
+
+   if (c == INVALID_SOCKET)
+      return c;
+
+   if (c == 0)
+      return EOF;
+
+   return buffer[0];
+}
+
+#else
+
+int fgetcSocket(int s)
+{
+   static int index = 0;
+   static int total = 0;
+   static unsigned char buffer[4096];
+
+   if (index == total)
+     {
+       index = 0;
+       total = recv(s, buffer, sizeof(buffer), 0);
+
+       if (total == INVALID_SOCKET)
+	 {
+	   total = 0;
+	   return ERROR;
+	 }
+
+       if (total == 0)
+	 return EOF;
+     }
+   return buffer[index++];
+}
+
+#endif
+
+char *fprintfSocket(int s, char *format, ...)
+{
+   va_list argptr;
+   char buffer[10009];
+
+   va_start(argptr, format);
+   vsprintf(buffer, format, argptr);
+   va_end(argptr);
+
+   send(s, buffer, strlen(buffer), 0);
+
+   return NULL;
+}
+
+char *fputsSocket(char *format, int s)
+{
+   send(s, format, strlen(format), 0);
+
+   return NULL;
+}
+
+int fputcSocket(int s, char putChar)
+{
+   char buffer[2];
+
+   buffer[0] = putChar;
+   buffer[1] = '\0';
+
+   if(SOCKET_ERROR==send(s, buffer, 1, 0)) {
+	   int iret=WSAGetLastError (); 
+	   fprintf(stdout,"fputcSocket: %d\n",iret);
+	   return 0;
+   }
+   else {
+	return putChar;
+   }
+}
+int fputSocket(int s, char *buffer, int len)
+{
+	int iret;
+	while(len) {
+		if(SOCKET_ERROR==(iret=send(s, buffer, len, 0))) 
+		{
+			iret=WSAGetLastError (); 
+			fprintf(stdout,"fputcSocket: %d\n",iret);
+			return 0;
+		}
+		else {
+			return len-=iret;
+		}
+	}
+	return 0;
+}
+
+char *fgetsSocket(int s, char *string)
+{
+   char buffer[2] = {0};
+   int i, count;
+
+   for (i = 0, count = 1; count != 0 && buffer[0] != '\n'; i++)
+   {
+      checkRecv(s);
+
+      count = recv(s, buffer, 1, 0);
+
+      if (count == SOCKET_ERROR)
+      {
+	 printf("Error in fgetssocket");
+	 return NULL;
+      }
+
+      if (count == 1)
+      {
+	 string[i] = buffer[0];
+	 
+	 if (i == MAX_ASCII - 3)
+	 {
+	    count = 0;
+	    string[++i] = '\n';
+	    string[++i] = '\0';
+	 }
+      }
+      else
+      {
+	 if (i == 0)
+	    return NULL;
+	 else
+	 {
+	    string[i] = '\n';
+	    string[i + 1] = '\0'; // This is risky
+	    return string;
+	 }
+
+      }
+
+   }
+   string[i] = '\0';
+
+#ifdef DEBUG_IN
+   printf("%s", string);
+#endif
+   return string;
+}
+
+
+#if 0
+char *getpass(const char *prompt)
+{
+   static char string[64];
+
+   printf("%s", prompt);
+
+   gets(string);
+
+   return string;
+}
+#endif
+char *getpass (const char * prompt)
+{
+  static char input[256];
+  HANDLE in;
+  HANDLE err;
+  DWORD    count;
+
+  in = GetStdHandle (STD_INPUT_HANDLE);
+  err = GetStdHandle (STD_ERROR_HANDLE);
+
+  if (in == INVALID_HANDLE_VALUE || err == INVALID_HANDLE_VALUE)
+    return NULL;
+
+  if (WriteFile (err, prompt, strlen (prompt), &count, NULL))
+    {
+      int istty = (GetFileType (in) == FILE_TYPE_CHAR);
+      DWORD old_flags;
+      int rc;
+
+      if (istty)
+	{
+	  if (GetConsoleMode (in, &old_flags))
+	    SetConsoleMode (in, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
+	  else
+	    istty = 0;
+	}
+      /* Need to read line one byte at time to avoid blocking, if not a
+         tty, so always do it this way.  */
+      count = 0;
+      while (1)
+	{
+	  DWORD  dummy;
+	  char   one_char;
+
+	  rc = ReadFile (in, &one_char, 1, &dummy, NULL);
+	  if (rc == 0)
+	    break;
+	  if (one_char == '\r')
+	    {
+	      /* CR is always followed by LF if reading from tty.  */
+	      if (istty)
+		continue;
+	      else
+		break;
+	    }
+	  if (one_char == '\n')
+	    break;
+	  /* Silently truncate password string if overly long.  */
+	  if (count < sizeof (input) - 1)
+	    input[count++] = one_char;
+	}
+      input[count] = '\0';
+
+      WriteFile (err, "\r\n", 2, &count, NULL);
+      if (istty)
+	SetConsoleMode (in, old_flags);
+      if (rc)
+	return input;
+    }
+
+  return NULL;
+}
+
+// Stubbed out here. Should be changed in Source code...
+int access(const char *filename, int accessmethod)
+{
+   return 0;
+}
+
+#ifndef __GNUC__
+#define EPOCHFILETIME (116444736000000000i64)
+#else
+#define EPOCHFILETIME (116444736000000000LL)
+#endif
+
+struct timezone {
+    int tz_minuteswest; /* minutes W of Greenwich */
+    int tz_dsttime;     /* type of dst correction */
+};
+
+__inline int gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+    FILETIME        ft;
+    LARGE_INTEGER   li;
+    __int64         t;
+    static int      tzflag;
+
+    if (tv)
+    {
+        GetSystemTimeAsFileTime(&ft);
+        //li.LowPart  = ft.dwLowDateTime;
+        //li.HighPart = ft.dwHighDateTime;
+        t  = li.QuadPart;       /* In 100-nanosecond intervals */
+        t -= EPOCHFILETIME;     /* Offset to the Epoch time */
+        t /= 10;                /* In microseconds */
+        tv->tv_sec  = (long)(t / 1000000);
+        tv->tv_usec = (long)(t % 1000000);
+    }
+
+    if (tz)
+    {
+        if (!tzflag)
+        {
+            _tzset();
+            tzflag++;
+        }
+        tz->tz_minuteswest = _timezone / 60;
+        tz->tz_dsttime = _daylight;
+    }
+
+    return 0;
+}

apps/utils/net/ftp/fake.h

@@ -1,10 +1,10 @@
-#define bcopy(s,d,l) memcpy((d),(s),(l))
-#define bzero(cp,l) memset((cp),0,(l))
-
-#define rindex strrchr
-#define index strchr
-
-#define getwd getcwd
-
-#define strcasecmp strcmp
-#define strncasecmp strnicmp
+#define bcopy(s,d,l) memcpy((d),(s),(l))
+#define bzero(cp,l) memset((cp),0,(l))
+
+#define rindex strrchr
+#define index strchr
+
+#define getwd getcwd
+
+#define strcasecmp strcmp
+#define strncasecmp strnicmp

apps/utils/net/ftp/ftp.mak

@@ -1,372 +1,372 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ftp.dsp
-!IF "$(CFG)" == ""
-CFG=ftp - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to ftp - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "ftp - Win32 Release" && "$(CFG)" != "ftp - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ftp.mak" CFG="ftp - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ftp - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ftp - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-!IF  "$(CFG)" == "ftp - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\ftp.exe"
-
-!ELSE
-
-ALL : "$(OUTDIR)\ftp.exe"
-
-!ENDIF
-
-CLEAN :
-	-@erase "$(INTDIR)\cmds.obj"
-	-@erase "$(INTDIR)\cmdtab.obj"
-	-@erase "$(INTDIR)\domacro.obj"
-	-@erase "$(INTDIR)\fake.obj"
-	-@erase "$(INTDIR)\ftp.obj"
-	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\ruserpass.obj"
-	-@erase "$(INTDIR)\vc*.idb"
-	-@erase "$(OUTDIR)\ftp.exe"
-	-@erase "$(OUTDIR)\ftp.pch"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" \
- /D "HAVE_TIMEVAL" /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
- /c
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\ftp.pdb" /machine:I386 /out:"$(OUTDIR)\ftp.exe"
-LINK32_OBJS= \
-	"$(INTDIR)\cmds.obj" \
-	"$(INTDIR)\cmdtab.obj" \
-	"$(INTDIR)\domacro.obj" \
-	"$(INTDIR)\fake.obj" \
-	"$(INTDIR)\ftp.obj" \
-	"$(INTDIR)\main.obj" \
-	"$(INTDIR)\ruserpass.obj"
-
-"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\ftp.exe
-InputPath=.\Release\ftp.exe
-SOURCE=$(InputPath)
-
-!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\ftp.exe"
-
-!ELSE
-
-ALL : "$(OUTDIR)\ftp.exe"
-
-!ENDIF
-
-CLEAN :
-	-@erase "$(INTDIR)\cmds.obj"
-	-@erase "$(INTDIR)\cmdtab.obj"
-	-@erase "$(INTDIR)\domacro.obj"
-	-@erase "$(INTDIR)\fake.obj"
-	-@erase "$(INTDIR)\ftp.obj"
-	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\ruserpass.obj"
-	-@erase "$(INTDIR)\vc*.idb"
-	-@erase "$(INTDIR)\vc*.pdb"
-	-@erase "$(OUTDIR)\ftp.exe"
-	-@erase "$(OUTDIR)\ftp.ilk"
-	-@erase "$(OUTDIR)\ftp.pdb"
-	-@erase "$(OUTDIR)\ftp.pch"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
- /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\ftp.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ftp.exe"\
- /pdbtype:sept
-LINK32_OBJS= \
-	"$(INTDIR)\cmds.obj" \
-	"$(INTDIR)\cmdtab.obj" \
-	"$(INTDIR)\domacro.obj" \
-	"$(INTDIR)\fake.obj" \
-	"$(INTDIR)\ftp.obj" \
-	"$(INTDIR)\main.obj" \
-	"$(INTDIR)\ruserpass.obj"
-
-"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\ftp.exe
-InputPath=.\Debug\ftp.exe
-SOURCE=$(InputPath)
-
-!ENDIF
-
-
-!IF "$(CFG)" == "ftp - Win32 Release" || "$(CFG)" == "ftp - Win32 Debug"
-SOURCE=.\cmds.c
-
-!IF  "$(CFG)" == "ftp - Win32 Release"
-
-DEP_CPP_CMDS_=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\pathnames.h"\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
-
-DEP_CPP_CMDS_=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\pathnames.h"\
-	".\prototypes.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-
-
-"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
-
-
-!ENDIF
-
-SOURCE=.\cmdtab.c
-DEP_CPP_CMDTA=\
-	".\fake.h"\
-	".\ftp_var.h"\
-
-
-"$(INTDIR)\cmdtab.obj" : $(SOURCE) $(DEP_CPP_CMDTA) "$(INTDIR)"
-
-
-SOURCE=.\domacro.c
-DEP_CPP_DOMAC=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\domacro.obj" : $(SOURCE) $(DEP_CPP_DOMAC) "$(INTDIR)"
-
-
-SOURCE=.\fake.c
-DEP_CPP_FAKE_=\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\fake.obj" : $(SOURCE) $(DEP_CPP_FAKE_) "$(INTDIR)"
-
-
-SOURCE=.\ftp.c
-
-!IF  "$(CFG)" == "ftp - Win32 Release"
-
-DEP_CPP_FTP_C=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
-
-DEP_CPP_FTP_C=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-
-
-"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
-
-
-!ENDIF
-
-SOURCE=.\main.c
-
-!IF  "$(CFG)" == "ftp - Win32 Release"
-
-DEP_CPP_MAIN_=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
-
-DEP_CPP_MAIN_=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-	{$(INCLUDE)}"sys\types.h"\
-
-
-"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
-
-
-!ENDIF
-
-SOURCE=.\ruserpass.c
-
-!IF  "$(CFG)" == "ftp - Win32 Release"
-
-DEP_CPP_RUSER=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
-
-DEP_CPP_RUSER=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-
-
-"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
-
-
-!ENDIF
-
-
-!ENDIF
+# Microsoft Developer Studio Generated NMAKE File, Based on ftp.dsp
+!IF "$(CFG)" == ""
+CFG=ftp - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to ftp - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "ftp - Win32 Release" && "$(CFG)" != "ftp - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "ftp.mak" CFG="ftp - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "ftp - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "ftp - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ftp.exe"
+
+!ELSE
+
+ALL : "$(OUTDIR)\ftp.exe"
+
+!ENDIF
+
+CLEAN :
+	-@erase "$(INTDIR)\cmds.obj"
+	-@erase "$(INTDIR)\cmdtab.obj"
+	-@erase "$(INTDIR)\domacro.obj"
+	-@erase "$(INTDIR)\fake.obj"
+	-@erase "$(INTDIR)\ftp.obj"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\ruserpass.obj"
+	-@erase "$(INTDIR)\vc*.idb"
+	-@erase "$(OUTDIR)\ftp.exe"
+	-@erase "$(OUTDIR)\ftp.pch"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" \
+ /D "HAVE_TIMEVAL" /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
+ /c
+CPP_OBJS=.\Release/
+CPP_SBRS=.
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
+ /pdb:"$(OUTDIR)\ftp.pdb" /machine:I386 /out:"$(OUTDIR)\ftp.exe"
+LINK32_OBJS= \
+	"$(INTDIR)\cmds.obj" \
+	"$(INTDIR)\cmdtab.obj" \
+	"$(INTDIR)\domacro.obj" \
+	"$(INTDIR)\fake.obj" \
+	"$(INTDIR)\ftp.obj" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\ruserpass.obj"
+
+"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\ftp.exe
+InputPath=.\Release\ftp.exe
+SOURCE=$(InputPath)
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ftp.exe"
+
+!ELSE
+
+ALL : "$(OUTDIR)\ftp.exe"
+
+!ENDIF
+
+CLEAN :
+	-@erase "$(INTDIR)\cmds.obj"
+	-@erase "$(INTDIR)\cmdtab.obj"
+	-@erase "$(INTDIR)\domacro.obj"
+	-@erase "$(INTDIR)\fake.obj"
+	-@erase "$(INTDIR)\ftp.obj"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\ruserpass.obj"
+	-@erase "$(INTDIR)\vc*.idb"
+	-@erase "$(INTDIR)\vc*.pdb"
+	-@erase "$(OUTDIR)\ftp.exe"
+	-@erase "$(OUTDIR)\ftp.ilk"
+	-@erase "$(OUTDIR)\ftp.pdb"
+	-@erase "$(OUTDIR)\ftp.pch"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
+ /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_OBJS=.\Debug/
+CPP_SBRS=.
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes\
+ /pdb:"$(OUTDIR)\ftp.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ftp.exe"\
+ /pdbtype:sept
+LINK32_OBJS= \
+	"$(INTDIR)\cmds.obj" \
+	"$(INTDIR)\cmdtab.obj" \
+	"$(INTDIR)\domacro.obj" \
+	"$(INTDIR)\fake.obj" \
+	"$(INTDIR)\ftp.obj" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\ruserpass.obj"
+
+"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\ftp.exe
+InputPath=.\Debug\ftp.exe
+SOURCE=$(InputPath)
+
+!ENDIF
+
+
+!IF "$(CFG)" == "ftp - Win32 Release" || "$(CFG)" == "ftp - Win32 Debug"
+SOURCE=.\cmds.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_CMDS_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\pathnames.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_CMDS_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\pathnames.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\cmdtab.c
+DEP_CPP_CMDTA=\
+	".\fake.h"\
+	".\ftp_var.h"\
+
+
+"$(INTDIR)\cmdtab.obj" : $(SOURCE) $(DEP_CPP_CMDTA) "$(INTDIR)"
+
+
+SOURCE=.\domacro.c
+DEP_CPP_DOMAC=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\domacro.obj" : $(SOURCE) $(DEP_CPP_DOMAC) "$(INTDIR)"
+
+
+SOURCE=.\fake.c
+DEP_CPP_FAKE_=\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\fake.obj" : $(SOURCE) $(DEP_CPP_FAKE_) "$(INTDIR)"
+
+
+SOURCE=.\ftp.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_FTP_C=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_FTP_C=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\main.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_MAIN_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_MAIN_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\ruserpass.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_RUSER=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_RUSER=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
+
+
+!ENDIF
+
+
+!ENDIF

apps/utils/net/ftp/ftp.mak.orig

@@ -1,400 +1,400 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ftp.dsp
-!IF "$(CFG)" == ""
-CFG=ftp - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to ftp - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "ftp - Win32 Release" && "$(CFG)" != "ftp - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ftp.mak" CFG="ftp - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ftp - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ftp - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-!IF  "$(CFG)" == "ftp - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
-
-!ELSE
-
-ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
-
-!ENDIF
-
-CLEAN :
-	-@erase "$(INTDIR)\cmds.obj"
-	-@erase "$(INTDIR)\cmdtab.obj"
-	-@erase "$(INTDIR)\domacro.obj"
-	-@erase "$(INTDIR)\fake.obj"
-	-@erase "$(INTDIR)\ftp.obj"
-	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\ruserpass.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ftp.exe"
-	-@erase "\emacs-19.34\bin\ftp.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "C:\emacs-19.34\nt\inc" /I\
- "C:\emacs-19.34\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D\
- "HAVE_TIMEVAL" /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
- /c
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\ftp.pdb" /machine:I386 /out:"$(OUTDIR)\ftp.exe"
-LINK32_OBJS= \
-	"$(INTDIR)\cmds.obj" \
-	"$(INTDIR)\cmdtab.obj" \
-	"$(INTDIR)\domacro.obj" \
-	"$(INTDIR)\fake.obj" \
-	"$(INTDIR)\ftp.obj" \
-	"$(INTDIR)\main.obj" \
-	"$(INTDIR)\ruserpass.obj" \
-	"d:\Program Files\DevStudio\VC\lib\WSOCK32.LIB"
-
-"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\ftp.exe
-InputPath=.\Release\ftp.exe
-SOURCE=$(InputPath)
-
-"\emacs-19.34\bin\ftp.exe"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-#	copy $(TargetPath) \emacs-19.34\bin
-
-!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
-
-!ELSE
-
-ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
-
-!ENDIF
-
-CLEAN :
-	-@erase "$(INTDIR)\cmds.obj"
-	-@erase "$(INTDIR)\cmdtab.obj"
-	-@erase "$(INTDIR)\domacro.obj"
-	-@erase "$(INTDIR)\fake.obj"
-	-@erase "$(INTDIR)\ftp.obj"
-	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\ruserpass.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ftp.exe"
-	-@erase "$(OUTDIR)\ftp.ilk"
-	-@erase "$(OUTDIR)\ftp.pdb"
-	-@erase "\emacs-19.34\bin\ftp.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "C:\emacs-19.34\nt\inc" /I\
- "C:\emacs-19.34\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
- /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\ftp.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ftp.exe"\
- /pdbtype:sept
-LINK32_OBJS= \
-	"$(INTDIR)\cmds.obj" \
-	"$(INTDIR)\cmdtab.obj" \
-	"$(INTDIR)\domacro.obj" \
-	"$(INTDIR)\fake.obj" \
-	"$(INTDIR)\ftp.obj" \
-	"$(INTDIR)\main.obj" \
-	"$(INTDIR)\ruserpass.obj" \
-	"d:\Program Files\DevStudio\VC\lib\WSOCK32.LIB"
-
-"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\ftp.exe
-InputPath=.\Debug\ftp.exe
-SOURCE=$(InputPath)
-
-"\emacs-19.34\bin\ftp.exe"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-#	copy $(TargetPath) \emacs-19.34\bin
-
-!ENDIF
-
-
-!IF "$(CFG)" == "ftp - Win32 Release" || "$(CFG)" == "ftp - Win32 Debug"
-SOURCE=.\cmds.c
-
-!IF  "$(CFG)" == "ftp - Win32 Release"
-
-DEP_CPP_CMDS_=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\pathnames.h"\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
-
-DEP_CPP_CMDS_=\
-	"..\..\..\emacs-19.34\nt\inc\netdb.h"\
-	"..\..\..\emacs-19.34\nt\inc\netinet\in.h"\
-	"..\..\..\emacs-19.34\nt\inc\sys\socket.h"\
-	"..\..\..\emacs-19.34\src\nt.h"\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\pathnames.h"\
-	".\prototypes.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-
-
-"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
-
-
-!ENDIF
-
-SOURCE=.\cmdtab.c
-DEP_CPP_CMDTA=\
-	".\fake.h"\
-	".\ftp_var.h"\
-
-
-"$(INTDIR)\cmdtab.obj" : $(SOURCE) $(DEP_CPP_CMDTA) "$(INTDIR)"
-
-
-SOURCE=.\domacro.c
-DEP_CPP_DOMAC=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\domacro.obj" : $(SOURCE) $(DEP_CPP_DOMAC) "$(INTDIR)"
-
-
-SOURCE=.\fake.c
-DEP_CPP_FAKE_=\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\fake.obj" : $(SOURCE) $(DEP_CPP_FAKE_) "$(INTDIR)"
-
-
-SOURCE=.\ftp.c
-
-!IF  "$(CFG)" == "ftp - Win32 Release"
-
-DEP_CPP_FTP_C=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
-
-DEP_CPP_FTP_C=\
-	"..\..\..\emacs-19.34\nt\inc\netdb.h"\
-	"..\..\..\emacs-19.34\nt\inc\netinet\in.h"\
-	"..\..\..\emacs-19.34\nt\inc\pwd.h"\
-	"..\..\..\emacs-19.34\nt\inc\sys\file.h"\
-	"..\..\..\emacs-19.34\nt\inc\sys\ioctl.h"\
-	"..\..\..\emacs-19.34\nt\inc\sys\param.h"\
-	"..\..\..\emacs-19.34\nt\inc\sys\socket.h"\
-	"..\..\..\emacs-19.34\nt\inc\sys\time.h"\
-	"..\..\..\emacs-19.34\src\nt.h"\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-
-
-"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
-
-
-!ENDIF
-
-SOURCE=.\main.c
-
-!IF  "$(CFG)" == "ftp - Win32 Release"
-
-DEP_CPP_MAIN_=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
-
-DEP_CPP_MAIN_=\
-	"..\..\..\emacs-19.34\nt\inc\netdb.h"\
-	"..\..\..\emacs-19.34\nt\inc\pwd.h"\
-	"..\..\..\emacs-19.34\nt\inc\sys\ioctl.h"\
-	"..\..\..\emacs-19.34\nt\inc\sys\socket.h"\
-	"..\..\..\emacs-19.34\src\nt.h"\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-	{$(INCLUDE)}"sys\types.h"\
-
-
-"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
-
-
-!ENDIF
-
-SOURCE=.\ruserpass.c
-
-!IF  "$(CFG)" == "ftp - Win32 Release"
-
-DEP_CPP_RUSER=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-
-
-"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
-
-DEP_CPP_RUSER=\
-	".\fake.h"\
-	".\ftp_var.h"\
-	".\prototypes.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-
-
-"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
-
-
-!ENDIF
-
-
-!ENDIF
+# Microsoft Developer Studio Generated NMAKE File, Based on ftp.dsp
+!IF "$(CFG)" == ""
+CFG=ftp - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to ftp - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "ftp - Win32 Release" && "$(CFG)" != "ftp - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "ftp.mak" CFG="ftp - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "ftp - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "ftp - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
+
+!ELSE
+
+ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
+
+!ENDIF
+
+CLEAN :
+	-@erase "$(INTDIR)\cmds.obj"
+	-@erase "$(INTDIR)\cmdtab.obj"
+	-@erase "$(INTDIR)\domacro.obj"
+	-@erase "$(INTDIR)\fake.obj"
+	-@erase "$(INTDIR)\ftp.obj"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\ruserpass.obj"
+	-@erase "$(INTDIR)\vc50.idb"
+	-@erase "$(OUTDIR)\ftp.exe"
+	-@erase "\emacs-19.34\bin\ftp.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "C:\emacs-19.34\nt\inc" /I\
+ "C:\emacs-19.34\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D\
+ "HAVE_TIMEVAL" /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
+ /c
+CPP_OBJS=.\Release/
+CPP_SBRS=.
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib /nologo /subsystem:console /incremental:no\
+ /pdb:"$(OUTDIR)\ftp.pdb" /machine:I386 /out:"$(OUTDIR)\ftp.exe"
+LINK32_OBJS= \
+	"$(INTDIR)\cmds.obj" \
+	"$(INTDIR)\cmdtab.obj" \
+	"$(INTDIR)\domacro.obj" \
+	"$(INTDIR)\fake.obj" \
+	"$(INTDIR)\ftp.obj" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\ruserpass.obj" \
+	"d:\Program Files\DevStudio\VC\lib\WSOCK32.LIB"
+
+"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Release\ftp.exe
+InputPath=.\Release\ftp.exe
+SOURCE=$(InputPath)
+
+"\emacs-19.34\bin\ftp.exe"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+#	copy $(TargetPath) \emacs-19.34\bin
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
+
+!ELSE
+
+ALL : "$(OUTDIR)\ftp.exe" "\emacs-19.34\bin\ftp.exe"
+
+!ENDIF
+
+CLEAN :
+	-@erase "$(INTDIR)\cmds.obj"
+	-@erase "$(INTDIR)\cmdtab.obj"
+	-@erase "$(INTDIR)\domacro.obj"
+	-@erase "$(INTDIR)\fake.obj"
+	-@erase "$(INTDIR)\ftp.obj"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\ruserpass.obj"
+	-@erase "$(INTDIR)\vc50.idb"
+	-@erase "$(INTDIR)\vc50.pdb"
+	-@erase "$(OUTDIR)\ftp.exe"
+	-@erase "$(OUTDIR)\ftp.ilk"
+	-@erase "$(OUTDIR)\ftp.pdb"
+	-@erase "\emacs-19.34\bin\ftp.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "C:\emacs-19.34\nt\inc" /I\
+ "C:\emacs-19.34\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
+ /Fp"$(INTDIR)\ftp.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_OBJS=.\Debug/
+CPP_SBRS=.
+
+.c{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ftp.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
+ odbccp32.lib /nologo /subsystem:console /incremental:yes\
+ /pdb:"$(OUTDIR)\ftp.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ftp.exe"\
+ /pdbtype:sept
+LINK32_OBJS= \
+	"$(INTDIR)\cmds.obj" \
+	"$(INTDIR)\cmdtab.obj" \
+	"$(INTDIR)\domacro.obj" \
+	"$(INTDIR)\fake.obj" \
+	"$(INTDIR)\ftp.obj" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\ruserpass.obj" \
+	"d:\Program Files\DevStudio\VC\lib\WSOCK32.LIB"
+
+"$(OUTDIR)\ftp.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+TargetPath=.\Debug\ftp.exe
+InputPath=.\Debug\ftp.exe
+SOURCE=$(InputPath)
+
+"\emacs-19.34\bin\ftp.exe"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+#	copy $(TargetPath) \emacs-19.34\bin
+
+!ENDIF
+
+
+!IF "$(CFG)" == "ftp - Win32 Release" || "$(CFG)" == "ftp - Win32 Debug"
+SOURCE=.\cmds.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_CMDS_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\pathnames.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_CMDS_=\
+	"..\..\..\emacs-19.34\nt\inc\netdb.h"\
+	"..\..\..\emacs-19.34\nt\inc\netinet\in.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\socket.h"\
+	"..\..\..\emacs-19.34\src\nt.h"\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\pathnames.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\cmds.obj" : $(SOURCE) $(DEP_CPP_CMDS_) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\cmdtab.c
+DEP_CPP_CMDTA=\
+	".\fake.h"\
+	".\ftp_var.h"\
+
+
+"$(INTDIR)\cmdtab.obj" : $(SOURCE) $(DEP_CPP_CMDTA) "$(INTDIR)"
+
+
+SOURCE=.\domacro.c
+DEP_CPP_DOMAC=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\domacro.obj" : $(SOURCE) $(DEP_CPP_DOMAC) "$(INTDIR)"
+
+
+SOURCE=.\fake.c
+DEP_CPP_FAKE_=\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\fake.obj" : $(SOURCE) $(DEP_CPP_FAKE_) "$(INTDIR)"
+
+
+SOURCE=.\ftp.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_FTP_C=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_FTP_C=\
+	"..\..\..\emacs-19.34\nt\inc\netdb.h"\
+	"..\..\..\emacs-19.34\nt\inc\netinet\in.h"\
+	"..\..\..\emacs-19.34\nt\inc\pwd.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\file.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\ioctl.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\param.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\socket.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\time.h"\
+	"..\..\..\emacs-19.34\src\nt.h"\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\ftp.obj" : $(SOURCE) $(DEP_CPP_FTP_C) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\main.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_MAIN_=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_MAIN_=\
+	"..\..\..\emacs-19.34\nt\inc\netdb.h"\
+	"..\..\..\emacs-19.34\nt\inc\pwd.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\ioctl.h"\
+	"..\..\..\emacs-19.34\nt\inc\sys\socket.h"\
+	"..\..\..\emacs-19.34\src\nt.h"\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
+
+
+!ENDIF
+
+SOURCE=.\ruserpass.c
+
+!IF  "$(CFG)" == "ftp - Win32 Release"
+
+DEP_CPP_RUSER=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+
+
+"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "ftp - Win32 Debug"
+
+DEP_CPP_RUSER=\
+	".\fake.h"\
+	".\ftp_var.h"\
+	".\prototypes.h"\
+	{$(INCLUDE)}"sys\stat.h"\
+	{$(INCLUDE)}"sys\types.h"\
+
+
+"$(INTDIR)\ruserpass.obj" : $(SOURCE) $(DEP_CPP_RUSER) "$(INTDIR)"
+
+
+!ENDIF
+
+
+!ENDIF

apps/utils/net/ftp/ftp_var.h

@@ -1,181 +1,181 @@
-#include "fake.h"
-#include <winsock.h>
-#include <setjmp.h>
-
-//typedef void (*Sig_t)(int);
-
-int fgetcSocket(int s);
-char *fputsSocket(char *format, int s);
-
-char *fprintfSocket(int s, char *format, ...);
-
-int fputcSocket(int s, char putChar);
-int fputSocket(int s, char *putChar, int len);
-char *fgetsSocket(int s, char *string);
-
-/* The following defines are from ftp.h and telnet.h from bsd.h */
-/* All relevent copyrights below apply.                         */
-
-#define	IAC	255
-#define	DONT	254
-#define	DO	253
-#define	WONT	252
-#define	WILL	251
-#define	SB	250
-#define	GA	249
-#define	EL	248
-#define	EC	247
-#define	AYT	246
-#define	AO	245
-#define	IP	244
-#define	BREAK	243
-#define	DM	242
-#define	NOP	241
-#define	SE	240
-#define EOR     239
-#define	ABORT	238
-#define	SUSP	237
-#define	xEOF	236
-
-
-#define MAXPATHLEN 255
-#define TYPE_A 'A'
-#define TYPE_I 'I'
-#define TYPE_E 'E'
-#define TYPE_L 'L'
-
-#define PRELIM		1
-#define COMPLETE	2
-#define CONTINUE	3
-#define TRANSIENT	4
-
-#define	MODE_S		1
-#define	MODE_B		2
-#define	MODE_C		3
-
-#define	STRU_F		1
-#define	STRU_R		2
-#define	STRU_P		3
-
-#define SIGQUIT 1
-#define SIGPIPE 2
-#define SIGALRM 3
-
-
-#define	FORM_N		1
-#define	FORM_T		2
-#define	FORM_C		3
-
-
-/*
- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- *	@(#)ftp_var.h	5.5 (Berkeley) 6/29/88
- */
-
-/*
- * FTP global variables.
- */
-
-/*
- * Options and other state info.
- */
-extern int	trace;			/* trace packets exchanged */
-extern int	hash;			/* print # for each buffer transferred */
-extern int	sendport;		/* use PORT cmd for each data connection */
-extern int	verbose;		/* print messages coming back from server */
-extern int	connected;		/* connected to server */
-extern int	fromatty;		/* input is from a terminal */
-extern int	interactive;		/* interactively prompt on m* cmds */
-extern int	debug;			/* debugging level */
-extern int	bell;			/* ring bell on cmd completion */
-extern int	doglob;			/* glob local file names */
-extern int	proxy;			/* proxy server connection active */
-extern int	proxflag;		/* proxy connection exists */
-extern int	sunique;		/* store files on server with unique name */
-extern int	runique;		/* store local files with unique name */
-extern int	mcase;			/* map upper to lower case for mget names */
-extern int	ntflag;			/* use ntin ntout tables for name translation */
-extern int	mapflag;		/* use mapin mapout templates on file names */
-extern int	code;			/* return/reply code for ftp command */
-extern int	crflag;			/* if 1, strip car. rets. on ascii gets */
-extern char	pasv[64];		/* passive port for proxy data connection */
-extern int  passivemode;    /* passive mode enabled */
-extern char	*altarg;		/* argv[1] with no shell-like preprocessing  */
-extern char	ntin[17];		/* input translation table */
-extern char	ntout[17];		/* output translation table */
-
-extern char	mapin[MAXPATHLEN];	/* input map template */
-extern char	mapout[MAXPATHLEN];	/* output map template */
-extern char	typename[32];		/* name of file transfer type */
-extern int	type;			/* file transfer type */
-extern char	structname[32];		/* name of file transfer structure */
-extern int	stru;			/* file transfer structure */
-extern char	formname[32];		/* name of file transfer format */
-extern int	form;			/* file transfer format */
-extern char	modename[32];		/* name of file transfer mode */
-extern int	mode;			/* file transfer mode */
-extern char	bytename[32];		/* local byte size in ascii */
-extern int	bytesize;		/* local byte size in binary */
-
-extern jmp_buf	toplevel;		/* non-local goto stuff for cmd scanner */
-
-extern char	line[200];		/* input line buffer */
-extern char	*stringbase;		/* current scan point in line buffer */
-extern char	argbuf[200];		/* argument storage buffer */
-extern char	*argbase;		/* current storage point in arg buffer */
-extern int	margc;			/* count of arguments on input line */
-extern char	*margv[20];		/* args parsed from input line */
-extern int     cpend;                  /* flag: if != 0, then pending server reply */
-extern int	mflag;			/* flag: if != 0, then active multi command */
-
-extern int	options;		/* used during socket creation */
-
-/*
- * Format of command table.
- */
-struct cmd {
-	char	*c_name;	/* name of command */
-	char	*c_help;	/* help string */
-	char	c_bell;		/* give bell when command completes */
-	char	c_conn;		/* must be connected to use command */
-	char	c_proxy;	/* proxy server may execute */
-	int	(*c_handler)();	/* function to call */
-};
-
-struct macel {
-	char mac_name[9];	/* macro name */
-	char *mac_start;	/* start of macro in macbuf */
-	char *mac_end;		/* end of macro in macbuf */
-};
-
-int macnum;			/* number of defined macros */
-struct macel macros[16];
-char macbuf[4096];
-
-extern	char *tail();
-extern	char *remglob();
-extern	int errno;
-extern	char *mktemp();
-
-#if	defined(__ANSI__) || defined(sparc)
-typedef void sig_t;
-#else
-typedef int sig_t;
-#endif
-
-typedef int uid_t;
-int herror(char *s);
+#include "fake.h"
+#include <winsock.h>
+#include <setjmp.h>
+
+//typedef void (*Sig_t)(int);
+
+int fgetcSocket(int s);
+char *fputsSocket(char *format, int s);
+
+char *fprintfSocket(int s, char *format, ...);
+
+int fputcSocket(int s, char putChar);
+int fputSocket(int s, char *putChar, int len);
+char *fgetsSocket(int s, char *string);
+
+/* The following defines are from ftp.h and telnet.h from bsd.h */
+/* All relevent copyrights below apply.                         */
+
+#define	IAC	255
+#define	DONT	254
+#define	DO	253
+#define	WONT	252
+#define	WILL	251
+#define	SB	250
+#define	GA	249
+#define	EL	248
+#define	EC	247
+#define	AYT	246
+#define	AO	245
+#define	IP	244
+#define	BREAK	243
+#define	DM	242
+#define	NOP	241
+#define	SE	240
+#define EOR     239
+#define	ABORT	238
+#define	SUSP	237
+#define	xEOF	236
+
+
+#define MAXPATHLEN 255
+#define TYPE_A 'A'
+#define TYPE_I 'I'
+#define TYPE_E 'E'
+#define TYPE_L 'L'
+
+#define PRELIM		1
+#define COMPLETE	2
+#define CONTINUE	3
+#define TRANSIENT	4
+
+#define	MODE_S		1
+#define	MODE_B		2
+#define	MODE_C		3
+
+#define	STRU_F		1
+#define	STRU_R		2
+#define	STRU_P		3
+
+#define SIGQUIT 1
+#define SIGPIPE 2
+#define SIGALRM 3
+
+
+#define	FORM_N		1
+#define	FORM_T		2
+#define	FORM_C		3
+
+
+/*
+ * Copyright (c) 1985 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *	@(#)ftp_var.h	5.5 (Berkeley) 6/29/88
+ */
+
+/*
+ * FTP global variables.
+ */
+
+/*
+ * Options and other state info.
+ */
+extern int	trace;			/* trace packets exchanged */
+extern int	hash;			/* print # for each buffer transferred */
+extern int	sendport;		/* use PORT cmd for each data connection */
+extern int	verbose;		/* print messages coming back from server */
+extern int	connected;		/* connected to server */
+extern int	fromatty;		/* input is from a terminal */
+extern int	interactive;		/* interactively prompt on m* cmds */
+extern int	debug;			/* debugging level */
+extern int	bell;			/* ring bell on cmd completion */
+extern int	doglob;			/* glob local file names */
+extern int	proxy;			/* proxy server connection active */
+extern int	proxflag;		/* proxy connection exists */
+extern int	sunique;		/* store files on server with unique name */
+extern int	runique;		/* store local files with unique name */
+extern int	mcase;			/* map upper to lower case for mget names */
+extern int	ntflag;			/* use ntin ntout tables for name translation */
+extern int	mapflag;		/* use mapin mapout templates on file names */
+extern int	code;			/* return/reply code for ftp command */
+extern int	crflag;			/* if 1, strip car. rets. on ascii gets */
+extern char	pasv[64];		/* passive port for proxy data connection */
+extern int  passivemode;    /* passive mode enabled */
+extern char	*altarg;		/* argv[1] with no shell-like preprocessing  */
+extern char	ntin[17];		/* input translation table */
+extern char	ntout[17];		/* output translation table */
+
+extern char	mapin[MAXPATHLEN];	/* input map template */
+extern char	mapout[MAXPATHLEN];	/* output map template */
+extern char	typename[32];		/* name of file transfer type */
+extern int	type;			/* file transfer type */
+extern char	structname[32];		/* name of file transfer structure */
+extern int	stru;			/* file transfer structure */
+extern char	formname[32];		/* name of file transfer format */
+extern int	form;			/* file transfer format */
+extern char	modename[32];		/* name of file transfer mode */
+extern int	mode;			/* file transfer mode */
+extern char	bytename[32];		/* local byte size in ascii */
+extern int	bytesize;		/* local byte size in binary */
+
+extern jmp_buf	toplevel;		/* non-local goto stuff for cmd scanner */
+
+extern char	line[200];		/* input line buffer */
+extern char	*stringbase;		/* current scan point in line buffer */
+extern char	argbuf[200];		/* argument storage buffer */
+extern char	*argbase;		/* current storage point in arg buffer */
+extern int	margc;			/* count of arguments on input line */
+extern char	*margv[20];		/* args parsed from input line */
+extern int     cpend;                  /* flag: if != 0, then pending server reply */
+extern int	mflag;			/* flag: if != 0, then active multi command */
+
+extern int	options;		/* used during socket creation */
+
+/*
+ * Format of command table.
+ */
+struct cmd {
+	char	*c_name;	/* name of command */
+	char	*c_help;	/* help string */
+	char	c_bell;		/* give bell when command completes */
+	char	c_conn;		/* must be connected to use command */
+	char	c_proxy;	/* proxy server may execute */
+	int	(*c_handler)();	/* function to call */
+};
+
+struct macel {
+	char mac_name[9];	/* macro name */
+	char *mac_start;	/* start of macro in macbuf */
+	char *mac_end;		/* end of macro in macbuf */
+};
+
+int macnum;			/* number of defined macros */
+struct macel macros[16];
+char macbuf[4096];
+
+extern	char *tail();
+extern	char *remglob();
+extern	int errno;
+extern	char *mktemp();
+
+#if	defined(__ANSI__) || defined(sparc)
+typedef void sig_t;
+#else
+typedef int sig_t;
+#endif
+
+typedef int uid_t;
+int herror(char *s);

apps/utils/net/ftp/main.c

@@ -0,0 +1,602 @@
+/*
+ * Copyright (c) 1985, 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1985, 1989 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)main.c	based on 5.13 (Berkeley) 3/14/89";
+#endif /* not lint */
+
+/*
+ * FTP User Program -- Command Interface.
+ */
+#if !defined(WIN32)
+#include <netdb.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <arpa/ftp.h>
+#include <errno.h>
+#include <pwd.h>
+#endif
+#include "ftp_var.h"
+#include "prototypes.h"
+#include <sys/types.h>
+
+#include <io.h>
+#include <fcntl.h>
+
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+
+#if defined(sun) && !defined(FD_SET)
+typedef int uid_t;
+#endif
+
+uid_t	getuid();
+void	intr();
+void	lostpeer();
+char	*getlogin();
+
+short   portnum;
+
+char     home[128];
+char	*globerr;
+int     autologin;
+
+
+
+/* Lot's of options... */
+/*
+ * Options and other state info.
+ */
+int	trace;			/* trace packets exchanged */
+int	hash;			/* print # for each buffer transferred */
+int	sendport;		/* use PORT cmd for each data connection */
+int	verbose;		/* print messages coming back from server */
+int	connected;		/* connected to server */
+int	fromatty;		/* input is from a terminal */
+int	interactive;		/* interactively prompt on m* cmds */
+int	debug;			/* debugging level */
+int	bell;			/* ring bell on cmd completion */
+int	doglob;			/* glob local file names */
+int	proxy;			/* proxy server connection active */
+int passivemode;
+int	proxflag;		/* proxy connection exists */
+int	sunique;		/* store files on server with unique name */
+int	runique;		/* store local files with unique name */
+int	mcase;			/* map upper to lower case for mget names */
+int	ntflag;			/* use ntin ntout tables for name translation */
+int	mapflag;		/* use mapin mapout templates on file names */
+int	code;			/* return/reply code for ftp command */
+int	crflag;			/* if 1, strip car. rets. on ascii gets */
+char	pasv[64];		/* passive port for proxy data connection */
+char	*altarg;		/* argv[1] with no shell-like preprocessing  */
+char	ntin[17];		/* input translation table */
+char	ntout[17];		/* output translation table */
+// #include <sys/param.h>
+char	mapin[MAXPATHLEN];	/* input map template */
+char	mapout[MAXPATHLEN];	/* output map template */
+char	typename[32];		/* name of file transfer type */
+int	type;			/* file transfer type */
+char	structname[32];		/* name of file transfer structure */
+int	stru;			/* file transfer structure */
+char	formname[32];		/* name of file transfer format */
+int	form;			/* file transfer format */
+char	modename[32];		/* name of file transfer mode */
+int	mode;			/* file transfer mode */
+char	bytename[32];		/* local byte size in ascii */
+int	bytesize;		/* local byte size in binary */
+
+jmp_buf	toplevel;		/* non-local goto stuff for cmd scanner */
+
+char	line[200];		/* input line buffer */
+char	*stringbase;		/* current scan point in line buffer */
+char	argbuf[200];		/* argument storage buffer */
+char	*argbase;		/* current storage point in arg buffer */
+int	margc;			/* count of arguments on input line */
+char	*margv[20];		/* args parsed from input line */
+int     cpend;                  /* flag: if != 0, then pending server reply */
+int	mflag;			/* flag: if != 0, then active multi command */
+
+int	options;		/* used during socket creation */
+
+
+
+int main(int argc, char *argv[])
+{
+	register char *cp;
+	int top;
+	struct passwd *pw = NULL;
+#if 0
+	char homedir[MAXPATHLEN];
+#endif
+
+        int err;
+        WORD wVerReq;
+
+        WSADATA WSAData;
+        struct	servent *sp;		/* service spec for tcp/ftp */
+
+	/* Disable output buffering, for the benefit of Emacs.  */
+	//setbuf(stdout, NULL);
+
+        _fmode = O_BINARY; // This causes an error somewhere.
+
+        wVerReq = MAKEWORD(1,1);
+
+        err = WSAStartup(wVerReq, &WSAData);
+        if (err != 0)
+        {
+           fprintf(stderr, "Could not initialize Windows socket interface.");
+           exit(1);
+        }
+
+	sp = getservbyname("ftp", "tcp");
+	if (sp == 0) {
+		fprintf(stderr, "ftp: ftp/tcp: unknown service\n");
+		exit(1);
+	}
+
+        portnum = sp->s_port;
+
+
+	doglob = 1;
+	interactive = 1;
+	autologin = 1;
+	argc--, argv++;
+	while (argc > 0 && **argv == '-') {
+		for (cp = *argv + 1; *cp; cp++)
+			switch (*cp) {
+
+			case 'd':
+				options |= SO_DEBUG;
+				debug++;
+				break;
+
+			case 'v':
+				verbose++;
+				break;
+
+			case 't':
+				trace++;
+				break;
+
+			case 'i':
+				interactive = 0;
+				break;
+
+			case 'n':
+				autologin = 0;
+				break;
+
+			case 'g':
+				doglob = 0;
+				break;
+
+			default:
+				fprintf(stdout,
+				  "ftp: %c: unknown option\n", *cp);
+				exit(1);
+			}
+		argc--, argv++;
+	}
+//	fromatty = isatty(fileno(stdin));
+        fromatty = 1; // Strengthen this test
+	/*
+	 * Set up defaults for FTP.
+	 */
+	(void) strcpy(typename, "ascii"), type = TYPE_A;
+	(void) strcpy(formname, "non-print"), form = FORM_N;
+	(void) strcpy(modename, "stream"), mode = MODE_S;
+	(void) strcpy(structname, "file"), stru = STRU_F;
+	(void) strcpy(bytename, "8"), bytesize = 8;
+	if (fromatty)
+		verbose++;
+	cpend = 0;           /* no pending replies */
+	proxy = 0;	/* proxy not active */
+    passivemode = 1; /* passive mode *is* active */
+	crflag = 1;    /* strip c.r. on ascii gets */
+	/*
+	 * Set up the home directory in case we're globbing.
+	 */
+#if 0
+	cp = getlogin();
+	if (cp != NULL) {
+		pw = getpwnam(cp);
+	}
+	if (pw == NULL)
+		pw = getpwuid(getuid());
+	if (pw != NULL) {
+		home = homedir;
+		(void) strcpy(home, pw->pw_dir);
+	}
+#endif
+        strcpy(home, "C:/");
+	if (argc > 0) {
+		if (setjmp(toplevel))
+			exit(0);
+//		(void) signal(SIGINT, intr);
+//		(void) signal(SIGPIPE, lostpeer);
+		setpeer(argc + 1, argv - 1);
+	}
+	top = setjmp(toplevel) == 0;
+	if (top) {
+//		(void) signal(SIGINT, intr);
+//		(void) signal(SIGPIPE, lostpeer);
+	}
+	for (;;) {
+		cmdscanner(top);
+		top = 1;
+	}
+}
+
+void
+intr()
+{
+
+	longjmp(toplevel, 1);
+}
+
+void lostpeer(void)
+{
+   extern int cout;
+   extern int data;
+
+   if (connected) {
+      if (cout != (int) NULL) {
+         closesocket(cout);
+         cout = (int) NULL;
+      }
+      if (data >= 0) {
+         (void) shutdown(data, 1+1);
+         (void) close(data);
+         data = -1;
+      }
+      connected = 0;
+   }
+   pswitch(1);
+   if (connected) {
+      if (cout != (int)NULL) {
+						closesocket(cout);
+         cout = (int) NULL;
+      }
+      connected = 0;
+   }
+   proxflag = 0;
+   pswitch(0);
+}
+
+/*char *
+tail(filename)
+	char *filename;
+{
+	register char *s;
+
+	while (*filename) {
+		s = rindex(filename, '/');
+		if (s == NULL)
+			break;
+		if (s[1])
+			return (s + 1);
+		*s = '\0';
+	}
+	return (filename);
+}
+*/
+/*
+ * Command parser.
+ */
+void cmdscanner(top)
+	int top;
+{
+	register struct cmd *c;
+	struct cmd *getcmd();
+	extern int help();
+
+	if (!top)
+		(void) putchar('\n');
+	for (;;) {
+		(void) fflush(stdout);
+		if (fromatty) {
+			printf("ftp> ");
+			(void) fflush(stdout);
+		}
+		if (gets(line) == 0) {
+			if (feof(stdin) || ferror(stdin))
+				quit();
+			break;
+		}
+		if (line[0] == 0)
+			break;
+		makeargv();
+		if (margc == 0) {
+			continue;
+		}
+		c = getcmd(margv[0]);
+		if (c == (struct cmd *)-1) {
+			printf("?Ambiguous command\n");
+			continue;
+		}
+		if (c == 0) {
+			printf("?Invalid command\n");
+			continue;
+		}
+		if (c->c_conn && !connected) {
+			printf ("Not connected.\n");
+			continue;
+		}
+		(*c->c_handler)(margc, margv);
+		if (bell && c->c_bell)
+			(void) putchar('\007');
+		if (c->c_handler != help)
+			break;
+	}
+	(void) fflush(stdout);
+//	(void) signal(SIGINT, intr);
+//	(void) signal(SIGPIPE, lostpeer);
+}
+
+struct cmd *
+getcmd(name)
+	register char *name;
+{
+	extern struct cmd cmdtab[];
+	register char *p, *q;
+	register struct cmd *c, *found;
+	register int nmatches, longest;
+
+	longest = 0;
+	nmatches = 0;
+	found = 0;
+	for (c = cmdtab; p = c->c_name; c++) {
+		for (q = name; *q == *p++; q++)
+			if (*q == 0)		/* exact match? */
+				return (c);
+		if (!*q) {			/* the name was a prefix */
+			if (q - name > longest) {
+				longest = q - name;
+				nmatches = 1;
+				found = c;
+			} else if (q - name == longest)
+				nmatches++;
+		}
+	}
+	if (nmatches > 1)
+		return ((struct cmd *)-1);
+	return (found);
+}
+
+/*
+ * Slice a string up into argc/argv.
+ */
+
+int slrflag;
+
+void makeargv()
+{
+	char **argp;
+	char *slurpstring();
+
+	margc = 0;
+	argp = margv;
+	stringbase = line;		/* scan from first of buffer */
+	argbase = argbuf;		/* store from first of buffer */
+	slrflag = 0;
+	while (*argp++ = slurpstring())
+		margc++;
+}
+
+/*
+ * Parse string into argbuf;
+ * implemented with FSM to
+ * handle quoting and strings
+ */
+char *
+slurpstring()
+{
+	int got_one = 0;
+	register char *sb = stringbase;
+	register char *ap = argbase;
+	char *tmp = argbase;		/* will return this if token found */
+
+	if (*sb == '!' || *sb == '$') {	/* recognize ! as a token for shell */
+		switch (slrflag) {	/* and $ as token for macro invoke */
+			case 0:
+				slrflag++;
+				stringbase++;
+				return ((*sb == '!') ? "!" : "$");
+				/* NOTREACHED */
+			case 1:
+				slrflag++;
+				altarg = stringbase;
+				break;
+			default:
+				break;
+		}
+	}
+
+S0:
+	switch (*sb) {
+
+	case '\0':
+		goto OUT1;
+
+	case ' ':
+	case '\t':
+		sb++; goto S0;
+
+	default:
+		switch (slrflag) {
+			case 0:
+				slrflag++;
+				break;
+			case 1:
+				slrflag++;
+				altarg = sb;
+				break;
+			default:
+				break;
+		}
+		goto S1;
+	}
+
+S1:
+	switch (*sb) {
+
+	case ' ':
+	case '\t':
+	case '\0':
+		goto OUT1;	/* end of token */
+
+	case '\\':
+		sb++; goto S2;	/* slurp next character */
+
+	case '"':
+		sb++; goto S3;	/* slurp quoted string */
+
+	default:
+		*ap++ = *sb++;	/* add character to token */
+		got_one = 1;
+		goto S1;
+	}
+
+S2:
+	switch (*sb) {
+
+	case '\0':
+		goto OUT1;
+
+	default:
+		*ap++ = *sb++;
+		got_one = 1;
+		goto S1;
+	}
+
+S3:
+	switch (*sb) {
+
+	case '\0':
+		goto OUT1;
+
+	case '"':
+		sb++; goto S1;
+
+	default:
+		*ap++ = *sb++;
+		got_one = 1;
+		goto S3;
+	}
+
+OUT1:
+	if (got_one)
+		*ap++ = '\0';
+	argbase = ap;			/* update storage pointer */
+	stringbase = sb;		/* update scan pointer */
+	if (got_one) {
+		return(tmp);
+	}
+	switch (slrflag) {
+		case 0:
+			slrflag++;
+			break;
+		case 1:
+			slrflag++;
+			altarg = (char *) 0;
+			break;
+		default:
+			break;
+	}
+	return((char *)0);
+}
+
+#define HELPINDENT (sizeof ("directory"))
+
+/*
+ * Help command.
+ * Call each command handler with argc == 0 and argv[0] == name.
+ */
+int help(argc, argv)
+	int argc;
+	char *argv[];
+{
+	extern struct cmd cmdtab[];
+	register struct cmd *c;
+
+	if (argc == 1) {
+		register int i, j, w, k;
+		int columns, width = 0, lines;
+		extern int NCMDS;
+
+		printf("Commands may be abbreviated.  Commands are:\n\n");
+		for (c = cmdtab; c < &cmdtab[NCMDS]; c++) {
+			int len = strlen(c->c_name);
+
+			if (len > width)
+				width = len;
+		}
+		width = (width + 8) &~ 7;
+		columns = 80 / width;
+		if (columns == 0)
+			columns = 1;
+		lines = (NCMDS + columns - 1) / columns;
+		for (i = 0; i < lines; i++) {
+			for (j = 0; j < columns; j++) {
+				c = cmdtab + j * lines + i;
+				if (c->c_name && (!proxy || c->c_proxy)) {
+					printf("%s", c->c_name);
+				}
+				else if (c->c_name) {
+					for (k=0; k < (int) strlen(c->c_name); k++) {
+						(void) putchar(' ');
+					}
+				}
+				if (c + lines >= &cmdtab[NCMDS]) {
+					printf("\n");
+					break;
+				}
+				w = strlen(c->c_name);
+				while (w < width) {
+					w = (w + 8) &~ 7;
+					(void) putchar('\t');
+				}
+			}
+		}
+		(void) fflush(stdout);
+		return 0;
+	}
+	while (--argc > 0) {
+		register char *arg;
+		arg = *++argv;
+		c = getcmd(arg);
+		if (c == (struct cmd *)-1)
+			printf("?Ambiguous help command %s\n", arg);
+		else if (c == (struct cmd *)0)
+			printf("?Invalid help command %s\n", arg);
+		else
+			printf("%-*s\t%s\n", HELPINDENT,
+				c->c_name, c->c_help);
+	}
+	(void) fflush(stdout);
+	return 0;
+}

apps/utils/net/ftp/makefile

@@ -0,0 +1,29 @@
+PATH_TO_TOP = ../../../..
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_NAME = ftp
+
+TARGET_INSTALLDIR = system32
+
+TARGET_CFLAGS = -D__USE_W32API
+
+TARGET_SDKLIBS = ws2_32.a iphlpapi.a
+# ntdll.a
+
+TARGET_OBJECTS = \
+	cmds.o \
+	cmdtab.o \
+	domacro.o \
+	fake.o \
+	ftp.o \
+	main.o \
+	ruserpass.o
+
+TARGET_GCCLIBS = 
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk

apps/utils/net/ftp/prototypes.h

@@ -1,32 +1,32 @@
-
-int getreply(int expecteof);
-int ruserpass(char *host, char **aname, char **apass, char **aacct);
-char *getpass(const char *prompt);
-void makeargv(void);
-void domacro(int argc, char *argv[]);
-void proxtrans(char *cmd, char *local, char *remote);
-int null(void);
-int initconn(void);
-void disconnect(void);
-void ptransfer(char *direction, long bytes, struct timeval *t0, struct timeval *t1);
-void setascii(void);
-void setbinary(void);
-void setebcdic(void);
-void settenex(void);
-void tvsub(struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
-void setpassive(int argc, char *argv[]);
-void setpeer(int argc, char *argv[]);
-void cmdscanner(int top);
-void pswitch(int flag);
-void quit(void);
-int login(char *host);
-int command(char *fmt, ...);
-int globulize(char **cpp);
-void sendrequest(char *cmd, char *local, char *remote, int printnames);
-void recvrequest(char *cmd, char *local, char *remote, char *mode,
-                int printnames);
-int confirm(char *cmd, char *file);
-void blkfree(char **av0);
-int getit(int argc, char *argv[], int restartit, char *mode);
-static int token(void);
-int sleep(int time);
+
+int getreply(int expecteof);
+int ruserpass(char *host, char **aname, char **apass, char **aacct);
+char *getpass(const char *prompt);
+void makeargv(void);
+void domacro(int argc, char *argv[]);
+void proxtrans(char *cmd, char *local, char *remote);
+int null(void);
+int initconn(void);
+void disconnect(void);
+void ptransfer(char *direction, long bytes, struct timeval *t0, struct timeval *t1);
+void setascii(void);
+void setbinary(void);
+void setebcdic(void);
+void settenex(void);
+void tvsub(struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
+void setpassive(int argc, char *argv[]);
+void setpeer(int argc, char *argv[]);
+void cmdscanner(int top);
+void pswitch(int flag);
+void quit(void);
+int login(char *host);
+int command(char *fmt, ...);
+int globulize(char **cpp);
+void sendrequest(char *cmd, char *local, char *remote, int printnames);
+void recvrequest(char *cmd, char *local, char *remote, char *mode,
+                int printnames);
+int confirm(char *cmd, char *file);
+void blkfree(char **av0);
+int getit(int argc, char *argv[], int restartit, char *mode);
+static int token(void);
+int sleep(int time);

apps/utils/net/ftp/ruserpass.c

@@ -1,271 +1,271 @@
-/*
- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)ruserpass.c	5.1 (Berkeley) 3/1/89";
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <stdio.h>
-//#include <utmp.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include "ftp_var.h"
-#include "prototypes.h"
-#include <winsock.h>
-
-char	*renvlook(), *index(), *getenv(), *getpass(), *getlogin();
-void  *malloc();
-char	*strcpy();
-struct	utmp *getutmp();
-static	FILE *cfile;
-
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 64
-#endif
-
-#define	DEFAULT	1
-#define	LOGIN	2
-#define	PASSWD	3
-#define	ACCOUNT 4
-#define MACDEF  5
-#define	ID	10
-#define	MACH	11
-
-static char tokval[100];
-
-static struct toktab {
-	char *tokstr;
-	int tval;
-} toktab[]= {
-	"default",	DEFAULT,
-	"login",	LOGIN,
-	"password",	PASSWD,
-	"passwd",	PASSWD,
-	"account",	ACCOUNT,
-	"machine",	MACH,
-	"macdef",	MACDEF,
-	0,		0
-};
-
-extern char *hostname;
-
-int ruserpass(char *host, char **aname, char **apass, char **aacct)
-{
-	char *hdir, buf[BUFSIZ], *tmp;
-	char myname[MAXHOSTNAMELEN], *mydomain;
-	int t, i, c, usedefault = 0;
-	struct stat stb;
-	extern int errno;
-
-	hdir = getenv("HOME");
-	if (hdir == NULL)
-		hdir = ".";
-	(void) sprintf(buf, "%s/.netrc", hdir);
-	cfile = fopen(buf, "r");
-	if (cfile == NULL) {
-		if (errno != ENOENT)
-			perror(buf);
-		return(0);
-	}
-
-
-		  if (gethostname(myname, sizeof(myname)) < 0)
-		myname[0] = '\0';
-	if ((mydomain = index(myname, '.')) == NULL)
-		mydomain = "";
-next:
-	while ((t = token())) switch(t) {
-
-	case DEFAULT:
-		usedefault = 1;
-		/* FALL THROUGH */
-
-	case MACH:
-		if (!usedefault) {
-			if (token() != ID)
-				continue;
-			/*
-			 * Allow match either for user's input host name
-			 * or official hostname.  Also allow match of
-			 * incompletely-specified host in local domain.
-			 */
-			if (strcasecmp(host, tokval) == 0)
-				goto match;
-			if (strcasecmp(hostname, tokval) == 0)
-				goto match;
-			if ((tmp = index(hostname, '.')) != NULL &&
-				 strcasecmp(tmp, mydomain) == 0 &&
-				 strncasecmp(hostname, tokval, tmp - hostname) == 0 &&
-				 tokval[tmp - hostname] == '\0')
-				goto match;
-			if ((tmp = index(host, '.')) != NULL &&
-				 strcasecmp(tmp, mydomain) == 0 &&
-				 strncasecmp(host, tokval, tmp - host) == 0 &&
-				 tokval[tmp - host] == '\0')
-				goto match;
-			continue;
-		}
-	match:
-		while ((t = token()) && t != MACH && t != DEFAULT) switch(t) {
-
-		case LOGIN:
-			if (token())
-				if (*aname == 0) { 
-					*aname = malloc((unsigned) strlen(tokval) + 1);
-					(void) strcpy(*aname, tokval);
-				} else {
-					if (strcmp(*aname, tokval))
-						goto next;
-				}
-			break;
-		case PASSWD:
-			if (strcmp(*aname, "anonymous") &&
-			    fstat(fileno(cfile), &stb) >= 0 &&
-			    (stb.st_mode & 077) != 0) {
-	fprintf(stderr, "Error - .netrc file not correct mode.\n");
-	fprintf(stderr, "Remove password or correct mode.\n");
-				goto bad;
-			}
-			if (token() && *apass == 0) {
-				*apass = malloc((unsigned) strlen(tokval) + 1);
-				(void) strcpy(*apass, tokval);
-			}
-			break;
-		case ACCOUNT:
-			if (fstat(fileno(cfile), &stb) >= 0
-			    && (stb.st_mode & 077) != 0) {
-	fprintf(stderr, "Error - .netrc file not correct mode.\n");
-	fprintf(stderr, "Remove account or correct mode.\n");
-				goto bad;
-			}
-			if (token() && *aacct == 0) {
-				*aacct = malloc((unsigned) strlen(tokval) + 1);
-				(void) strcpy(*aacct, tokval);
-			}
-			break;
-		case MACDEF:
-			if (proxy) {
-				(void) fclose(cfile);
-				return(0);
-			}
-			while ((c=getc(cfile)) != EOF && c == ' ' || c == '\t');
-			if (c == EOF || c == '\n') {
-				printf("Missing macdef name argument.\n");
-				goto bad;
-			}
-			if (macnum == 16) {
-				printf("Limit of 16 macros have already been defined\n");
-				goto bad;
-			}
-			tmp = macros[macnum].mac_name;
-			*tmp++ = c;
-			for (i=0; i < 8 && (c=getc(cfile)) != EOF &&
-			    !isspace(c); ++i) {
-				*tmp++ = c;
-			}
-			if (c == EOF) {
-				printf("Macro definition missing null line terminator.\n");
-				goto bad;
-			}
-			*tmp = '\0';
-			if (c != '\n') {
-				while ((c=getc(cfile)) != EOF && c != '\n');
-			}
-			if (c == EOF) {
-				printf("Macro definition missing null line terminator.\n");
-				goto bad;
-			}
-			if (macnum == 0) {
-				macros[macnum].mac_start = macbuf;
-			}
-			else {
-				macros[macnum].mac_start = macros[macnum-1].mac_end + 1;
-			}
-			tmp = macros[macnum].mac_start;
-			while (tmp != macbuf + 4096) {
-				if ((c=getc(cfile)) == EOF) {
-				printf("Macro definition missing null line terminator.\n");
-					goto bad;
-				}
-				*tmp = c;
-				if (*tmp == '\n') {
-					if (*(tmp-1) == '\0') {
-					   macros[macnum++].mac_end = tmp - 1;
-					   break;
-					}
-					*tmp = '\0';
-				}
-				tmp++;
-			}
-			if (tmp == macbuf + 4096) {
-				printf("4K macro buffer exceeded\n");
-				goto bad;
-			}
-			break;
-		default:
-	fprintf(stderr, "Unknown .netrc keyword %s\n", tokval);
-			break;
-		}
-		goto done;
-	}
-done:
-	(void) fclose(cfile);
-	return(0);
-bad:
-	(void) fclose(cfile);
-	return(-1);
-}
-
-static int token(void)
-{
-   char *cp;
-   int c;
-   struct toktab *t;
-   
-   if (feof(cfile))
-      return (0);
-   while ((c = getc(cfile)) != EOF &&
-          (c == '\r' || c == '\n' || c == '\t' || c == ' ' || c == ','))
-      continue;
-   if (c == EOF)
-      return (0);
-   cp = tokval;
-   if (c == '"') {
-      while ((c = getc(cfile)) != EOF && c != '"') {
-         if (c == '\\')
-            c = getc(cfile);
-         *cp++ = c;
-      }
-   } else {
-      *cp++ = c;
-      while ((c = getc(cfile)) != EOF
-             && c != '\n' && c != '\t' && c != ' ' && c != ',' && c != '\r') {
-         if (c == '\\')
-            c = getc(cfile);
-         *cp++ = c;
-      }
-   }
-   *cp = 0;
-   if (tokval[0] == 0)
-      return (0);
-   for (t = toktab; t->tokstr; t++)
-      if (!strcmp(t->tokstr, tokval))
-         return (t->tval);
-   return (ID);
-}
+/*
+ * Copyright (c) 1985 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)ruserpass.c	5.1 (Berkeley) 3/1/89";
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <stdio.h>
+//#include <utmp.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include "ftp_var.h"
+#include "prototypes.h"
+#include <winsock.h>
+
+char	*renvlook(), *index(), *getenv(), *getpass(), *getlogin();
+void  *malloc();
+char	*strcpy();
+struct	utmp *getutmp();
+static	FILE *cfile;
+
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
+
+#define	DEFAULT	1
+#define	LOGIN	2
+#define	PASSWD	3
+#define	ACCOUNT 4
+#define MACDEF  5
+#define	ID	10
+#define	MACH	11
+
+static char tokval[100];
+
+static struct toktab {
+	char *tokstr;
+	int tval;
+} toktab[]= {
+	"default",	DEFAULT,
+	"login",	LOGIN,
+	"password",	PASSWD,
+	"passwd",	PASSWD,
+	"account",	ACCOUNT,
+	"machine",	MACH,
+	"macdef",	MACDEF,
+	0,		0
+};
+
+extern char *hostname;
+
+int ruserpass(char *host, char **aname, char **apass, char **aacct)
+{
+	char *hdir, buf[BUFSIZ], *tmp;
+	char myname[MAXHOSTNAMELEN], *mydomain;
+	int t, i, c, usedefault = 0;
+	struct stat stb;
+	extern int errno;
+
+	hdir = getenv("HOME");
+	if (hdir == NULL)
+		hdir = ".";
+	(void) sprintf(buf, "%s/.netrc", hdir);
+	cfile = fopen(buf, "r");
+	if (cfile == NULL) {
+		if (errno != ENOENT)
+			perror(buf);
+		return(0);
+	}
+
+
+		  if (gethostname(myname, sizeof(myname)) < 0)
+		myname[0] = '\0';
+	if ((mydomain = index(myname, '.')) == NULL)
+		mydomain = "";
+next:
+	while ((t = token())) switch(t) {
+
+	case DEFAULT:
+		usedefault = 1;
+		/* FALL THROUGH */
+
+	case MACH:
+		if (!usedefault) {
+			if (token() != ID)
+				continue;
+			/*
+			 * Allow match either for user's input host name
+			 * or official hostname.  Also allow match of
+			 * incompletely-specified host in local domain.
+			 */
+			if (strcasecmp(host, tokval) == 0)
+				goto match;
+			if (strcasecmp(hostname, tokval) == 0)
+				goto match;
+			if ((tmp = index(hostname, '.')) != NULL &&
+				 strcasecmp(tmp, mydomain) == 0 &&
+				 strncasecmp(hostname, tokval, tmp - hostname) == 0 &&
+				 tokval[tmp - hostname] == '\0')
+				goto match;
+			if ((tmp = index(host, '.')) != NULL &&
+				 strcasecmp(tmp, mydomain) == 0 &&
+				 strncasecmp(host, tokval, tmp - host) == 0 &&
+				 tokval[tmp - host] == '\0')
+				goto match;
+			continue;
+		}
+	match:
+		while ((t = token()) && t != MACH && t != DEFAULT) switch(t) {
+
+		case LOGIN:
+			if (token())
+				if (*aname == 0) { 
+					*aname = malloc((unsigned) strlen(tokval) + 1);
+					(void) strcpy(*aname, tokval);
+				} else {
+					if (strcmp(*aname, tokval))
+						goto next;
+				}
+			break;
+		case PASSWD:
+			if (strcmp(*aname, "anonymous") &&
+			    fstat(fileno(cfile), &stb) >= 0 &&
+			    (stb.st_mode & 077) != 0) {
+	fprintf(stderr, "Error - .netrc file not correct mode.\n");
+	fprintf(stderr, "Remove password or correct mode.\n");
+				goto bad;
+			}
+			if (token() && *apass == 0) {
+				*apass = malloc((unsigned) strlen(tokval) + 1);
+				(void) strcpy(*apass, tokval);
+			}
+			break;
+		case ACCOUNT:
+			if (fstat(fileno(cfile), &stb) >= 0
+			    && (stb.st_mode & 077) != 0) {
+	fprintf(stderr, "Error - .netrc file not correct mode.\n");
+	fprintf(stderr, "Remove account or correct mode.\n");
+				goto bad;
+			}
+			if (token() && *aacct == 0) {
+				*aacct = malloc((unsigned) strlen(tokval) + 1);
+				(void) strcpy(*aacct, tokval);
+			}
+			break;
+		case MACDEF:
+			if (proxy) {
+				(void) fclose(cfile);
+				return(0);
+			}
+			while ((c=getc(cfile)) != EOF && c == ' ' || c == '\t');
+			if (c == EOF || c == '\n') {
+				printf("Missing macdef name argument.\n");
+				goto bad;
+			}
+			if (macnum == 16) {
+				printf("Limit of 16 macros have already been defined\n");
+				goto bad;
+			}
+			tmp = macros[macnum].mac_name;
+			*tmp++ = c;
+			for (i=0; i < 8 && (c=getc(cfile)) != EOF &&
+			    !isspace(c); ++i) {
+				*tmp++ = c;
+			}
+			if (c == EOF) {
+				printf("Macro definition missing null line terminator.\n");
+				goto bad;
+			}
+			*tmp = '\0';
+			if (c != '\n') {
+				while ((c=getc(cfile)) != EOF && c != '\n');
+			}
+			if (c == EOF) {
+				printf("Macro definition missing null line terminator.\n");
+				goto bad;
+			}
+			if (macnum == 0) {
+				macros[macnum].mac_start = macbuf;
+			}
+			else {
+				macros[macnum].mac_start = macros[macnum-1].mac_end + 1;
+			}
+			tmp = macros[macnum].mac_start;
+			while (tmp != macbuf + 4096) {
+				if ((c=getc(cfile)) == EOF) {
+				printf("Macro definition missing null line terminator.\n");
+					goto bad;
+				}
+				*tmp = c;
+				if (*tmp == '\n') {
+					if (*(tmp-1) == '\0') {
+					   macros[macnum++].mac_end = tmp - 1;
+					   break;
+					}
+					*tmp = '\0';
+				}
+				tmp++;
+			}
+			if (tmp == macbuf + 4096) {
+				printf("4K macro buffer exceeded\n");
+				goto bad;
+			}
+			break;
+		default:
+	fprintf(stderr, "Unknown .netrc keyword %s\n", tokval);
+			break;
+		}
+		goto done;
+	}
+done:
+	(void) fclose(cfile);
+	return(0);
+bad:
+	(void) fclose(cfile);
+	return(-1);
+}
+
+static int token(void)
+{
+   char *cp;
+   int c;
+   struct toktab *t;
+   
+   if (feof(cfile))
+      return (0);
+   while ((c = getc(cfile)) != EOF &&
+          (c == '\r' || c == '\n' || c == '\t' || c == ' ' || c == ','))
+      continue;
+   if (c == EOF)
+      return (0);
+   cp = tokval;
+   if (c == '"') {
+      while ((c = getc(cfile)) != EOF && c != '"') {
+         if (c == '\\')
+            c = getc(cfile);
+         *cp++ = c;
+      }
+   } else {
+      *cp++ = c;
+      while ((c = getc(cfile)) != EOF
+             && c != '\n' && c != '\t' && c != ' ' && c != ',' && c != '\r') {
+         if (c == '\\')
+            c = getc(cfile);
+         *cp++ = c;
+      }
+   }
+   *cp = 0;
+   if (tokval[0] == 0)
+      return (0);
+   for (t = toktab; t->tokstr; t++)
+      if (!strcmp(t->tokstr, tokval))
+         return (t->tval);
+   return (ID);
+}

apps/utils/net/ping/makefile

@@ -0,0 +1,19 @@
+PATH_TO_TOP = ../../../..
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_NAME = ping
+
+TARGET_INSTALLDIR = system32
+
+TARGET_CFLAGS = -D__USE_W32API -D__USE_W32_SOCKETS
+
+TARGET_SDKLIBS = ws2_32.a
+
+TARGET_OBJECTS = $(TARGET_NAME).o
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk

apps/utils/net/ping/ping.c

@@ -331,7 +331,7 @@ BOOL Setup(VOID)
     }
 	
     if (phe != NULL) {
-        CopyMemory(&Target.sin_addr, phe->h_addr_list, phe->h_length);
+        CopyMemory(&Target.sin_addr, phe->h_addr, phe->h_length);
     } else {
         Target.sin_addr.s_addr = Addr;
     }
@@ -391,19 +391,9 @@ VOID TimeToMsString(LPSTR String, LARGE_INTEGER Time)
     LARGE_INTEGER LargeTime;
 
     LargeTime.QuadPart = Time.QuadPart / TicksPerMs.QuadPart;
+ 
     _i64toa(LargeTime.QuadPart, Convstr, 10);
 	strcpy(String, Convstr);
-    strcat(String, ",");
-
-    LargeTime.QuadPart = (Time.QuadPart % TicksPerMs.QuadPart) / TicksPerUs.QuadPart;
-    _i64toa(LargeTime.QuadPart, Convstr, 10);
-    Length = strlen(Convstr);
-    if (Length < 4) {
-        for (i = 0; i < 4 - Length; i++)
-            strcat(String, "0");
-    }
-
-    strcat(String, Convstr);
     strcat(String, "ms");
 }
 
@@ -417,6 +407,7 @@ BOOL DecodeResponse(PCHAR buffer, UINT size, PSOCKADDR_IN from)
     CHAR              Time[100];
     LARGE_INTEGER     RelativeTime;
     LARGE_INTEGER     LargeTime;
+    CHAR              Sign[1];
 
     IpHeader = (PIPv4_HEADER)buffer;
 
@@ -449,10 +440,17 @@ BOOL DecodeResponse(PCHAR buffer, UINT size, PSOCKADDR_IN from)
 
     RelativeTime.QuadPart = (LargeTime.QuadPart - Icmp->Timestamp.QuadPart);
 
-    TimeToMsString(Time, RelativeTime);
+    if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1) {
+        strcpy(Sign, "<");
+        strcpy(Time, "1ms");
+    } else {
+        strcpy(Sign, "=");
+        TimeToMsString(Time, RelativeTime);
+    }
 
-    printf("Reply from %s: bytes=%d time=%s TTL=%d\n", inet_ntoa(from->sin_addr), 
-      size - IphLength - sizeof(ICMP_ECHO_PACKET), Time, IpHeader->TTL);
+
+    printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), 
+      size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL);
     if (RelativeTime.QuadPart < MinRTT.QuadPart) {
 		  MinRTT.QuadPart = RelativeTime.QuadPart;
       MinRTTSet = TRUE;

apps/utils/net/route/makefile

@@ -0,0 +1,19 @@
+PATH_TO_TOP = ../../../..
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_NAME = route
+
+TARGET_INSTALLDIR = system32
+
+TARGET_SDKLIBS = ws2_32.a iphlpapi.a ntdll.a
+
+TARGET_OBJECTS = $(TARGET_NAME).o
+
+TARGET_CFLAGS = -D__USE_W32API
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk