summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLu Chong <Chong.Lu@windriver.com>2013-10-16 15:02:13 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-26 15:59:12 +0100
commitd4cc036508f6468e01a74548a6390790f59753b3 (patch)
tree22ee2aedcc2ec89241272fe1e270b557f9dd79a9
parent30bafdc1c75ad7efee824b4e84c147112d771c5a (diff)
downloadpoky-d4cc036508f6468e01a74548a6390790f59753b3.tar.gz
minicom: fix -v/-h return value
The previous return value for '-h' and '-v' options was 1 which was not correct. These two options should return 0 instead. (From OE-Core rev: 88701b8c8b73202a738447ea8a1c169a0efdc7ed) Signed-off-by: Lu Chong <Chong.Lu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/minicom/minicom-2.6.2/0001-fix-minicom-h-v-return-value-is-not-0.patch35
-rw-r--r--meta/recipes-extended/minicom/minicom_2.6.2.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-extended/minicom/minicom-2.6.2/0001-fix-minicom-h-v-return-value-is-not-0.patch b/meta/recipes-extended/minicom/minicom-2.6.2/0001-fix-minicom-h-v-return-value-is-not-0.patch
new file mode 100644
index 0000000000..bd8261c979
--- /dev/null
+++ b/meta/recipes-extended/minicom/minicom-2.6.2/0001-fix-minicom-h-v-return-value-is-not-0.patch
@@ -0,0 +1,35 @@
1Subject: [PATCH] fix minicom -h/-v return value is not 0
2
3Upstream-Status: Pending
4
5Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
6
7---
8 src/minicom.c | 6 ++----
9 1 file changed, 2 insertions(+), 4 deletions(-)
10
11diff --git a/src/minicom.c b/src/minicom.c
12index e1a557b..730da7c 100644
13--- a/src/minicom.c
14+++ b/src/minicom.c
15@@ -1166,15 +1166,13 @@ int main(int argc, char **argv)
16 "modify it under the terms of the GNU General Public License\n"
17 "as published by the Free Software Foundation; either version\n"
18 "2 of the License, or (at your option) any later version.\n\n");
19- exit(1);
20- break;
21+ exit(0);
22 case 's': /* setup mode */
23 dosetup = 1;
24 break;
25 case 'h':
26 helpthem();
27- exit(1);
28- break;
29+ exit(0);
30 case 'p': /* Pseudo terminal to use. */
31 if (strncmp(optarg, "/dev/", 5) == 0)
32 optarg += 5;
33--
341.7.9.5
35
diff --git a/meta/recipes-extended/minicom/minicom_2.6.2.bb b/meta/recipes-extended/minicom/minicom_2.6.2.bb
index 558867d1d1..bef386acfe 100644
--- a/meta/recipes-extended/minicom/minicom_2.6.2.bb
+++ b/meta/recipes-extended/minicom/minicom_2.6.2.bb
@@ -10,6 +10,7 @@ PR = "r0"
10 10
11SRC_URI = "http://alioth.debian.org/frs/download.php/3869/minicom-${PV}.tar.gz \ 11SRC_URI = "http://alioth.debian.org/frs/download.php/3869/minicom-${PV}.tar.gz \
12 file://allow.to.disable.lockdev.patch \ 12 file://allow.to.disable.lockdev.patch \
13 file://0001-fix-minicom-h-v-return-value-is-not-0.patch \
13" 14"
14 15
15SRC_URI[md5sum] = "203c56c4b447f45e2301b0cc4e83da3c" 16SRC_URI[md5sum] = "203c56c4b447f45e2301b0cc4e83da3c"