aniani/trader
1
0
Fork 0
mirror of https://git.zap.org.au/git/trader.git synced 2024-09-01 17:14:15 -04:00
Code

Merge branch master into with-autogenerated: bug fix in utils.c

Browse Source
This commit is contained in:
John Zaitseff 2017-06-18 06:08:52 +10:00
commit 8ab9365b54
20 changed files with 62 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
INSTALL
View File

@ -102,12 +102,12 @@ You can also run configure in a separate build-only directory tree. This
feature requires GNU Make and allows you to keep the source code tree from
being modified by the compilation process. To use this option, create a
separate build directory, then run configure. For example, if you placed
the Star Traders source code tree in $HOME/src/trader-7.10, you could run
the Star Traders source code tree in $HOME/src/trader-7.11, you could run
something like:
mkdir $HOME/build/trader-build-7.10
cd $HOME/build/trader-build-7.10
$HOME/src/trader-7.10/configure
mkdir $HOME/build/trader-build-7.11
cd $HOME/build/trader-build-7.11
$HOME/src/trader-7.11/configure
Once again, the Autoconf manual describes these options (and many others):

8
NEWS
View File

@ -15,6 +15,14 @@ browse the Git repository on The ZAP Group web server at the following
location: http://www.zap.org.au/gitweb/trader.git
Version 7.11 (18th June, 2017)
------------------------------
Bug fix: some architectures (such as ARM, PowerPC and S390) treat "char"
as "unsigned char", and this caused b64decode() to fail while loading a
saved game. Changed the relevant type from "char" to "int" to fix this.
Version 7.10 (2nd June, 2017)
-----------------------------

2
configure.ac
View File

@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program. If not, see http://www.gnu.org/licenses/.
AC_INIT([Star Traders], [7.10], [J.Zaitseff@zap.org.au], [trader],
AC_INIT([Star Traders], [7.11], [J.Zaitseff@zap.org.au], [trader],
[http://www.zap.org.au/software/trader/])
AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author])

2
doc/trader.6
View File

@ -41,7 +41,7 @@
.if \n[.g] .mso www.tmac
.\"
.\" *********************************************************************
.TH TRADER 6 "2nd June, 2017" "Unix-like systems"
.TH TRADER 6 "18th June, 2017" "Unix-like systems"
.SH NAME
trader \- a game of interstellar trading
.\" *********************************************************************

6
po/da.po
View File

@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:26+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:02+1000\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"Language: da\n"

6
po/de.po
View File

@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:02+1000\n"
"Last-Translator: Philipp Thomas <pth@suse.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
"Language: de\n"

6
po/en_AU.po
View File

@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:02+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English (Australian) <(nothing)>\n"
"Language: en_AU\n"

6
po/en_CA.po
View File

@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:02+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English (Canadian) <(nothing)>\n"
"Language: en_CA\n"

6
po/en_GB.po
View File

@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English (British) <(nothing)>\n"
"Language: en_GB\n"

6
po/en_US.po
View File

@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English (US) <(nothing)>\n"
"Language: en_US\n"

6
po/eo.po
View File

@ -13,10 +13,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
"Language: eo\n"

6
po/fi.po
View File

@ -13,10 +13,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
"Language: fi\n"

6
po/fr.po
View File

@ -19,10 +19,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
"Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n"

6
po/hr.po
View File

@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
"Language: hr\n"

6
po/hu.po
View File

@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
"Language: hu\n"

6
po/nb.po
View File

@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n"

6
po/ru.po
View File

@ -15,10 +15,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
"Language: ru\n"

6
po/sr.po
View File

@ -13,10 +13,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
"Language: sr\n"

6
po/sv.po
View File

@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: trader 7.10\n"
"Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n"
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"

6
src/utils.c
View File

@ -873,10 +873,10 @@ ssize_t b64decode (const void *restrict in, size_t inlen,
n = 1;
for (size_t i = 0; i < inlen && *u_in != '\0'; i++, u_in++) {
char c = *u_in > UNSCRAMBLE_TABLE_SIZE ?
int v = *u_in > UNSCRAMBLE_TABLE_SIZE ?
UNSCRAMBLE_INVALID : unscramble_table[*u_in];
switch (c) {
switch (v) {
case UNSCRAMBLE_INVALID:
return -1;
@ -889,7 +889,7 @@ ssize_t b64decode (const void *restrict in, size_t inlen,
continue;
default:
n = n << 6 | c; // c is 0 .. 63
n = n << 6 | v; // v is 0 .. 63
if (n & 0x1000000) {
// Convert 24-bit number into three output bytes