Re: Porting git to HP NonStop

From: Brandon Casey <drafnel@gmail.com>
Date: Aug 22, 2012, 17:00 UTC
Message-ID: <CA+sFfMdnixrUekh40Sde05tkap7Oj19=5D6J6aYVVD1krqPZkw@mail.gmail.com>
In-Reply-To: <002a01cd8083$69fb9960$3df2cc20$@schmitz-digital.de>

On Wed, Aug 22, 2012 at 9:30 AM, Joachim Schmitz <jojo@schmitz-digital.de> wrote:

Show 29 quoted lines

> OK, so how about this:
> /usr/local/bin/diff -EBbu ./compat/mkdir.c.orig ./compat/mkdir.c
> --- ./compat/mkdir.c.orig       2012-08-21 05:02:11 -0500
> +++ ./compat/mkdir.c    2012-08-21 05:02:11 -0500
> @@ -0,0 +1,24 @@
> +#include "../git-compat-util.h"
> +#undef mkdir
> +
> +/* for platforms that can't deal with a trailing '/' */
> +int compat_mkdir_wo_trailing_slash(const char *dir, mode_t mode)
> +{
> +       int retval;
> +       char *tmp_dir = NULL;
> +       size_t len = strlen(dir);
> +
> +       if (len && dir[len-1] == '/') {
> +               if ((tmp_dir = strdup(dir)) == NULL)
> +                       return -1;
> +               tmp_dir[len-1] = '\0';
> +       }
> +       else
> +               tmp_dir = (char *)dir;
> +
> +       retval = mkdir(tmp_dir, mode);
> +       if (tmp_dir != dir)
> +               free(tmp_dir);
> +
> +       return retval;
> +}

Why not rearrange this so that you assign to dir the value of tmp_dir and then just pass dir to mkdir. Then you can avoid the recast of dir to (char*) in the else branch. Later, just call free(tmp_dir). Also, we have xstrndup. So I think the body of your function can become something like:

   if (len && dir[len-1] == '/')
       dir = tmp_dir = xstrndup(dir, len-1);

   retval = mkdir(dir, mode);
   free(tmp_dir);

-Brandon