From 43e4d63d5baadeaa2d69f4de6e34a2651d90dc2d Mon Sep 17 00:00:00 2001 From: Oleg Borodin Date: Tue, 2 Jan 2024 03:28:26 +0200 Subject: [PATCH] at work --- Makefile | 56 ++++++++++++++--------------- clib/cdynarr.c | 1 - clib/jlexer.c | 6 ++++ clib/jlexer.h | 3 +- clib/jparser.c | 96 +++++++++++++++++++++++++++++++++++++++++--------- clib/test.json | 2 +- config.h | 6 ++-- config.status | 78 ++++++++++++++++++++-------------------- cworker.c | 4 +-- defines.h | 14 ++++---- 10 files changed, 167 insertions(+), 99 deletions(-) diff --git a/Makefile b/Makefile index 73f78de..37d0ec3 100644 --- a/Makefile +++ b/Makefile @@ -237,20 +237,20 @@ distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} /home/ziggi/Projects/cworker/missing aclocal +ACLOCAL = ${SHELL} /home/ziggi/projects/cworker/missing aclocal AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 -APP_CACHEDIR = /var/cache/cworker -APP_CONFIGDIR = /app/etc/cworker -APP_DATABASEDIR = /var/db/cworker -APP_LIBDIR = /app/lib/cworker -APP_LOGDIR = /var/log/cworker -APP_RUNDIR = /var/run/cworker -APP_USER = www +APP_CACHEDIR = /home/ziggi/projects/cworker/cache +APP_CONFIGDIR = /home/ziggi/projects/cworker/ +APP_DATABASEDIR = /home/ziggi/projects/cworker/data +APP_LIBDIR = /home/ziggi/projects/cworker/lib +APP_LOGDIR = /home/ziggi/projects/cworker/log +APP_RUNDIR = /home/ziggi/projects/cworker/run +APP_USER = ziggi AR = ar -AUTOCONF = ${SHELL} /home/ziggi/Projects/cworker/missing autoconf -AUTOHEADER = ${SHELL} /home/ziggi/Projects/cworker/missing autoheader -AUTOMAKE = ${SHELL} /home/ziggi/Projects/cworker/missing automake +AUTOCONF = ${SHELL} /home/ziggi/projects/cworker/missing autoconf +AUTOHEADER = ${SHELL} /home/ziggi/projects/cworker/missing autoheader +AUTOMAKE = ${SHELL} /home/ziggi/projects/cworker/missing automake AWK = gawk CC = clang CCDEPMODE = depmode=none @@ -264,8 +264,8 @@ DLLTOOL = false DOCKER = /usr/bin/true DSYMUTIL = DUMPBIN = -ECHO_C = \c -ECHO_N = +ECHO_C = +ECHO_N = -n ECHO_T = EGREP = /usr/bin/grep -E EXEEXT = @@ -289,7 +289,7 @@ LIPO = LN_S = ln -s LTLIBOBJS = LT_SYS_LIBRARY_PATH = -MAKEINFO = ${SHELL} /home/ziggi/Projects/cworker/missing makeinfo +MAKEINFO = ${SHELL} /home/ziggi/projects/cworker/missing makeinfo MANIFEST_TOOL = : MKDIR_P = /usr/local/bin/gmkdir -p NM = /usr/bin/nm @@ -309,14 +309,14 @@ PATH_SEPARATOR = : RANLIB = ranlib SED = /usr/local/bin/gsed SET_MAKE = -SHELL = /bin/bash +SHELL = /bin/sh STRIP = strip VALGRIND = /usr/local/bin/valgrind VERSION = 0.0.1 -abs_builddir = /home/ziggi/Projects/cworker -abs_srcdir = /home/ziggi/Projects/cworker -abs_top_builddir = /home/ziggi/Projects/cworker -abs_top_srcdir = /home/ziggi/Projects/cworker +abs_builddir = /home/ziggi/projects/cworker +abs_srcdir = /home/ziggi/projects/cworker +abs_top_builddir = /home/ziggi/projects/cworker +abs_top_srcdir = /home/ziggi/projects/cworker ac_ct_AR = ar ac_ct_CC = clang ac_ct_DUMPBIN = @@ -325,14 +325,14 @@ am__leading_dot = . am__quote = am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - -app_cachedir = /var/cache/cworker -app_configdir = /app/etc/cworker -app_databasedir = /var/db/cworker -app_libdir = /app/lib/cworker -app_logdir = /var/log/cworker +app_cachedir = /home/ziggi/projects/cworker/cache +app_configdir = /home/ziggi/projects/cworker/ +app_databasedir = /home/ziggi/projects/cworker/data +app_libdir = /home/ziggi/projects/cworker/lib +app_logdir = /home/ziggi/projects/cworker/log app_name = cworker -app_rundir = /var/run/cworker -app_user = www +app_rundir = /home/ziggi/projects/cworker/run +app_user = ziggi bindir = ${exec_prefix}/bin build = amd64-unknown-freebsd12.4 build_alias = @@ -353,7 +353,7 @@ host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/ziggi/Projects/cworker/install-sh +install_sh = ${SHELL} /home/ziggi/projects/cworker/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -362,7 +362,7 @@ mandir = ${datarootdir}/man mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /app +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} runstatedir = ${localstatedir}/run diff --git a/clib/cdynarr.c b/clib/cdynarr.c index de28b9d..5753c57 100644 --- a/clib/cdynarr.c +++ b/clib/cdynarr.c @@ -158,4 +158,3 @@ void cboolarr_free(cboolarr_t* array) { cboolarr_destroy(array); free(array); } - diff --git a/clib/jlexer.c b/clib/jlexer.c index 205f162..01b40cd 100644 --- a/clib/jlexer.c +++ b/clib/jlexer.c @@ -83,6 +83,11 @@ void jlexer_init(jlexer_t * lexer, rcache_t * cache) { lexer->tokpos = 0; lexer->letter = EOF; lexer->rewind = false; + lexer->jpos = 0; +} + +int jlexer_gettokbegin(jlexer_t * lexer) { + return lexer->jpos - lexer->tokpos; } int jlexer_gettoken(jlexer_t * lexer, char* token) { @@ -90,6 +95,7 @@ int jlexer_gettoken(jlexer_t * lexer, char* token) { while (true) { if (!lexer->rewind) { lexer->letter = rcache_getc(lexer->cache); + lexer->jpos++; } lexer->rewind = false; int type = get_ltype(lexer->letter); diff --git a/clib/jlexer.h b/clib/jlexer.h index dc64945..49c238e 100644 --- a/clib/jlexer.h +++ b/clib/jlexer.h @@ -12,6 +12,7 @@ typedef struct { char letter; int tokpos; bool rewind; + int jpos; } jlexer_t; @@ -35,6 +36,6 @@ typedef struct { void jlexer_init(jlexer_t * lexer, rcache_t * cache); int jlexer_gettoken(jlexer_t * lexer, char* token); void jlexer_destroy(jlexer_t * lexer); - +int jlexer_gettokbegin(jlexer_t * lexer); #endif diff --git a/clib/jparser.c b/clib/jparser.c index 3807a13..acdf45c 100644 --- a/clib/jparser.c +++ b/clib/jparser.c @@ -31,7 +31,7 @@ void jparser_init(jparser_t * parser, jlexer_t * lexer) { #define MAX_TOKEN_SIZE 1024 -int jparser_parse_array(jparser_t * parser, char* arrname) { +static int jparser_parse_array(jparser_t * parser, char* arrname) { jlexer_t* lex = parser->lexer; char token[MAX_TOKEN_SIZE]; @@ -39,18 +39,67 @@ int jparser_parse_array(jparser_t * parser, char* arrname) { int pos = 0; - while ((type = jlexer_gettoken(lex, token)) != JLEXTOK_END) { - log_debug("pos %d tok 0x%02x: %s\n", pos, type, token); - - if (type == JLEXTOK_ARRE) { - return 1; + log_debug("Array parser pos %d tok 0x%02x: %s", pos, type, token); + switch (pos) { + // POS 0 + case 0:{ + if (type == JLEXTOK_SEPAR) { + break; + } + if (type == JLEXTOK_ARRE) { + return 1; + } + if (type == JLEXTOK_INTEG) { + char* val = strcopy(token); + char* eptr = NULL; + int64_t integ = (int64_t)strtol(val, &eptr, 10);; + free(val); + log_debug("Parser integer array element %s = %d", arrname, integ); + } + if (type == JLEXTOK_FLOAT) { + char* val = strcopy(token); + char* eptr = NULL; + double numb = (double)strtod(val, &eptr); + log_debug("Parser float array element %s = %f", arrname, numb); + free(val); + } + if (type == JLEXTOK_RAWSTR) { + char* val = strcopy(token); + bool isbool = false; + bool bval = false; + if (strcmp(val, "true") == 0) { + isbool = true; + bval = true; + } + if (strcmp(val, "false") == 0) { + isbool = true; + bval = false; + } + free(val); + if (isbool) { + log_debug("Parser bool array element %s = %d", arrname, bval); + break; + } + log_error("Wrong array value token: %s", token); + return -1; + } + break; + } + case 1:{ + if (type == JLEXTOK_ARRE) { + return 1; + } + if (type == JLEXTOK_SEPAR) { + pos = 0; + break; + } + log_error("Wrong array value token: %s", token); + return -1; + } } - - } return 1; - } int jparser_parse(jparser_t * parser) { @@ -62,7 +111,7 @@ int jparser_parse(jparser_t * parser) { char* key = ""; while ((type = jlexer_gettoken(lex, token)) != JLEXTOK_END) { - log_debug("pos %d tok 0x%02x: %s\n", pos, type, token); + log_debug("Parser pos %d tok 0x%02x: %s", pos, type, token); switch (pos) { // POS 0 case 0:{ @@ -90,7 +139,7 @@ int jparser_parse(jparser_t * parser) { if (type == JLEXTOK_BLOCKE) return 0; if (type != JLEXTOK_WORD) { - log_error("Wrong word token: %s", token); + log_error("Wrong word token: %s in pos %d", token, jlexer_gettokbegin(lex)); return -1; } key = strcopy(token); @@ -137,6 +186,11 @@ int jparser_parse(jparser_t * parser) { break; } if (type == JLEXTOK_INTEG) { + if (strcmp(token, "-") == 0 || strcmp(token, "+") == 0) { + log_error("Wrong integer token: %s in pos %d", token, jlexer_gettokbegin(lex)); + return -1; + } + char* val = strcopy(token); jkval_t* kv = &(parser->kvalarr[parser->kvalsize]); kv->key = strcopy(key); @@ -145,26 +199,30 @@ int jparser_parse(jparser_t * parser) { kv->integ = (int64_t)strtol(val, &eptr, 10);; free(val); free(key); - log_debug("Parser added integer key %s = %d", kv->key, kv->integ); + log_debug("Parser added integer key-value %s = %d", kv->key, kv->integ); parser->kvalsize++; pos++; break; } if (type == JLEXTOK_FLOAT) { + if (strcmp(token, "-") == 0 || strcmp(token, "+") == 0) { + log_error("Wrong integer token: %s in pos %d", token, jlexer_gettokbegin(lex)); + return -1; + } + char* val = strcopy(token); jkval_t* kv = &(parser->kvalarr[parser->kvalsize]); kv->key = strcopy(key); kv->type = JVALTYPE_FLOAT; char* eptr = NULL; kv->numb = (double)strtod(val, &eptr); - log_debug("Parser added float key %s = %f", kv->key, kv->numb); + log_debug("Parser added float key-value %s = %f", kv->key, kv->numb); free(val); free(key); parser->kvalsize++; pos++; break; } - if (type == JLEXTOK_RAWSTR) { char* val = strcopy(token); bool isbool = false; @@ -177,16 +235,20 @@ int jparser_parse(jparser_t * parser) { isbool = true; bval = false; } + free(val); if (isbool) { jkval_t* kv = &(parser->kvalarr[parser->kvalsize]); kv->key = strcopy(key); - log_debug("Parser added bool key %s = %d", kv->key, bval); + log_debug("Parser added bool key-value %s = %d", kv->key, bval); kv->type = JVALTYPE_BOOL; kv->flag = bval; free(key); parser->kvalsize++; pos++; break; + } else { + log_error("Wrong bool token: %s in pos %d", token, jlexer_gettokbegin(lex)); + return -1; } } if (type == JLEXTOK_ARRB) { @@ -200,7 +262,7 @@ int jparser_parse(jparser_t * parser) { pos++; break; } - log_error("Wrong value token: %s", token); + log_error("Uknown token: %s in pos %d", token, jlexer_gettokbegin(lex)); return -1; } @@ -216,7 +278,7 @@ int jparser_parse(jparser_t * parser) { //log_debug("Block ended: %s", token); return 0; } else if (type != JLEXTOK_NEXT && type != JLEXTOK_BLOCKE) { - log_error("Wrong next token: %s", token); + log_error("Wrong next token: %s in pos %d", token, jlexer_gettokbegin(lex)); return -1; } pos = 1; diff --git a/clib/test.json b/clib/test.json index 6601441..95de0f8 100644 --- a/clib/test.json +++ b/clib/test.json @@ -1 +1 @@ -{"id":-123, "name": "qwerty", "size": -12345E3, "exists": true, "intarr": [ 11E1, 12, 13 ], "a\"b.c": 567.123 } +{"id": 123, "name": "qwerty", "size": -12345E3, "exists": true, "intarr": [ 11E1, 12, 13, true ], "a\"b.c": 567.123 } diff --git a/config.h b/config.h index 50ee4a4..1d4b43c 100644 --- a/config.h +++ b/config.h @@ -2,8 +2,8 @@ #ifndef CONFIG_H_QWER #define CONFIG_H_QWER -static const char *srv_runpath = "/var/run/cworker/cworker.pid"; -static const char *srv_logpath = "/var/log/cworker/cworker.log"; -static const char *srv_configpath = "/app/etc/cworker/cworker.conf"; +static const char *srv_runpath = "/home/ziggi/projects/cworker/run/cworker.pid"; +static const char *srv_logpath = "/home/ziggi/projects/cworker/log/cworker.log"; +static const char *srv_configpath = "/home/ziggi/projects/cworker//cworker.conf"; #endif diff --git a/config.status b/config.status index 82c4b35..addaf54 100755 --- a/config.status +++ b/config.status @@ -1,4 +1,4 @@ -#! /bin/bash +#! /bin/sh # Generated by configure. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging @@ -8,7 +8,7 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=${CONFIG_SHELL-/bin/bash} +SHELL=${CONFIG_SHELL-/bin/sh} export SHELL ## -------------------- ## ## M4sh Initialization. ## @@ -420,7 +420,7 @@ $config_commands Report bugs to the package provider." -ac_cs_config='--prefix=/app' +ac_cs_config='--enable-devel-mode' ac_cs_version="\ cworker config.status 0.0.1 configured by ./configure, generated by GNU Autoconf 2.71, @@ -430,7 +430,7 @@ Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/home/ziggi/Projects/cworker' +ac_pwd='/home/ziggi/projects/cworker' srcdir='.' INSTALL='/usr/bin/install -c' MKDIR_P='/usr/local/bin/gmkdir -p' @@ -512,10 +512,10 @@ if $ac_cs_silent; then fi if $ac_cs_recheck; then - set X /bin/bash './configure' '--prefix=/app' $ac_configure_extra_args --no-create --no-recursion + set X /bin/sh './configure' '--enable-devel-mode' $ac_configure_extra_args --no-create --no-recursion shift - \printf "%s\n" "running CONFIG_SHELL=/bin/bash $*" >&6 - CONFIG_SHELL='/bin/bash' + \printf "%s\n" "running CONFIG_SHELL=/bin/sh $*" >&6 + CONFIG_SHELL='/bin/sh' export CONFIG_SHELL exec "$@" fi @@ -549,7 +549,7 @@ enable_static='yes' pic_mode='default' enable_fast_install='needless' shared_archive_member_spec='' -SHELL='/bin/bash' +SHELL='/bin/sh' ECHO='printf %s\n' PATH_SEPARATOR=':' host_alias='' @@ -811,20 +811,20 @@ S["am__EXEEXT_FALSE"]="" S["am__EXEEXT_TRUE"]="#" S["LTLIBOBJS"]="" S["app_name"]="cworker" -S["app_cachedir"]="/var/cache/cworker" -S["APP_CACHEDIR"]="/var/cache/cworker" -S["app_databasedir"]="/var/db/cworker" -S["APP_DATABASEDIR"]="/var/db/cworker" -S["app_user"]="www" -S["APP_USER"]="www" -S["app_libdir"]="/app/lib/cworker" -S["APP_LIBDIR"]="/app/lib/cworker" -S["app_rundir"]="/var/run/cworker" -S["APP_RUNDIR"]="/var/run/cworker" -S["app_logdir"]="/var/log/cworker" -S["APP_LOGDIR"]="/var/log/cworker" -S["app_configdir"]="/app/etc/cworker" -S["APP_CONFIGDIR"]="/app/etc/cworker" +S["app_cachedir"]="/home/ziggi/projects/cworker/cache" +S["APP_CACHEDIR"]="/home/ziggi/projects/cworker/cache" +S["app_databasedir"]="/home/ziggi/projects/cworker/data" +S["APP_DATABASEDIR"]="/home/ziggi/projects/cworker/data" +S["app_user"]="ziggi" +S["APP_USER"]="ziggi" +S["app_libdir"]="/home/ziggi/projects/cworker/lib" +S["APP_LIBDIR"]="/home/ziggi/projects/cworker/lib" +S["app_rundir"]="/home/ziggi/projects/cworker/run" +S["APP_RUNDIR"]="/home/ziggi/projects/cworker/run" +S["app_logdir"]="/home/ziggi/projects/cworker/log" +S["APP_LOGDIR"]="/home/ziggi/projects/cworker/log" +S["app_configdir"]="/home/ziggi/projects/cworker/" +S["APP_CONFIGDIR"]="/home/ziggi/projects/cworker/" S["SYSTEMD_FALSE"]="" S["SYSTEMD_TRUE"]="#" S["LINUX_OS_FALSE"]="" @@ -901,12 +901,12 @@ S["mkdir_p"]="$(MKDIR_P)" S["MKDIR_P"]="/usr/local/bin/gmkdir -p" S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s" S["STRIP"]="strip" -S["install_sh"]="${SHELL} /home/ziggi/Projects/cworker/install-sh" -S["MAKEINFO"]="${SHELL} /home/ziggi/Projects/cworker/missing makeinfo" -S["AUTOHEADER"]="${SHELL} /home/ziggi/Projects/cworker/missing autoheader" -S["AUTOMAKE"]="${SHELL} /home/ziggi/Projects/cworker/missing automake" -S["AUTOCONF"]="${SHELL} /home/ziggi/Projects/cworker/missing autoconf" -S["ACLOCAL"]="${SHELL} /home/ziggi/Projects/cworker/missing aclocal" +S["install_sh"]="${SHELL} /home/ziggi/projects/cworker/install-sh" +S["MAKEINFO"]="${SHELL} /home/ziggi/projects/cworker/missing makeinfo" +S["AUTOHEADER"]="${SHELL} /home/ziggi/projects/cworker/missing autoheader" +S["AUTOMAKE"]="${SHELL} /home/ziggi/projects/cworker/missing automake" +S["AUTOCONF"]="${SHELL} /home/ziggi/projects/cworker/missing autoconf" +S["ACLOCAL"]="${SHELL} /home/ziggi/projects/cworker/missing aclocal" S["VERSION"]="0.0.1" S["PACKAGE"]="cworker" S["CYGPATH_W"]="echo" @@ -919,8 +919,8 @@ S["host_alias"]="" S["build_alias"]="" S["LIBS"]="" S["ECHO_T"]="" -S["ECHO_N"]="" -S["ECHO_C"]="\\c" +S["ECHO_N"]="-n" +S["ECHO_C"]="" S["DEFS"]="-DHAVE_CONFIG_H" S["mandir"]="${datarootdir}/man" S["localedir"]="${datarootdir}/locale" @@ -943,7 +943,7 @@ S["libexecdir"]="${exec_prefix}/libexec" S["sbindir"]="${exec_prefix}/sbin" S["bindir"]="${exec_prefix}/bin" S["program_transform_name"]="s,x,x," -S["prefix"]="/app" +S["prefix"]="/usr/local" S["exec_prefix"]="${prefix}" S["PACKAGE_URL"]="" S["PACKAGE_BUGREPORT"]="" @@ -952,7 +952,7 @@ S["PACKAGE_VERSION"]="0.0.1" S["PACKAGE_TARNAME"]="cworker" S["PACKAGE_NAME"]="cworker" S["PATH_SEPARATOR"]=":" -S["SHELL"]="/bin/bash" +S["SHELL"]="/bin/sh" S["am__quote"]="" _ACAWK cat >>"$ac_tmp/subs1.awk" <<_ACAWK && @@ -1040,13 +1040,13 @@ D["HAVE_MEMSET"]=" 1" D["HAVE_MKDIR"]=" 1" D["HAVE_SETLOCALE"]=" 1" D["HAVE_SOCKET"]=" 1" -D["APP_CONFIGDIR"]=" \"/app/etc/cworker\"" -D["APP_LOGDIR"]=" \"/var/log/cworker\"" -D["APP_RUNDIR"]=" \"/var/run/cworker\"" -D["APP_LIBDIR"]=" \"/app/lib/cworker\"" -D["APP_USER"]=" \"www\"" -D["APP_DATABASEDIR"]=" \"/var/db/cworker\"" -D["APP_CACHEDIR"]=" \"/var/cache/cworker\"" +D["APP_CONFIGDIR"]=" \"/home/ziggi/projects/cworker/\"" +D["APP_LOGDIR"]=" \"/home/ziggi/projects/cworker/log\"" +D["APP_RUNDIR"]=" \"/home/ziggi/projects/cworker/run\"" +D["APP_LIBDIR"]=" \"/home/ziggi/projects/cworker/lib\"" +D["APP_USER"]=" \"ziggi\"" +D["APP_DATABASEDIR"]=" \"/home/ziggi/projects/cworker/data\"" +D["APP_CACHEDIR"]=" \"/home/ziggi/projects/cworker/cache\"" for (key in D) D_is_set[key] = 1 FS = "" } diff --git a/cworker.c b/cworker.c index 1002263..f1a9c4e 100644 --- a/cworker.c +++ b/cworker.c @@ -291,10 +291,10 @@ int cworker_handler(const cworker_t* worker, int socket) { int64_t timeout = 0; char* name = "none"; - if (jparser_bind(&parser, JVALTYPE_NUM, "id", (void *)&id) < 0) { + if (jparser_bind(&parser, JVALTYPE_INTEG, "id", (void *)&id) < 0) { log_error("Cannot bind id"); } - if (jparser_bind(&parser, JVALTYPE_NUM, "timeout", (void *)&timeout) < 0) { + if (jparser_bind(&parser, JVALTYPE_INTEG, "timeout", (void *)&timeout) < 0) { log_error("Cannot bind timeout"); } diff --git a/defines.h b/defines.h index a04f3db..721850c 100644 --- a/defines.h +++ b/defines.h @@ -2,25 +2,25 @@ /* defines.h.in. Generated from configure.ac by autoheader. */ /* location of cache dir */ -#define APP_CACHEDIR "/var/cache/cworker" +#define APP_CACHEDIR "/home/ziggi/projects/cworker/cache" /* location of configuration files for ${PACKAGE} */ -#define APP_CONFIGDIR "/app/etc/cworker" +#define APP_CONFIGDIR "/home/ziggi/projects/cworker/" /* location of database dir */ -#define APP_DATABASEDIR "/var/db/cworker" +#define APP_DATABASEDIR "/home/ziggi/projects/cworker/data" /* location of libs */ -#define APP_LIBDIR "/app/lib/cworker" +#define APP_LIBDIR "/home/ziggi/projects/cworker/lib" /* location of ${PACKAGE} logdir */ -#define APP_LOGDIR "/var/log/cworker" +#define APP_LOGDIR "/home/ziggi/projects/cworker/log" /* location of pid file */ -#define APP_RUNDIR "/var/run/cworker" +#define APP_RUNDIR "/home/ziggi/projects/cworker/run" /* effective user */ -#define APP_USER "www" +#define APP_USER "ziggi" /* Define to 1 if you have the header file. */ #define HAVE_ARPA_INET_H 1