development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-03 23:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

log_ref_setup: don't return stack-allocated array

Browse source 
859c301 (refs: split log_ref_write logic into log_ref_setup,
2010-05-21) refactors the stack allocation of the log_file array into
the new log_ref_setup() function, but passes it back to the caller.

Since the original intent seems to have been to split the work between
log_ref_setup and log_ref_write, make it the caller's responsibility
to allocate the buffer.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Rast 2010-06-10 14:54:03 +02:00 committed by Junio C Hamano
parent 86e8e7a566
commit 157aaea5ff
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builtin/checkout.c
View file

@ -496,12 +496,12 @@ static void update_refs_for_switch(struct checkout_opts *opts,
if (opts->new_orphan_branch) { if (opts->new_orphan_branch) {
if (opts->new_branch_log && !log_all_ref_updates) { if (opts->new_branch_log && !log_all_ref_updates) {
int temp; int temp;
char *log_file; char log_file[PATH_MAX];
char *ref_name = mkpath("refs/heads/%s", opts->new_orphan_branch); char *ref_name = mkpath("refs/heads/%s", opts->new_orphan_branch);
temp = log_all_ref_updates; temp = log_all_ref_updates;
log_all_ref_updates = 1; log_all_ref_updates = 1;
if (log_ref_setup(ref_name, &log_file)) { if (log_ref_setup(ref_name, log_file, sizeof(log_file))) {
fprintf(stderr, "Can not do reflog for '%s'\n", fprintf(stderr, "Can not do reflog for '%s'\n",
opts->new_orphan_branch); opts->new_orphan_branch);
log_all_ref_updates = temp; log_all_ref_updates = temp;

26
refs.c
View file

@ -1258,43 +1258,41 @@ static int copy_msg(char *buf, const char *msg)
return cp - buf; return cp - buf;
} }
int log_ref_setup(const char *ref_name, char **log_file) int log_ref_setup(const char *ref_name, char *logfile, int bufsize)
{ {
int logfd, oflags = O_APPEND | O_WRONLY; int logfd, oflags = O_APPEND | O_WRONLY;
char logfile[PATH_MAX];
git_snpath(logfile, sizeof(logfile), "logs/%s", ref_name); git_snpath(logfile, bufsize, "logs/%s", ref_name);
*log_file = logfile;
if (log_all_ref_updates && if (log_all_ref_updates &&
(!prefixcmp(ref_name, "refs/heads/") || (!prefixcmp(ref_name, "refs/heads/") ||
!prefixcmp(ref_name, "refs/remotes/") || !prefixcmp(ref_name, "refs/remotes/") ||
!prefixcmp(ref_name, "refs/notes/") || !prefixcmp(ref_name, "refs/notes/") ||
!strcmp(ref_name, "HEAD"))) { !strcmp(ref_name, "HEAD"))) {
if (safe_create_leading_directories(*log_file) < 0) if (safe_create_leading_directories(logfile) < 0)
return error("unable to create directory for %s", return error("unable to create directory for %s",
*log_file); logfile);
oflags |= O_CREAT; oflags |= O_CREAT;
} }
logfd = open(*log_file, oflags, 0666); logfd = open(logfile, oflags, 0666);
if (logfd < 0) { if (logfd < 0) {
if (!(oflags & O_CREAT) && errno == ENOENT) if (!(oflags & O_CREAT) && errno == ENOENT)
return 0; return 0;
if ((oflags & O_CREAT) && errno == EISDIR) { if ((oflags & O_CREAT) && errno == EISDIR) {
if (remove_empty_directories(*log_file)) { if (remove_empty_directories(logfile)) {
return error("There are still logs under '%s'", return error("There are still logs under '%s'",
*log_file); logfile);
} }
logfd = open(*log_file, oflags, 0666); logfd = open(logfile, oflags, 0666);
} }
if (logfd < 0) if (logfd < 0)
return error("Unable to append to %s: %s", return error("Unable to append to %s: %s",
*log_file, strerror(errno)); logfile, strerror(errno));
} }
adjust_shared_perm(*log_file); adjust_shared_perm(logfile);
close(logfd); close(logfd);
return 0; return 0;
} }
@ -1305,14 +1303,14 @@ static int log_ref_write(const char *ref_name, const unsigned char *old_sha1,
int logfd, result, written, oflags = O_APPEND | O_WRONLY; int logfd, result, written, oflags = O_APPEND | O_WRONLY;
unsigned maxlen, len; unsigned maxlen, len;
int msglen; int msglen;
char *log_file; char log_file[PATH_MAX];
char *logrec; char *logrec;
const char *committer; const char *committer;
if (log_all_ref_updates < 0) if (log_all_ref_updates < 0)
log_all_ref_updates = !is_bare_repository(); log_all_ref_updates = !is_bare_repository();
result = log_ref_setup(ref_name, &log_file); result = log_ref_setup(ref_name, log_file, sizeof(log_file));
if (result) if (result)
return result; return result;

2
refs.h
View file

@ -69,7 +69,7 @@ extern void unlock_ref(struct ref_lock *lock);
extern int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1, const char *msg); extern int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1, const char *msg);
/** Setup reflog before using. **/ /** Setup reflog before using. **/
int log_ref_setup(const char *ref_name, char **log_file); int log_ref_setup(const char *ref_name, char *logfile, int bufsize);
/** Reads log for the value of ref during at_time. **/ /** Reads log for the value of ref during at_time. **/
extern int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *sha1, char **msg, unsigned long *cutoff_time, int *cutoff_tz, int *cutoff_cnt); extern int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *sha1, char **msg, unsigned long *cutoff_time, int *cutoff_tz, int *cutoff_cnt);