* [PATCH] mingw: do not set errno to 0 on success
@ 2010-11-23 19:53 Erik Faye-Lund
2010-11-24 0:07 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Erik Faye-Lund @ 2010-11-23 19:53 UTC (permalink / raw)
To: git; +Cc: gitster, j6t, msysgit, Erik Faye-Lund
Currently do_lstat always sets errno to 0 on success. This incorrectly
overwrites previous errors.
Fetch the error-code into a temporary variable instead, and assign that
to errno on failure.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
A bug I found while hunting down another regression. maint-worthy, perhaps?
compat/mingw.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index f2d9e1f..b98e600 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -195,9 +195,10 @@ static inline time_t filetime_to_time_t(const FILETIME *ft)
*/
static int do_lstat(const char *file_name, struct stat *buf)
{
+ int err;
WIN32_FILE_ATTRIBUTE_DATA fdata;
- if (!(errno = get_file_attr(file_name, &fdata))) {
+ if (!(err = get_file_attr(file_name, &fdata))) {
buf->st_ino = 0;
buf->st_gid = 0;
buf->st_uid = 0;
@@ -211,6 +212,7 @@ static int do_lstat(const char *file_name, struct stat *buf)
buf->st_ctime = filetime_to_time_t(&(fdata.ftCreationTime));
return 0;
}
+ errno = err;
return -1;
}
--
1.7.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] mingw: do not set errno to 0 on success
2010-11-23 19:53 [PATCH] mingw: do not set errno to 0 on success Erik Faye-Lund
@ 2010-11-24 0:07 ` Junio C Hamano
2010-11-24 9:54 ` Erik Faye-Lund
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2010-11-24 0:07 UTC (permalink / raw)
To: Erik Faye-Lund; +Cc: git, gitster, j6t, msysgit
Erik Faye-Lund <kusmabite@gmail.com> writes:
> Currently do_lstat always sets errno to 0 on success. This incorrectly
> overwrites previous errors.
>
> Fetch the error-code into a temporary variable instead, and assign that
> to errno on failure.
>
> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
> ---
>
> A bug I found while hunting down another regression. maint-worthy, perhaps?
I would say so, as long as the error return from get_file_attr() is
trustworthy.
>
> compat/mingw.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/compat/mingw.c b/compat/mingw.c
> index f2d9e1f..b98e600 100644
> --- a/compat/mingw.c
> +++ b/compat/mingw.c
> @@ -195,9 +195,10 @@ static inline time_t filetime_to_time_t(const FILETIME *ft)
> */
> static int do_lstat(const char *file_name, struct stat *buf)
> {
> + int err;
> WIN32_FILE_ATTRIBUTE_DATA fdata;
>
> - if (!(errno = get_file_attr(file_name, &fdata))) {
> + if (!(err = get_file_attr(file_name, &fdata))) {
> buf->st_ino = 0;
> buf->st_gid = 0;
> buf->st_uid = 0;
> @@ -211,6 +212,7 @@ static int do_lstat(const char *file_name, struct stat *buf)
> buf->st_ctime = filetime_to_time_t(&(fdata.ftCreationTime));
> return 0;
> }
> + errno = err;
> return -1;
> }
>
> --
> 1.7.3.2
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] mingw: do not set errno to 0 on success
2010-11-24 0:07 ` Junio C Hamano
@ 2010-11-24 9:54 ` Erik Faye-Lund
0 siblings, 0 replies; 3+ messages in thread
From: Erik Faye-Lund @ 2010-11-24 9:54 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, j6t, msysgit
On Wed, Nov 24, 2010 at 1:07 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Erik Faye-Lund <kusmabite@gmail.com> writes:
>
>> Currently do_lstat always sets errno to 0 on success. This incorrectly
>> overwrites previous errors.
>>
>> Fetch the error-code into a temporary variable instead, and assign that
>> to errno on failure.
>>
>> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
>> ---
>>
>> A bug I found while hunting down another regression. maint-worthy, perhaps?
>
> I would say so, as long as the error return from get_file_attr() is
> trustworthy.
It looks trustworthy to me; it returns 0 if GetFileAttributesExA
succeeds, and either EACCES, ENAMETOOLONG, ENOMEM or ENOENT based on
the result of GetLastError().
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-11-24 9:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-23 19:53 [PATCH] mingw: do not set errno to 0 on success Erik Faye-Lund
2010-11-24 0:07 ` Junio C Hamano
2010-11-24 9:54 ` Erik Faye-Lund
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).