use struct strbuf instead of static buffers

Use "struct strbuf" from Git to remove the limit on file path length.

Notes on scan-tree:
This is slightly involved since I decided to pass the strbuf into
add_repo() and modify if whenever a new file name is required, which
should avoid any extra allocations within that function.  The pattern
there is to append the filename, use it and then reset the buffer to its
original length (retaining a trailing '/').

Notes on ui-snapshot:
Since write_archive modifies the argv array passed to it we
copy the argv_array values into a new array of char* and then free the
original argv_array structure and the new array without worrying about
what the values now look like.

Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
John Keeping
2013-04-06 10:28:57 +01:00
committed by Jason A. Donenfeld
vanhempi 42d5476f25
commit fb3655df3b
12 muutettua tiedostoa jossa 306 lisäystä ja 244 poistoa

Näytä tiedosto

@ -33,7 +33,7 @@ static time_t read_agefile(char *path)
static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
{
char *path;
struct strbuf path = STRBUF_INIT;
struct stat s;
struct cgit_repo *r = (struct cgit_repo *)repo;
@ -41,32 +41,36 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
*mtime = repo->mtime;
return 1;
}
path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
if (stat(path, &s) == 0) {
*mtime = read_agefile(path);
strbuf_addf(&path, "%s/%s", repo->path, ctx.cfg.agefile);
if (stat(path.buf, &s) == 0) {
*mtime = read_agefile(path.buf);
if (*mtime) {
r->mtime = *mtime;
return 1;
goto end;
}
}
path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ?
repo->defbranch : "master");
if (stat(path, &s) == 0) {
strbuf_reset(&path);
strbuf_addf(&path, "%s/refs/heads/%s", repo->path,
repo->defbranch ? repo->defbranch : "master");
if (stat(path.buf, &s) == 0) {
*mtime = s.st_mtime;
r->mtime = *mtime;
return 1;
goto end;
}
path = fmt("%s/%s", repo->path, "packed-refs");
if (stat(path, &s) == 0) {
strbuf_reset(&path);
strbuf_addf(&path, "%s/%s", repo->path, "packed-refs");
if (stat(path.buf, &s) == 0) {
*mtime = s.st_mtime;
r->mtime = *mtime;
return 1;
goto end;
}
*mtime = 0;
r->mtime = *mtime;
end:
strbuf_release(&path);
return (r->mtime != 0);
}