git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Joachim Schmitz" <jojo@schmitz-digital.de>
To: "'Junio C Hamano'" <gitster@pobox.com>
Cc: "'Brandon Casey'" <drafnel@gmail.com>,
	"'Shawn Pearce'" <spearce@spearce.org>, <git@vger.kernel.org>,
	<rsbecker@nexbridge.com>
Subject: RE: Porting git to HP NonStop
Date: Wed, 22 Aug 2012 20:52:39 +0200	[thread overview]
Message-ID: <004201cd8097$4ef04a80$ecd0df80$@schmitz-digital.de> (raw)
In-Reply-To: <7v393e943x.fsf@alter.siamese.dyndns.org>

> From: Junio C Hamano [mailto:gitster@pobox.com]
> Sent: Wednesday, August 22, 2012 8:25 PM
> To: Joachim Schmitz
> Cc: 'Brandon Casey'; 'Shawn Pearce'; git@vger.kernel.org;
> rsbecker@nexbridge.com
> Subject: Re: Porting git to HP NonStop
> 
> "Joachim Schmitz" <jojo@schmitz-digital.de> writes:
> 
> >> Nice.  And we have xmemdupz() would be even better as you followed-up.
> >
> > How's that one used?
> 
> I forgot that we frown upon use of any x<allocate>() wrapper in the
compat/
> layer as J6t mentioned.
> 
> So probably something along these lines...
> 
> 	int retval;
> 	char *dir_to_free = NULL;
> 	size_t len = strlen(dir);
> 
>         if (len && dir[len - 1] == '/') {
> 		dir_to_free = malloc(len);
>                 if (!dir_to_free) {
> 			fprintf(stderr, "malloc failed!\n");
> 			exit(1);
> 		}
>                 memcpy(dir_to_free, dir, len - 1);
>                 dir_to_free[len - 1] = '\0';
>                 dir = dir_to_free;
> 	}
> 	retval = mkdir(dir, mode);
> 	free(dir_to_free);
>         return retval;

So why not just strdup? I stole the idea from gnulib...

int
rpl_mkdir (char const *dir, mode_t mode maybe_unused)
{
  int ret_val;
  char *tmp_dir;
  size_t len = strlen (dir);

  if (len && dir[len - 1] == '/')
    {
      tmp_dir = strdup (dir);
      if (!tmp_dir)
        {
          /* Rather than rely on strdup-posix, we set errno ourselves.  */
          errno = ENOMEM;
          return -1;
        }
      strip_trailing_slashes (tmp_dir);
    }
  else
    {
      tmp_dir = (char *) dir;
    }


They strip more than one trailing slash, but for git's purpose I believed
this to be too much overhead. Also the errno stuff doesn't seem to be really
needed IMHO. Same for the following code

#if FUNC_MKDIR_DOT_BUG
  /* Additionally, cygwin 1.5 mistakenly creates a directory "d/./".  */
  {
    char *last = last_component (tmp_dir);
    if (*last == '.' && (last[1] == '\0'
                         || (last[1] == '.' && last[2] == '\0')))
      {
        struct stat st;
        if (stat (tmp_dir, &st) == 0)
          errno = EEXIST;
        return -1;
      }
  }
#endif /* FUNC_MKDIR_DOT_BUG */

Then it goes on like mine:

  ret_val = mkdir (tmp_dir, mode);

  if (tmp_dir != dir)
    free (tmp_dir);

  return ret_val;
}

Compare:
$ cat compat/mkdir.c
#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;
}

Bye, Jojo

  reply	other threads:[~2012-08-22 18:52 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-10 15:04 Porting git to HP NonStop Joachim Schmitz
2012-08-10 16:27 ` Shawn Pearce
2012-08-10 17:32   ` Joachim Schmitz
2012-08-10 17:38     ` Shawn Pearce
2012-08-19  8:57       ` Joachim Schmitz
2012-08-19 17:23         ` Junio C Hamano
2012-08-20 10:22           ` Joachim Schmitz
2012-08-20 14:41             ` Junio C Hamano
2012-08-20 16:09               ` Joachim Schmitz
2012-08-20 16:53                 ` Junio C Hamano
2012-08-22 16:30                   ` Joachim Schmitz
2012-08-22 17:00                     ` Brandon Casey
2012-08-22 17:13                       ` Brandon Casey
2012-08-22 17:18                       ` Joachim Schmitz
2012-08-22 17:23                         ` Brandon Casey
2012-08-22 17:30                           ` Joachim Schmitz
2012-08-22 17:30                       ` Junio C Hamano
2012-08-22 18:01                         ` Joachim Schmitz
2012-08-22 18:24                           ` Junio C Hamano
2012-08-22 18:52                             ` Joachim Schmitz [this message]
2012-08-22 17:41                       ` Johannes Sixt
2012-08-22 18:02                         ` Joachim Schmitz
2012-08-22 18:09                           ` Johannes Sixt
2012-08-22 18:18                             ` Joachim Schmitz
2012-08-22 18:09                         ` Brandon Casey
2012-08-22 18:24                           ` Brandon Casey
2012-08-22 18:33                             ` Junio C Hamano
2012-08-22 18:38                               ` Brandon Casey
2012-08-22 20:18                                 ` Joachim Schmitz
2012-08-22 20:49                                   ` Junio C Hamano
2012-08-22 21:05                                     ` Joachim Schmitz
2012-08-22 21:12                                       ` Junio C Hamano
2012-08-22 21:22                                         ` Joachim Schmitz
2012-08-22 21:54                                           ` Junio C Hamano
2012-08-22 18:26                           ` Junio C Hamano
2012-08-10 20:08   ` Joachim Schmitz
2012-08-11  8:20   ` Johannes Sixt
2012-08-14  7:05   ` Joachim Schmitz
2012-08-14 14:56     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='004201cd8097$4ef04a80$ecd0df80$@schmitz-digital.de' \
    --to=jojo@schmitz-digital.de \
    --cc=drafnel@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=rsbecker@nexbridge.com \
    --cc=spearce@spearce.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).