From: Duy Nguyen <pclouds@gmail.com>
To: Brandon Williams <bmwill@google.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Stefan Beller <sbeller@google.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 01/17] mv: convert to using pathspec struct interface
Date: Wed, 7 Dec 2016 17:07:24 +0700 [thread overview]
Message-ID: <CACsJy8Bm+Nif_PL1=BzTYLKGrnz94rjKOB=_PXz6OB47Js6v2A@mail.gmail.com> (raw)
In-Reply-To: <1481061106-117775-2-git-send-email-bmwill@google.com>
On Wed, Dec 7, 2016 at 4:51 AM, Brandon Williams <bmwill@google.com> wrote:
> Convert the 'internal_copy_pathspec()' function to use the pathspec
> struct interface from using the deprecated 'get_pathspec()' interface.
>
> In addition to this, fix a memory leak caused by only duplicating some
> of the pathspec elements. Instead always duplicate all of the the
> pathspec elements as an intermediate step (with modificationed based on
> the passed in flags). This way the intermediate strings can then be
> freed prior to duplicating the result of parse_pathspec (which contains
> each of the elements with the prefix prepended).
>
> Signed-off-by: Brandon Williams <bmwill@google.com>
> ---
> builtin/mv.c | 45 ++++++++++++++++++++++++++++++++-------------
> 1 file changed, 32 insertions(+), 13 deletions(-)
Stefan did something similar last year [1] but I couldn't find why it
did not get merged. Not sure if the reasons are still relevant or
not...
[1] http://public-inbox.org/git/%3C1438885632-26470-1-git-send-email-sbeller@google.com%3E/
> diff --git a/builtin/mv.c b/builtin/mv.c
> index 2f43877..4df4a12 100644
> --- a/builtin/mv.c
> +++ b/builtin/mv.c
> @@ -4,6 +4,7 @@
> * Copyright (C) 2006 Johannes Schindelin
> */
> #include "builtin.h"
> +#include "pathspec.h"
> #include "lockfile.h"
> #include "dir.h"
> #include "cache-tree.h"
> @@ -25,25 +26,43 @@ static const char **internal_copy_pathspec(const char *prefix,
> {
> int i;
> const char **result;
> + struct pathspec ps;
> ALLOC_ARRAY(result, count + 1);
> - COPY_ARRAY(result, pathspec, count);
> - result[count] = NULL;
> +
> + /* Create an intermediate copy of the pathspec based on the flags */
> for (i = 0; i < count; i++) {
> - int length = strlen(result[i]);
> + int length = strlen(pathspec[i]);
> int to_copy = length;
> + char *it;
> while (!(flags & KEEP_TRAILING_SLASH) &&
> - to_copy > 0 && is_dir_sep(result[i][to_copy - 1]))
> + to_copy > 0 && is_dir_sep(pathspec[i][to_copy - 1]))
> to_copy--;
> - if (to_copy != length || flags & DUP_BASENAME) {
> - char *it = xmemdupz(result[i], to_copy);
> - if (flags & DUP_BASENAME) {
> - result[i] = xstrdup(basename(it));
> - free(it);
> - } else
> - result[i] = it;
> - }
> +
> + it = xmemdupz(pathspec[i], to_copy);
> + if (flags & DUP_BASENAME) {
> + result[i] = xstrdup(basename(it));
> + free(it);
> + } else
> + result[i] = it;
> + }
> + result[count] = NULL;
> +
> + parse_pathspec(&ps,
> + PATHSPEC_ALL_MAGIC &
> + ~(PATHSPEC_FROMTOP | PATHSPEC_LITERAL),
> + PATHSPEC_KEEP_ORDER | PATHSPEC_PREFER_CWD,
> + prefix, result);
> + assert(count == ps.nr);
> +
> + /* Copy the pathspec and free the old intermediate strings */
> + for (i = 0; i < count; i++) {
> + const char *match = xstrdup(ps.items[i].match);
> + free((char *) result[i]);
> + result[i] = match;
Sigh.. it looks so weird that we do all the parsing (in a _copy_
pathspec function) then remove struct pathspec and return the plain
string. I guess we can't do anything more until we rework cmd_mv code
to handle pathspec natively.
At the least I think we should rename this function to something else.
But if you have time I really wish we could kill this function. I
haven't stared at cmd_mv() long and hard, but it looks to me that we
combining two separate functionalities in the same function here.
If "mv" takes n arguments, then the first <n-1> arguments may be
pathspec, the last one is always a plain path. The "dest_path =
internal_copy_pathspec..." could be as simple as "dest_path =
prefix_path(argv[argc - 1])". the special treatment for this last
argument [1] can live here. Then, we can do parse_pathspec for the
<n-1> arguments in cmd_mv(). It's still far from perfect, because
cmd_mv can't handle pathspec properly, but it reduces the messy mess
in internal_copy_pathspec a bit, I hope.
[1] c57f628 (mv: let 'git mv file no-such-dir/' error out - 2013-12-03)
> }
> - return get_pathspec(prefix, result);
> +
> + clear_pathspec(&ps);
> + return result;
> }
>
> static const char *add_slash(const char *path)
> --
> 2.8.0.rc3.226.g39d4020
>
--
Duy
next prev parent reply other threads:[~2016-12-07 10:07 UTC|newest]
Thread overview: 142+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-06 21:51 [PATCH 00/17] pathspec cleanup Brandon Williams
2016-12-06 21:51 ` [PATCH 01/17] mv: convert to using pathspec struct interface Brandon Williams
2016-12-07 10:07 ` Duy Nguyen [this message]
2016-12-08 0:36 ` Brandon Williams
2016-12-08 11:04 ` Duy Nguyen
2016-12-08 18:06 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 02/17] dir: convert create_simplify to use the " Brandon Williams
2016-12-07 10:17 ` Duy Nguyen
2016-12-08 0:03 ` Brandon Williams
2016-12-08 11:05 ` Duy Nguyen
2016-12-08 18:19 ` Brandon Williams
2016-12-09 13:08 ` Duy Nguyen
2016-12-09 19:23 ` Brandon Williams
2016-12-13 22:49 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 03/17] dir: convert fill_directory " Brandon Williams
2016-12-07 10:24 ` Duy Nguyen
2016-12-07 22:46 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 04/17] ls-tree: convert show_recursive " Brandon Williams
2016-12-07 10:38 ` Duy Nguyen
2016-12-07 22:43 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 05/17] pathspec: remove the deprecated get_pathspec function Brandon Williams
2016-12-06 21:51 ` [PATCH 06/17] pathspec: copy and free owned memory Brandon Williams
2016-12-06 21:51 ` [PATCH 07/17] mv: small code cleanup Brandon Williams
2016-12-06 21:51 ` [PATCH 08/17] pathspec: remove unused variable from unsupported_magic Brandon Williams
2016-12-06 21:51 ` [PATCH 09/17] pathspec: always show mnemonic and name in unsupported_magic Brandon Williams
2016-12-07 10:44 ` Duy Nguyen
2016-12-07 22:41 ` Brandon Williams
2016-12-07 10:47 ` Duy Nguyen
2016-12-07 22:41 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 10/17] pathspec: simpler logic to prefix original pathspec elements Brandon Williams
2016-12-06 22:20 ` Stefan Beller
2016-12-06 22:37 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 11/17] pathspec: factor global magic into its own function Brandon Williams
2016-12-07 12:53 ` Duy Nguyen
2016-12-07 22:39 ` Brandon Williams
2016-12-08 9:20 ` Duy Nguyen
2016-12-06 21:51 ` [PATCH 12/17] pathspec: create parse_short_magic function Brandon Williams
2016-12-06 21:51 ` [PATCH 13/17] pathspec: create parse_long_magic function Brandon Williams
2016-12-06 21:51 ` [PATCH 14/17] pathspec: create parse_element_magic helper Brandon Williams
2016-12-06 21:51 ` [PATCH 15/17] pathspec: create strip submodule slash helpers Brandon Williams
2016-12-06 21:51 ` [PATCH 16/17] pathspec: small readability changes Brandon Williams
2016-12-06 22:30 ` Stefan Beller
2016-12-07 13:00 ` Duy Nguyen
2016-12-07 23:27 ` Brandon Williams
2016-12-08 9:23 ` Duy Nguyen
2016-12-07 13:04 ` Duy Nguyen
2016-12-07 22:04 ` Junio C Hamano
2016-12-07 22:36 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 17/17] pathspec: remove outdated comment Brandon Williams
2016-12-07 22:04 ` [PATCH 00/17] pathspec cleanup Junio C Hamano
2016-12-08 18:58 ` [PATCH v2 00/16] " Brandon Williams
2016-12-08 18:58 ` [PATCH v2 01/16] mv: remove use of deprecated 'get_pathspec()' Brandon Williams
2016-12-08 18:58 ` [PATCH v2 02/16] dir: convert create_simplify to use the pathspec struct interface Brandon Williams
2016-12-08 18:58 ` [PATCH v2 03/16] dir: convert fill_directory " Brandon Williams
2016-12-08 18:58 ` [PATCH v2 04/16] ls-tree: convert show_recursive " Brandon Williams
2016-12-08 18:58 ` [PATCH v2 05/16] pathspec: remove the deprecated get_pathspec function Brandon Williams
2016-12-08 18:59 ` [PATCH v2 06/16] pathspec: copy and free owned memory Brandon Williams
2016-12-08 18:59 ` [PATCH v2 07/16] pathspec: remove unused variable from unsupported_magic Brandon Williams
2016-12-08 18:59 ` [PATCH v2 08/16] pathspec: always show mnemonic and name in unsupported_magic Brandon Williams
2016-12-08 18:59 ` [PATCH v2 09/16] pathspec: simpler logic to prefix original pathspec elements Brandon Williams
2016-12-08 18:59 ` [PATCH v2 10/16] pathspec: factor global magic into its own function Brandon Williams
2016-12-08 18:59 ` [PATCH v2 11/16] pathspec: create parse_short_magic function Brandon Williams
2016-12-08 18:59 ` [PATCH v2 12/16] pathspec: create parse_long_magic function Brandon Williams
2016-12-09 23:44 ` Junio C Hamano
2016-12-09 23:52 ` Stefan Beller
2016-12-10 0:29 ` Brandon Williams
2016-12-10 18:18 ` Junio C Hamano
2016-12-12 5:38 ` Stefan Beller
2016-12-12 6:19 ` Junio C Hamano
2016-12-08 18:59 ` [PATCH v2 13/16] pathspec: create parse_element_magic helper Brandon Williams
2016-12-08 18:59 ` [PATCH v2 14/16] pathspec: create strip submodule slash helpers Brandon Williams
2016-12-09 0:28 ` Junio C Hamano
2016-12-09 12:16 ` Duy Nguyen
2016-12-09 19:18 ` [PATCH " Brandon Williams
2016-12-09 19:40 ` Stefan Beller
2016-12-09 20:30 ` Brandon Williams
2016-12-08 18:59 ` [PATCH v2 15/16] pathspec: small readability changes Brandon Williams
2016-12-08 18:59 ` [PATCH v2 16/16] pathspec: rename prefix_pathspec to init_pathspec_item Brandon Williams
2016-12-09 0:25 ` [PATCH v2 00/16] pathspec cleanup Junio C Hamano
2016-12-09 19:03 ` Brandon Williams
2016-12-13 23:14 ` [PATCH v3 " Brandon Williams
2016-12-13 23:14 ` [PATCH v3 01/16] mv: remove use of deprecated 'get_pathspec()' Brandon Williams
2016-12-13 23:14 ` [PATCH v3 02/16] dir: remove struct path_simplify Brandon Williams
2016-12-19 17:33 ` Stefan Beller
2017-01-03 12:02 ` Duy Nguyen
2016-12-13 23:14 ` [PATCH v3 03/16] dir: convert fill_directory to use the pathspec struct interface Brandon Williams
2016-12-13 23:14 ` [PATCH v3 04/16] ls-tree: convert show_recursive " Brandon Williams
2016-12-13 23:14 ` [PATCH v3 05/16] pathspec: remove the deprecated get_pathspec function Brandon Williams
2016-12-13 23:14 ` [PATCH v3 06/16] pathspec: copy and free owned memory Brandon Williams
2017-01-03 12:06 ` Duy Nguyen
2016-12-13 23:14 ` [PATCH v3 07/16] pathspec: remove unused variable from unsupported_magic Brandon Williams
2016-12-13 23:14 ` [PATCH v3 08/16] pathspec: always show mnemonic and name in unsupported_magic Brandon Williams
2017-01-03 12:14 ` Duy Nguyen
2017-01-03 18:15 ` Brandon Williams
2016-12-13 23:14 ` [PATCH v3 09/16] pathspec: simpler logic to prefix original pathspec elements Brandon Williams
2016-12-13 23:14 ` [PATCH v3 10/16] pathspec: factor global magic into its own function Brandon Williams
2016-12-13 23:14 ` [PATCH v3 11/16] pathspec: create parse_short_magic function Brandon Williams
2016-12-13 23:14 ` [PATCH v3 12/16] pathspec: create parse_long_magic function Brandon Williams
2016-12-13 23:14 ` [PATCH v3 13/16] pathspec: create parse_element_magic helper Brandon Williams
2016-12-13 23:14 ` [PATCH v3 14/16] pathspec: create strip submodule slash helpers Brandon Williams
2016-12-13 23:14 ` [PATCH v3 15/16] pathspec: small readability changes Brandon Williams
2016-12-13 23:14 ` [PATCH v3 16/16] pathspec: rename prefix_pathspec to init_pathspec_item Brandon Williams
2017-01-03 18:42 ` [PATCH v4 00/16] pathspec cleanup Brandon Williams
2017-01-03 18:42 ` [PATCH v4 01/16] mv: remove use of deprecated 'get_pathspec()' Brandon Williams
2017-01-03 18:42 ` [PATCH v4 02/16] dir: remove struct path_simplify Brandon Williams
2017-01-03 18:42 ` [PATCH v4 03/16] dir: convert fill_directory to use the pathspec struct interface Brandon Williams
2017-01-03 18:42 ` [PATCH v4 04/16] ls-tree: convert show_recursive " Brandon Williams
2017-01-03 18:42 ` [PATCH v4 05/16] pathspec: remove the deprecated get_pathspec function Brandon Williams
2017-01-03 18:42 ` [PATCH v4 06/16] pathspec: copy and free owned memory Brandon Williams
2017-01-03 18:42 ` [PATCH v4 07/16] pathspec: remove unused variable from unsupported_magic Brandon Williams
2017-01-03 18:42 ` [PATCH v4 08/16] pathspec: always show mnemonic and name in unsupported_magic Brandon Williams
2017-01-03 18:42 ` [PATCH v4 09/16] pathspec: simpler logic to prefix original pathspec elements Brandon Williams
2017-01-03 18:42 ` [PATCH v4 10/16] pathspec: factor global magic into its own function Brandon Williams
2017-01-03 18:42 ` [PATCH v4 11/16] pathspec: create parse_short_magic function Brandon Williams
2017-01-03 18:42 ` [PATCH v4 12/16] pathspec: create parse_long_magic function Brandon Williams
2017-01-03 18:42 ` [PATCH v4 13/16] pathspec: create parse_element_magic helper Brandon Williams
2017-01-03 18:42 ` [PATCH v4 14/16] pathspec: create strip submodule slash helpers Brandon Williams
2017-01-03 18:42 ` [PATCH v4 15/16] pathspec: small readability changes Brandon Williams
2017-01-03 18:42 ` [PATCH v4 16/16] pathspec: rename prefix_pathspec to init_pathspec_item Brandon Williams
2017-01-04 13:56 ` [PATCH v4 00/16] pathspec cleanup Duy Nguyen
2017-01-04 17:53 ` Brandon Williams
2017-01-04 17:56 ` Brandon Williams
2017-01-04 18:03 ` [PATCH v5 " Brandon Williams
2017-01-04 18:03 ` [PATCH v5 01/16] mv: remove use of deprecated 'get_pathspec()' Brandon Williams
2017-01-04 18:03 ` [PATCH v5 02/16] dir: remove struct path_simplify Brandon Williams
2017-01-04 18:03 ` [PATCH v5 03/16] dir: convert fill_directory to use the pathspec struct interface Brandon Williams
2017-01-04 18:03 ` [PATCH v5 04/16] ls-tree: convert show_recursive " Brandon Williams
2017-01-04 18:04 ` [PATCH v5 05/16] pathspec: remove the deprecated get_pathspec function Brandon Williams
2017-01-04 18:04 ` [PATCH v5 06/16] pathspec: copy and free owned memory Brandon Williams
2017-01-04 18:04 ` [PATCH v5 07/16] pathspec: remove unused variable from unsupported_magic Brandon Williams
2017-01-04 18:04 ` [PATCH v5 08/16] pathspec: always show mnemonic and name in unsupported_magic Brandon Williams
2017-01-04 18:04 ` [PATCH v5 09/16] pathspec: simpler logic to prefix original pathspec elements Brandon Williams
2017-01-04 18:04 ` [PATCH v5 10/16] pathspec: factor global magic into its own function Brandon Williams
2017-01-04 18:04 ` [PATCH v5 11/16] pathspec: create parse_short_magic function Brandon Williams
2017-01-04 18:04 ` [PATCH v5 12/16] pathspec: create parse_long_magic function Brandon Williams
2017-01-04 18:04 ` [PATCH v5 13/16] pathspec: create parse_element_magic helper Brandon Williams
2017-01-04 18:04 ` [PATCH v5 14/16] pathspec: create strip submodule slash helpers Brandon Williams
2017-01-04 18:04 ` [PATCH v5 15/16] pathspec: small readability changes Brandon Williams
2017-01-04 18:04 ` [PATCH v5 16/16] pathspec: rename prefix_pathspec to init_pathspec_item Brandon Williams
2017-01-07 9:29 ` [PATCH v5 00/16] pathspec cleanup Duy Nguyen
2017-01-09 2:04 ` Junio C Hamano
2017-01-09 17:57 ` Brandon Williams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACsJy8Bm+Nif_PL1=BzTYLKGrnz94rjKOB=_PXz6OB47Js6v2A@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).