mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

prefer mkpathdup to mkpath in assignments

Browse Source 
As with the previous commit to git_path, assigning the
result of mkpath is suspicious, since it is not clear
whether we will still depend on the value after it may have
been overwritten by subsequent calls. This patch converts
low-hanging fruit to use mkpathdup instead of mkpath (with
the downside that we must remember to free the result).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2015-08-10 05:35:38 -04:00 committed by Junio C Hamano
parent fcd12db6af
commit e3cf230324
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/repack.c
View File

@ -285,8 +285,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
failed = 0; failed = 0;
for_each_string_list_item(item, &names) { for_each_string_list_item(item, &names) {
for (ext = 0; ext < ARRAY_SIZE(exts); ext++) { for (ext = 0; ext < ARRAY_SIZE(exts); ext++) {
const char *fname_old; char *fname, *fname_old;
char *fname;
fname = mkpathdup("%s/pack-%s%s", packdir, fname = mkpathdup("%s/pack-%s%s", packdir,
item->string, exts[ext].name); item->string, exts[ext].name);
if (!file_exists(fname)) { if (!file_exists(fname)) {
@ -294,7 +293,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
continue; continue;
} }
fname_old = mkpath("%s/old-%s%s", packdir, fname_old = mkpathdup("%s/old-%s%s", packdir,
item->string, exts[ext].name); item->string, exts[ext].name);
if (file_exists(fname_old)) if (file_exists(fname_old))
if (unlink(fname_old)) if (unlink(fname_old))
@ -302,10 +301,12 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
if (!failed && rename(fname, fname_old)) { if (!failed && rename(fname, fname_old)) {
free(fname); free(fname);
free(fname_old);
failed = 1; failed = 1;
break; break;
} else { } else {
string_list_append(&rollback, fname); string_list_append(&rollback, fname);
free(fname_old);
} }
} }
if (failed) if (failed)
@ -314,13 +315,13 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
if (failed) { if (failed) {
struct string_list rollback_failure = STRING_LIST_INIT_DUP; struct string_list rollback_failure = STRING_LIST_INIT_DUP;
for_each_string_list_item(item, &rollback) { for_each_string_list_item(item, &rollback) {
const char *fname_old; char *fname, *fname_old;
char *fname;
fname = mkpathdup("%s/%s", packdir, item->string); fname = mkpathdup("%s/%s", packdir, item->string);
fname_old = mkpath("%s/old-%s", packdir, item->string); fname_old = mkpathdup("%s/old-%s", packdir, item->string);
if (rename(fname_old, fname)) if (rename(fname_old, fname))
string_list_append(&rollback_failure, fname); string_list_append(&rollback_failure, fname);
free(fname); free(fname);
free(fname_old);
} }
if (rollback_failure.nr) { if (rollback_failure.nr) {
@ -368,13 +369,14 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
/* Remove the "old-" files */ /* Remove the "old-" files */
for_each_string_list_item(item, &names) { for_each_string_list_item(item, &names) {
for (ext = 0; ext < ARRAY_SIZE(exts); ext++) { for (ext = 0; ext < ARRAY_SIZE(exts); ext++) {
const char *fname; char *fname;
fname = mkpath("%s/old-%s%s", fname = mkpathdup("%s/old-%s%s",
packdir, packdir,
item->string, item->string,
exts[ext].name); exts[ext].name);
if (remove_path(fname)) if (remove_path(fname))
warning(_("removing '%s' failed"), fname); warning(_("removing '%s' failed"), fname);
free(fname);
} }
} }

6
refs.c
View File

@ -3380,7 +3380,7 @@ static int commit_ref_update(struct ref_lock *lock,
int create_symref(const char *ref_target, const char *refs_heads_master, int create_symref(const char *ref_target, const char *refs_heads_master,
const char *logmsg) const char *logmsg)
{ {
const char *lockpath; char *lockpath = NULL;
char ref[1000]; char ref[1000];
int fd, len, written; int fd, len, written;
char *git_HEAD = git_pathdup("%s", ref_target); char *git_HEAD = git_pathdup("%s", ref_target);
@ -3407,7 +3407,7 @@ int create_symref(const char *ref_target, const char *refs_heads_master,
error("refname too long: %s", refs_heads_master); error("refname too long: %s", refs_heads_master);
goto error_free_return; goto error_free_return;
} }
lockpath = mkpath("%s.lock", git_HEAD); lockpath = mkpathdup("%s.lock", git_HEAD);
fd = open(lockpath, O_CREAT | O_EXCL | O_WRONLY, 0666); fd = open(lockpath, O_CREAT | O_EXCL | O_WRONLY, 0666);
if (fd < 0) { if (fd < 0) {
error("Unable to open %s for writing", lockpath); error("Unable to open %s for writing", lockpath);
@ -3427,9 +3427,11 @@ int create_symref(const char *ref_target, const char *refs_heads_master,
error_unlink_return: error_unlink_return:
unlink_or_warn(lockpath); unlink_or_warn(lockpath);
error_free_return: error_free_return:
free(lockpath);
free(git_HEAD); free(git_HEAD);
return -1; return -1;
} }
free(lockpath);
#ifndef NO_SYMLINK_HEAD #ifndef NO_SYMLINK_HEAD
done: done: