diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:19:18 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:19:18 +0200 |
| commit | 3ce2f6f40a6cb6170433058fbfc644cafddf6030 (patch) | |
| tree | d5863f48dcf98c51b27547ac947a8a24f5b68dc3 /cmd-line-utils | |
| parent | fc26e1c15b32cfb789afb962644eae0d96bbb46d (diff) | |
| parent | 7e04d257eb2f0cf89f07a161e7ac3762366c5da2 (diff) | |
| download | mariadb-git-3ce2f6f40a6cb6170433058fbfc644cafddf6030.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')
| -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); |