From: Jiang Xin <worldhello.net@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH v14 04/16] Refactor quote_path_relative, remove unused params
Date: Tue, 25 Jun 2013 19:39:55 +0800 [thread overview]
Message-ID: <CANYiYbHCJWhm9sVwaOrjZ+K6SYhssFmSt4XEqXWXhkZ=8KCqmQ@mail.gmail.com> (raw)
In-Reply-To: <7vd2rb8gmc.fsf@alter.siamese.dyndns.org>
2013/6/25 Junio C Hamano <gitster@pobox.com>:
> Jiang Xin <worldhello.net@gmail.com> writes:
>
>> After substitute path_relative() in quote.c with relative_path() from
>> path.c, parameters (such as len and prefix_len) are obsolete in function
>> quote_path_relative(). Remove unused parameters and change the order of
>> parameters for quote_path_relative() function.
>> ...
>> diff --git a/builtin/clean.c b/builtin/clean.c
>> index 04e39..f77f95 100644
>> --- a/builtin/clean.c
>> +++ b/builtin/clean.c
>> @@ -262,7 +262,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
>> if (remove_dirs(&directory, prefix, rm_flags, dry_run, quiet, &gone))
>> errors++;
>> if (gone && !quiet) {
>> - qname = quote_path_relative(directory.buf, directory.len, &buf, prefix);
>> + qname = quote_path_relative(directory.buf, prefix, &buf);
>> printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname);
>
> This one needed a bit closer look to make sure directory.len is
> already pointing at the end of directory.buf (it is) to verify that
> this is a safe conversion. Everywhere else we lost either -1 or
> strlen() of the string we feed quote_path() and quote_path_relative()
> so they look fine.
When tracking in "remove_dirs(&directory, prefix, rm_flags, dry_run,
quiet, &gone)",
there are some suspect strbuf_setlens, like:
strbuf_setlen(path, len);
strbuf_addstr(path, e->d_name);
and at the end of remove_dirs, there is:
strbuf_setlen(path, original_len);
So both the but and len will be restored in the end, and directory.len always
points to strlen of directory.buf.
So it's safe for the following refactor:
- qname =
quote_path_relative(directory.buf, directory.len, &buf, prefix);
+ qname =
quote_path_relative(directory.buf, prefix, &buf);
--
Jiang Xin
next prev parent reply other threads:[~2013-06-25 11:40 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-13 8:23 [PATCH jx/clean-interactive] t0060: skip a few relative_path tests on Windows Johannes Sixt
2013-06-13 9:40 ` Jiang Xin
2013-06-24 15:21 ` [PATCH v14 00/16] Interactive git-clean Jiang Xin
2013-06-24 15:21 ` [PATCH v14 01/16] test: add test cases for relative_path Jiang Xin
2013-06-24 19:01 ` Junio C Hamano
2013-06-25 1:06 ` Jiang Xin
2013-06-25 4:57 ` Junio C Hamano
2013-06-25 7:02 ` Jiang Xin
2013-06-24 15:21 ` [PATCH v14 02/16] path.c: refactor relative_path(), not only strip prefix Jiang Xin
2013-06-24 15:21 ` [PATCH v14 03/16] quote.c: remove path_relative, use relative_path instead Jiang Xin
2013-06-24 19:11 ` Junio C Hamano
2013-06-25 11:09 ` Jiang Xin
2013-06-25 19:23 ` Junio C Hamano
2013-06-24 15:21 ` [PATCH v14 04/16] Refactor quote_path_relative, remove unused params Jiang Xin
2013-06-24 19:15 ` Junio C Hamano
2013-06-25 11:39 ` Jiang Xin [this message]
2013-06-24 15:21 ` [PATCH v14 05/16] Refactor write_name_quoted_relative, " Jiang Xin
2013-06-24 19:19 ` Junio C Hamano
2013-06-25 11:51 ` Jiang Xin
2013-06-24 15:21 ` [PATCH v14 06/16] git-clean: refactor git-clean into two phases Jiang Xin
2013-06-24 19:22 ` Junio C Hamano
2013-06-24 15:21 ` [PATCH v14 07/16] git-clean: add support for -i/--interactive Jiang Xin
2013-06-24 15:21 ` [PATCH v14 08/16] git-clean: show items of del_list in columns Jiang Xin
2013-06-24 15:21 ` [PATCH v14 09/16] git-clean: add colors to interactive git-clean Jiang Xin
2013-06-24 15:21 ` [PATCH v14 10/16] git-clean: use a git-add-interactive compatible UI Jiang Xin
2013-06-24 15:21 ` [PATCH v14 11/16] git-clean: add filter by pattern interactive action Jiang Xin
2013-06-24 15:21 ` [PATCH v14 12/16] git-clean: add select by numbers " Jiang Xin
2013-06-24 15:21 ` [PATCH v14 13/16] git-clean: add ask each " Jiang Xin
2013-06-24 15:21 ` [PATCH v14 14/16] git-clean: add documentation for interactive git-clean Jiang Xin
2013-06-24 15:21 ` [PATCH v14 15/16] test: add t7301 for git-clean--interactive Jiang Xin
2013-06-24 15:21 ` [PATCH v14 16/16] test: run testcases with POSIX absolute paths on Windows Jiang Xin
2013-06-24 18:56 ` Johannes Sixt
2013-06-25 0:40 ` Jiang Xin
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='CANYiYbHCJWhm9sVwaOrjZ+K6SYhssFmSt4XEqXWXhkZ=8KCqmQ@mail.gmail.com' \
--to=worldhello.net@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
/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).