Codebase list logstalgia / 85b0d0e
Imported Upstream version 1.0.6 Andrew Caudwell 9 years ago
9 changed file(s) with 100 addition(s) and 201 deletion(s). Raw diff Collapse all Expand all
0 1.0.6:
1 * Display invalid requests as having the path '???'.
2 * Updated the boost autoconf macro.
3
04 1.0.5:
15 * Performance improvements.
26 * Multi-monitor support using SDL 2.0.
00 #! /bin/sh
11 # Attempt to guess a canonical system name.
2 # Copyright 1992-2013 Free Software Foundation, Inc.
3
4 timestamp='2013-06-10'
2 # Copyright 1992-2014 Free Software Foundation, Inc.
3
4 timestamp='2014-03-23'
55
66 # This file is free software; you can redistribute it and/or modify it
77 # under the terms of the GNU General Public License as published by
4949 GNU config.guess ($timestamp)
5050
5151 Originally written by Per Bothner.
52 Copyright 1992-2013 Free Software Foundation, Inc.
52 Copyright 1992-2014 Free Software Foundation, Inc.
5353
5454 This is free software; see the source for copying conditions. There is NO
5555 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
148148 LIBC=gnu
149149 #endif
150150 EOF
151 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
151 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
152152 ;;
153153 esac
154154
825825 *:MINGW*:*)
826826 echo ${UNAME_MACHINE}-pc-mingw32
827827 exit ;;
828 i*:MSYS*:*)
828 *:MSYS*:*)
829829 echo ${UNAME_MACHINE}-pc-msys
830830 exit ;;
831831 i*:windows32*:*)
968968 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
969969 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
970970 ;;
971 or1k:Linux:*:*)
972 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
973 exit ;;
974 or32:Linux:*:*)
971 openrisc*:Linux:*:*)
972 echo or1k-unknown-linux-${LIBC}
973 exit ;;
974 or32:Linux:*:* | or1k*:Linux:*:*)
975975 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
976976 exit ;;
977977 padre:Linux:*:*)
12591259 if test "$UNAME_PROCESSOR" = unknown ; then
12601260 UNAME_PROCESSOR=powerpc
12611261 fi
1262 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1263 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1264 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1265 grep IS_64BIT_ARCH >/dev/null
1266 then
1267 case $UNAME_PROCESSOR in
1268 i386) UNAME_PROCESSOR=x86_64 ;;
1269 powerpc) UNAME_PROCESSOR=powerpc64 ;;
1270 esac
1262 if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
1263 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1264 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1265 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1266 grep IS_64BIT_ARCH >/dev/null
1267 then
1268 case $UNAME_PROCESSOR in
1269 i386) UNAME_PROCESSOR=x86_64 ;;
1270 powerpc) UNAME_PROCESSOR=powerpc64 ;;
1271 esac
1272 fi
12711273 fi
1274 elif test "$UNAME_PROCESSOR" = i386 ; then
1275 # Avoid executing cc on OS X 10.9, as it ships with a stub
1276 # that puts up a graphical alert prompting to install
1277 # developer tools. Any system running Mac OS X 10.7 or
1278 # later (Darwin 11 and later) is required to have a 64-bit
1279 # processor. This is not true of the ARM version of Darwin
1280 # that Apple uses in portable devices.
1281 UNAME_PROCESSOR=x86_64
12721282 fi
12731283 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
12741284 exit ;;
13601370 exit ;;
13611371 esac
13621372
1363 eval $set_cc_for_build
1364 cat >$dummy.c <<EOF
1365 #ifdef _SEQUENT_
1366 # include <sys/types.h>
1367 # include <sys/utsname.h>
1368 #endif
1369 main ()
1370 {
1371 #if defined (sony)
1372 #if defined (MIPSEB)
1373 /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
1374 I don't know.... */
1375 printf ("mips-sony-bsd\n"); exit (0);
1376 #else
1377 #include <sys/param.h>
1378 printf ("m68k-sony-newsos%s\n",
1379 #ifdef NEWSOS4
1380 "4"
1381 #else
1382 ""
1383 #endif
1384 ); exit (0);
1385 #endif
1386 #endif
1387
1388 #if defined (__arm) && defined (__acorn) && defined (__unix)
1389 printf ("arm-acorn-riscix\n"); exit (0);
1390 #endif
1391
1392 #if defined (hp300) && !defined (hpux)
1393 printf ("m68k-hp-bsd\n"); exit (0);
1394 #endif
1395
1396 #if defined (NeXT)
1397 #if !defined (__ARCHITECTURE__)
1398 #define __ARCHITECTURE__ "m68k"
1399 #endif
1400 int version;
1401 version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
1402 if (version < 4)
1403 printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1404 else
1405 printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
1406 exit (0);
1407 #endif
1408
1409 #if defined (MULTIMAX) || defined (n16)
1410 #if defined (UMAXV)
1411 printf ("ns32k-encore-sysv\n"); exit (0);
1412 #else
1413 #if defined (CMU)
1414 printf ("ns32k-encore-mach\n"); exit (0);
1415 #else
1416 printf ("ns32k-encore-bsd\n"); exit (0);
1417 #endif
1418 #endif
1419 #endif
1420
1421 #if defined (__386BSD__)
1422 printf ("i386-pc-bsd\n"); exit (0);
1423 #endif
1424
1425 #if defined (sequent)
1426 #if defined (i386)
1427 printf ("i386-sequent-dynix\n"); exit (0);
1428 #endif
1429 #if defined (ns32000)
1430 printf ("ns32k-sequent-dynix\n"); exit (0);
1431 #endif
1432 #endif
1433
1434 #if defined (_SEQUENT_)
1435 struct utsname un;
1436
1437 uname(&un);
1438
1439 if (strncmp(un.version, "V2", 2) == 0) {
1440 printf ("i386-sequent-ptx2\n"); exit (0);
1441 }
1442 if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
1443 printf ("i386-sequent-ptx1\n"); exit (0);
1444 }
1445 printf ("i386-sequent-ptx\n"); exit (0);
1446
1447 #endif
1448
1449 #if defined (vax)
1450 # if !defined (ultrix)
1451 # include <sys/param.h>
1452 # if defined (BSD)
1453 # if BSD == 43
1454 printf ("vax-dec-bsd4.3\n"); exit (0);
1455 # else
1456 # if BSD == 199006
1457 printf ("vax-dec-bsd4.3reno\n"); exit (0);
1458 # else
1459 printf ("vax-dec-bsd\n"); exit (0);
1460 # endif
1461 # endif
1462 # else
1463 printf ("vax-dec-bsd\n"); exit (0);
1464 # endif
1465 # else
1466 printf ("vax-dec-ultrix\n"); exit (0);
1467 # endif
1468 #endif
1469
1470 #if defined (alliant) && defined (i860)
1471 printf ("i860-alliant-bsd\n"); exit (0);
1472 #endif
1473
1474 exit (1);
1475 }
1476 EOF
1477
1478 $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1479 { echo "$SYSTEM_NAME"; exit; }
1480
1481 # Apollos put the system type in the environment.
1482
1483 test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1484
1485 # Convex versions that predate uname can use getsysinfo(1)
1486
1487 if [ -x /usr/convex/getsysinfo ]
1488 then
1489 case `getsysinfo -f cpu_type` in
1490 c1*)
1491 echo c1-convex-bsd
1492 exit ;;
1493 c2*)
1494 if getsysinfo -f scalar_acc
1495 then echo c32-convex-bsd
1496 else echo c2-convex-bsd
1497 fi
1498 exit ;;
1499 c34*)
1500 echo c34-convex-bsd
1501 exit ;;
1502 c38*)
1503 echo c38-convex-bsd
1504 exit ;;
1505 c4*)
1506 echo c4-convex-bsd
1507 exit ;;
1508 esac
1509 fi
1510
15111373 cat >&2 <<EOF
15121374 $0: unable to guess system type
15131375
00 #! /bin/sh
11 # Configuration validation subroutine script.
2 # Copyright 1992-2013 Free Software Foundation, Inc.
3
4 timestamp='2013-08-10'
2 # Copyright 1992-2014 Free Software Foundation, Inc.
3
4 timestamp='2014-09-11'
55
66 # This file is free software; you can redistribute it and/or modify it
77 # under the terms of the GNU General Public License as published by
6767 version="\
6868 GNU config.sub ($timestamp)
6969
70 Copyright 1992-2013 Free Software Foundation, Inc.
70 Copyright 1992-2014 Free Software Foundation, Inc.
7171
7272 This is free software; see the source for copying conditions. There is NO
7373 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
264264 | hexagon \
265265 | i370 | i860 | i960 | ia64 \
266266 | ip2k | iq2000 \
267 | k1om \
267268 | le32 | le64 \
268269 | lm32 \
269270 | m32c | m32r | m32rle | m68000 | m68k | m88k \
281282 | mips64vr5900 | mips64vr5900el \
282283 | mipsisa32 | mipsisa32el \
283284 | mipsisa32r2 | mipsisa32r2el \
285 | mipsisa32r6 | mipsisa32r6el \
284286 | mipsisa64 | mipsisa64el \
285287 | mipsisa64r2 | mipsisa64r2el \
288 | mipsisa64r6 | mipsisa64r6el \
286289 | mipsisa64sb1 | mipsisa64sb1el \
287290 | mipsisa64sr71k | mipsisa64sr71kel \
288291 | mipsr5900 | mipsr5900el \
294297 | nds32 | nds32le | nds32be \
295298 | nios | nios2 | nios2eb | nios2el \
296299 | ns16k | ns32k \
297 | open8 \
298 | or1k | or32 \
300 | open8 | or1k | or1knd | or32 \
299301 | pdp10 | pdp11 | pj | pjl \
300302 | powerpc | powerpc64 | powerpc64le | powerpcle \
301303 | pyramid \
304 | riscv32 | riscv64 \
302305 | rl78 | rx \
303306 | score \
304307 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
323326 c6x)
324327 basic_machine=tic6x-unknown
325328 ;;
326 m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
329 m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
327330 basic_machine=$basic_machine-unknown
328331 os=-none
329332 ;;
380383 | hexagon-* \
381384 | i*86-* | i860-* | i960-* | ia64-* \
382385 | ip2k-* | iq2000-* \
386 | k1om-* \
383387 | le32-* | le64-* \
384388 | lm32-* \
385389 | m32c-* | m32r-* | m32rle-* \
399403 | mips64vr5900-* | mips64vr5900el-* \
400404 | mipsisa32-* | mipsisa32el-* \
401405 | mipsisa32r2-* | mipsisa32r2el-* \
406 | mipsisa32r6-* | mipsisa32r6el-* \
402407 | mipsisa64-* | mipsisa64el-* \
403408 | mipsisa64r2-* | mipsisa64r2el-* \
409 | mipsisa64r6-* | mipsisa64r6el-* \
404410 | mipsisa64sb1-* | mipsisa64sb1el-* \
405411 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
406412 | mipsr5900-* | mipsr5900el-* \
412418 | nios-* | nios2-* | nios2eb-* | nios2el-* \
413419 | none-* | np1-* | ns16k-* | ns32k-* \
414420 | open8-* \
421 | or1k*-* \
415422 | orion-* \
416423 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
417424 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
821828 basic_machine=powerpc-unknown
822829 os=-morphos
823830 ;;
831 moxiebox)
832 basic_machine=moxie-unknown
833 os=-moxiebox
834 ;;
824835 msdos)
825836 basic_machine=i386-pc
826837 os=-msdos
13661377 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
13671378 | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
13681379 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1369 | -uxpv* | -beos* | -mpeix* | -udk* \
1380 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
13701381 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
13711382 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
13721383 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
13731384 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
13741385 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
13751386 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1376 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1387 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
13771388 # Remember, each alternative MUST END IN *, to match a version number.
13781389 ;;
13791390 -qnx*)
15911602 mips*-*)
15921603 os=-elf
15931604 ;;
1594 or1k-*)
1595 os=-elf
1596 ;;
15971605 or32-*)
15981606 os=-coff
15991607 ;;
00 #! /bin/sh
11 # Guess values for system-dependent variables and create Makefiles.
2 # Generated by GNU Autoconf 2.69 for Logstalgia 1.0.5.
2 # Generated by GNU Autoconf 2.69 for Logstalgia 1.0.6.
33 #
44 # Report bugs to <acaudwell@gmail.com>.
55 #
579579 # Identity of this package.
580580 PACKAGE_NAME='Logstalgia'
581581 PACKAGE_TARNAME='logstalgia'
582 PACKAGE_VERSION='1.0.5'
583 PACKAGE_STRING='Logstalgia 1.0.5'
582 PACKAGE_VERSION='1.0.6'
583 PACKAGE_STRING='Logstalgia 1.0.6'
584584 PACKAGE_BUGREPORT='acaudwell@gmail.com'
585585 PACKAGE_URL=''
586586
13301330 # Omit some internal or obsolete options to make the list less imposing.
13311331 # This message is too long to be a string in the A/UX 3.1 sh.
13321332 cat <<_ACEOF
1333 \`configure' configures Logstalgia 1.0.5 to adapt to many kinds of systems.
1333 \`configure' configures Logstalgia 1.0.6 to adapt to many kinds of systems.
13341334
13351335 Usage: $0 [OPTION]... [VAR=VALUE]...
13361336
14041404
14051405 if test -n "$ac_init_help"; then
14061406 case $ac_init_help in
1407 short | recursive ) echo "Configuration of Logstalgia 1.0.5:";;
1407 short | recursive ) echo "Configuration of Logstalgia 1.0.6:";;
14081408 esac
14091409 cat <<\_ACEOF
14101410
15281528 test -n "$ac_init_help" && exit $ac_status
15291529 if $ac_init_version; then
15301530 cat <<\_ACEOF
1531 Logstalgia configure 1.0.5
1531 Logstalgia configure 1.0.6
15321532 generated by GNU Autoconf 2.69
15331533
15341534 Copyright (C) 2012 Free Software Foundation, Inc.
21402140 This file contains any messages produced by compilers while
21412141 running configure, to aid debugging if configure makes a mistake.
21422142
2143 It was created by Logstalgia $as_me 1.0.5, which was
2143 It was created by Logstalgia $as_me 1.0.6, which was
21442144 generated by GNU Autoconf 2.69. Invocation command line was
21452145
21462146 $ $0 $@
30053005
30063006 # Define the identity of the package.
30073007 PACKAGE='logstalgia'
3008 VERSION='1.0.5'
3008 VERSION='1.0.6'
30093009
30103010
30113011 cat >>confdefs.h <<_ACEOF
70027002
70037003 libsubdirs="lib"
70047004 ax_arch=`uname -m`
7005 if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
7005 case $ax_arch in
7006 x86_64|ppc64|s390x|sparc64|aarch64)
70067007 libsubdirs="lib64 lib lib64"
7007 fi
7008 ;;
7009 esac
7010
7011
7012 libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
7013
7014 case ${host_cpu} in
7015 i?86)
7016 libsubdirs="lib/i386-${host_os} $libsubdirs"
7017 ;;
7018 esac
70087019
70097020 if test "$ac_boost_path" != ""; then
70107021 BOOST_CPPFLAGS="-I$ac_boost_path/include"
78197830 # report actual input values of CONFIG_FILES etc. instead of their
78207831 # values after options handling.
78217832 ac_log="
7822 This file was extended by Logstalgia $as_me 1.0.5, which was
7833 This file was extended by Logstalgia $as_me 1.0.6, which was
78237834 generated by GNU Autoconf 2.69. Invocation command line was
78247835
78257836 CONFIG_FILES = $CONFIG_FILES
78767887 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
78777888 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
78787889 ac_cs_version="\\
7879 Logstalgia config.status 1.0.5
7890 Logstalgia config.status 1.0.6
78807891 configured by $0, generated by GNU Autoconf 2.69,
78817892 with options \\"\$ac_cs_config\\"
78827893
22
33 AC_PREREQ(2.61)
44
5 AC_INIT(Logstalgia, 1.0.5, [acaudwell@gmail.com])
5 AC_INIT(Logstalgia, 1.0.6, [acaudwell@gmail.com])
66 AC_CONFIG_AUX_DIR([build-aux])
77 AC_CONFIG_SRCDIR([src/main.cpp])
88
3232 # and this notice are preserved. This file is offered as-is, without any
3333 # warranty.
3434
35 #serial 20
35 #serial 23
3636
3737 AC_DEFUN([AX_BOOST_BASE],
3838 [
9090 dnl are found, e.g. when only header-only libraries are installed!
9191 libsubdirs="lib"
9292 ax_arch=`uname -m`
93 if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
93 case $ax_arch in
94 x86_64|ppc64|s390x|sparc64|aarch64)
9495 libsubdirs="lib64 lib lib64"
95 fi
96 ;;
97 esac
98
99 dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
100 dnl them priority over the other paths since, if libs are found there, they
101 dnl are almost assuredly the ones desired.
102 AC_REQUIRE([AC_CANONICAL_HOST])
103 libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
104
105 case ${host_cpu} in
106 i?86)
107 libsubdirs="lib/i386-${host_os} $libsubdirs"
108 ;;
109 esac
96110
97111 dnl first we check the system location for boost libraries
98112 dnl this location ist chosen if boost libraries are installed with the --layout=system option
137137 if(pid == "-") pid = "";
138138 if(referrer == "-") referrer = "";
139139
140 if(hostname.size()==0) return false;
140 if(hostname.empty()) return false;
141141
142142 if(settings.mask_hostnames) {
143143 hostname = maskHostname(hostname);
144144 }
145145
146 if(path.size()==0) return false;
146 if(path.empty()) return false;
147147 if(timestamp == 0) return false;
148148
149149 return true;
2222 const char* ls_ncsa_months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug" , "Sep", "Oct", "Nov", "Dec" };
2323 Regex ls_ncsa_entry_start("^(?:([^ ]+) )?([^ ]+) +[^ ]+ +([^ ]+) +\\[(.*?)\\] +(.*)$");
2424 Regex ls_ncsa_entry_date("(\\d+)/(\\d+|[A-Za-z]+)/(\\d+):(\\d+):(\\d+):(\\d+) ([+-])(\\d+)");
25 Regex ls_ncsa_entry_request("\"([^ ]+) +([^ ]+) +([^ ]+)\" +([^ ]+) +([^\\s+]+)(.*)");
25 Regex ls_ncsa_entry_request("\"(?:([^ ]+) +([^ ]+) +([^ ]+)|(?:[^\"]*))\" +([^ ]+) +([^\\s+]+)(.*)");
2626 Regex ls_ncsa_entry_agent("(?: +\"([^\"]+)\" +\"([^\"]+)\")?( .+)?");
2727 Regex ls_ncsa_extra_field("^ +(\"[^\"]*\"|[^ ]+)");
2828
112112 }
113113
114114 // entry.method = matches[0];
115 entry.path = matches[1];
115 entry.path = (!matches[1].empty()) ? matches[1] : "???";
116116 // entry.protocol = matches[2];
117117
118 entry.response_code = matches[3].c_str();
118 entry.response_code = matches[3];
119119 entry.response_size = atol(matches[4].c_str());
120120
121121 if(matches.size() > 5) {
1717 #ifndef LOGSTALGIA_SETTINGS_H
1818 #define LOGSTALGIA_SETTINGS_H
1919
20 #define LOGSTALGIA_VERSION "1.0.5"
20 #define LOGSTALGIA_VERSION "1.0.6"
2121
2222 #include "core/settings.h"
2323