Author: jilles
Date: Wed Apr 17 21:08:15 2013
New Revision: 249593
URL: http://svnweb.freebsd.org/changeset/base/249593
Log:
pututxline: Don't set errno=0 in subfunctions.
The functions utx_active_add(), utx_active_remove(), utx_lastlogin_add() and
utx_log_add() set errno to 0 if they are successful. This not only violates
POSIX if pututxline() is successful, but may also overwrite a valid error
with 0 if, for example, utx_lastlogin_add() fails while utx_log_add()
succeeds.
Reviewed by: ed
Modified:
head/lib/libc/gen/pututxline.c
Modified: head/lib/libc/gen/pututxline.c
==============================================================================
--- head/lib/libc/gen/pututxline.c Wed Apr 17 21:00:22 2013
(r249592)
+++ head/lib/libc/gen/pututxline.c Wed Apr 17 21:08:15 2013
(r249593)
@@ -131,7 +131,8 @@ exact:
else
error = 0;
fclose(fp);
- errno = error;
+ if (error != 0)
+ errno = error;
return (error == 0 ? 0 : 1);
}
@@ -169,7 +170,8 @@ utx_active_remove(struct futx *fu)
}
fclose(fp);
- errno = error;
+ if (ret != 0)
+ errno = error;
return (ret);
}
@@ -225,7 +227,8 @@ utx_lastlogin_add(const struct futx *fu)
ret = -1;
}
fclose(fp);
- errno = error;
+ if (ret == -1)
+ errno = error;
return (ret);
}
@@ -277,7 +280,8 @@ utx_log_add(const struct futx *fu)
else
error = 0;
_close(fd);
- errno = error;
+ if (error != 0)
+ errno = error;
return (error == 0 ? 0 : 1);
}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
