patch 8.1.1060: MS-Windows: get_cmd_args() is no longer needed

Problem:    MS-Windows: get_cmd_args() is no longer needed, get_cmd_argsW() is
            always used.
Solution:   Remove get_cmd_args(). (Ken Takata, closes #4171)

diff --git a/src/gui_w32.c b/src/gui_w32.c
index e8336b56f6aeada2bb1a2d0dfaef0e9aff4c5cf7..c584d8c78b0f981cdb979860e9a5fe94cabe92f6 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -3882,151 +3882,6 @@ _OnScroll(
 }
 
 
-/*
- * Get command line arguments.
- * Use "prog" as the name of the program and "cmdline" as the arguments.
- * Copy the arguments to allocated memory.
- * Return the number of arguments (including program name).
- * Return pointers to the arguments in "argvp".  Memory is allocated with
- * malloc(), use free() instead of vim_free().
- * Return pointer to buffer in "tofree".
- * Returns zero when out of memory.
- */
-    int
-get_cmd_args(char *prog, char *cmdline, char ***argvp, char **tofree)
-{
-    int                i;
-    char       *p;
-    char       *progp;
-    char       *pnew = NULL;
-    char       *newcmdline;
-    int                inquote;
-    int                argc;
-    char       **argv = NULL;
-    int                round;
-
-    *tofree = NULL;
-
-    /* Try using the Unicode version first, it takes care of conversion when
-     * 'encoding' is changed. */
-    argc = get_cmd_argsW(&argv);
-    if (argc != 0)
-       goto done;
-
-    /* Handle the program name.  Remove the ".exe" extension, and find the 1st
-     * non-space. */
-    p = strrchr(prog, '.');
-    if (p != NULL)
-       *p = NUL;
-    for (progp = prog; *progp == ' '; ++progp)
-       ;
-
-    /* The command line is copied to allocated memory, so that we can change
-     * it.  Add the size of the string, the separating NUL and a terminating
-     * NUL. */
-    newcmdline = malloc(STRLEN(cmdline) + STRLEN(progp) + 2);
-    if (newcmdline == NULL)
-       return 0;
-
-    /*
-     * First round: count the number of arguments ("pnew" == NULL).
-     * Second round: produce the arguments.
-     */
-    for (round = 1; round <= 2; ++round)
-    {
-       /* First argument is the program name. */
-       if (pnew != NULL)
-       {
-           argv[0] = pnew;
-           strcpy(pnew, progp);
-           pnew += strlen(pnew);
-           *pnew++ = NUL;
-       }
-
-       /*
-        * Isolate each argument and put it in argv[].
-        */
-       p = cmdline;
-       argc = 1;
-       while (*p != NUL)
-       {
-           inquote = FALSE;
-           if (pnew != NULL)
-               argv[argc] = pnew;
-           ++argc;
-           while (*p != NUL && (inquote || (*p != ' ' && *p != '\t')))
-           {
-               /* Backslashes are only special when followed by a double
-                * quote. */
-               i = (int)strspn(p, "\\");
-               if (p[i] == '"')
-               {
-                   /* Halve the number of backslashes. */
-                   if (i > 1 && pnew != NULL)
-                   {
-                       vim_memset(pnew, '\\', i / 2);
-                       pnew += i / 2;
-                   }
-
-                   /* Even nr of backslashes toggles quoting, uneven copies
-                    * the double quote. */
-                   if ((i & 1) == 0)
-                       inquote = !inquote;
-                   else if (pnew != NULL)
-                       *pnew++ = '"';
-                   p += i + 1;
-               }
-               else if (i > 0)
-               {
-                   /* Copy span of backslashes unmodified. */
-                   if (pnew != NULL)
-                   {
-                       vim_memset(pnew, '\\', i);
-                       pnew += i;
-                   }
-                   p += i;
-               }
-               else
-               {
-                   if (pnew != NULL)
-                       *pnew++ = *p;
-                   /* Can't use mb_* functions, because 'encoding' is not
-                    * initialized yet here. */
-                   if (IsDBCSLeadByte(*p))
-                   {
-                       ++p;
-                       if (pnew != NULL)
-                           *pnew++ = *p;
-                   }
-                   ++p;
-               }
-           }
-
-           if (pnew != NULL)
-               *pnew++ = NUL;
-           while (*p == ' ' || *p == '\t')
-               ++p;                /* advance until a non-space */
-       }
-
-       if (round == 1)
-       {
-           argv = (char **)malloc((argc + 1) * sizeof(char *));
-           if (argv == NULL )
-           {
-               free(newcmdline);
-               return 0;                  /* malloc error */
-           }
-           pnew = newcmdline;
-           *tofree = newcmdline;
-       }
-    }
-
-done:
-    argv[argc] = NULL;         /* NULL-terminated list */
-    *argvp = argv;
-    return argc;
-}
-
 #ifdef FEAT_XPM_W32
 # include "xpm_w32.h"
 #endif

diff --git a/src/os_w32exe.c b/src/os_w32exe.c
index 197d65da4ced373b6b03bc40d4c222ac5aa0fa47..d3ac092b41fcec535f2278c182f0b9674f841c54 100644 (file)
--- a/src/os_w32exe.c
+++ b/src/os_w32exe.c
@@ -10,7 +10,7 @@
 /*
  * Windows GUI: main program (EXE) entry point:
  *
- * Ron Aaron <ronaharon@yahoo.com> wrote this and  the DLL support code.
+ * Ron Aaron <ronaharon@yahoo.com> wrote this and the DLL support code.
  */
 #include "vim.h"
 
@@ -42,36 +42,25 @@ static void (_cdecl *pSaveInst)(HINSTANCE);
 WinMain(
     HINSTANCE  hInstance UNUSED,
     HINSTANCE  hPrevInst UNUSED,
-    LPSTR      lpszCmdLine,
+    LPSTR      lpszCmdLine UNUSED,
     int                nCmdShow UNUSED)
 {
     int                argc = 0;
-    char       **argv;
-    char       *tofree;
-    char       prog[256];
+    char       **argv = NULL;
 #ifdef VIMDLL
+    char       prog[256];
     char       *p;
     HANDLE     hLib;
-#endif
 
     /* Ron: added full path name so that the $VIM variable will get set to our
      * startup path (so the .vimrc file can be found w/o a VIM env. var.) */
     GetModuleFileName(NULL, prog, 255);
 
-    argc = get_cmd_args(prog, (char *)lpszCmdLine, &argv, &tofree);
-    if (argc == 0)
-    {
-       MessageBox(0, "Could not allocate memory for command line.",
-                                                             "VIM Error", 0);
-       return 0;
-    }
-
-#ifdef DYNAMIC_GETTEXT
+# ifdef DYNAMIC_GETTEXT
     /* Initialize gettext library */
     dyn_libintl_init();
-#endif
+# endif
 
-#ifdef VIMDLL
     // LoadLibrary - get name of dll to load in here:
     p = strrchr(prog, '\\');
     if (p != NULL)
@@ -127,9 +116,6 @@ WinMain(
     FreeLibrary(hLib);
 errout:
 #endif
-    free(argv);
-    if (tofree != NULL)
-       free(tofree);
     free_cmd_argsW();
 
     return 0;

diff --git a/src/version.c b/src/version.c
index c7fcb590fb6c736e71d45acd4d01a9fbf3d809d9..69f2f064ca1d09861f46b81d08c1b689d88f642f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -775,6 +775,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1060,
 /**/
     1059,
 /**/