Re: [PATCH v2 3/3] Refactor mingw_cygwin_offset_1st_component()
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Dec 7, 2018, 22:18 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1812072316290.43@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20181207170500.9078-1-tboegi@web.de>
Hi Torsten,
On Fri, 7 Dec 2018, tboegi@web.de wrote:
Show 10 quoted lines
> diff --git a/compat/mingw-cygwin.c b/compat/mingw-cygwin.c
> index 5552c3ac20..c379a72775 100644
> --- a/compat/mingw-cygwin.c
> +++ b/compat/mingw-cygwin.c
> @@ -10,10 +10,8 @@ size_t mingw_cygwin_skip_dos_drive_prefix(char **path)
> size_t mingw_cygwin_offset_1st_component(const char *path)
> {
> char *pos = (char *)path;
> -
> - /* unc paths */This comment is still useful (and now even more correct), and should stay.
Show 15 quoted lines
> - if (!skip_dos_drive_prefix(&pos) &&
> - is_dir_sep(pos[0]) && is_dir_sep(pos[1])) {
> + if (is_dir_sep(pos[0]) && is_dir_sep(pos[1])) {
> + /* unc path */
> /* skip server name */
> pos = strpbrk(pos + 2, "\\/");
> if (!pos)
> @@ -22,7 +20,8 @@ size_t mingw_cygwin_offset_1st_component(const char *path)
> do {
> pos++;
> } while (*pos && !is_dir_sep(*pos));
> + } else {
> + skip_dos_drive_prefix(&pos);
> }
> -Why remove this empty line? It structures the code quite nicely.
The rest looks correct to me, Johannes
Show 6 quoted lines
> return pos + is_dir_sep(*pos) - path; > } > -- > 2.19.0.271.gfe8321ec05 > >