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

Merge branch 'nd/clean-preserve-errno-in-warning'

Browse Source 
Some warning() messages from "git clean" were updated to show the
errno from failed system calls.

* nd/clean-preserve-errno-in-warning:
  clean: use warning_errno() when appropriate
This commit is contained in:
Junio C Hamano 2017-02-27 13:57:16 -08:00
commit b4ca5d05e7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/clean.c
View File

@ -174,8 +174,10 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
/* an empty dir could be removed even if it is unreadble */ /* an empty dir could be removed even if it is unreadble */
res = dry_run ? 0 : rmdir(path->buf); res = dry_run ? 0 : rmdir(path->buf);
if (res) { if (res) {
int saved_errno = errno;
quote_path_relative(path->buf, prefix, &quoted); quote_path_relative(path->buf, prefix, &quoted);
warning(_(msg_warn_remove_failed), quoted.buf); errno = saved_errno;
warning_errno(_(msg_warn_remove_failed), quoted.buf);
*dir_gone = 0; *dir_gone = 0;
} }
return res; return res;
@ -208,8 +210,10 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
quote_path_relative(path->buf, prefix, &quoted); quote_path_relative(path->buf, prefix, &quoted);
string_list_append(&dels, quoted.buf); string_list_append(&dels, quoted.buf);
} else { } else {
int saved_errno = errno;
quote_path_relative(path->buf, prefix, &quoted); quote_path_relative(path->buf, prefix, &quoted);
warning(_(msg_warn_remove_failed), quoted.buf); errno = saved_errno;
warning_errno(_(msg_warn_remove_failed), quoted.buf);
*dir_gone = 0; *dir_gone = 0;
ret = 1; ret = 1;
} }
@ -230,8 +234,10 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
if (!res) if (!res)
*dir_gone = 1; *dir_gone = 1;
else { else {
int saved_errno = errno;
quote_path_relative(path->buf, prefix, &quoted); quote_path_relative(path->buf, prefix, &quoted);
warning(_(msg_warn_remove_failed), quoted.buf); errno = saved_errno;
warning_errno(_(msg_warn_remove_failed), quoted.buf);
*dir_gone = 0; *dir_gone = 0;
ret = 1; ret = 1;
} }
@ -981,8 +987,10 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
} else { } else {
res = dry_run ? 0 : unlink(abs_path.buf); res = dry_run ? 0 : unlink(abs_path.buf);
if (res) { if (res) {
int saved_errno = errno;
qname = quote_path_relative(item->string, NULL, &buf); qname = quote_path_relative(item->string, NULL, &buf);
warning(_(msg_warn_remove_failed), qname); errno = saved_errno;
warning_errno(_(msg_warn_remove_failed), qname);
errors++; errors++;
} else if (!quiet) { } else if (!quiet) {
qname = quote_path_relative(item->string, NULL, &buf); qname = quote_path_relative(item->string, NULL, &buf);