Loading ...
Sorry, an error occurred while loading the content.

Patch 7.3.269

Expand Messages
  • Bram Moolenaar
    Patch 7.3.269 Problem: shellcmdflag only works with one flag. Solution: Split into multiple arguments. (Gary Johnson) Files: src/os_unix.c ...
    Message 1 of 5 , Aug 4, 2011
    • 0 Attachment
      Patch 7.3.269
      Problem: 'shellcmdflag' only works with one flag.
      Solution: Split into multiple arguments. (Gary Johnson)
      Files: src/os_unix.c


      *** ../vim-7.3.268/src/os_unix.c 2011-08-04 19:36:47.000000000 +0200
      --- src/os_unix.c 2011-08-04 20:27:13.000000000 +0200
      ***************
      *** 3795,3802 ****
      --- 3795,3804 ----
      int retval = -1;
      char **argv = NULL;
      int argc;
      + char_u *p_shcf_copy = NULL;
      int i;
      char_u *p;
      + char_u *s;
      int inquote;
      int pty_master_fd = -1; /* for pty's */
      # ifdef FEAT_GUI
      ***************
      *** 3855,3860 ****
      --- 3857,3875 ----
      }
      if (argv == NULL)
      {
      + /*
      + * Account for possible multiple args in p_shcf.
      + */
      + p = p_shcf;
      + for (;;)
      + {
      + p = skiptowhite(p);
      + if (*p == NUL)
      + break;
      + ++argc;
      + p = skipwhite(p);
      + }
      +
      argv = (char **)alloc((unsigned)((argc + 4) * sizeof(char *)));
      if (argv == NULL) /* out of memory */
      goto error;
      ***************
      *** 3864,3870 ****
      {
      if (extra_shell_arg != NULL)
      argv[argc++] = (char *)extra_shell_arg;
      ! argv[argc++] = (char *)p_shcf;
      argv[argc++] = (char *)cmd;
      }
      argv[argc] = NULL;
      --- 3879,3901 ----
      {
      if (extra_shell_arg != NULL)
      argv[argc++] = (char *)extra_shell_arg;
      !
      ! /* Break 'shellcmdflag' into white separated parts. This doesn't
      ! * handle quoted strings, they are very unlikely to appear. */
      ! p_shcf_copy = alloc((unsigned)STRLEN(p_shcf) + 1);
      ! if (p_shcf_copy == NULL) /* out of memory */
      ! goto error;
      ! s = p_shcf_copy;
      ! p = p_shcf;
      ! while (*p != NUL)
      ! {
      ! argv[argc++] = (char *)s;
      ! while (*p && *p != ' ' && *p != TAB)
      ! *s++ = *p++;
      ! *s++ = NUL;
      ! p = skipwhite(p);
      ! }
      !
      argv[argc++] = (char *)cmd;
      }
      argv[argc] = NULL;
      ***************
      *** 4677,4682 ****
      --- 4708,4714 ----
      }
      }
      vim_free(argv);
      + vim_free(p_shcf_copy);

      error:
      if (!did_settmode)
      *** ../vim-7.3.268/src/version.c 2011-08-04 19:36:47.000000000 +0200
      --- src/version.c 2011-08-04 20:30:44.000000000 +0200
      ***************
      *** 711,712 ****
      --- 711,714 ----
      { /* Add new patch number below this line */
      + /**/
      + 269,
      /**/

      --
      Be nice to your kids... they'll be the ones choosing your nursing home.

      /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
      /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
      \\\ an exciting new programming language -- http://www.Zimbu.org ///
      \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

      --
      You received this message from the "vim_dev" maillist.
      Do not top-post! Type your reply below the text you are replying to.
      For more information, visit http://www.vim.org/maillist.php
    • Tony Mechelynck
      ... [...] Hm, for some reason this patch seems not to have reached the Mercurial server (with tip at v7-3-268, hg incoming answers no changes found ). Best
      Message 2 of 5 , Aug 4, 2011
      • 0 Attachment
        On 04/08/11 20:32, Bram Moolenaar wrote:
        >
        > Patch 7.3.269
        > Problem: 'shellcmdflag' only works with one flag.
        > Solution: Split into multiple arguments. (Gary Johnson)
        > Files: src/os_unix.c
        [...]

        Hm, for some reason this patch seems not to have reached the Mercurial
        server (with tip at v7-3-268, "hg incoming" answers "no changes found").


        Best regards,
        Tony.
        --
        In Pocatello, Idaho, a law passed in 1912 provided that "The carrying
        of concealed weapons is forbidden, unless same are exhibited to public
        view."

        --
        You received this message from the "vim_dev" maillist.
        Do not top-post! Type your reply below the text you are replying to.
        For more information, visit http://www.vim.org/maillist.php
      • Bram Moolenaar
        ... The push failed. Should be done now. -- Proofread carefully to see if you any words out. /// Bram Moolenaar -- Bram@Moolenaar.net --
        Message 3 of 5 , Aug 4, 2011
        • 0 Attachment
          Tony Mechelynck wrote:

          > On 04/08/11 20:32, Bram Moolenaar wrote:
          > >
          > > Patch 7.3.269
          > > Problem: 'shellcmdflag' only works with one flag.
          > > Solution: Split into multiple arguments. (Gary Johnson)
          > > Files: src/os_unix.c
          > [...]
          >
          > Hm, for some reason this patch seems not to have reached the Mercurial
          > server (with tip at v7-3-268, "hg incoming" answers "no changes found").

          The push failed. Should be done now.

          --
          Proofread carefully to see if you any words out.

          /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
          /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
          \\\ an exciting new programming language -- http://www.Zimbu.org ///
          \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

          --
          You received this message from the "vim_dev" maillist.
          Do not top-post! Type your reply below the text you are replying to.
          For more information, visit http://www.vim.org/maillist.php
        • Tony Mechelynck
          ... Yes indeed. Thanks Bram (and sorry for the late reply). :-) :-) :-) Best regards, Tony. -- hundred-and-one symptoms of being an internet addict: 150. You
          Message 4 of 5 , Aug 5, 2011
          • 0 Attachment
            On 04/08/11 23:00, Bram Moolenaar wrote:
            >
            > Tony Mechelynck wrote:
            >
            >> On 04/08/11 20:32, Bram Moolenaar wrote:
            >>>
            >>> Patch 7.3.269
            >>> Problem: 'shellcmdflag' only works with one flag.
            >>> Solution: Split into multiple arguments. (Gary Johnson)
            >>> Files: src/os_unix.c
            >> [...]
            >>
            >> Hm, for some reason this patch seems not to have reached the Mercurial
            >> server (with tip at v7-3-268, "hg incoming" answers "no changes found").
            >
            > The push failed. Should be done now.
            >

            Yes indeed. Thanks Bram (and sorry for the late reply). :-) :-) :-)

            Best regards,
            Tony.
            --
            hundred-and-one symptoms of being an internet addict:
            150. You find yourself counting emoticons to get to sleep.

            --
            You received this message from the "vim_dev" maillist.
            Do not top-post! Type your reply below the text you are replying to.
            For more information, visit http://www.vim.org/maillist.php
          • Gary Johnson
            ... Thank you! Regards, Gary -- You received this message from the vim_dev maillist. Do not top-post! Type your reply below the text you are replying to. For
            Message 5 of 5 , Aug 5, 2011
            • 0 Attachment
              On 2011-08-04, Bram Moolenaar wrote:
              > Patch 7.3.269
              > Problem: 'shellcmdflag' only works with one flag.
              > Solution: Split into multiple arguments. (Gary Johnson)
              > Files: src/os_unix.c

              Thank you!

              Regards,
              Gary

              --
              You received this message from the "vim_dev" maillist.
              Do not top-post! Type your reply below the text you are replying to.
              For more information, visit http://www.vim.org/maillist.php
            Your message has been successfully submitted and would be delivered to recipients shortly.