From: "René Scharfe" <l.s.r@web.de>
To: Stefan Beller <stefanbeller@googlemail.com>
Cc: git@vger.kernel.org, mfick@codeaurora.org, apelisse@gmail.com,
Matthieu.Moy@grenoble-inp.fr, pclouds@gmail.com, iveqy@iveqy.com,
gitster@pobox.com
Subject: Re: [RFC PATCHv3] repack: rewrite the shell script in C.
Date: Sun, 18 Aug 2013 18:44:46 +0200 [thread overview]
Message-ID: <5210F9FE.1080801@web.de> (raw)
In-Reply-To: <1376836587-25248-1-git-send-email-stefanbeller@googlemail.com>
> +static void remove_temporary_files() {
> + DIR *dir;
> + struct dirent *e;
> + char *prefix, *path;
> +
> + prefix = mkpathdup(".tmp-%d-pack", getpid());
> + path = mkpathdup("%s/pack", get_object_directory());
> +
> + dir = opendir(path);
> + while ((e = readdir(dir)) != NULL) {
> + if (!prefixcmp(e->d_name, prefix)) {
> + struct strbuf fname = STRBUF_INIT;
> + strbuf_addf(&fname, "%s/%s", path, e->d_name);
> + unlink(strbuf_detach(&fname, NULL));
I'm not sure I like the memory allocation done here for each file to be
deleted, but it's probably not worth worrying about.
> +void get_pack_sha1_list(char *packdir, struct string_list *sha1_list)
> +{
> + DIR *dir;
> + struct dirent *e;
> + char *path, *suffix;
> +
> + path = mkpathdup("%s/pack", get_object_directory());
> + suffix = ".pack";
> +
> + dir = opendir(path);
> + while ((e = readdir(dir)) != NULL) {
> + if (!suffixcmp(e->d_name, suffix)) {
> + char *buf, *sha1;
> + buf = xmemdupz(e->d_name, strlen(e->d_name));
> + buf[strlen(e->d_name) - strlen(suffix)] = '\0';
> + if (strlen(e->d_name) - strlen(suffix) > 40) {
> + sha1 = &buf[strlen(e->d_name) - strlen(suffix) - 40];
> + string_list_append_nodup(sha1_list, sha1);
Unless sha1 == buf, this will crash when that string_list is freed
because sha1 was not returned by malloc. If it doesn't crash for
you then I guess sha1_list is never freed. :) How about just
taking the part of d_name we need, like this?
size_t len = strlen(e->d_name) - strlen(suffix);
if (len > 40) {
char *sha1 = xmemdupz(e->d_name + len - 40, 40);
string_list_append_nodup(sha1_list, sha1);
}
> + } else {
> + /*TODO: what should happen to pack files having no 40 char sha1 specifier?*/
What does the current code do with them? From a quick glance it
looks like it deletes them in the end, right?
René
next prev parent reply other threads:[~2013-08-18 16:45 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-13 19:23 [PATCH] Rewriting git-repack in C Stefan Beller
2013-08-13 19:23 ` [PATCH] repack: rewrite the shell script " Stefan Beller
2013-08-14 7:26 ` Matthieu Moy
2013-08-14 16:26 ` Stefan Beller
2013-08-14 16:27 ` [RFC PATCH] " Stefan Beller
2013-08-14 16:49 ` Antoine Pelisse
2013-08-14 17:04 ` Stefan Beller
2013-08-14 17:19 ` Jeff King
2013-08-14 17:25 ` Martin Fick
2013-08-14 22:16 ` Stefan Beller
2013-08-14 22:28 ` Martin Fick
2013-08-14 22:53 ` Junio C Hamano
2013-08-14 23:28 ` Martin Fick
2013-08-15 17:15 ` Junio C Hamano
2013-08-16 0:12 ` [RFC PATCHv2] " Stefan Beller
2013-08-17 13:34 ` René Scharfe
2013-08-17 19:18 ` Kyle J. McKay
2013-08-18 14:34 ` Stefan Beller
2013-08-18 14:36 ` [RFC PATCHv3] " Stefan Beller
2013-08-18 15:41 ` Kyle J. McKay
2013-08-18 16:44 ` René Scharfe [this message]
2013-08-18 22:26 ` [RFC PATCHv4] " Stefan Beller
2013-08-19 23:23 ` Stefan Beller
2013-08-20 13:31 ` Johannes Sixt
2013-08-20 15:08 ` Stefan Beller
2013-08-20 18:38 ` Johannes Sixt
2013-08-20 18:57 ` René Scharfe
2013-08-20 22:36 ` Stefan Beller
2013-08-20 22:38 ` [PATCH] " Stefan Beller
2013-08-21 8:25 ` Jonathan Nieder
2013-08-21 10:37 ` Stefan Beller
2013-08-21 17:25 ` Stefan Beller
2013-08-21 17:28 ` [RFC PATCHv6 1/2] " Stefan Beller
2013-08-21 17:28 ` [RFC PATCHv6 2/2] repack: retain the return value of pack-objects Stefan Beller
2013-08-21 20:56 ` [RFC PATCHv6 1/2] repack: rewrite the shell script in C Junio C Hamano
2013-08-21 21:52 ` Matthieu Moy
2013-08-21 22:15 ` Stefan Beller
2013-08-21 22:50 ` Junio C Hamano
2013-08-21 22:57 ` Stefan Beller
2013-08-22 10:46 ` Johannes Sixt
2013-08-22 21:03 ` Jonathan Nieder
2013-08-21 8:49 ` [PATCH] " Matthieu Moy
2013-08-21 12:47 ` Stefan Beller
2013-08-21 13:05 ` Matthieu Moy
2013-08-21 12:53 ` Stefan Beller
2013-08-21 13:07 ` Matthieu Moy
2013-08-22 10:46 ` Johannes Sixt
2013-08-22 10:46 ` Johannes Sixt
2013-08-22 20:06 ` [PATCH] repack: rewrite the shell script in C (squashing proposal) Stefan Beller
2013-08-22 20:31 ` Junio C Hamano
2013-08-20 22:46 ` [RFC PATCHv4] repack: rewrite the shell script in C Jonathan Nieder
2013-08-21 9:20 ` Johannes Sixt
2013-08-20 21:24 ` Stefan Beller
2013-08-20 21:34 ` Jonathan Nieder
2013-08-20 21:40 ` Dokumenting api-paths.txt Stefan Beller
2013-08-20 21:59 ` Jonathan Nieder
2013-08-21 22:43 ` Stefan Beller
2013-08-22 17:29 ` Junio C Hamano
2013-08-14 22:51 ` [RFC PATCH] repack: rewrite the shell script in C Junio C Hamano
2013-08-14 22:59 ` Matthieu Moy
2013-08-15 7:47 ` Stefan Beller
2013-08-15 4:15 ` Duy Nguyen
2013-08-14 17:26 ` Junio C Hamano
2013-08-14 22:51 ` Matthieu Moy
2013-08-14 23:25 ` Martin Fick
2013-08-15 0:26 ` Martin Fick
2013-08-15 7:46 ` Stefan Beller
2013-08-15 15:04 ` Martin Fick
2013-08-15 4:20 ` Duy Nguyen
2013-08-14 17:04 ` Junio C Hamano
2013-08-15 7:53 ` Stefan Beller
2013-08-14 7:12 ` [PATCH] Rewriting git-repack " Matthieu Moy
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=5210F9FE.1080801@web.de \
--to=l.s.r@web.de \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=apelisse@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=iveqy@iveqy.com \
--cc=mfick@codeaurora.org \
--cc=pclouds@gmail.com \
--cc=stefanbeller@googlemail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.