summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile16
-rw-r--r--README.txt4
-rw-r--r--contrib/build-env-setup/README.md229
-rw-r--r--mingw64-include/regex.h2
-rw-r--r--src/array/array.c2
-rw-r--r--src/array/array.h2
-rw-r--r--src/common/commonbase.c2
-rw-r--r--src/common/commonbase.h2
-rw-r--r--src/entrypoint/gateleenResclone.c2
-rw-r--r--src/gateleen_resclone/gateleen_resclone.c871
-rw-r--r--src/gateleen_resclone/gateleen_resclone.h2
-rw-r--r--src/log/log.c32
-rw-r--r--src/log/log.h25
-rw-r--r--src/mime/mime.c2
-rw-r--r--src/mime/mime.h2
-rw-r--r--src/util_string/util_string.h2
-rw-r--r--src/util_term/util_term.c2
-rw-r--r--src/util_term/util_term.h2
18 files changed, 692 insertions, 509 deletions
diff --git a/Makefile b/Makefile
index 5ce9593..114de79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-# By using this work you agree to the terms and conditions in 'LICENCE.txt'
+# By using this work you agree to the terms and conditions in 'LICENSE.txt'
CC ?=gcc
LD ?=ld
AR ?=ar
-BINEXT ?= .elf
+BINEXT ?=
LIBSEXT ?= .a
TOOLCHAIN ?= lxGcc64
@@ -26,7 +26,7 @@ LDFLAGS ?= -Wl,--no-demangle,--fatal-warnings
ifndef NDEBUG
CFLAGS := $(CFLAGS) -ggdb -O0 -g3
else
- CFLAGS := $(CFLAGS) -ffunction-sections -fdata-sections -O2 "-DNDEBUG=1"
+ CFLAGS := $(CFLAGS) -ffunction-sections -fdata-sections -Os "-DNDEBUG=1"
LDFLAGS := $(LDFLAGS) -Wl,--gc-sections,--as-needed
endif
@@ -44,6 +44,7 @@ ifeq ($(BINEXT),.exe)
LPCREPOSIX := -lpcreposix
endif
+.SILENT:
default: dist
@@ -68,12 +69,13 @@ build/bin/gateleen-resclone$(BINEXT): \
@echo "\n[\033[34mINFO \033[0m] Linking '$@'"
@mkdir -p $(shell dirname $@)
$(CC) -o $@ $(LDFLAGS) $^ $(LIBSDIR) \
+ -Wl,-Bstatic \
-larchive -lcurl -lcJSON $(LPCREPOSIX) $(LPCRE) \
+ -Wl,-Bdynamic \
build/lib/libGateleenResclone$(LIBSEXT): \
build/obj/array/array.o \
build/obj/gateleen_resclone/gateleen_resclone.o \
- build/obj/log/log.o \
build/obj/mime/mime.o \
build/obj/util_term/util_term.o
@echo "\n[\033[34mINFO \033[0m] Archive '$@'"
@@ -86,7 +88,7 @@ dist: clean link
@mkdir -p build dist
@rm -rf build/dist-*
@echo
- @bash -c 'if [[ -n `git status --porcelain` ]]; then echo "[ERROR] Worktree not clean as it should be (see: git status)"; exit 1; fi'
+ @sh -c 'if test -n `git status --porcelain`; then echo "[ERROR] Worktree not clean as it should be (see: git status)"; exit 1; fi'
# Source bundle.
git archive --format=tar "--prefix=dist-src/" HEAD | tar -C build -x
@echo
@@ -103,7 +105,7 @@ dist: clean link
rm -rf build/dist-bin && mkdir -p build/dist-bin
mv -t build/dist-bin \
build/dist-src/README* \
- build/dist-src/LICENCE* \
+ build/dist-src/LICENSE* \
build/dist-src/MANIFEST.INI
mkdir build/dist-bin/bin
mv -t build/dist-bin/bin \
@@ -114,7 +116,7 @@ dist: clean link
@echo "\n[\033[34mINFO \033[0m] DONE: Artifacts created and placed in 'dist'."
@# Dependency Bundle.
$(eval PCKROOT := build/dist-rt)
- @bash -c 'if [ ".exe" = "$(BINEXT)" ]; then \
+ @sh -c 'if test ".exe" = "$(BINEXT)"; then \
rm -rf ./$(PCKROOT); \
mkdir -p ./$(PCKROOT)/bin; \
cp external/$(TOOLCHAIN)/rt/bin/libarchive-13.dll $(PCKROOT)/bin/; \
diff --git a/README.txt b/README.txt
index f8f32d6..a3b93c9 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-# By using this work you agree to the terms and conditions in 'LICENCE.txt'
+# By using this work you agree to the terms and conditions in 'LICENSE.txt'
Gateleen Resclone
=================
@@ -49,7 +49,7 @@ From "gateleenResclone --help":
- libyajl 2.1.0 "http://lloyd.github.io/yajl"
- libarchive 3.3.3 "https://www.libarchive.org/"
-If you prefer to NOT cluttering your system with tons of never again used
+If you prefer to NOT clutter your system with tons of never again used
packages, you have the option to provide the dependencies from within the
project tree itself. For this, place the files as described below.
diff --git a/contrib/build-env-setup/README.md b/contrib/build-env-setup/README.md
new file mode 100644
index 0000000..064f6f8
--- /dev/null
+++ b/contrib/build-env-setup/README.md
@@ -0,0 +1,229 @@
+
+Showcase how to build and install
+=================================
+
+WARN: Do NOT perform any of these steps on your host system! This script
+ MUST only be run on a system which is a
+ just-throw-it-away-if-broken system.
+
+Sometimes happy developers (like me) have no choice but using terribly
+restricted systems where setting up tools to run even something as
+trivial as configure/make/install becomes a nightmare if not impossible.
+I found it to be very handy to have some independent qemu VM at hand
+which lets me install whatever I need, neither with any special software
+nor any annoying privileges on a host machine. Qemu runs portable and in
+user mode even doesn't need any annoying permissions at all.
+
+
+
+## Setup a minimal system in your qemu VM
+
+This setup mainly targets debian. Nevertheless it tries to stay POSIX
+compatible as possible. So setup a minimal install of your system of
+choice and then as soon you've SSH access to a (posix) shell, you're
+ready for the next step.
+
+Still not sure which system to use? Link below provides some candidates.
+HINT: Windows IMHO is a terrible choice. So stop complaining if you go
+this route.
+
+https://en.wikipedia.org/wiki/POSIX#POSIX-oriented_operating_systems
+
+
+
+## Start VM with SSH access
+
+Easiest way to work with your machine is via SSH. Therefore if you've
+chosen to use a qemu VM, make sure you've setup and configured sshd
+properly inside the VM. Then just pass args like those to qemu:
+
+ --device e1000,netdev=n0 --netdev user,id=n0,hostfwd=tcp:127.0.0.1:2222-:22
+
+Started this way, the SSHDaemon inside the VM is accessible from your
+host via "localhost" at port "2222":
+
+ ssh localhost -p2222
+
+I strongly recommend using SSH paired with a well-designed
+terminal-emulator in place of some fancy VGA/GUI emulators or similar.
+Those commandline tools give immediate benefits like copy-pasting of
+script snippets which becomes very handy with the scripts which follow,
+or also with file transfers to get the final build result out the VM. My
+condolence to users which still think windows is the only way to use a
+computer.
+
+
+
+## Configure build environment
+
+Setup environ vars according to your chosen build system. Here are few examlpes:
+
+### Config for debian
+true \
+ && PKGS_TO_ADD="git make gcc ca-certificates libc6-dev cmake autoconf automake libtool m4" \
+ && PKGS_TO_DEL="cmake autoconf automake libtool m4" \
+ && SUDO=sudo \
+ && PKGINIT="$SUDO apt update" \
+ && PKGADD="$SUDO apt install -y --no-install-recommends" \
+ && PKGDEL="$SUDO apt purge -y" \
+ && PKGCLEAN="$SUDO apt clean" \
+ && HOST= \
+ && true
+
+### Config for alpine with mingw
+true \
+ && PKGS_TO_ADD="git make mingw-w64-gcc curl tar musl-dev cmake autoconf automake libtool m4" \
+ && PKGS_TO_DEL="cmake autoconf automake libtool m4" \
+ && SUDO="/home/$USER/.local/bin/sudo" \
+ && PKGINIT=true \
+ && PKGADD="$SUDO apk add" \
+ && PKGDEL="$SUDO apk del" \
+ && PKGCLEAN="$SUDO apk cache clean || true" \
+ && HOST=x86_64-w64-mingw32 \
+ && true
+
+### Setup build env
+true \
+ && GIT_TAG="master" \
+ && LIBARCHIVE_VERSION="3.6.2" \
+ && CURL_VERSION="8.3.0" \
+ && CJSON_VERSION="1.7.15" \
+ && PCRE_VERSION="8.45" \
+ \
+ && CACHE_DIR="/var/tmp" \
+ && INSTALL_ROOT="/usr/${HOST:-local}" \
+ && if test -n "$HOST"; then HOST_="${HOST:?}-" ;fi \
+ && CJSON_URL="https://github.com/DaveGamble/cJSON/archive/refs/tags/v${CJSON_VERSION:?}.tar.gz" \
+ && CJSON_SRCTGZ="/var/tmp/cJSON-${CJSON_VERSION:?}.tgz" \
+ && CJSON_BINTGZ="${CJSON_SRCTGZ%.*}-bin.tgz" \
+ && CURL_VERSION_UGLY="$(echo "$CURL_VERSION"|sed 's;\.;_;g')" \
+ && CURL_URL="https://github.com/curl/curl/archive/refs/tags/curl-${CURL_VERSION_UGLY:?}.tar.gz" \
+ && CURL_SRCTGZ="/var/tmp/curl-${CURL_VERSION:?}.tgz" \
+ && CURL_BINTGZ="${CURL_SRCTGZ%.*}-bin.tgz" \
+ && LIBARCHIVE_URL="https://github.com/libarchive/libarchive/releases/download/v${LIBARCHIVE_VERSION:?}/libarchive-${LIBARCHIVE_VERSION:?}.tar.gz" \
+ && LIBARCHIVE_SRCTGZ="${CACHE_DIR:?}/libarchive-${LIBARCHIVE_VERSION:?}.tgz" \
+ && LIBARCHIVE_BINTGZ="${LIBARCHIVE_SRCTGZ%.*}-bin.tgz" \
+ && PCRE_URL="https://sourceforge.net/projects/pcre/files/pcre/${PCRE_VERSION:?}/pcre-${PCRE_VERSION:?}.tar.gz/download" \
+ && PCRE_SRCTGZ="/var/tmp/pcre-${PCRE_VERSION:?}.tgz" \
+ && PCRE_BINTGZ="${PCRE_SRCTGZ%.*}-bin.tgz" \
+ \
+ && ${PKGINIT:?} && ${PKGADD:?} $PKGS_TO_ADD \
+ && printf '\n Download Dependency Sources\n\n' \
+ && if test ! -e "${CJSON_SRCTGZ:?}"; then true \
+ && echo "Download ${CJSON_URL:?}" \
+ && curl -sSLo "${CJSON_SRCTGZ:?}" "${CJSON_URL:?}" \
+ ;fi \
+ && if test ! -e "${LIBARCHIVE_SRCTGZ:?}"; then true \
+ && echo "Download ${LIBARCHIVE_URL:?}" \
+ && curl -sSLo "${LIBARCHIVE_SRCTGZ:?}" "${LIBARCHIVE_URL:?}" \
+ ;fi \
+ && if test ! -e "${CURL_SRCTGZ:?}"; then true \
+ && echo "Download ${CURL_URL:?}" \
+ && curl -sSLo "${CURL_SRCTGZ:?}" "${CURL_URL:?}" \
+ ;fi \
+ && if test ! -e "${PCRE_SRCTGZ:?}"; then true \
+ && echo "Download ${PCRE_URL:?}" \
+ && curl -sSLo "${PCRE_SRCTGZ:?}" "${PCRE_URL:?}" \
+ ;fi \
+ && if test ! -e "${CJSON_BINTGZ:?}"; then (true \
+ && printf '\n Build cJSON\n\n' \
+ && cd /tmp \
+ && tar xf "${CJSON_SRCTGZ:?}" \
+ && cd "cJSON-${CJSON_VERSION:?}" \
+ && mkdir build build/obj build/lib build/include \
+ && CFLAGS="-Wall -pedantic -fPIC" \
+ && ${HOST_}cc $CFLAGS -c -o build/obj/cJSON.o cJSON.c \
+ && ${HOST_}cc $CFLAGS -shared -o build/lib/libcJSON.so.${CJSON_VERSION:?} build/obj/cJSON.o \
+ && unset CFLAGS \
+ && (cd build/lib \
+ && MIN=${CJSON_VERSION%.*} && MAJ=${MIN%.*} \
+ && ln -s libcJSON.so.${CJSON_VERSION:?} libcJSON.so.${MIN:?} \
+ && ln -s libcJSON.so.${MIN:?} libcJSON.so.${MAJ} \
+ ) \
+ && ${HOST_}ar rcs build/lib/libcJSON.a build/obj/cJSON.o \
+ && cp -t build/. LICENSE README.md \
+ && cp -t build/include/. cJSON.h \
+ && rm -rf build/obj \
+ && (cd build && tar --owner=0 --group=0 -czf "${CJSON_BINTGZ:?}" *) \
+ && cd /tmp \
+ && rm -rf "cJSON-${CJSON_VERSION:?}" \
+ && $SUDO tar -C "${INSTALL_ROOT:?}" -xzf "${CJSON_BINTGZ:?}" \
+ );fi \
+ && if test ! -e "${LIBARCHIVE_BINTGZ}"; then (true \
+ && printf '\n Build libarchive\n\n' \
+ && tar xf "${LIBARCHIVE_SRCTGZ:?}" \
+ && cd "libarchive-${LIBARCHIVE_VERSION:?}" \
+ && ./configure --prefix="${PWD:?}/build/usr_local" --host=${HOST} \
+ --enable-bsdtar=static --enable-bsdcat=static --enable-bsdcpio=static \
+ --disable-rpath --enable-posix-regex-lib \
+ CC=${HOST_}gcc \
+ CPP=${HOST_}cpp \
+ && make clean && make -j$(nproc) && make install \
+ && (cd build/usr_local \
+ && rm -rf lib/pkgconfig lib/libarchive.la \
+ && tar --owner=0 --group=0 -czf "${LIBARCHIVE_BINTGZ:?}" * \
+ && md5sum -b "${LIBARCHIVE_BINTGZ:?}" > "${LIBARCHIVE_BINTGZ:?}.md5" \
+ ) \
+ && cd .. && rm -rf "libarchive-${LIBARCHIVE_VERSION:?}" \
+ && $SUDO tar -C "${INSTALL_ROOT:?}" -xzf "${LIBARCHIVE_BINTGZ:?}" \
+ );fi \
+ && if test ! -e "${CURL_BINTGZ:?}"; then (true \
+ && printf '\n Build curl\n\n' \
+ && cd /tmp \
+ && tar xf "${CURL_SRCTGZ:?}" \
+ && cd "curl-curl-${CURL_VERSION_UGLY:?}" \
+ && autoreconf -fi \
+ && if test -n "$HOST"; then HORSCHT="--host=${HOST:?}";fi \
+ && ./configure --prefix="$PWD/build/usr_local" --enable-http --with-nghttp2 --with-nghttp3 --disable-alt-svc --disable-ares --disable-aws --disable-basic-auth --disable-bearer-auth --disable-bindlocal --disable-cookies --disable-curldebug --disable-dateparse --disable-debug --disable-dependency-tracking --disable-dict --disable-digest-auth --disable-dnsshuffle --disable-doh --disable-ech --disable-file --disable-form-api --disable-ftp --disable-get-easy-options --disable-gopher --disable-headers-api --disable-hsts --disable-http-auth --disable-imap --enable-ipv6 --disable-kerberos-auth --disable-largefile --disable-ldap --disable-ldaps --disable-libcurl-option --disable-libtool-lock --enable-manual --disable-mime --disable-mqtt --disable-negotiate-auth --disable-netrc --enable-ntlm --enable-ntlm-wb --disable-openssl-auto-load-config --disable-optimize --disable-pop3 --disable-progress-meter --enable-proxy --disable-pthreads --disable-rt --disable-rtsp --disable-smb --enable-smtp --disable-socketpair --disable-sspi --disable-symbol-hiding --disable-telnet --disable-tftp --disable-threaded-resolver --disable-tls-srp --disable-unix-sockets --disable-verbose --disable-versioned-symbols --disable-warnings --disable-websockets --disable-werror --without-schannel --without-secure-transport --without-amissl --without-ssl --without-openssl --without-gnutls --without-mbedtls --without-wolfssl --without-bearssl --without-rustls --without-test-nghttpx --without-test-caddy --without-test-httpd --without-pic --without-aix-soname --without-gnu-ld --without-sysroot --without-mingw1-deprecated --without-hyper --without-zlib --without-brotli --without-zstd --without-ldap-lib --without-lber-lib --without-gssapi-includes --without-gssapi-libs --without-gssapi --without-default-ssl-backend --without-random --without-ca-bundle --without-ca-path --without-ca-fallback --without-libpsl --without-libgsasl --without-librtmp --without-winidn --without-libidn2 --without-ngtcp2 --without-quiche --without-msh3 \
+ --without-zsh-functions-dir --without-fish-functions-dir CFLAGS=-fPIC $HORSCHT \
+ && make clean && make -j$(nproc) && make install \
+ && (cd build/usr_local && rm -rf share/aclocal bin/curl-config lib/libcurl.la lib/pkgconfig) \
+ && (cd build/usr_local && tar --owner=0 --group=0 -czf "${CURL_BINTGZ:?}" *) \
+ && cd /tmp \
+ && rm -rf "curl-curl-${CURL_VERSION_UGLY:?}" \
+ && $SUDO tar -C "${INSTALL_ROOT:?}" -xzf "${CURL_BINTGZ:?}" \
+ );fi \
+ && if test -n "$HOST" -a ! -e "${PCRE_BINTGZ:?}"; then (true \
+ && printf '\n Build pcre\n\n' \
+ && cd /tmp \
+ && tar xf "${PCRE_SRCTGZ:?}" \
+ && cd "pcre-${PCRE_VERSION:?}" \
+ && ./configure --prefix="$PWD/build/usr_local" --host=${HOST:?} --disable-cpp --enable-utf \
+ && make clean && make -j$(nproc) && make install \
+ && (cd build/usr_local \
+ && rm -rf lib/libpcre.la lib/pkgconfig lib/libpcreposix.la bin/pcre-config \
+ && tar --owner=0 --group=0 -czf "${PCRE_BINTGZ:?}" * \
+ ) \
+ && cd /tmp \
+ && rm -rf "pcre-${PCRE_VERSION:?}" \
+ && $SUDO tar -C "${INSTALL_ROOT:?}" -xzf "${PCRE_BINTGZ:?}" \
+ );fi \
+ && ${PKGDEL:?} $PKGS_TO_DEL && ${PKGCLEAN:?} \
+ && true
+
+### Make
+true \
+ && WORKDIR="/home/${USER:?}/work" \
+ \
+ && printf '\n Build GateleenResclone\n\n' \
+ && mkdir -p "${WORKDIR:?}" && cd "${WORKDIR:?}" \
+ && git clone --depth 42 --branch "${GIT_TAG:?}" https://github.com/hiddenalpha/GateleenResclone.git . \
+ && git config advice.detachedHead false \
+ && git checkout --detach "${GIT_TAG:?}" \
+ && if echo $HOST|grep -q '\-mingw'; then true \
+ && HORSCHT="TOOLCHAIN=mingw CC=$HOST-cc LD=$HOST-ld AR=$HOST-ar BINEXT=.exe LIBSEXT=.lib" \
+ && tmpfile="$(mktemp "/tmp/XXXXXXXXXXXXXXXX")" \
+ && mv Makefile "${tmpfile:?}" && cat "${tmpfile:?}" \
+ | sed -E 's;^CFLAGS \?=(.*)?$;CFLAGS ?= -DPCRE_STATIC=1 -DCURL_STATICLIB=1 \1;' \
+ | sed -E 's;-larchive;/usr/x86_64-w64-mingw32/lib/libarchive.a;' \
+ | sed -E 's;(-Wl,-Bdynamic);\1 -lws2_32 -lbcrypt;' \
+ | grep -v 'Worktree not clean as it should be' \
+ > Makefile \
+ && rm "${tmpfile:?}" \
+ ;fi \
+ && make clean $HORSCHT && make -e -j$(nproc) $HORSCHT \
+ && dirOfDistBundle="$(realpath dist)" \
+ && printf '\n SUCCESS :) Distribution bundle is ready in:\n\n %s\n\n Tip: Before pulling out your hair about how to get that archive out of\n your qemu VM. STOP kluding around with silly tools and learn how\n basic tools do the job perfectly fine. So go to your host and run:\n\n ssh %s@localhost -p2222 -- sh -c '\''true && cd "%s" && tar c *'\'' | tar x\n\n' "${dirOfDistBundle:?}" "$USER" "${dirOfDistBundle:?}" \
+ && true
+
+
diff --git a/mingw64-include/regex.h b/mingw64-include/regex.h
index 21d6cc4..8692182 100644
--- a/mingw64-include/regex.h
+++ b/mingw64-include/regex.h
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
#ifndef INCGUARD_4271049675ab4024740579a2e97a9704
#define INCGUARD_4271049675ab4024740579a2e97a9704
diff --git a/src/array/array.c b/src/array/array.c
index d936851..083249b 100644
--- a/src/array/array.c
+++ b/src/array/array.c
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
/* This */
#include "array.h"
diff --git a/src/array/array.h b/src/array/array.h
index faad036..b50d3a4 100644
--- a/src/array/array.h
+++ b/src/array/array.h
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
#ifndef INCGUARD_6dff7e511be9d0848804e8d1e2dc23a4
#define INCGUARD_6dff7e511be9d0848804e8d1e2dc23a4
diff --git a/src/common/commonbase.c b/src/common/commonbase.c
index 87314a8..45bb5cb 100644
--- a/src/common/commonbase.c
+++ b/src/common/commonbase.c
@@ -1,2 +1,2 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
diff --git a/src/common/commonbase.h b/src/common/commonbase.h
index 23f0418..fba00bf 100644
--- a/src/common/commonbase.h
+++ b/src/common/commonbase.h
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
#ifndef INCGUARD_0835dec38b8927b0daeba484a1eb21e7
#define INCGUARD_0835dec38b8927b0daeba484a1eb21e7
diff --git a/src/entrypoint/gateleenResclone.c b/src/entrypoint/gateleenResclone.c
index 152740c..76c8175 100644
--- a/src/entrypoint/gateleenResclone.c
+++ b/src/entrypoint/gateleenResclone.c
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
/* Project */
#include "gateleen_resclone.h"
diff --git a/src/gateleen_resclone/gateleen_resclone.c b/src/gateleen_resclone/gateleen_resclone.c
index a49990f..daf1556 100644
--- a/src/gateleen_resclone/gateleen_resclone.c
+++ b/src/gateleen_resclone/gateleen_resclone.c
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
/* This Unit */
#include "gateleen_resclone.h"
@@ -8,7 +8,6 @@
#include <errno.h>
#include <libgen.h>
#include <regex.h>
-#include <stdbool.h>
#include <string.h>
/* Libs */
@@ -19,7 +18,6 @@
/* Project */
#include "array.h"
-#include "log.h"
#include "mime.h"
#include "util_string.h"
@@ -31,129 +29,124 @@
/** Operation mode. */
-typedef enum opMode {
+typedef enum OpMode {
MODE_NULL =0,
MODE_FETCH=1,
MODE_PUSH =2
-} opMode_t;
+} OpMode;
/** Main module handle representing an instance. */
-typedef struct this {
- enum opMode mode;
+typedef struct Resclone {
+ enum OpMode mode;
/** Base URL where to upload to / download from. */
char *url;
/** Array of regex patterns to use per segment. */
regex_t *filter;
size_t filter_len;
/** Says if only start or whole path needs to match the pattern. */
- bool isFilterFull;
+ int isFilterFull;
/* Path to archive file to use. Using stdin/stdout if NULL. */
char *file;
-} this_t;
+} Resclone;
/** Closure for a download instructed by external caller. */
-typedef struct cls_dload {
- struct this *this;
+typedef struct ClsDload {
+ struct Resclone *resclone;
char *rootUrl;
struct archive *dstArchive;
struct archive_entry *tmpEntry;
char *archiveFile;
CURL *curl;
-} cls_dload_t;
+} ClsDload;
/** Closure for a collection (directory) download. */
-typedef struct cls_resourceDir {
- struct cls_dload *dload;
+typedef struct ResourceDir {
+ struct ClsDload *dload;
//yajl_handle yajl; <- TODO Obsolete
- struct cls_resourceDir *parentDir;
+ struct ResourceDir *parentDir;
char *rspBody;
size_t rspBody_len;
size_t rspBody_cap;
short rspCode;
char *name;
-} cls_resourceDir_t;
+} ResourceDir;
/** Closure for a file download. */
-typedef struct cls_resourceFile {
- struct cls_dload *dload;
+typedef struct ResourceFile {
+ struct ClsDload *dload;
size_t srcChunkIdx;
char *url;
char *buf;
int buf_len;
int buf_memSz;
-} cls_resourceFile_t;
+} ResourceFile;
/** Closure for an upload instructed by external caller. */
-typedef struct cls_upload {
- struct this *this;
+typedef struct Upload {
+ struct Resclone *resclone;
char *rootUrl;
char *archiveFile;
struct archive *srcArchive;
CURL *curl;
-} cls_upload_t;
+} Upload;
/** Closure for a PUT of a single resource. */
-typedef struct cls_put {
- struct cls_upload *upload;
+typedef struct Put {
+ struct Upload *upload;
/* Path (relative to rootUrl) of the resource to be uploaded. */
char *name;
-} cls_put_t;
+} Put;
/* Operations ****************************************************************/
-TPL_ARRAY( str, char*, 16 );
+TPL_ARRAY(str, char*, 16);
-static void
-printHelp( void )
-{
- char filename[sizeof(__FILE__)];
- strcpy( filename, __FILE__ );
+static void printHelp( void ){
printf("%s%s%s",
- "\n"
- " ", basename(filename), " - " STR_QUOT(PROJECT_VERSION) "\n"
- "\n"
- "Options:\n"
- "\n"
+ " \n"
+ " ", strrchr(__FILE__,'/')+1, " - " STR_QUOT(PROJECT_VERSION) "\n"
+ " \n"
+ " Options:\n"
+ " \n"
" --pull|--push\n"
" Choose to download or upload.\n"
- "\n"
+ " \n"
" --url <url>\n"
- " Root node of remote tree.\n"
- "\n"
+ " Root node of remote tre\n"
+ " \n"
" --filter-part <path-filter>\n"
- " Regex pattern applied as predicate to the path starting after the path\n"
- " specified in '--url'. Each path segment will be handled as its\n"
- " individual pattern. If there are longer paths to process, they will be\n"
- " accepted, as long they at least start-with specified filter.\n"
+ " Regex pattern applied as predicate to the path starting after\n"
+ " the path specified in '--url'. Each path segment will be\n"
+ " handled as its individual pattern. If there are longer paths to\n"
+ " process, they will be accepted, as long they at least\n"
+ " start-with specified filter.\n"
" Example: /foo/[0-9]+/bar\n"
- "\n"
+ " \n"
" --filter-full <path-filter>\n"
- " Nearly same as '--filter-part'. But paths with more segments than the\n"
- " pattern, will be rejected.\n"
- "\n"
+ " Nearly same as '--filter-part'. But paths with more segments\n"
+ " than the pattern, will be rejected.\n"
+ " \n"
" --file <path.tar>\n"
" (optional) Path to the archive file to read/write. Defaults to\n"
" stdin/stdout if ommitted.\n"
- "\n"
+ " \n"
+ " \n"
);
}
-static int
-parseArgs( int argc, char**argv, opMode_t*mode, char**url, regex_t**filter, size_t*filter_cnt,
- bool*isFilterFull, char**file )
-{
- ssize_t err, ret=0;
+static int parseArgs( int argc, char**argv, OpMode*mode, char**url, regex_t**filter, size_t*filter_cnt, int*isFilterFull, char**file ){
+ ssize_t err;
char *filterRaw = NULL;
if( argc == -1 ){ // -1 indicates the call to free our resources. So simply jump
goto fail; // to 'fail' because that has the same effect.
@@ -162,95 +155,94 @@ parseArgs( int argc, char**argv, opMode_t*mode, char**url, regex_t**filter, size
*url = NULL;
*filter = NULL;
*filter_cnt = 0;
- *isFilterFull = false;
+ *isFilterFull = 0;
*file = NULL;
for( int i=1 ; i<argc ; ++i ){
char *arg = argv[i];
if( !strcmp(arg,"--help") ){
printHelp();
- ret = -1; goto fail;
+ err = -1; goto fail;
}else if( !strcmp(arg,"--pull") ){
if( *mode ){
printf("%s\n","ERROR: Mode already specified. Won't set '--pull'.");
- ret = -1; goto fail;
+ err = -1; goto fail;
}
*mode = MODE_FETCH;
}else if( !strcmp(arg,"--push") ){
if( *mode ){
printf("%s\n","ERROR: Mode already specified. Won't set '--push'.");
- ret = -1; goto fail;
+ err = -1; goto fail;
}
*mode = MODE_PUSH;
}else if( !strcmp(arg,"--url") ){
if(!( arg=argv[++i]) ){
printf("%s\n","ERROR: Arg '--url' needs a value.");
- ret = -1; goto fail;
+ err = -1; goto fail;
}
*url = arg;
}else if( !strcmp(arg,"--filter-full") ){
if(!( arg=argv[++i] )){
printf("%s\n","ERROR: Arg '--filter-full' needs a value.");
- ret = -1; goto fail; }
+ err = -1; goto fail; }
if( filterRaw ){
printf("%s\n","ERROR: Cannot use '--filter-full' because a filter is already set.");
- ret=-1; goto fail; }
+ err=-1; goto fail; }
filterRaw = arg;
- *isFilterFull = true;
+ *isFilterFull = !0;
}else if( !strcmp(arg,"--filter-part") ){
if(!( arg=argv[++i] )){
printf("%s\n","ERROR: Arg '--filter-part' needs a value.");
- ret = -1; goto fail; }
+ err = -1; goto fail; }
if( filterRaw ){
printf("%s\n","ERROR: Cannot use '--filter-part' because a filter is already set.");
- ret=-1; goto fail; }
+ err = -1; goto fail; }
filterRaw = arg;
- *isFilterFull = false;
+ *isFilterFull = 0;
}else if( !strcmp(arg,"--file") ){
if(!( arg=argv[++i]) ){
printf("%s\n","ERROR: Arg '--file' needs a value.");
- ret = -1; goto fail;
+ err = -1; goto fail;
}
*file = arg;
}else{
printf("%s%s\n", "ERROR: Unknown arg ",arg);
- ret = -1; goto fail;
+ err = -1; goto fail;
}
}
- if( *mode==0 ){
- printf("%s\n", "ERROR: One of --push or --pull required.");
- ret = -1; goto fail;
+ if( *mode == 0 ){
+ printf("ERROR: One of --push or --pull required.\n");
+ err = -1; goto fail;
}
if( *url==NULL ){
- printf("%s\n", "ERROR: Arg --url missing.");
- ret = -1; goto fail;
+ printf("ERROR: Arg --url missing.\n");
+ err = -1; goto fail;
}
- uint_t urlFromArgs_len = strlen( *url );
+ uint_t urlFromArgs_len = strlen(*url);
if( ((*url)[urlFromArgs_len-1]) != '/' ){
char *urlFromArgs = *url;
uint_t url_len = urlFromArgs_len + 1;
*url = malloc(url_len+1); /* TODO: Should we free this? */
- memcpy( *url, urlFromArgs, urlFromArgs_len );
+ memcpy(*url, urlFromArgs, urlFromArgs_len);
(*url)[url_len-1] = '/';
(*url)[url_len] = '\0';
}else{
- *url = strdup( *url ); // Make our own string (so we've no fear to call
- // free on it later)
+ *url = strdup(*url);
}
if( filterRaw ){
- uint_t buf_len = strlen( filterRaw );
- char *buf = malloc( 1+ buf_len +2 );
+ uint_t buf_len = strlen(filterRaw);
+ char *buf = malloc(1 + buf_len + 2);
buf[0] = '_'; // <- Match whole segment.
- memcpy( buf+1, filterRaw, buf_len+1 );
+ memcpy(buf+1, filterRaw, buf_len+1);
char *beg, *end;
size_t filter_cap = 0;
end = buf+1; // <- Initialize at begin for 1st iteration.
for( uint_t iSegm=0 ;; ++iSegm ){
- for( beg=end ; *beg=='/' ; ++beg ); // <- Search for begin and
- for( end=beg ; *end!='/' && *end!='\0' ; ++end ); // <- end of current segment.
+ for( beg=end ; *beg=='/' ; ++beg ); // <- Search for begin and ..
+ for( end=beg ; *end!='/' && *end!='\0' ; ++end ); // <- .. end of current segment.
char origBeg = beg[-1];
char origSep = *end;
char origNext = end[1];
@@ -259,104 +251,110 @@ parseArgs( int argc, char**argv, opMode_t*mode, char**url, regex_t**filter, size
end[1] = '\0'; // <- Temporary terminate to compile segment only.
if( iSegm >= filter_cap ){
filter_cap += 8;
- *filter = realloc( *filter, filter_cap*sizeof(**filter) );
- //LOG_DEBUG("%s%u%s%p\n", "realloc( NULL, ", filter_cap*sizeof(**filter)," ) -> ", *filter );
- if( !*filter ){ LOG_ERROR("%s%d%s\n","realloc(",filter_cap*sizeof(**filter),")"); ret=-ENOMEM; goto fail; }
+ void *tmp = realloc(*filter, filter_cap*sizeof**filter);
+ //fprintf(stderr, "%s%u%s%p\n",
+ // "[DEBUG] realloc(NULL, ", filter_cap*sizeof**filter," ) -> ", tmp);
+ if( tmp == NULL ){
+ fprintf(stderr, "%s%llu%s\n", "[ERROR] realloc(", filter_cap*sizeof**filter, ")");
+ err = -ENOMEM; goto fail; }
+ *filter = tmp;
}
- //LOG_DEBUG("%s%d%s%s%s\n", "filter[", iSegm, "] -> '", beg-1, "'");
- err = regcomp( (*filter)+iSegm, beg-1, REG_EXTENDED);
- if( err ){ LOG_ERROR("%s%s%s%d\n","regcomp(",beg,") -> ", err); return -1; }
- // Restore surrounding stuff.
+ //fprintf(stderr, "%s%d%s%s%s\n", "[DEBUG] filter[", iSegm, "] -> '", beg-1, "'");
+ err = regcomp((*filter)+iSegm, beg-1, REG_EXTENDED);
+ if( err ){
+ fprintf(stderr, "%s%s%s%lld\n", "[ERROR] regcomp(", beg, ") -> ", err);
+ err = -1; goto fail; }
+ /* Restore surrounding stuff. */
beg[-1] = origBeg;
- *end = origSep; // <- Restore tmp 'end-of-match' ($).
- end[1] = origNext; // <- Restore tmp termination.
- if( *end=='\0' ){ // EOF
+ *end = origSep; /* <- Restore tmp 'end-of-match' ($) */
+ end[1] = origNext; /* <- Restore tmp termination. */
+ if( *end == '\0' ){ /* EOF */
*filter_cnt = iSegm +1;
- *filter = realloc( *filter, *filter_cnt *sizeof(**filter) ); // Trim result.
- free( buf ); buf=NULL;
+ *filter = realloc(*filter, *filter_cnt *sizeof(**filter)); /* Trim result. */
+ assert(*filter != NULL);
+ free(buf); buf = NULL;
break;
}
}
}
- if( *mode==MODE_PUSH && *filter ){
- printf("%s\n", "ERROR: Filtering not supported for push mode.");
- ret = -1; goto fail;
+ if( *mode == MODE_PUSH && *filter ){
+ fprintf(stderr, "%s\n", "[ERROR] Filtering not supported for push mode.");
+ err = -1; goto fail;
}
return 0;
- fail:
- free( *url ); *url=NULL;
+fail:
+ free(*url); *url = NULL;
for( uint_t i=0 ; i<*filter_cnt ; ++i ){
- regfree( &(filter[0][i]) );
+ regfree(&(filter[0][i]));
}
*filter_cnt = 0;
- free( *filter ); *filter=NULL;
- return ret;
+ free(*filter); *filter = NULL;
+ return err;
}
-static size_t
-onCurlDirRsp( char*buf , size_t size , size_t nmemb , void*cls_resourceDir_ )
-{
- //LOG_DEBUG( "%s%s%p%s%ld%s%ld%s%p%s\n" , __func__, "( buf=", buf, ", size=", size, ", nmemb=", nmemb, ", cls=", cls_resourceDir_, " )" );
- ssize_t err, ret = size*nmemb;
- cls_resourceDir_t *resourceDir = cls_resourceDir_;
- cls_dload_t *dload = resourceDir->dload;
+static size_t onCurlDirRsp( char*buf, size_t size, size_t nmemb, void*ResourceDir_ ){
+ int err;
+ fprintf(stderr, "%s%s%s%p%s%lld%s%lld%s%p%s\n", "[TRACE] ", __func__, "( buf=", buf,
+ ", size=", size, ", nmemb=", nmemb, ", cls=", ResourceDir_, " )");
+ ResourceDir *resourceDir = ResourceDir_;
+ ClsDload *dload = resourceDir->dload;
CURL *curl = dload->curl;
const size_t buf_len = size * nmemb;
long rspCode;
- curl_easy_getinfo( curl, CURLINFO_RESPONSE_CODE, &rspCode );
+ curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &rspCode);
resourceDir->rspCode = rspCode;
if( rspCode != 200 ){
- goto endFn;
- }
+ return size * nmemb; }
// Collect whole response body into one buf (as cJSON seems unable to parse
// partially)
if( resourceDir->rspBody_cap < resourceDir->rspBody_len + buf_len +1 ){
- // Enlarge buf
+ /* Enlarge buf */
resourceDir->rspBody_cap = resourceDir->rspBody_len + buf_len + 1024;
- resourceDir->rspBody = realloc( resourceDir->rspBody, resourceDir->rspBody_cap );
+ void *tmp = realloc(resourceDir->rspBody, resourceDir->rspBody_cap);
+ if( tmp == NULL ){
+ err = size * nmemb/*TODO could we return anything better here?*/; goto endFn; }
+ resourceDir->rspBody = tmp;
}
- memcpy( resourceDir->rspBody+resourceDir->rspBody_len, buf, buf_len );
+ memcpy(resourceDir->rspBody+resourceDir->rspBody_len, buf, buf_len);
resourceDir->rspBody_len += buf_len;
resourceDir->rspBody[resourceDir->rspBody_len] = '\0';
// Parsing occurs in the caller, as soon we processed whole response.
- endFn:
- return ret;
+ err = size * nmemb;
+endFn:
+ return err;
}
-static size_t
-onResourceChunk( char*buf , size_t size , size_t nmemb , void*cls_resourceFile_ )
-{
- int buf_len = size * nmemb;
- int ret = buf_len;
- cls_resourceFile_t *resourceFile = cls_resourceFile_;
+static size_t onResourceChunk( char*buf, size_t size, size_t nmemb, void*ResourceFile_ ){
+ const int buf_len = size * nmemb;
+ ResourceFile *resourceFile = ResourceFile_;
- int avail = resourceFile->buf_memSz - resourceFile->buf_len;
+ const int avail = resourceFile->buf_memSz - resourceFile->buf_len;
if( avail <= buf_len ){
resourceFile->buf_memSz += buf_len - avail +1;
- resourceFile->buf = realloc( resourceFile->buf , resourceFile->buf_memSz );
+ void *tmp = realloc(resourceFile->buf , resourceFile->buf_memSz);
+ assert(tmp != NULL); /* TODO error handling */
+ resourceFile->buf = tmp;
}
char *it = resourceFile->buf + resourceFile->buf_len;
- memcpy( it , buf , buf_len ); it+=buf_len;
+ memcpy(it, buf, buf_len); it += buf_len;
*it = '\0';
resourceFile->buf_len = it - resourceFile->buf;
- return ret;
+ return buf_len;
}
-static ssize_t
-collectResourceIntoMemory( cls_resourceFile_t*resourceFile , char*url )
-{
- ssize_t err, ret=0;
- cls_dload_t *dload = resourceFile->dload;
+static ssize_t collectResourceIntoMemory( ResourceFile*resourceFile, char*url ){
+ ssize_t err;
+ ClsDload *dload = resourceFile->dload;
CURL *curl = dload->curl;
err = CURLE_OK!= curl_easy_setopt(curl, CURLOPT_URL, url)
@@ -364,375 +362,375 @@ collectResourceIntoMemory( cls_resourceFile_t*resourceFile , char*url )
|| CURLE_OK!= curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, onResourceChunk)
|| CURLE_OK!= curl_easy_setopt(curl, CURLOPT_WRITEDATA, resourceFile)
;
- if( err ){ assert(!err); ret=-1; goto finally; }
+ if( err ){ assert(!err); err = -1; goto endFn; }
- err = curl_easy_perform( curl );
- if( err!=CURLE_OK ){
- LOG_ERROR("%s%s%s%s%ld%s%s\n", __func__, "(): '",url,"' (code ", err, "): ", curl_easy_strerror(err));
- ret=-1; goto finally;
+ err = curl_easy_perform(curl);
+ if( err != CURLE_OK ){
+ fprintf(stderr, "%s%s%s%s%s%lld%s%s\n", "[ERROR] ", __func__, "(): '",
+ url, "' (code ", err, "): ", curl_easy_strerror(err));
+ err = -1; goto endFn;
}
- finally:
- return ret;
+ err = 0;
+endFn:
+ return err;
}
-static ssize_t
-copyBufToArchive( cls_resourceFile_t*resourceFile )
-{
- ssize_t err, ret=0;
- cls_dload_t *dload = resourceFile->dload;
+static ssize_t copyBufToArchive( ResourceFile*resourceFile ){
+ ssize_t err;
+ ClsDload *dload = resourceFile->dload;
char *fileName = resourceFile->url + strlen(resourceFile->dload->rootUrl);
if( ! dload->dstArchive ){
- // Setup archive if not setup yet.
+ /* Setup archive if not setup yet. */
dload->dstArchive = archive_write_new();
- err = archive_write_set_format_pax_restricted( dload->dstArchive )
- || archive_write_open_filename( dload->dstArchive , dload->archiveFile )
+ err = archive_write_set_format_pax_restricted(dload->dstArchive)
+ || archive_write_open_filename(dload->dstArchive, dload->archiveFile)
;
if( err ){
- LOG_ERROR("%s%s%s\n", __func__, "(): Failed to setup tar output: ", archive_error_string(dload->dstArchive));
- ret = -1; goto endFn;
+ fprintf(stderr, "%s%s\n", "[ERROR] Failed to setup tar output: ",
+ archive_error_string(dload->dstArchive));
+ err = -1; goto endFn;
}
}
- if( ! dload->tmpEntry ){
+ if( dload->tmpEntry == NULL ){
dload->tmpEntry = archive_entry_new();
}else{
- dload->tmpEntry = archive_entry_clear( dload->tmpEntry );
+ dload->tmpEntry = archive_entry_clear(dload->tmpEntry);
}
archive_entry_set_pathname(dload->tmpEntry, fileName);
archive_entry_set_filetype(dload->tmpEntry, AE_IFREG);
archive_entry_set_size(dload->tmpEntry, resourceFile->buf_len);
archive_entry_set_perm(dload->tmpEntry, 0644);
err = archive_write_header(dload->dstArchive, dload->tmpEntry);
- if( err ){ ret=-1; goto endFn; }
+ if( err ){ err = -1; goto endFn; }
- ssize_t written = archive_write_data( dload->dstArchive , resourceFile->buf , resourceFile->buf_len );
+ ssize_t written = archive_write_data(dload->dstArchive, resourceFile->buf, resourceFile->buf_len);
if( written < 0 ){
- LOG_ERROR("%s%s%s\n", __func__, "Failed to archive_write_data: ", archive_error_string(dload->dstArchive));
- ret = -1; goto endFn;
+ fprintf(stderr, "%s%s\n", "[ERROR] Failed to archive_write_data: ",
+ archive_error_string(dload->dstArchive));
+ err = -1; goto endFn;
}else if( written != resourceFile->buf_len ){
- LOG_ERROR("%s%s%u%s%lu\n", __func__, "(): archive_write_data failed to write all ", resourceFile->buf_len, " bytes. Instead it wrote ", written);
- ret = -1; goto endFn;
+ fprintf(stderr, "%s%u%s%llu\n", "[ERROR] archive_write_data failed to write all ",
+ resourceFile->buf_len, " bytes. Instead it wrote ", written);
+ err = -1; goto endFn;
}
resourceFile->buf_len = 0;
- endFn:
- return ret;
+ err = 0;
+endFn:
+ return err;
}
/** @return 0:Reject, 1:Accept, <0:ERROR */
-static ssize_t pathFilterAcceptsEntry( cls_dload_t*dload, cls_resourceDir_t*resourceDir, const char*nameOrig )
-{
- ssize_t err, ret=1; // <- Accept per default.
- char *name = strdup( nameOrig );
- uint_t name_len = strlen( name );
+static ssize_t pathFilterAcceptsEntry( ClsDload*dload, ResourceDir*resourceDir, const char*nameOrig ){
+ ssize_t err;
+ char *name = strdup(nameOrig);
+ uint_t name_len = strlen(name);
- if( dload->this->filter ){
+ if( dload->resclone->filter ){
// Count parents to find correct regex to apply.
uint_t idx = 0;
- for( cls_resourceDir_t*it=resourceDir->parentDir ; it ; it=it->parentDir ){ ++idx; }
+ for( ResourceDir*it=resourceDir->parentDir ; it ; it=it->parentDir ){ ++idx; }
// Check if we even have such a long filter at all.
- if( idx >= dload->this->filter_len ){
- if( dload->this->isFilterFull ){
- //LOG_DEBUG("%s\n", "Path longer than --filter-full -> reject.");
- ret = 0; goto finally;
+ if( idx >= dload->resclone->filter_len ){
+ if( dload->resclone->isFilterFull ){
+ //fprintf(stderr, "%s\n", "[DEBUG] Path longer than --filter-full -> reject.");
+ err = 0; goto endFn;
}else{
- //LOG_DEBUG("%s\n", "Path longer than --filter-part -> accept.");
- ret = 1; goto finally;
+ //fprintf(stderr, "%s\n", "[DEBUG] Path longer than --filter-part -> accept.");
+ err = 1; goto endFn;
}
}
// We have a regex. Setup the check.
- bool restoreEndSlash = false;
- if( name[name_len-1]=='/' ){
- restoreEndSlash = true;
+ int restoreEndSlash = 0;
+ if( name[name_len-1] == '/' ){
+ restoreEndSlash = !0;
name[name_len-1] = '\0';
}
- //LOG_DEBUG("%s%u%s%s%s\n", "idx=",idx," name='", name, "'");
- regex_t *filterArr = dload->this->filter;
- regex_t *r = filterArr + (idx);
- err = regexec( r, name, 0, 0, 0 );
- if( ! err ){
- //LOG_DEBUG("%s\n", "Segment accepted by filter.");
- ret = 1;
- }else if( err==REG_NOMATCH ){
- //LOG_DEBUG("%s\n", "Segment rejected by filter.");
- ret = 0;
+ //fprintf(stderr, "%s%u%s%s%s\n", "[DEBUG] idx=", idx," name='", name, "'");
+ regex_t *filterArr = dload->resclone->filter;
+ regex_t *r = filterArr + idx;
+ err = regexec(r, name, 0, 0, 0);
+ if( !err ){
+ //fprintf(stderr, "%s\n", "[DEBUG] Segment accepted by filter.");
+ err = 1; /* fall to restoreEndSlash */
+ }else if( err == REG_NOMATCH ){
+ //fprintf(stderr, "%s\n", "[DEBUG] Segment rejected by filter.");
+ err = 0; /* fall to restoreEndSlash */
}else{
- LOG_ERROR("%s%.*s%s%d\n", "regexec(rgx, '",(int)name_len,name,"') -> ", err );
- ret = -1;
+ fprintf(stderr, "%s%.*s%s%lld\n", "[ERROR] regexec(rgx, '", (int)name_len, name, "') -> ", err);
+ err = -1; /* fall to restoreEndSlash */
}
if( restoreEndSlash ){
name[name_len-1] = '/';
}
- goto finally;
+ goto endFn;
}
- finally:
- free( name );
- return ret;
+ err = 1; /* accept by default */
+endFn:
+ free(name);
+ return err;
}
/** Gets called for every resource to scan/download.
* HINT: Gets called recursively. */
-static ssize_t
-gateleenResclone_download( cls_dload_t*dload , cls_resourceDir_t*parentResourceDir , char*entryName )
-{
- ssize_t err, ret=0;
+static ssize_t gateleenResclone_download( ClsDload*dload , ResourceDir*parentResourceDir , char*entryName ){
+ ssize_t err;
char *url = NULL;
int url_len = 0;
cJSON *jsonRoot = NULL;
int resUrl_len = 0;
- cls_resourceDir_t *resourceDir = NULL;
- cls_resourceFile_t *resourceFile = NULL;
+ ResourceDir *resourceDir = NULL;
+ ResourceFile *resourceFile = NULL;
- if( !entryName ){
- // Is the case when its the root call and not a recursive one.
+ if( entryName == NULL ){
+ /* Is the case when its the root call and not a recursive one */
entryName = dload->rootUrl;
}
// Stack-Alloc resourceDir-closure.
- cls_resourceDir_t _1={0}; resourceDir =&_1;
+ ResourceDir _1 = {0}; resourceDir = &_1;
resourceDir->dload = dload;
resourceDir->parentDir = parentResourceDir;
- resourceDir->name = strdup( entryName );
+ resourceDir->name = strdup(entryName);
// Configure client
{
url_len = 0;
- for( cls_resourceDir_t*d=resourceDir ; d ; d=d->parentDir ){
+ for( ResourceDir*d=resourceDir ; d ; d=d->parentDir ){
int len = strlen(d->name) - strspn(d->name, "/");
url_len += len;
}
- url = malloc( url_len +1 /*MightPreventReallocLaterForName*/+24 );
+ url = malloc(url_len +1 /*MayPreventReallocLaterForName*/+24);
char *u = url + url_len;
- for( cls_resourceDir_t*d=resourceDir ; d ; d=d->parentDir ){
- char *name = d->name + strspn( d->name , "/" );
+ for( ResourceDir*d=resourceDir ; d ; d=d->parentDir ){
+ char *name = d->name + strspn(d->name, "/");
int name_len = strlen(name);
- memcpy( u-name_len , name , name_len ); u-=name_len;
+ memcpy(u-name_len, name, name_len); u -= name_len;
}
url[url_len] = '\0';
- //LOG_DEBUG("%s%s%s%s\n", __func__, "(): URL '",url,"'");
+ //fprintf(stderr, "%s%s%s\n", "[DEBUG] URL '", url, "'");
err = CURLE_OK != curl_easy_setopt(dload->curl, CURLOPT_URL, url)
- || CURLE_OK != curl_easy_setopt(dload->curl, CURLOPT_FOLLOWLOCATION, 0L )
+ || CURLE_OK != curl_easy_setopt(dload->curl, CURLOPT_FOLLOWLOCATION, 0L)
|| CURLE_OK != curl_easy_setopt(dload->curl, CURLOPT_WRITEFUNCTION, onCurlDirRsp)
|| CURLE_OK != curl_easy_setopt(dload->curl, CURLOPT_WRITEDATA, resourceDir)
;
- if( err ){ assert(!err); ret=-1; goto finally; }
+ if( err ){
+ assert(!err); err = -1; goto endFn; }
}
- err = curl_easy_perform( dload->curl );
- if( err!=CURLE_OK ){
- LOG_ERROR("%s%s%s%s%ld%s%s\n", __func__, "(): '",url,"' (code ", err, "): ", curl_easy_strerror(err));
- ret=-1; goto finally;
+ err = curl_easy_perform(dload->curl);
+ if( err != CURLE_OK ){
+ fprintf(stderr, "%s%s%s%lld%s%s\n",
+ "[ERROR] '", url, "' (code ", err, "): ", curl_easy_strerror(err));
+ err = -1; goto endFn;
}
if( resourceDir->rspCode == ERR_PARSE_DIR_LIST ){
- goto finally; // Already logged by sub-ctxt. Simply skip to next entry.
+ err = 0; goto endFn; /* Already logged by sub-ctxt. Simply skip to next entry. */
}
if( resourceDir->rspCode != 200 ){
// Ugh? Just one request earlier, server said there's a directory on
- // that URL. Never mind. Just skip it and at least download the other
+ // that URL. Nevermind. Just skip it and at least download the other
// stuff.
- LOG_WARN("%s%d%s%s%s\n", "Skip HTTP ", resourceDir->rspCode ," -> '",url,"'");
- goto finally;
+ fprintf(stderr, "%s%d%s%s%s\n", "[INFO ] Skip HTTP ", resourceDir->rspCode, " -> '", url, "'");
+ err = 0; goto endFn;
}
// Parse the collected response body.
- // I would like to NOT rely on zero-terminated strings. But did not find any
- // better API for this yet.
- jsonRoot = cJSON_Parse( resourceDir->rspBody );
+ jsonRoot = cJSON_Parse(resourceDir->rspBody);
if( ! cJSON_IsObject(jsonRoot) ){ // TODO: Handle case
- LOG_ERROR("%s\n", "JSON root expected to be object but is not.");
- err = -1; goto finally;
+ fprintf(stderr, "%s\n", "[ERROR] JSON root expected to be object but is not.");
+ err = -1; goto endFn;
}
- // Do some validations to get to the payload we're interested in.
+ /* Do some validations to get to the payload we're interested in. */
if( cJSON_GetArraySize(jsonRoot) != 1 ){
- LOG_ERROR("%s%d\n", "JSON root expected ONE child but got ", cJSON_GetArraySize(jsonRoot) );
- err = -1; goto finally;
+ fprintf(stderr, "%s%d\n", "[ERROR] JSON root expected ONE child but got ",
+ cJSON_GetArraySize(jsonRoot));
+ err = -1; goto endFn;
}
cJSON *data = jsonRoot->child;
- //LOG_DEBUG( "%s%s%s\n", "Processing json['", data->string, "']" );
+ //fprintf(stderr, "%s%s%s\n", "[DEBUG] Processing json['", data->string, "']");
if( ! cJSON_IsArray(data) ){
- LOG_ERROR("%s%s%s\n", "json['", data->string,"'] expected to be an array. But is not." );
- err = -1; goto finally;
+ fprintf(stderr, "%s%s%s\n", "[ERROR] json['", data->string,
+ "'] expected to be an array. But is not.");
+ err = -1; goto endFn;
}
// Iterate all the entries we have to process.
- cls_resourceFile_t _2={0}; resourceFile =&_2;
+ ResourceFile _2 = {0}; resourceFile =&_2;
resourceFile->dload = dload;
uint_t iDirEntry = 0;
for( cJSON *arrEntry=data->child ; arrEntry!=NULL ; arrEntry=arrEntry->next ){
if( ! cJSON_IsString(arrEntry) ){
- LOG_ERROR("%s%s%u%s\n", data->string,"['", iDirEntry,"'] expected to be a string. But is not." );
- err = -1; goto finally;
+ fprintf(stderr, "%s%s%s%u%s\n", "[ERROR] ", data->string, "['", iDirEntry,
+ "'] expected to be a string. But is not." );
+ err = -1; goto endFn;
}
- //LOG_DEBUG("%s%s%u%s%s%s\n", data->string, "[", iDirEntry, "] -> ", arrEntry->valuestring, "");
+ //fprintf(stderr, "%s%s%s%u%s%s\n", "[DEBUG] ", data->string, "[", iDirEntry, "] -> ", arrEntry->valuestring);
char *name = arrEntry->valuestring;
- int name_len = strlen( name );
+ int name_len = strlen(name);
- err = pathFilterAcceptsEntry( dload, resourceDir, name );
- if( err<0 ){ // ERROR
- ret = err; goto finally;
- }else if( err==0 ){ // REJECT
- LOG_INFO("%s%s%s%s\n", "Skip '", url, name, "' (filtered)");
+ err = pathFilterAcceptsEntry(dload, resourceDir, name);
+ if( err < 0 ){ /* ERROR */
+ goto endFn;
+ }else if( err == 0 ){ /* REJECT */
+ fprintf(stderr, "%s%s%s%s\n", "[INFO ] Skip '", url, name, "' (filtered)");
continue;
- }else{ // ACCEPT
- // Go ahead.
+ }else{ /* ACCEPT */
+ /* Go ahead */
}
- if( name[name_len-1]=='/' ){ // Gateleen reports a 'directory'
- //LOG_DEBUG("%s%s%s%s\n", "Scan '", url, name,"'");
- err = gateleenResclone_download( dload , resourceDir , name );
- if( err ){ ret=err; goto finally; }
- }
- else{ // Not a 'dir'? Then assume 'file'
+ if( name[name_len-1] == '/' ){ /* Gateleen reports a 'directory' */
+ //fprintf(stderr, "%s%s%s%s\n", "[DEBUG] Scan '", url, name,"'");
+ err = gateleenResclone_download(dload, resourceDir, name);
+ if( err ){
+ goto endFn; }
+ }else{ /* Not a 'dir'? Then assume 'file' */
int requiredLen = url_len + 1/*slash*/ + name_len;
if( resUrl_len < requiredLen ){
- resourceFile->url = realloc( resourceFile->url , requiredLen +1 );
+ void *tmp = realloc(resourceFile->url, requiredLen +1);
+ if( tmp == NULL ){
+ err = -ENOMEM; goto endFn; }
+ resourceFile->url = tmp;
resUrl_len = requiredLen;
}
- sprintf(resourceFile->url, "%s%s", url , name );
- LOG_INFO("%s%s%s\n", "Download '", resourceFile->url, "'");
+ sprintf(resourceFile->url, "%s%s", url, name);
+ fprintf(stderr, "%s%s%s\n", "[INFO ] Download '", resourceFile->url, "'");
resourceFile->buf_len = 0; // <- Reset before use.
- collectResourceIntoMemory( resourceFile , resourceFile->url );
- copyBufToArchive( resourceFile );
+ collectResourceIntoMemory(resourceFile, resourceFile->url);
+ copyBufToArchive(resourceFile);
}
iDirEntry += 1;
}
- finally:
+ err = 0; /* OK */
+endFn:
if( jsonRoot != NULL ){ cJSON_Delete(jsonRoot); }
if( resourceFile ){
free(resourceFile->buf); resourceFile->buf = NULL;
- free( resourceFile->url ); resourceFile->url = NULL;
+ free(resourceFile->url); resourceFile->url = NULL;
}
if( resourceDir ){
- free( resourceDir->name ); resourceDir->name = NULL;
- free( resourceDir->rspBody ); resourceDir->rspBody = NULL;
+ free(resourceDir->name); resourceDir->name = NULL;
+ free(resourceDir->rspBody); resourceDir->rspBody = NULL;
}
- free( url );
- return ret;
+ free(url);
+ return err;
}
-static void
-this_free( this_t*this )
-{
- if( this==NULL ) return;
-
+static void Resclone_free( Resclone*resclone ){
+ if( resclone == NULL ) return;
// TODO need free? -> char *url;
// TODO need free? -> regex_t *filter;
// TODO need free? -> char *file;
-
- free( this );
+ free(resclone);
}
-static this_t*
-this_alloc()
-{
+
+static Resclone* Resclone_alloc(){
ssize_t err;
- this_t *this = NULL;
+ Resclone *resclone = NULL;
- err = curl_global_init( CURL_GLOBAL_ALL );
- if( err ){ assert(!err); goto fail; }
+ err = curl_global_init(CURL_GLOBAL_ALL);
+ if( err ){
+ assert(!err); goto fail; }
- this = calloc(1, sizeof(*this) );
+ resclone = calloc(1, sizeof*resclone);
- return this;
+ return resclone;
fail:
- this_free( this );
+ Resclone_free(resclone);
return NULL;
}
-static size_t
-onUploadChunkRequested( char*buf , size_t size , size_t count , void*cls_put_ )
-{
- cls_put_t *put = cls_put_;
- cls_upload_t *upload = put->upload;
+static size_t onUploadChunkRequested( char*buf, size_t size, size_t count, void*Put_ ){
+ int err;
+ Put *put = Put_;
+ Upload *upload = put->upload;
const size_t buf_len = size * count;
- ssize_t ret = buf_len;
ssize_t readLen = archive_read_data(upload->srcArchive, buf, buf_len);
- //LOG_DEBUG("%s%lu%s\n", "Cpy ",readLen," bytes.");
- if( readLen<0 ){
- LOG_ERROR("%s%ld%s%s\n", "Failed to read from archive (code ",readLen,"): ", archive_error_string(upload->srcArchive));
- assert(0); ret=-1; goto endFn;
- }
- else if( readLen>0 ){
+ //fprintf(stderr, "%s%lu%s\n", "[DEBUG] Cpy ", readLen, " bytes.");
+ if( readLen < 0 ){
+ fprintf(stderr, "%s%lld%s%s\n", "[ERROR] Failed to read from archive (code ",
+ readLen, "): ", archive_error_string(upload->srcArchive));
+ err = -1; goto endFn;
+ }else if( readLen > 0 ){
// Regular read. Data already written to 'buf'. Only need to adjust
// return val.
- ret = readLen;
+ err = readLen; goto endFn;
+ }else{ // EOF
+ assert(readLen == 0);
+ err = 0; goto endFn;
}
- else{ // readLen==0 -> EOF
- ret = 0; // Nothing more to read.
- }
-
- endFn:
- //LOG_DEBUG("%s%s%ld\n", __func__, "() -> ", ret);
- return ret>=0 ? ret : CURL_READFUNC_ABORT;
+ assert(!"Unreachable code");
+endFn:
+ //fprintf(stderr, "%s%s%s%ld\n", "[DEBUG] ", __func__, "() -> ", err);
+ return err >= 0 ? err : CURL_READFUNC_ABORT;
}
-static ssize_t
-addContentTypeHeader( cls_put_t*put , struct curl_slist *reqHdrs )
-{
- ssize_t err, ret=0;
+static ssize_t addContentTypeHeader( Put*put, struct curl_slist *reqHdrs ){
+ ssize_t err;
char *contentTypeHdr = NULL;
- cls_upload_t *upload = put->upload;
+ Upload *upload = put->upload;
const char *name = put->name;
- uint_t name_len = strlen( put->name );
+ uint_t name_len = strlen(put->name);
// Find file extension.
const char *ext = name + name_len;
for(; ext>name && *ext!='.' && *ext!='/' ; --ext );
// Convert it to mime type.
const char *mimeType;
- if( *ext=='.' ){
- mimeType = fileExtToMime( ext+1 ); // <- +1, to skip the (useless) dot.
+ if( *ext == '.' ){
+ mimeType = fileExtToMime(ext +1); // <- +1, to skip the (useless) dot.
if( mimeType ){
- //LOG_DEBUG("%s%s%s%s%s\n", "Resolved file ext '", ext+1,"' to mime '", mimeType?mimeType:"<null>", "'.");
+ //fprintf(stderr, "%s%s%s%s%s\n", "[DEBUG] Resolved file ext '", ext+1,"' to mime '", mimeType?mimeType:"<null>", "'.");
}
- }
- else if( *ext=='/' || ext==name || *ext=='\0' ){ // TODO Explain why 0x00.
+ }else if( *ext=='/' || ext==name || *ext=='\0' ){ // TODO Explain why 0x00.
mimeType = "application/json";
- //LOG_DEBUG("%s\n", "No file extension. Fallback to json (gateleen default)");
- }
- else{
+ //fprintf(stderr, "%s\n", "[DEBUG] No file extension. Fallback to json (gateleen default)");
+ }else{
mimeType = NULL;
}
- if( mimeType==NULL ){
- //LOG_DEBUG("%s%s%s\n", "Unknown file extension '", ext+1, "'. Will NOT add Content-Type header.");
+ if( mimeType == NULL ){
+ //fprintf(stderr, "%s%s%s\n", "[DEBUG] Unknown file extension '", ext+1, "'. Will NOT add Content-Type header.");
mimeType = ""; // <- Need to 'remove' header. To do this, pass an empty value to curl.
}
- uint_t mimeType_len = strlen( mimeType );
+ uint_t mimeType_len = strlen(mimeType);
static const char contentTypePrefix[] = "Content-Type: ";
static const uint_t contentTypePrefix_len = sizeof(contentTypePrefix)-1;
contentTypeHdr = malloc( contentTypePrefix_len + mimeType_len +1 );
- memcpy( contentTypeHdr , contentTypePrefix , contentTypePrefix_len );
- memcpy( contentTypeHdr+contentTypePrefix_len , mimeType , mimeType_len+1 );
- reqHdrs = curl_slist_append( reqHdrs, contentTypeHdr );
- err = curl_easy_setopt( upload->curl, CURLOPT_HTTPHEADER, reqHdrs );
- if( err ){ assert(!err); ret=-1; goto endFn; }
-
- endFn:
- free( contentTypeHdr );
- return ret;
+ memcpy(contentTypeHdr , contentTypePrefix , contentTypePrefix_len);
+ memcpy(contentTypeHdr+contentTypePrefix_len , mimeType , mimeType_len+1);
+ reqHdrs = curl_slist_append(reqHdrs, contentTypeHdr);
+ err = curl_easy_setopt(upload->curl, CURLOPT_HTTPHEADER, reqHdrs);
+ if( err ){
+ fprintf(stderr, "%s%lld\n", "[ERROR] curl_easy_setopt(_, HTTPHEADER, _): ", err);
+ assert(!err); err = -1; goto endFn; }
+
+ err = 0;
+endFn:
+ free(contentTypeHdr);
+ return err;
}
-static ssize_t
-httpPutEntry( cls_put_t*put )
-{
- ssize_t err, ret = 0;
- cls_upload_t *upload = put->upload;
+static ssize_t httpPutEntry( Put*put ){
+ ssize_t err;
+ Upload *upload = put->upload;
char *url = NULL;
struct curl_slist *reqHdrs = NULL;
@@ -741,184 +739,195 @@ httpPutEntry( cls_put_t*put )
rootUrl_len -= 1;
}
int url_len = strlen(upload->rootUrl) + strlen(put->name);
- url = malloc( url_len +2 );
+ url = malloc(url_len +2);
+ if( url == NULL ){
+ err = -ENOMEM; goto endFn; }
sprintf(url, "%.*s/%s", rootUrl_len,upload->rootUrl, put->name);
- err = CURLE_OK != curl_easy_setopt(upload->curl, CURLOPT_URL, url )
- || addContentTypeHeader( put , reqHdrs )
+ err = CURLE_OK != curl_easy_setopt(upload->curl, CURLOPT_URL, url)
+ || addContentTypeHeader(put, reqHdrs)
;
- if( err ){ assert(!err); ret=-1; goto endFn; }
+ if( err ){
+ assert(!err); err = -1; goto endFn; }
- LOG_INFO("%s%s%s\n", "Upload '",url,"'");
- err = curl_easy_perform( upload->curl );
- if( err!=CURLE_OK ){
- LOG_ERROR("%s%s%s%ld%s%s\n", "PUT '",url,"' (code ", err, "): ", curl_easy_strerror(err));
- ret=-1; goto endFn;
+ fprintf(stderr, "%s%s%s\n", "[INFO ] Upload '", url, "'");
+ err = curl_easy_perform(upload->curl);
+ if( err != CURLE_OK ){
+ fprintf(stderr, "%s%s%s%lld%s%s\n",
+ "[ERROR] PUT '", url, "' (code ", err, "): ", curl_easy_strerror(err));
+ err = -1; goto endFn;
}
long rspCode;
curl_easy_getinfo(upload->curl, CURLINFO_RESPONSE_CODE, &rspCode);
- if( rspCode<=199 || rspCode>=300 ){
- LOG_WARN("%s%ld%s%s%s\n", "Got RspCode ", rspCode, " for 'PUT ", url, "'");
+ if( rspCode <= 199 || rspCode >= 300 ){
+ fprintf(stderr, "%s%ld%s%s%s\n",
+ "[WARN ] Got RspCode ", rspCode, " for 'PUT ", url, "'");
}else{
- //LOG_DEBUG("%s%ld%s%s%s\n", "Got RspCode ", rspCode, " for 'PUT ", url, "'");
+ //fprintf(stderr, "%s%ld%s%s%s\n", "[DEBUG] Got RspCode ", rspCode, " for 'PUT ", url, "'");
}
- endFn:
- curl_slist_free_all( reqHdrs );
- free( url );
- return ret;
+ err = 0;
+endFn:
+ curl_slist_free_all(reqHdrs);
+ free(url);
+ return err;
}
-static ssize_t
-readArchive( cls_upload_t*upload )
-{
- ssize_t err, ret=0;
- cls_put_t *put = NULL;
+static ssize_t readArchive( Upload*upload ){
+ ssize_t err;
+ Put *put = NULL;
upload->srcArchive = archive_read_new();
- if( ! upload->srcArchive ){ assert(upload->srcArchive); ret=-1; goto endFn; }
+ if( ! upload->srcArchive ){
+ assert(upload->srcArchive); err = -1; goto endFn; }
- const int blockSize = 16384; // <- Because curl examples use this value too.
- err = archive_read_support_format_all( upload->srcArchive )
- || archive_read_open_filename( upload->srcArchive , upload->archiveFile , blockSize )
+ const int blockSize = (1<<14);
+ err = archive_read_support_format_all(upload->srcArchive)
+ || archive_read_open_filename(upload->srcArchive, upload->archiveFile, blockSize)
;
if( err ){
- LOG_ERROR("%s%ld%s%s\n", "Failed to open src archive (code ",err,"): ", curl_easy_strerror(err) );
- ret=-1; goto endFn;
+ fprintf(stderr, "%s%lld%s%s\n", "[ERROR] Failed to open src archive (code ", err, "): ",
+ curl_easy_strerror(err));
+ err = -1; goto endFn;
}
- err = curl_easy_setopt( upload->curl, CURLOPT_UPLOAD, 1L)
- || curl_easy_setopt( upload->curl, CURLOPT_READFUNCTION, onUploadChunkRequested )
+ err = curl_easy_setopt(upload->curl, CURLOPT_UPLOAD, 1L)
+ || curl_easy_setopt(upload->curl, CURLOPT_READFUNCTION, onUploadChunkRequested)
;
- if( err ){ assert(!err); ret=-1; goto endFn; }
- for( struct archive_entry*entry ; archive_read_next_header(upload->srcArchive,&entry)==ARCHIVE_OK ;){
- const char *name = archive_entry_pathname( entry );
- int ftype = archive_entry_filetype( entry );
+ if( err ){
+ assert(!err); err = -1; goto endFn; }
+ for( struct archive_entry*entry ; archive_read_next_header(upload->srcArchive,&entry) == ARCHIVE_OK ;){
+ const char *name = archive_entry_pathname(entry);
+ int ftype = archive_entry_filetype(entry);
if( ftype == AE_IFDIR ){
continue; // Ignore dirs because gateleen doesn't know 'dirs' as such.
}
if( ftype != AE_IFREG ){
- LOG_WARN("%s%s%s\n", "Ignore non-regular file '", name, "'");
+ fprintf(stderr, "%s%s%s\n", "[WARN ] Ignore non-regular file '", name, "'");
continue;
}
- //LOG_DEBUG("%s%s%s\n", "Reading '",name,"'");
- cls_put_t _1={
+ //fprintf(stderr, "%s%s%s\n", "[DEBUG] Reading '",name,"'");
+ Put _1 = {
.upload = upload,
.name = (char*)name
- }; put =&_1;
- err = curl_easy_setopt( upload->curl, CURLOPT_READDATA, put )
- || httpPutEntry( put );
+ }; put = &_1;
+ err = curl_easy_setopt(upload->curl, CURLOPT_READDATA, put)
+ || httpPutEntry(put);
//curl = upload->curl; // Sync back. TODO: Still needed?
- if( err ){ ret=-1; goto endFn; }
+ if( err ){
+ assert(!err); err = -1; goto endFn; }
}
- endFn:
- return ret;
+ err = 0;
+endFn:
+ return err;
}
-static ssize_t
-pull( this_t*this )
-{
- ssize_t err, ret = 0;
- cls_dload_t *dload = NULL;
+static ssize_t pull( Resclone*resclone ){
+ ssize_t err;
+ ClsDload *dload = NULL;
- if( this->file==NULL && isatty(1) ){
- LOG_ERROR("%s\n", "Are you sure you wanna write binary content to tty?");
- ret = -1; goto finally;
+ if( resclone->file == NULL && isatty(1) ){
+ fprintf(stderr, "%s\n",
+ "[ERROR] Are you sure you wanna write binary content to tty?");
+ err = -1; goto endFn;
}
- cls_dload_t _1={0}; dload =&_1;
- dload->this = this;
- dload->rootUrl = this->url;
- dload->archiveFile = this->file;
+ ClsDload _1 = {0}; dload =&_1;
+ dload->resclone = resclone;
+ dload->rootUrl = resclone->url;
+ dload->archiveFile = resclone->file;
dload->curl = curl_easy_init();
- if( ! dload->curl ){
- LOG_ERROR("%s\n", "curl_easy_init() -> NULL");
- ret = -1; goto finally;
+ if( dload->curl == NULL ){
+ fprintf(stderr, "%s\n", "[ERROR] curl_easy_init() -> NULL");
+ err = -1; goto endFn;
}
- err = gateleenResclone_download( dload , NULL , NULL );
- if( err ){ ret=-1; goto finally; }
+ err = gateleenResclone_download(dload, NULL, NULL);
+ if( err ){
+ err = -1; goto endFn; }
if( dload->dstArchive && archive_write_close(dload->dstArchive) ){
- LOG_ERROR("%s%s%ld%s%s\n", __func__, "(): archive_write_close failed (code ", err, "): ", archive_error_string(dload->dstArchive));
- ret = -1; goto finally;
+ fprintf(stderr, "%s%lld%s%s\n", "[ERROR] archive_write_close failed (code ",
+ err, "): ", archive_error_string(dload->dstArchive));
+ err = -1; goto endFn;
}
- finally:
+ err = 0;
+endFn:
if( dload ){
- curl_easy_cleanup( dload->curl );
- archive_entry_free( dload->tmpEntry ); dload->tmpEntry = NULL;
- archive_write_free( dload->dstArchive ); dload->dstArchive = NULL;
+ curl_easy_cleanup(dload->curl);
+ archive_entry_free(dload->tmpEntry); dload->tmpEntry = NULL;
+ archive_write_free(dload->dstArchive); dload->dstArchive = NULL;
}
- return ret;
+ return err;
}
-static ssize_t
-push( this_t*this )
-{
- ssize_t err, ret = 0;
- cls_upload_t *upload = NULL;
+static ssize_t push( Resclone*resclone ){
+ ssize_t err;
+ Upload *upload = NULL;
- cls_upload_t _1={0}; upload =&_1;
- upload->this = this;
- upload->archiveFile = this->file;
- upload->rootUrl = this->url;
+ Upload _1={0}; upload =&_1;
+ upload->resclone = resclone;
+ upload->archiveFile = resclone->file;
+ upload->rootUrl = resclone->url;
upload->curl = curl_easy_init();
if( ! upload->curl ){
- LOG_ERROR("%s\n", "curl_easy_init() -> NULL" );
- ret = -1; goto finally;
+ fprintf(stderr, "%s\n", "[ERROR] curl_easy_init() -> NULL");
+ err = -1; goto endFn;
}
- err = readArchive( upload );
- if( err ){ ret=-1; goto finally; }
+ err = readArchive(upload);
+ if( err ){
+ err = -1; goto endFn; }
- finally:
+ err = 0;
+endFn:
if( upload ){
- curl_easy_cleanup( upload->curl );
- archive_read_free( upload->srcArchive );
+ curl_easy_cleanup(upload->curl);
+ archive_read_free(upload->srcArchive);
}
- return ret;
+ return err;
}
-ssize_t
-gateleenResclone_run( int argc , char**argv )
-{
- ssize_t err, ret=0;
- this_t *this = NULL;
+ssize_t gateleenResclone_run( int argc, char**argv ){
+ ssize_t err;
+ Resclone *resclone = NULL;
- this = this_alloc();
- if( this==NULL ){ ret=-1; goto finally; }
+ resclone = Resclone_alloc();
+ if( resclone == NULL ){
+ err = -1; goto endFn; }
- err = parseArgs( argc, argv, &this->mode, &this->url, &this->filter, &this->filter_len,
- &this->isFilterFull, &this->file );
- if( err ){ ret=-1; goto finally; }
+ err = parseArgs(argc, argv, &resclone->mode, &resclone->url, &resclone->filter,
+ &resclone->filter_len, &resclone->isFilterFull, &resclone->file);
+ if( err ){
+ err = -1; goto endFn; }
- if( this->mode == MODE_FETCH ){
- ret = pull(this); goto finally;
- }else if( this->mode == MODE_PUSH ){
- ret = push(this); goto finally;
+ if( resclone->mode == MODE_FETCH ){
+ err = pull(resclone); goto endFn;
+ }else if( resclone->mode == MODE_PUSH ){
+ err = push(resclone); goto endFn;
}else{
- ret = -1; goto finally;
+ err = -1; goto endFn;
}
- finally:
- parseArgs( -1, argv, &this->mode, &this->url, &this->filter, &this->filter_len,
- &this->isFilterFull, &this->file );
- this->mode=MODE_NULL; this->url=NULL; this->file=NULL;
- this_free( this );
- return ret;
+ assert(!"Unreachable");
+endFn:
+ parseArgs(-1, argv, &resclone->mode, &resclone->url, &resclone->filter, &resclone->filter_len,
+ &resclone->isFilterFull, &resclone->file);
+ resclone->mode = MODE_NULL; resclone->url = NULL; resclone->file = NULL;
+ Resclone_free(resclone);
+ return err;
}
-int
-gateleenResclone_main( int argc , char**argv )
-{
+int gateleenResclone_main( int argc, char**argv ){
int ret;
- ret = gateleenResclone_run( argc , argv );
- return ret<0||ret>127 ? 1 : ret;
+ ret = gateleenResclone_run(argc, argv);
+ if( ret < 0 ){ ret = 0 - ret; }
+ return (ret > 127) ? 1 : ret;
}
diff --git a/src/gateleen_resclone/gateleen_resclone.h b/src/gateleen_resclone/gateleen_resclone.h
index 6f92f8b..779f6ad 100644
--- a/src/gateleen_resclone/gateleen_resclone.h
+++ b/src/gateleen_resclone/gateleen_resclone.h
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
#ifndef INCGUARD_d16bcf26aca7174fb8aae7641c828007
#define INCGUARD_d16bcf26aca7174fb8aae7641c828007
diff --git a/src/log/log.c b/src/log/log.c
deleted file mode 100644
index f6660cc..0000000
--- a/src/log/log.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
-
-#include "log.h"
-
-/* System */
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-
-void log_asdfghjklqwertzu( const char*level, const char*cLvl, const char*file, int line, const char*fmt, ... )
-{
- va_list args;
- va_start( args, fmt );
- int isTTY = isatty(2);
- const char *cRst = isTTY ? "\033[0m" : "";
- char *cTxt = isTTY ? "\033[90m" : "";
- cLvl = isTTY ? cLvl : "";
- char tBuf[20];
- const time_t t = time(0);
- const char *tfmt = "%Y-%m-%d_%H:%M:%S";
- if( isTTY ){ tfmt += 9; }
- strftime( tBuf,sizeof(tBuf), tfmt, localtime(&t) );
- const char *fileOnly = strrchr(file, '/') +1;
- fprintf( stderr, "[%s%s%s %s%s%s %s%s:%d%s] ",
- cTxt,tBuf,cRst, cLvl,level,cRst , cTxt,fileOnly,line,cRst );
- vfprintf( stderr, fmt, args );
- va_end( args );
-}
-
diff --git a/src/log/log.h b/src/log/log.h
deleted file mode 100644
index e6520d2..0000000
--- a/src/log/log.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
-
-#ifndef INCGUARD_540e2cd36c1ba21909b922d45a94b7f7
-#define INCGUARD_540e2cd36c1ba21909b922d45a94b7f7
-
-#include "commonbase.h"
-
-
-#define LOG_FATAL( ... ) log_asdfghjklqwertzu("FATAL","\033[31m",__FILE__,__LINE__,__VA_ARGS__)
-#define LOG_ERROR( ... ) log_asdfghjklqwertzu("ERROR","\033[31m",__FILE__,__LINE__,__VA_ARGS__)
-#define LOG_WARN( ... ) log_asdfghjklqwertzu("WARN ","\033[33m",__FILE__,__LINE__,__VA_ARGS__)
-#define LOG_INFO( ... ) log_asdfghjklqwertzu("INFO ","\033[36m",__FILE__,__LINE__,__VA_ARGS__)
-#ifndef NDEBUG
- #define LOG_DEBUG( ... ) log_asdfghjklqwertzu("DEBUG","\033[35m",__FILE__,__LINE__,__VA_ARGS__ )
- #define LOG_TRACE( ... ) log_asdfghjklqwertzu("TRACE","\033[94m",__FILE__,__LINE__,__VA_ARGS__ )
-#else
- #define LOG_DEBUG( ... ) /* Debugging not enabled. Therefore ignore that log level. */
- #define LOG_TRACE( ... ) /* Debugging not enabled. Therefore ignore that log level. */
-#endif
-
-
-void log_asdfghjklqwertzu( const char*level, const char*cLvl, const char*file, int line, const char*fmt, ... );
-
-
-#endif /* INCGUARD_540e2cd36c1ba21909b922d45a94b7f7 */
diff --git a/src/mime/mime.c b/src/mime/mime.c
index 38e0668..22ccf15 100644
--- a/src/mime/mime.c
+++ b/src/mime/mime.c
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
#include "mime.h"
diff --git a/src/mime/mime.h b/src/mime/mime.h
index c3367a1..97c8b36 100644
--- a/src/mime/mime.h
+++ b/src/mime/mime.h
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
#ifndef INCGUARD_569e6cc3cc7a72f544dd00fb071f0a17
#define INCGUARD_569e6cc3cc7a72f544dd00fb071f0a17
diff --git a/src/util_string/util_string.h b/src/util_string/util_string.h
index d180dbb..348a61f 100644
--- a/src/util_string/util_string.h
+++ b/src/util_string/util_string.h
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
#ifndef INCGUARD_7af1eceb805a30c68adec1fd0ccc15c4
#define INCGUARD_7af1eceb805a30c68adec1fd0ccc15c4
diff --git a/src/util_term/util_term.c b/src/util_term/util_term.c
index 4d01022..e921ecc 100644
--- a/src/util_term/util_term.c
+++ b/src/util_term/util_term.c
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
#include "commonbase.h"
diff --git a/src/util_term/util_term.h b/src/util_term/util_term.h
index 84894f4..d9b31ab 100644
--- a/src/util_term/util_term.h
+++ b/src/util_term/util_term.h
@@ -1,4 +1,4 @@
-/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */
+/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */
#ifndef INCGUARD_559e64ee2a3c96a09c7c046f15fe0b1b
#define INCGUARD_559e64ee2a3c96a09c7c046f15fe0b1b
generated by cgit v1.1 at 2024-10-06 08:25:55 +0000