undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/prune.c: use strbuf to avoid having to worry about PATH_MAX

Browse Source 
While at it, rename prune_tmp_object(), which used to be a helper to
remove temporary files that were created to become loose object
files, to prune_tmp_file(), as the function is also used to remove
any random cruft whose name begins with tmp_ directly in .git/object
or .git/object/pack directories these days.

Noticed-by:  Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2013-12-17 18:22:31 -05:00 committed by Junio C Hamano
parent c235d960cb
commit 4454e9cb59
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
builtin/prune.c
View File

@ -17,9 +17,8 @@ static int verbose;
static unsigned long expire;
static int show_progress = -1;
static int prune_tmp_object(const char *path, const char *filename)
static int prune_tmp_file(const char *fullpath)
{
const char *fullpath = mkpath("%s/%s", path, filename);
struct stat st;
if (lstat(fullpath, &st))
return error("Could not stat '%s'", fullpath);
@ -32,9 +31,8 @@ static int prune_tmp_object(const char *path, const char *filename)
return 0;
}
static int prune_object(char *path, const char *filename, const unsigned char *sha1)
static int prune_object(const char *fullpath, const unsigned char *sha1)
{
const char *fullpath = mkpath("%s/%s", path, filename);
struct stat st;
if (lstat(fullpath, &st))
return error("Could not stat '%s'", fullpath);
@ -50,9 +48,10 @@ static int prune_object(char *path, const char *filename, const unsigned char *s
return 0;
}
static int prune_dir(int i, char *path)
static int prune_dir(int i, struct strbuf *path)
{
DIR *dir = opendir(path);
size_t baselen = path->len;
DIR *dir = opendir(path->buf);
struct dirent *de;
if (!dir)
@ -77,28 +76,39 @@ static int prune_dir(int i, char *path)
if (lookup_object(sha1))
continue;
prune_object(path, de->d_name, sha1);
strbuf_addf(path, "/%s", de->d_name);
prune_object(path->buf, sha1);
strbuf_setlen(path, baselen);
continue;
}
if (!prefixcmp(de->d_name, "tmp_obj_")) {
prune_tmp_object(path, de->d_name);
strbuf_addf(path, "/%s", de->d_name);
prune_tmp_file(path->buf);
strbuf_setlen(path, baselen);
continue;
}
fprintf(stderr, "bad sha1 file: %s/%s\n", path, de->d_name);
fprintf(stderr, "bad sha1 file: %s/%s\n", path->buf, de->d_name);
}
closedir(dir);
if (!show_only)
rmdir(path);
rmdir(path->buf);
return 0;
}
static void prune_object_dir(const char *path)
{
struct strbuf buf = STRBUF_INIT;
size_t baselen;
int i;
strbuf_addstr(&buf, path);
strbuf_addch(&buf, '/');
baselen = buf.len;
for (i = 0; i < 256; i++) {
static char dir[4096];
sprintf(dir, "%s/%02x", path, i);
prune_dir(i, dir);
strbuf_addf(&buf, "%02x", i);
prune_dir(i, &buf);
strbuf_setlen(&buf, baselen);
}
}
@ -120,7 +130,7 @@ static void remove_temporary_files(const char *path)
}
while ((de = readdir(dir)) != NULL)
if (!prefixcmp(de->d_name, "tmp_"))
prune_tmp_object(path, de->d_name);
prune_tmp_file(mkpath("%s/%s", path, de->d_name));
closedir(dir);
}