diff options
| author | msvensson@neptunus.(none) <> | 2005-04-27 12:19:18 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-04-27 12:19:18 +0200 |
| commit | b5e96531a7e26d6bbce62724a5ff1d40a201fe5f (patch) | |
| tree | d5863f48dcf98c51b27547ac947a8a24f5b68dc3 /cmd-line-utils | |
| parent | 631f035ee9ff8e914d4849a5b8e95d2a97c42865 (diff) | |
| parent | f3c72cc8914f309c45f35fe857348989f165e8f0 (diff) | |
| download | mariadb-git-b5e96531a7e26d6bbce62724a5ff1d40a201fe5f.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug9954
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/makelist.sh | 7 |
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); |