diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-06-21 11:29:38 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-06-21 11:29:38 +0300 |
| commit | d985d2b50a41eb5f9ba682f4afe72ac2c59b53e8 (patch) | |
| tree | 767a67cd54db1beb8549106f1b729699411df431 /main/musl/0044-getdate-correctly-specify-error-number.patch | |
| parent | 6b899d49bd1d15c8390bd53e710da0b26a36218e (diff) | |
| download | aports-d985d2b50a41eb5f9ba682f4afe72ac2c59b53e8.tar.bz2 aports-d985d2b50a41eb5f9ba682f4afe72ac2c59b53e8.tar.xz | |
main/musl: cherry-pick upstream fixes
Diffstat (limited to 'main/musl/0044-getdate-correctly-specify-error-number.patch')
| -rw-r--r-- | main/musl/0044-getdate-correctly-specify-error-number.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/main/musl/0044-getdate-correctly-specify-error-number.patch b/main/musl/0044-getdate-correctly-specify-error-number.patch new file mode 100644 index 0000000000..e9e48068a9 --- /dev/null +++ b/main/musl/0044-getdate-correctly-specify-error-number.patch @@ -0,0 +1,33 @@ +From 10800088099ec4c27c1db6c613c8bbf9f76e4057 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Fri, 9 Jun 2017 00:26:18 -0500 +Subject: [PATCH] getdate: correctly specify error number + +POSIX defines getdate error #5 as: +"An I/O error is encountered while reading the template file." + +POSIX defines getdate error #7 as: +"There is no line in the template that matches the input." + +This change correctly disambiguates between the two error conditions. +--- + src/time/getdate.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/time/getdate.c b/src/time/getdate.c +index 89f21699..420cd8e4 100644 +--- a/src/time/getdate.c ++++ b/src/time/getdate.c +@@ -37,7 +37,8 @@ struct tm *getdate(const char *s) + } + } + +- getdate_err = 7; ++ if (ferror(f)) getdate_err = 5; ++ else getdate_err = 7; + out: + if (f) fclose(f); + pthread_setcancelstate(cs, 0); +-- +2.13.0 + |