mirror of
https://git.zap.org.au/git/trader.git
synced 2024-10-27 18:20:13 -04:00
Merge branch with-autogenerated into with-debian: bug fix in utils.c
This commit is contained in:
John Zaitseff
commit
32c5e755a2
8
INSTALL
8
INSTALL
@ -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):
|
||||
|
||||
|
||||
@ -233,7 +233,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/build-aux/install-sh \
|
||||
$(top_srcdir)/build-aux/missing COPYING INSTALL NEWS README \
|
||||
build-aux/README build-aux/compile build-aux/config.guess \
|
||||
build-aux/config.rpath build-aux/config.sub \
|
||||
build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
|
||||
build-aux/install-sh build-aux/missing
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
distdir = $(PACKAGE)-$(VERSION)
|
||||
|
||||
8
NEWS
8
NEWS
@ -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)
|
||||
-----------------------------
|
||||
|
||||
|
||||
@ -1034,6 +1034,9 @@
|
||||
/* Define to 1 if you need to in order for 'stat' and other things to work. */
|
||||
#undef _POSIX_SOURCE
|
||||
|
||||
/* For standard stat data types on VMS. */
|
||||
#undef _USE_STD_STAT
|
||||
|
||||
/* Define to rpl_ if the getopt replacement functions and variables should be
|
||||
used. */
|
||||
#undef __GETOPT_PREFIX
|
||||
|
||||
24
configure
vendored
24
configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for Star Traders 7.10.
|
||||
# Generated by GNU Autoconf 2.69 for Star Traders 7.11.
|
||||
#
|
||||
# Report bugs to <J.Zaitseff@zap.org.au>.
|
||||
#
|
||||
@ -580,8 +580,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='Star Traders'
|
||||
PACKAGE_TARNAME='trader'
|
||||
PACKAGE_VERSION='7.10'
|
||||
PACKAGE_STRING='Star Traders 7.10'
|
||||
PACKAGE_VERSION='7.11'
|
||||
PACKAGE_STRING='Star Traders 7.11'
|
||||
PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au'
|
||||
PACKAGE_URL='http://www.zap.org.au/software/trader/'
|
||||
|
||||
@ -2051,7 +2051,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures Star Traders 7.10 to adapt to many kinds of systems.
|
||||
\`configure' configures Star Traders 7.11 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -2122,7 +2122,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of Star Traders 7.10:";;
|
||||
short | recursive ) echo "Configuration of Star Traders 7.11:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -2239,7 +2239,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
Star Traders configure 7.10
|
||||
Star Traders configure 7.11
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@ -2891,7 +2891,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by Star Traders $as_me 7.10, which was
|
||||
It was created by Star Traders $as_me 7.11, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -3791,7 +3791,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='trader'
|
||||
VERSION='7.10'
|
||||
VERSION='7.11'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -12984,6 +12984,10 @@ fi
|
||||
|
||||
|
||||
|
||||
$as_echo "#define _USE_STD_STAT 1" >>confdefs.h
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -20490,7 +20494,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by Star Traders $as_me 7.10, which was
|
||||
This file was extended by Star Traders $as_me 7.11, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -20557,7 +20561,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
Star Traders config.status 7.10
|
||||
Star Traders config.status 7.11
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@ -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])
|
||||
|
||||
|
||||
@ -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
|
||||
.\" *********************************************************************
|
||||
|
||||
@ -47,6 +47,11 @@
|
||||
# define opterr __GETOPT_ID (opterr)
|
||||
# define optind __GETOPT_ID (optind)
|
||||
# define optopt __GETOPT_ID (optopt)
|
||||
|
||||
/* The system's getopt.h may have already included getopt-core.h to
|
||||
declare the unprefixed identifiers. Undef _GETOPT_CORE_H so that
|
||||
getopt-core.h declares them with prefixes. */
|
||||
# undef _GETOPT_CORE_H
|
||||
#endif
|
||||
|
||||
#include <getopt-core.h>
|
||||
|
||||
@ -45,6 +45,11 @@
|
||||
# define getopt_long_only __GETOPT_ID (getopt_long_only)
|
||||
# define option __GETOPT_ID (option)
|
||||
# define _getopt_internal __GETOPT_ID (getopt_internal)
|
||||
|
||||
/* The system's getopt.h may have already included getopt-ext.h to
|
||||
declare the unprefixed identifiers. Undef _GETOPT_EXT_H so that
|
||||
getopt-ext.h declares them with prefixes. */
|
||||
# undef _GETOPT_EXT_H
|
||||
#endif
|
||||
|
||||
/* Standalone applications get correct prototypes for getopt_long and
|
||||
|
||||
@ -185,7 +185,8 @@ npgettext_aux (const char *domain,
|
||||
#include <string.h>
|
||||
|
||||
#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
|
||||
/* || __STDC_VERSION__ >= 199901L */ )
|
||||
/* || __STDC_VERSION__ == 199901L
|
||||
|| (__STDC_VERSION__ >= 201112L && !defined __STDC_NO_VLA__) */ )
|
||||
# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
|
||||
#else
|
||||
# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
|
||||
|
||||
1
m4/.gitignore
vendored
1
m4/.gitignore
vendored
@ -0,0 +1 @@
|
||||
/gnulib-tool.m4
|
||||
@ -1,4 +1,4 @@
|
||||
# sys_types_h.m4 serial 7
|
||||
# sys_types_h.m4 serial 8
|
||||
dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
@ -6,6 +6,9 @@ dnl with or without modifications, as long as this notice is preserved.
|
||||
|
||||
AC_DEFUN_ONCE([gl_SYS_TYPES_H],
|
||||
[
|
||||
dnl Use sane struct stat types in OpenVMS 8.2 and later.
|
||||
AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.])
|
||||
|
||||
AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
|
||||
gl_NEXT_HEADERS([sys/types.h])
|
||||
|
||||
|
||||
6
po/da.po
6
po/da.po
@ -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
6
po/de.po
@ -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"
|
||||
|
||||
BIN
po/en@quot.gmo
BIN
po/en@quot.gmo
Binary file not shown.
@ -27,10 +27,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:31+1000\n"
|
||||
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
|
||||
"PO-Revision-Date: 2017-06-18 06:01+1000\n"
|
||||
"Last-Translator: Automatically generated\n"
|
||||
"Language-Team: none\n"
|
||||
"Language: en@quot\n"
|
||||
|
||||
BIN
po/en_AU.gmo
BIN
po/en_AU.gmo
Binary file not shown.
@ -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"
|
||||
|
||||
BIN
po/en_CA.gmo
BIN
po/en_CA.gmo
Binary file not shown.
@ -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"
|
||||
|
||||
BIN
po/en_GB.gmo
BIN
po/en_GB.gmo
Binary file not shown.
@ -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"
|
||||
|
||||
BIN
po/en_US.gmo
BIN
po/en_US.gmo
Binary file not shown.
@ -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
6
po/eo.po
@ -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
6
po/fi.po
@ -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
6
po/fr.po
@ -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
6
po/hr.po
@ -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
6
po/hu.po
@ -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
6
po/nb.po
@ -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
6
po/ru.po
@ -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
6
po/sr.po
@ -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
6
po/sv.po
@ -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,9 +6,9 @@
|
||||
#, fuzzy
|
||||
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"
|
||||
"POT-Creation-Date: 2017-06-18 06:01+1000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user