Re: [PATCH v2 5/6] msvc: opendir: handle paths ending with a slash
- From
Erik Faye-Lund <kusmabite@gmail.com>
- Date
- Nov 23, 2010, 19:48 UTC
- Message-ID
- <AANLkTimkPMCAmpobetAvWjcGDt+G_wMdX+cXaf9-Z_v9@mail.gmail.com>
- In-Reply-To
- <4CEC1677.6000207@lsrfire.ath.cx>
On Tue, Nov 23, 2010 at 8:31 PM, René Scharfe <rene.scharfe@lsrfire.ath.cx> wrote:
Show 24 quoted lines
> Am 23.11.2010 19:38, schrieb Erik Faye-Lund:
>> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
>> ---
>> compat/msvc.c | 2 ++
>> 1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/compat/msvc.c b/compat/msvc.c
>> index 199eb22..fdbfb70 100644
>> --- a/compat/msvc.c
>> +++ b/compat/msvc.c
>> @@ -23,6 +23,8 @@ DIR *opendir(const char *name)
>>
>> /* check that the pattern won't be too long for FindFirstFileA */
>> len = strlen(name);
>> + if (is_dir_sep(name[len - 1]))
>
> Perhaps extend this thus, and handle multiple slashes?
>
> while (len > 0 && is_dir_sep(name[len - 1]))
>
>> + len--;
>> if (len + 2 >= MAX_PATH) {
>> errno = ENAMETOOLONG;
>> return NULL;Sure, it could be done. But the reason why I didn't do that myself was that I got a bit worried about this being a slippery slope towards full path-normalization. FindFirstFileA() does handle non-normalized paths, as long as they are below MAX_PATH in length.
I just didn't want to add a slash if there was already one there, which is something different than trying to fix the input-path.
In other words, I'm not entirely sure if fixing up such a case is a task that belongs to opendir.