summaryrefslogtreecommitdiff
path: root/cmd-line-utils/libedit
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-04-27 12:19:18 +0200
committerunknown <msvensson@neptunus.(none)>2005-04-27 12:19:18 +0200
commitac3598bad122bb253e01209970520aca1a432b6b (patch)
treed5863f48dcf98c51b27547ac947a8a24f5b68dc3 /cmd-line-utils/libedit
parentdf35bde81d533444aab0b2bc5ca567bf592ac6b2 (diff)
parent7f9829882bd7387fa44f60f91e7ba105c73c0b17 (diff)
downloadmariadb-git-ac3598bad122bb253e01209970520aca1a432b6b.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/bug9954
into neptunus.(none):/home/msvensson/mysql/mysql-4.1 configure.in: Auto merged
Diffstat (limited to 'cmd-line-utils/libedit')
-rw-r--r--cmd-line-utils/libedit/makelist.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd-line-utils/libedit/makelist.sh b/cmd-line-utils/libedit/makelist.sh
index b2502d16ed1..502604791f5 100644
--- a/cmd-line-utils/libedit/makelist.sh
+++ b/cmd-line-utils/libedit/makelist.sh
@@ -68,7 +68,7 @@ case $FLAG in
/\(\):/ {
pr = substr($2, 1, 2);
if (pr == "vi" || pr == "em" || pr == "ed") {
- name = substr($2, 1, length($2) - 3);
+ name = substr($2, 1, index($2,"(") - 1);
#
# XXX: need a space between name and prototype so that -fc and -fh
# parsing is much easier
@@ -97,7 +97,7 @@ case $FLAG in
/\(\):/ {
pr = substr($2, 1, 2);
if (pr == "vi" || pr == "em" || pr == "ed") {
- name = substr($2, 1, length($2) - 3);
+ name = substr($2, 1, index($2,"(") - 1);
uname = "";
fname = "";
for (i = 1; i <= length(name); i++) {
@@ -117,6 +117,7 @@ case $FLAG in
printf(" \"");
for (i = 2; i < NF; i++)
printf("%s ", $i);
+ sub("\r", "", $i);
printf("%s\" },\n", $i);
ok = 0;
}
@@ -219,7 +220,7 @@ case $FLAG in
/\(\):/ {
pr = substr($2, 1, 2);
if (pr == "vi" || pr == "em" || pr == "ed") {
- name = substr($2, 1, length($2) - 3);
+ name = substr($2, 1, index($2, "(") - 1);
fname = "";
for (i = 1; i <= length(name); i++) {
s = substr(name, i, 1);