mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-29 04:54:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mh/path-max'

Browse Source 
A few places where we relied on a fixed length buffer to hold
pathnames in these two programs have been converted to use strbuf.

* mh/path-max:
  builtin/prune.c: use strbuf to avoid having to worry about PATH_MAX
  prune-packed: use strbuf to avoid having to worry about PATH_MAX
This commit is contained in:
Junio C Hamano 2014-01-10 10:32:21 -08:00
commit 061614b309
2 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
builtin/prune-packed.c
View File

@ -10,58 +10,62 @@ static const char * const prune_packed_usage[] = {
static struct progress *progress;
static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
static void prune_dir(int i, DIR *dir, struct strbuf *pathname, int opts)
{
struct dirent *de;
char hex[40];
int top_len = pathname->len;
sprintf(hex, "%02x", i);
while ((de = readdir(dir)) != NULL) {
unsigned char sha1[20];
if (strlen(de->d_name) != 38)
continue;
memcpy(hex+2, de->d_name, 38);
memcpy(hex + 2, de->d_name, 38);
if (get_sha1_hex(hex, sha1))
continue;
if (!has_sha1_pack(sha1))
continue;
memcpy(pathname + len, de->d_name, 38);
strbuf_add(pathname, de->d_name, 38);
if (opts & PRUNE_PACKED_DRY_RUN)
printf("rm -f %s\n", pathname);
printf("rm -f %s\n", pathname->buf);
else
unlink_or_warn(pathname);
unlink_or_warn(pathname->buf);
display_progress(progress, i + 1);
strbuf_setlen(pathname, top_len);
}
}
void prune_packed_objects(int opts)
{
int i;
static char pathname[PATH_MAX];
const char *dir = get_object_directory();
int len = strlen(dir);
struct strbuf pathname = STRBUF_INIT;
int top_len;
strbuf_addstr(&pathname, dir);
if (opts & PRUNE_PACKED_VERBOSE)
progress = start_progress_delay("Removing duplicate objects",
256, 95, 2);
if (len > PATH_MAX - 42)
die("impossible object directory");
memcpy(pathname, dir, len);
if (len && pathname[len-1] != '/')
pathname[len++] = '/';
if (pathname.len && pathname.buf[pathname.len - 1] != '/')
strbuf_addch(&pathname, '/');
top_len = pathname.len;
for (i = 0; i < 256; i++) {
DIR *d;
display_progress(progress, i + 1);
sprintf(pathname + len, "%02x/", i);
d = opendir(pathname);
strbuf_setlen(&pathname, top_len);
strbuf_addf(&pathname, "%02x/", i);
d = opendir(pathname.buf);
if (!d)
continue;
prune_dir(i, d, pathname, len + 3, opts);
prune_dir(i, d, &pathname, opts);
closedir(d);
pathname[len + 2] = '\0';
rmdir(pathname);
strbuf_setlen(&pathname, top_len + 2);
rmdir(pathname.buf);
}
stop_progress(&progress);
}

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 (starts_with(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 (starts_with(de->d_name, "tmp_"))
prune_tmp_object(path, de->d_name);
prune_tmp_file(mkpath("%s/%s", path, de->d_name));
closedir(dir);
}