Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Enno Rehling 2016-10-16 17:28:31 +02:00
parent fb470b7af1 919001fae0
commit 680c873844
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
process/sendreport.sh
View File

@ -14,7 +14,7 @@ GAME=$1
EMAIL=$2 EMAIL=$2
FACTION=$3 FACTION=$3
PASSWD=$4 PASSWD=$4
echo "$GAME $EMAIL $FACTION $PASSWD" >> /tmp/report.log #echo "$GAME $EMAIL $FACTION $PASSWD" >> /tmp/report.log
function reply() { function reply() {
echo $@ | mutt -s "Reportnachforderung Partei ${FACTION}" $EMAIL echo $@ | mutt -s "Reportnachforderung Partei ${FACTION}" $EMAIL

1
s/preview
View File

@ -22,6 +22,7 @@ exit $2 # otherwise
function build() { function build() {
assert_dir $SOURCE assert_dir $SOURCE
cd $SOURCE cd $SOURCE
rm -rf crypto tolua
git fetch || abort "failed to update source. do you have local changes?" git fetch || abort "failed to update source. do you have local changes?"
[ -z $1 ] || git checkout $1 [ -z $1 ] || git checkout $1
git pull git pull

4
src/kernel/config.c
View File

@ -679,7 +679,7 @@ static const char * relpath(char *buf, size_t sz, const char *path) {
static const char *g_datadir; static const char *g_datadir;
const char *datapath(void) const char *datapath(void)
{ {
static char zText[MAX_PATH]; // FIXME: static return value static char zText[MAX_PATH];
if (g_datadir) if (g_datadir)
return g_datadir; return g_datadir;
return relpath(zText, sizeof(zText), "data"); return relpath(zText, sizeof(zText), "data");
@ -693,7 +693,7 @@ void set_datapath(const char *path)
static const char *g_reportdir; static const char *g_reportdir;
const char *reportpath(void) const char *reportpath(void)
{ {
static char zText[MAX_PATH]; // FIXME: static return value static char zText[MAX_PATH];
if (g_reportdir) if (g_reportdir)
return g_reportdir; return g_reportdir;
return relpath(zText, sizeof(zText), "reports"); return relpath(zText, sizeof(zText), "reports");

24
src/util/unicode.test.c
View File

@ -23,42 +23,42 @@ static void test_unicode_utf8_to_other(CuTest *tc)
unsigned char ch; unsigned char ch;
size_t sz; size_t sz;
CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str, &sz));
CuAssertIntEquals(tc, 2, sz); CuAssertIntEquals(tc, 2, (int)sz);
CuAssertIntEquals(tc, '?', ch); CuAssertIntEquals(tc, '?', ch);
CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str+2, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str+2, &sz));
CuAssertIntEquals(tc, 2, sz); CuAssertIntEquals(tc, 2, (int)sz);
CuAssertIntEquals(tc, '?', ch); CuAssertIntEquals(tc, '?', ch);
CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str+4, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str+4, &sz));
CuAssertIntEquals(tc, 2, sz); CuAssertIntEquals(tc, 2, (int)sz);
CuAssertIntEquals(tc, '?', ch); CuAssertIntEquals(tc, '?', ch);
CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str + 6, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_cp437(&ch, utf8_str + 6, &sz));
CuAssertIntEquals(tc, 1, sz); CuAssertIntEquals(tc, 1, (int)sz);
CuAssertIntEquals(tc, 'l', ch); CuAssertIntEquals(tc, 'l', ch);
CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str, &sz));
CuAssertIntEquals(tc, 2, sz); CuAssertIntEquals(tc, 2, (int)sz);
CuAssertIntEquals(tc, 216, ch); CuAssertIntEquals(tc, 216, ch);
CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str+2, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str+2, &sz));
CuAssertIntEquals(tc, 2, sz); CuAssertIntEquals(tc, 2, (int)sz);
CuAssertIntEquals(tc, 120, ch); CuAssertIntEquals(tc, 120, ch);
CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str + 4, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str + 4, &sz));
CuAssertIntEquals(tc, 2, sz); CuAssertIntEquals(tc, 2, (int)sz);
CuAssertIntEquals(tc, 0x9d, ch); CuAssertIntEquals(tc, 0x9d, ch);
CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str + 6, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_cp1252(&ch, utf8_str + 6, &sz));
CuAssertIntEquals(tc, 1, sz); CuAssertIntEquals(tc, 1, (int)sz);
CuAssertIntEquals(tc, 'l', ch); CuAssertIntEquals(tc, 'l', ch);
CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str, &sz));
CuAssertIntEquals(tc, 2, sz); CuAssertIntEquals(tc, 2, (int)sz);
CuAssertIntEquals(tc, '?', ch); CuAssertIntEquals(tc, '?', ch);
CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str + 2, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str + 2, &sz));
CuAssertIntEquals(tc, 2, sz); CuAssertIntEquals(tc, 2, (int)sz);
CuAssertIntEquals(tc, '?', ch); CuAssertIntEquals(tc, '?', ch);
CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str + 4, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str + 4, &sz));
CuAssertIntEquals(tc, 2, sz); CuAssertIntEquals(tc, 2, (int)sz);
CuAssertIntEquals(tc, '?', ch); CuAssertIntEquals(tc, '?', ch);
CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str + 6, &sz)); CuAssertIntEquals(tc, 0, unicode_utf8_to_ascii(&ch, utf8_str + 6, &sz));
CuAssertIntEquals(tc, 1, sz); CuAssertIntEquals(tc, 1, (int)sz);
CuAssertIntEquals(tc, 'l', ch); CuAssertIntEquals(tc, 'l', ch);
} }