Re: [PATCH v4 1/4] Refactor skipping DOS drive prefixes
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 23, 2016, 08:25 UTC
- Message-ID
- <alpine.DEB.2.20.1601230924090.2964@virtualbox>
- In-Reply-To
- <xmqq60ylv3bk.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Fri, 22 Jan 2016, Junio C Hamano wrote:
Show 42 quoted lines
> Johannes Sixt <j6t@kdbg.org> writes:
>
> > I suggest to move the function definition out of line:
> >
> > diff --git a/compat/mingw.c b/compat/mingw.c
> > index 10a51c0..0cebb61 100644
> > --- a/compat/mingw.c
> > +++ b/compat/mingw.c
> > @@ -1915,6 +1915,13 @@ pid_t waitpid(pid_t pid, int *status, int options)
> > return -1;
> > }
> >
> > +int mingw_skip_dos_drive_prefix(char **path)
> > +{
> > + int ret = has_dos_drive_prefix(*path);
> > + *path += ret;
> > + return ret;
> > +}
> > +
> > int mingw_offset_1st_component(const char *path)
> > {
> > char *pos = (char *)path;
> > diff --git a/compat/mingw.h b/compat/mingw.h
> > index 9b5db4e..2099b79 100644
> > --- a/compat/mingw.h
> > +++ b/compat/mingw.h
> > @@ -360,12 +360,7 @@ HANDLE winansi_get_osfhandle(int fd);
> >
> > #define has_dos_drive_prefix(path) \
> > (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0)
> > -static inline int mingw_skip_dos_drive_prefix(char **path)
> > -{
> > - int ret = has_dos_drive_prefix(*path);
> > - *path += ret;
> > - return ret;
> > -}
> > +int mingw_skip_dos_drive_prefix(char **path);
> > #define skip_dos_drive_prefix mingw_skip_dos_drive_prefix
> > #define is_dir_sep(c) ((c) == '/' || (c) == '\\')
> > static inline char *mingw_find_last_dir_sep(const char *path)
>
> This sounds good to me. Dscho?Yep, sounds good to me, too.
Personally, I have no inclination to add compatibility with the now-safely-obsolete MSys to my responsibilities, but if Hannes wants to do it, who am I to stand in his way? Especially when the fix is as trivial as here.
Ciao, Dscho