Re: [PATCH 1/4] make_absolute_path(): Do not append redundant slash

From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date: Feb 11, 2010, 10:00 UTC
Message-ID: <fcaeb9bf1002110200l89f8285k8c27ff916e295ac9@mail.gmail.com>
In-Reply-To: <201002092010.43910.j6t@kdbg.org>

On Wed, Feb 10, 2010 at 2:10 AM, Johannes Sixt <j6t@kdbg.org> wrote:

Show 14 quoted lines

> On Dienstag, 9. Februar 2010, Nguyễn Thái Ngọc Duy wrote:
>> @@ -54,8 +54,9 @@ const char *make_absolute_path(const char *path)
>>                       if (len + strlen(last_elem) + 2 > PATH_MAX)
>>                               die ("Too long path name: '%s/%s'",
>>                                               buf, last_elem);
>> -                     buf[len] = '/';
>> -                     strcpy(buf + len + 1, last_elem);
>> +                     if (*buf != '/' || buf[1] != '\0')
>> +                             buf[len++] = '/';
>
> Huh? You are adding a slash unless buf is exactly "/". That is, when buf
> is "/foo/" you still add a slash? That's not exactly avoiding redundancy.
> (Disclaimer: I didn't analyze the rest of the function whether my claim is
> true.)

buf is set by getcwd() so it should never be "/foo/" but doing

if (len && buf[len-1] != '/') buf[len++] = '/';

is probably clearer (and works on Windows too).

-- 
Duy