diff options
| author | Rich Felker <dalias@aerifal.cx> | 2016-07-13 15:04:30 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2016-07-13 15:04:30 -0400 |
| commit | cff5747c74c41b22f1ce1340978b1c226a8cdf32 (patch) | |
| tree | d4bb639db22cf5defe5c23126688f70e40df4841 | |
| parent | 6399fa9d29ea83de4735680b77d457bd59606532 (diff) | |
| download | musl-cff5747c74c41b22f1ce1340978b1c226a8cdf32.tar.gz musl-cff5747c74c41b22f1ce1340978b1c226a8cdf32.tar.xz musl-cff5747c74c41b22f1ce1340978b1c226a8cdf32.zip | |
fix regression in tcsetattr on all mips archs
revert commit 8c316e9e49d37ad92c2e7493e16166a2afca419f. it was wrong and does not match how the kernel API works.
| -rw-r--r-- | arch/mips/bits/termios.h | 6 | ||||
| -rw-r--r-- | arch/mips64/bits/termios.h | 6 | ||||
| -rw-r--r-- | arch/mipsn32/bits/termios.h | 6 | ||||
| -rw-r--r-- | src/passwd/nscd_query.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h index f559f76f..6a1205d7 100644 --- a/arch/mips/bits/termios.h +++ b/arch/mips/bits/termios.h @@ -141,9 +141,9 @@ struct termios { #define TCOFLUSH 1 #define TCIOFLUSH 2 -#define TCSANOW 0x540e -#define TCSADRAIN 0x540f -#define TCSAFLUSH 0x5410 +#define TCSANOW 0 +#define TCSADRAIN 1 +#define TCSAFLUSH 2 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define EXTA 0000016 diff --git a/arch/mips64/bits/termios.h b/arch/mips64/bits/termios.h index f559f76f..6a1205d7 100644 --- a/arch/mips64/bits/termios.h +++ b/arch/mips64/bits/termios.h @@ -141,9 +141,9 @@ struct termios { #define TCOFLUSH 1 #define TCIOFLUSH 2 -#define TCSANOW 0x540e -#define TCSADRAIN 0x540f -#define TCSAFLUSH 0x5410 +#define TCSANOW 0 +#define TCSADRAIN 1 +#define TCSAFLUSH 2 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define EXTA 0000016 diff --git a/arch/mipsn32/bits/termios.h b/arch/mipsn32/bits/termios.h index f559f76f..6a1205d7 100644 --- a/arch/mipsn32/bits/termios.h +++ b/arch/mipsn32/bits/termios.h @@ -141,9 +141,9 @@ struct termios { #define TCOFLUSH 1 #define TCIOFLUSH 2 -#define TCSANOW 0x540e -#define TCSADRAIN 0x540f -#define TCSAFLUSH 0x5410 +#define TCSANOW 0 +#define TCSADRAIN 1 +#define TCSAFLUSH 2 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define EXTA 0000016 diff --git a/src/passwd/nscd_query.c b/src/passwd/nscd_query.c index d38e371b..1897edc8 100644 --- a/src/passwd/nscd_query.c +++ b/src/passwd/nscd_query.c @@ -40,7 +40,7 @@ retry: buf[0] = NSCDVERSION; fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); - if (fd < 0) return NULL; + if (fd < 0 && errno != EAFNOSUPPORT) return NULL; if(!(f = fdopen(fd, "r"))) { close(fd); |