sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

socat: Access c_ispeed and c_ospeed via APIs 

make it more portable across libc implementations

(From OE-Core rev: cd3408e7b845891b63de04249982330e02f13ee8)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj 2016-03-17 05:18:20 +00:00 committed by Richard Purdie
parent bb4e6e08e5
commit e1f3f4cc3c
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch Normal file
View File

@ -0,0 +1,39 @@
From 545d3dec8c91d6074516ffcfa79323ddf9d83839 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 15 Mar 2016 21:36:02 +0000
Subject: [PATCH] Access c_ispeed and c_ospeed via APIs
Use cfsetispeed(), cfsetospeed(), cfgetispeed, and cfgetospeed()
instead of operating on c_ispeed and c_ospeed termios structure
members directly because they are not guaranteed to exist on all
libc implementations
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Submitted
xioinitialize.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/xioinitialize.c b/xioinitialize.c
index 9f50155..632ca4c 100644
--- a/xioinitialize.c
+++ b/xioinitialize.c
@@ -65,10 +65,10 @@ int xioinitialize(void) {
#if HAVE_TERMIOS_ISPEED && (ISPEED_OFFSET != -1) && (OSPEED_OFFSET != -1)
#if defined(ISPEED_OFFSET) && (ISPEED_OFFSET != -1)
#if defined(OSPEED_OFFSET) && (OSPEED_OFFSET != -1)
- tdata.termarg.c_ispeed = 0x56789abc;
- tdata.termarg.c_ospeed = 0x6789abcd;
- assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]);
- assert(tdata.termarg.c_ospeed == tdata.speeds[OSPEED_OFFSET]);
+ cfsetispeed(&tdata.termarg, 0x56789abc);
+ cfsetospeed(&tdata.termarg, 0x6789abcd);
+ assert(cfgetispeed(&tdata.termarg) == tdata.speeds[ISPEED_OFFSET]);
+ assert(cfgetospeed(&tdata.termarg) == tdata.speeds[OSPEED_OFFSET]);
#endif
#endif
#endif
--
1.9.1

1
meta/recipes-connectivity/socat/socat_1.7.3.1.bb
View File

@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
file://Makefile.in-fix-for-parallel-build.patch \
file://0001-define-NETDB_INTERNAL-to-1-if-not-available.patch \
file://0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch \
"
SRC_URI[md5sum] = "334e46924f2b386299c9db2ac22bcd36"