diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
commit | 12bb627384ddfd47382b9f1b6464481a58d01ebb (patch) | |
tree | f9760c04ccd4fcd7de214e2acd5b0e43fb530aa9 /dev-util/re2c/files | |
parent | 5fdd950c7ae03e12746a45c86d85861beaacc846 (diff) |
gentoo resync : 29.08.2018
Diffstat (limited to 'dev-util/re2c/files')
-rw-r--r-- | dev-util/re2c/files/re2c-1.1-dash-V.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/dev-util/re2c/files/re2c-1.1-dash-V.patch b/dev-util/re2c/files/re2c-1.1-dash-V.patch new file mode 100644 index 000000000000..77c3d80dd123 --- /dev/null +++ b/dev-util/re2c/files/re2c-1.1-dash-V.patch @@ -0,0 +1,49 @@ +From 84a7bf8585c500572a8ad19f9458f31d34abbcdc Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Tue, 28 Aug 2018 12:01:07 -0400 +Subject: [PATCH] Rewrite vernum function + +Fixes: https://github.com/skvadrik/re2c/issues/211 +--- + re2c/src/conf/msg.cc | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +--- a/src/conf/msg.cc ++++ b/src/conf/msg.cc +@@ -102,23 +102,22 @@ void usage() + void vernum () + { + std::string vernum (PACKAGE_VERSION); +- if (vernum[1] == '.') +- { +- vernum.insert(0, "0"); +- } +- vernum.erase(2, 1); +- if (vernum[3] == '.') +- { +- vernum.insert(2, "0"); +- } +- vernum.erase(4, 1); +- if (vernum.length() < 6 || vernum[5] < '0' || vernum[5] > '9') ++ std::string parts[3]; ++ unsigned p = 0; ++ ++ for (unsigned i = 0; p < 3 && i < vernum.length (); i++) + { +- vernum.insert(4, "0"); ++ if (vernum[i] == '.') ++ p++; ++ else ++ parts[p].push_back (vernum[i]); + } +- vernum.resize(6, '0'); + +- printf ("%s\n", vernum.c_str ()); ++ for (p = 0; p < 3; p++) ++ while (parts[p].length () < 2) ++ parts[p].insert (0, 1, '0'); ++ ++ printf ("%s%s%s\n", parts[0].c_str (), parts[1].c_str (), parts[2].c_str ()); + } + + void version () |