Patchwork minicom: fix -v/-h return value

login
register
mail settings
Submitter Chong.Lu@windriver.com
Date Oct. 16, 2013, 7:02 a.m.
Message ID <1381906933-32392-1-git-send-email-Chong.Lu@windriver.com>
Download mbox | patch
Permalink /patch/59993/
State Accepted
Commit 88701b8c8b73202a738447ea8a1c169a0efdc7ed
Headers show

Comments

Chong.Lu@windriver.com - Oct. 16, 2013, 7:02 a.m.
From: Lu Chong <Chong.Lu@windriver.com>

The previous return value for '-h' and '-v' options was 1 which was
not correct. These two options should return 0 instead.

Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
---
 ...001-fix-minicom-h-v-return-value-is-not-0.patch |   35 ++++++++++++++++++++
 meta/recipes-extended/minicom/minicom_2.6.2.bb     |    1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta/recipes-extended/minicom/minicom-2.6.2/0001-fix-minicom-h-v-return-value-is-not-0.patch

Patch

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 0000000..bd8261c
--- /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 @@ 
+Subject: [PATCH] fix minicom -h/-v return value is not 0
+
+Upstream-Status: Pending
+
+Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
+
+---
+ src/minicom.c |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/minicom.c b/src/minicom.c
+index e1a557b..730da7c 100644
+--- a/src/minicom.c
++++ b/src/minicom.c
+@@ -1166,15 +1166,13 @@ int main(int argc, char **argv)
+ 	         "modify it under the terms of the GNU General Public License\n"
+                  "as published by the Free Software Foundation; either version\n"
+                  "2 of the License, or (at your option) any later version.\n\n");
+-          exit(1);
+-          break;
++          exit(0);
+         case 's': /* setup mode */
+           dosetup = 1;
+           break;
+         case 'h':
+           helpthem();
+-          exit(1);
+-          break;
++          exit(0);
+         case 'p': /* Pseudo terminal to use. */
+           if (strncmp(optarg, "/dev/", 5) == 0)
+             optarg += 5;
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-extended/minicom/minicom_2.6.2.bb b/meta/recipes-extended/minicom/minicom_2.6.2.bb
index 558867d..bef386a 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"
 
 SRC_URI = "http://alioth.debian.org/frs/download.php/3869/minicom-${PV}.tar.gz \
            file://allow.to.disable.lockdev.patch \
+           file://0001-fix-minicom-h-v-return-value-is-not-0.patch \
 "
 
 SRC_URI[md5sum] = "203c56c4b447f45e2301b0cc4e83da3c"