diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml index 4e14353d..254c64f9 100644 --- a/.github/workflows/abicheck.yml +++ b/.github/workflows/abicheck.yml @@ -3,8 +3,8 @@ name: abicheck env: build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT prefix: /usr/local - apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev - get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install 'meson<0.59.0' + apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev libglib2.0-dev + get_pip_build_deps: pip3 install 'setuptools<66'; pip3 install wheel; pip3 install 'meson<0.59.0' getabidef_def: getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; } jobs: build-base-ref: @@ -17,7 +17,7 @@ jobs: echo "$HOME/.local/bin" >> $GITHUB_PATH - name: prepare required software run: | - sudo apt install $apt_build_deps + sudo apt update; sudo apt install $apt_build_deps eval "$get_pip_build_deps" - name: checkout base ref uses: actions/checkout@main @@ -36,8 +36,8 @@ jobs: base_abi=$(getabidef base$prefix) echo base abi : $base_abi ./base$prefix/bin/irssi --version - echo "::set-output name=base_abi::$base_abi" - - uses: actions/upload-artifact@v2 + echo base_abi=$base_abi >> $GITHUB_OUTPUT + - uses: actions/upload-artifact@v4 with: name: base.inst path: base @@ -52,7 +52,7 @@ jobs: echo "$HOME/.local/bin" >> $GITHUB_PATH - name: prepare required software run: | - sudo apt install $apt_build_deps + sudo apt update; sudo apt install $apt_build_deps eval "$get_pip_build_deps" - name: checkout merge ref uses: actions/checkout@main @@ -70,8 +70,8 @@ jobs: merge_abi=$(getabidef merge$prefix) echo merge abi : $merge_abi ./merge$prefix/bin/irssi --version - echo "::set-output name=merge_abi::$merge_abi" - - uses: actions/upload-artifact@v2 + echo merge_abi=$merge_abi >> $GITHUB_OUTPUT + - uses: actions/upload-artifact@v4 with: name: merge.inst path: merge @@ -87,14 +87,14 @@ jobs: steps: - name: prepare required software run: | - sudo apt install abigail-tools + sudo apt update; sudo apt install abigail-tools - name: fetch base build - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: base.inst path: base - name: fetch merge build - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: merge.inst path: merge @@ -103,7 +103,7 @@ jobs: abipkgdiff -l base merge >abipkgdiff.out && diff_ret=0 || diff_ret=$? echo "diff_ret=$diff_ret" >> $GITHUB_ENV cat abipkgdiff.out - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: path: abipkgdiff.out - run: | diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3e324649..186c2e83 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -5,27 +5,50 @@ on: pull_request: name: Check Irssi env: - apt_build_deps: libutf8proc-dev libperl-dev libotr5-dev - apt_build_deps_meson: ninja-build - apt_build_deps_autotools: autoconf automake libtool + apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev libglib2.0-dev get_pip_build_deps_meson: pip3 install setuptools${setuptools_ver}; pip3 install wheel; pip3 install meson${meson_ver} build_options_meson: -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes -Dwith-otr=yes - build_options_configure: --with-proxy=module --with-bot --with-perl=module --with-otr=module prefix: ~/irssi-build jobs: dist: runs-on: ubuntu-latest + env: + meson_ver: <0.63.0 + setuptools_ver: <66 steps: - name: prepare required software run: | - sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_autotools + sudo apt update && sudo apt install $apt_build_deps + eval "$get_pip_build_deps_meson" + patch ~/.local/lib/python3.12/site-packages/pkg_resources/__init__.py <<- PATCH + --- __init__.py 2024-12-16 20:37:46.733230351 +0100 + +++ __init__.py 2024-12-16 20:38:42.479554540 +0100 + @@ -2188,7 +2188,8 @@ def resolve_egg_link(path): + return next(dist_groups, ()) + + + -register_finder(pkgutil.ImpImporter, find_on_path) + +if hasattr(pkgutil, 'ImpImporter'): + + register_finder(pkgutil.ImpImporter, find_on_path) + + if hasattr(importlib_machinery, 'FileFinder'): + register_finder(importlib_machinery.FileFinder, find_on_path) + @@ -2345,7 +2346,8 @@ def file_ns_handler(importer, path_item, + return subpath + + + -register_namespace_handler(pkgutil.ImpImporter, file_ns_handler) + +if hasattr(pkgutil, 'ImpImporter'): + + register_namespace_handler(pkgutil.ImpImporter, file_ns_handler) + register_namespace_handler(zipimport.zipimporter, file_ns_handler) + + if hasattr(importlib_machinery, 'FileFinder'): + PATCH - uses: actions/checkout@main - name: make dist run: | - # make dist - ./autogen.sh $build_options_configure - make dist - - uses: actions/upload-artifact@v2 + ./utils/make-dist.sh + - uses: actions/upload-artifact@v4 with: path: irssi-*.tar.gz retention-days: 1 @@ -38,24 +61,21 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-18.04, ubuntu-latest] - builder: [meson, configure] + os: [ubuntu-22.04, ubuntu-latest] compiler: [clang, gcc] flags: [regular] + setuptools_ver: [<66] include: - - os: ubuntu-18.04 - builder: meson - meson_ver: ==0.49.2 + - os: ubuntu-22.04 + meson_ver: ==0.53.2 setuptools_ver: <51 - os: ubuntu-latest - builder: meson - meson_ver: <0.60.0 + meson_ver: <0.63.0 - os: ubuntu-latest - builder: meson flags: meson-latest FAILURE-OK steps: - name: fetch dist - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 - name: set PATH run: | echo "$HOME/.local/bin" >> $GITHUB_PATH @@ -64,8 +84,8 @@ jobs: meson_ver: ${{ matrix.meson_ver }} setuptools_ver: ${{ matrix.setuptools_ver }} run: | - sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }} - eval "$get_pip_build_deps_${{ matrix.builder }}" + sudo apt update && sudo apt install $apt_build_deps + eval "$get_pip_build_deps_meson" curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl - name: unpack archive run: tar xaf artifact/irssi-*.tar.gz @@ -76,31 +96,12 @@ jobs: meson Build $build_options_meson --prefix=${prefix/\~/~} ninja -C Build ninja -C Build install - if: ${{ matrix.builder == 'meson' }} - - name: build and install with Makefile - run: | - # make install - cd irssi-*/ - mkdir Build - cd Build - ../configure $build_options_configure --prefix=${prefix/\~/~} --enable-always-build-tests - make CFLAGS="-Wall -Werror -Werror=declaration-after-statement" - make install - if: ${{ matrix.builder == 'configure' }} - - name: run tests with Makefile - run: | - # make check - cd irssi-*/Build - make -C tests -sk check - find -name test-suite.log -exec cat {} + - if: ${{ matrix.builder == 'configure' }} - name: run tests with Meson run: | # ninja test cd irssi-*/ ninja -C Build test find -name testlog.txt -exec sed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} + - if: ${{ matrix.builder == 'meson' }} - name: run launch test env: TERM: xterm @@ -115,6 +116,10 @@ jobs: ^set -clear log_open_string ^set log_timestamp * ^window log on + load irc + load dcc + load flood + load notifylist load perl load otr load proxy @@ -141,7 +146,7 @@ jobs: meson_ver: ${{ matrix.meson_ver }} setuptools_ver: ${{ matrix.setuptools_ver }} run: | - sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_meson + sudo apt update && sudo apt install $apt_build_deps eval "$get_pip_build_deps_meson" curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl - name: build and install with meson @@ -163,6 +168,10 @@ jobs: ^set -clear log_open_string ^set log_timestamp * ^window log on + load irc + load dcc + load flood + load notifylist load perl load otr load proxy diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index 6325d671..3b20e427 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -44,7 +44,7 @@ jobs: dry-run: false sanitizer: ${{ matrix.sanitizer }} - name: Upload Crash - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 if: failure() && steps.build.outcome == 'success' with: name: ${{ matrix.sanitizer }}-artifacts diff --git a/.github/workflows/clangformat.yml b/.github/workflows/clangformat.yml index 9076edc2..55aca4f3 100644 --- a/.github/workflows/clangformat.yml +++ b/.github/workflows/clangformat.yml @@ -22,8 +22,8 @@ jobs: | CLANG_FORMAT=clang-format-14 git-clang-format-14 --diff FETCH_HEAD HEAD | tee git-clang-format.diff cmp -s <(echo no modified files to format) git-clang-format.diff || cmp -s <(echo -n) git-clang-format.diff - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: git-clang-format.diff - path: git-clang-format.diff \ No newline at end of file + path: git-clang-format.diff diff --git a/.github/workflows/muon-fmt.yml b/.github/workflows/muon-fmt.yml new file mode 100644 index 00000000..6fa06d38 --- /dev/null +++ b/.github/workflows/muon-fmt.yml @@ -0,0 +1,32 @@ +name: Format meson files + +on: + push: + pull_request: + +permissions: {} + +jobs: + muon-meson-fmt: + name: Format + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@main + with: + persist-credentials: false + + # Build from source because Ubuntu 24.04 apt only has muon 0.2.0. + # Newer muons seem to format differently. + - name: Build muon from source + run: | + git clone --depth 1 --branch 0.5.0 https://github.com/muon-build/muon /tmp/muon + cd /tmp/muon + ./bootstrap.sh build + build/muon-bootstrap setup build + build/muon-bootstrap -C build samu + sudo build/muon -C build install + + - name: Run muon fmt + run: | + find . -name meson.build -print0 | xargs -0 muon fmt -c .muon_fmt.ini -i + git diff --exit-code diff --git a/.github/workflows/solarisvm.yml b/.github/workflows/solarisvm.yml new file mode 100644 index 00000000..da1ffa17 --- /dev/null +++ b/.github/workflows/solarisvm.yml @@ -0,0 +1,104 @@ +on: + push: + branches: + - master + pull_request: + workflow_dispatch: +name: Check Irssi on Solaris +env: + get_pip_build_deps_meson: pip3 install setuptools${setuptools_ver}; pip3 install wheel + prefix: ~/irssi-build +jobs: + dist: + runs-on: ubuntu-latest + env: + setuptools_ver: <66 + steps: + - name: prepare required software + run: | + sudo apt update && sudo apt install $apt_build_deps + eval "$get_pip_build_deps_meson" + patch ~/.local/lib/python3.12/site-packages/pkg_resources/__init__.py <<- PATCH + --- __init__.py 2024-12-16 20:37:46.733230351 +0100 + +++ __init__.py 2024-12-16 20:38:42.479554540 +0100 + @@ -2188,7 +2188,8 @@ def resolve_egg_link(path): + return next(dist_groups, ()) + + + -register_finder(pkgutil.ImpImporter, find_on_path) + +if hasattr(pkgutil, 'ImpImporter'): + + register_finder(pkgutil.ImpImporter, find_on_path) + + if hasattr(importlib_machinery, 'FileFinder'): + register_finder(importlib_machinery.FileFinder, find_on_path) + @@ -2345,7 +2346,8 @@ def file_ns_handler(importer, path_item, + return subpath + + + -register_namespace_handler(pkgutil.ImpImporter, file_ns_handler) + +if hasattr(pkgutil, 'ImpImporter'): + + register_namespace_handler(pkgutil.ImpImporter, file_ns_handler) + register_namespace_handler(zipimport.zipimporter, file_ns_handler) + + if hasattr(importlib_machinery, 'FileFinder'): + PATCH + - uses: actions/checkout@main + - name: make dist + run: | + ./utils/make-dist.sh + - uses: actions/upload-artifact@v4 + with: + path: irssi-*.tar.gz + retention-days: 1 + install: + runs-on: ubuntu-latest + needs: dist + steps: + - name: fetch dist + uses: actions/download-artifact@v4 + - name: Test in Solaris + uses: vmactions/solaris-vm@v1 + with: + usesh: true + sync: rsync + release: "11.4-gcc" + prepare: | + pkg update --accept || echo 1:$? + pkg install meson || echo 2:$? + pkgutil -y -i curl || echo 3:$? + pkgutil -y -i gtar || echo 4:$? + pkgutil -y -i findutils || echo 5:$? + run: | + set -ex + export PKG_CONFIG_PATH=/usr/lib/64/pkgconfig + curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl + gtar xzf artifact/irssi-*.tar.gz + # ninja install + cd irssi-*/ + meson Build -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes --prefix=$HOME/irssi-build + ninja -C Build + ninja -C Build install + # ninja test + ninja -C Build test + gfind -name testlog.txt -exec gsed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} + + export TERM=xterm + # automated irssi launch test + cd + mkdir irssi-test + echo 'echo automated irssi launch test + ^set settings_autosave off + ^set -clear log_close_string + ^set -clear log_day_changed + ^set -clear log_open_string + ^set log_timestamp * + ^window log on + load irc + load dcc + load flood + load notifylist + load perl + load otr + load proxy + ^quit' > irssi-test/startup + irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl + cat irc.log.* diff --git a/.github/workflows/termuxpkg.yml b/.github/workflows/termuxpkg.yml new file mode 100644 index 00000000..23f35695 --- /dev/null +++ b/.github/workflows/termuxpkg.yml @@ -0,0 +1,79 @@ +on: + push: + branches: + - master + pull_request: +name: Build Irssi Termux package +jobs: + termux-package: + runs-on: ubuntu-latest + steps: + - name: checkout termux-packages + uses: actions/checkout@main + with: + repository: termux/termux-packages + - name: checkout irssi + uses: actions/checkout@main + with: + path: src.irssi.git + - name: download termux docker container + uses: docker://termux/package-builder:latest + - name: create irssi build receipe + run: | + mkdir packages/irssi-an + cat << 'BUILD_SH' > packages/irssi-an/build.sh + TERMUX_PKG_HOMEPAGE=https://irssi.org/ + TERMUX_PKG_DESCRIPTION="Terminal based IRC client" + TERMUX_PKG_LICENSE="GPL-2.0" + TERMUX_PKG_MAINTAINER="@irssi" + TERMUX_PKG_VERSION=@VERSION@ + TERMUX_PKG_REVISION=@REVISION@ + TERMUX_PKG_SRCURL=git+file:///home/builder/termux-packages/src.irssi.git + TERMUX_PKG_AUTO_UPDATE=true + TERMUX_PKG_DEPENDS="glib, libandroid-glob, libiconv, libotr, ncurses, openssl, perl, utf8proc" + TERMUX_PKG_BREAKS="irssi" + TERMUX_PKG_REPLACES="irssi" + TERMUX_MESON_PERL_CROSS_FILE=$TERMUX_PKG_TMPDIR/meson-perl-cross-$TERMUX_ARCH.txt + TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" + -Dfhs-prefix=$TERMUX_PREFIX + --cross-file $TERMUX_MESON_PERL_CROSS_FILE + " + + termux_step_pre_configure() { + LDFLAGS+=" -landroid-glob" + + # Make build log less noisy. + CFLAGS+=" -Wno-compound-token-split-by-macro" + + local perl_version=$(. $TERMUX_SCRIPTDIR/packages/perl/build.sh; echo $TERMUX_PKG_VERSION) + + cat << MESON_PERL_CROSS >$TERMUX_MESON_PERL_CROSS_FILE + [properties] + perl_version = '$perl_version' + perl_ccopts = ['-I$TERMUX_PREFIX/include', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-I$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android/CORE'] + perl_ldopts = ['-Wl,-E', '-I$TERMUX_PREFIX/include', '-L$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android/CORE', '-lperl', '-lm', '-ldl'] + perl_archname = '${TERMUX_ARCH}-android' + perl_installsitearch = '$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version/${TERMUX_ARCH}-android' + perl_installvendorarch = '' + perl_inc = ['$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version/${TERMUX_ARCH}-android', '$TERMUX_PREFIX/lib/perl5/site_perl/$perl_version', '$TERMUX_PREFIX/lib/perl5/$perl_version/${TERMUX_ARCH}-android', '$TERMUX_PREFIX/lib/perl5/$perl_version'] + MESON_PERL_CROSS + } + + BUILD_SH + version=$(awk '/^v/ { $0=$1; gsub(/^v/,""); gsub(/-head/,"dev"); gsub(/-/,""); print; exit }' src.irssi.git/NEWS) + version=$version+g$(git -C src.irssi.git rev-parse --short HEAD) + sed -i \ + -e "s:@VERSION@:$version:" \ + -e "s:@REVISION@:$GITHUB_RUN_NUMBER:" \ + packages/irssi-an/build.sh + git -C src.irssi.git tag v$version + - name: prepare output folder + run: | + install -m a+rwx -d output + - name: build irssi package + run: | + sudo ./scripts/run-docker.sh ./build-package.sh -I irssi-an + - uses: actions/upload-artifact@v4 + with: + name: irssi-termux-pkg + path: output/irssi-an*.deb diff --git a/.github/workflows/trigger-pages.yml b/.github/workflows/trigger-pages.yml new file mode 100644 index 00000000..0f2d3212 --- /dev/null +++ b/.github/workflows/trigger-pages.yml @@ -0,0 +1,20 @@ +on: + push: + branches: + - master + +jobs: + rebuild-pages: + if: github.repository == 'irssi/irssi' + runs-on: ubuntu-latest + steps: + - uses: actions/github-script@v6 + with: + github-token: ${{ secrets.PAT_TOKEN }} + script: | + await github.rest.actions.createWorkflowDispatch({ + owner: context.repo.owner, + repo: 'irssi.github.io', + workflow_id: 'pages.yml', + ref: 'main' + }) diff --git a/.github/workflows/voiddocker.yml b/.github/workflows/voiddocker.yml new file mode 100644 index 00000000..9dc2addf --- /dev/null +++ b/.github/workflows/voiddocker.yml @@ -0,0 +1,75 @@ +on: + push: + branches: + - master + pull_request: + workflow_dispatch: +name: Check Irssi on Void Linux glibc +jobs: + dist: + runs-on: ubuntu-latest + container: ghcr.io/void-linux/void-glibc:latest + steps: + - name: prepare required software + run: | + xbps-install -Syu xbps || : + xbps-install -Syu + xbps-install -Sy git findutils python3-setuptools tar xz gzip + - uses: actions/checkout@main + - name: make dist + run: | + git config --global --add safe.directory /__w/irssi/irssi + ./utils/make-dist.sh + - uses: actions/upload-artifact@v4 + with: + path: irssi-*.tar.gz + retention-days: 1 + install: + runs-on: ubuntu-latest + container: ghcr.io/void-linux/void-glibc:latest + needs: dist + steps: + - name: prepare required software + run: | + xbps-install -Syu xbps || : + xbps-install -Syu + xbps-install -Sy meson base-devel libglib-devel libutf8proc-devel ncurses-devel ncurses-base openssl-devel libotr-devel libgcrypt-devel tar findutils curl + - name: fetch dist + uses: actions/download-artifact@v4 + - name: Setup local annotations + uses: irssi-import/actions-irssi/problem-matchers@master + - name: Test on Void Linux glibc + run: | + set -ex + curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl + tar xzf artifact/irssi-*.tar.gz + # ninja install + cd irssi-*/ + meson Build -Dwith-proxy=yes -Dwith-bot=yes -Dwith-perl=yes --prefix=$HOME/irssi-build --buildtype debugoptimized + ninja -C Build + ninja -C Build install + # ninja test + ninja -C Build test + find -name testlog.txt -exec sed -i -e '/Inherited environment:.* GITHUB/d' {} + -exec cat {} + + export TERM=xterm + # automated irssi launch test + cd + mkdir irssi-test + echo 'echo automated irssi launch test + ^set settings_autosave off + ^set -clear log_close_string + ^set -clear log_day_changed + ^set -clear log_open_string + ^set log_timestamp * + ^window log on + load irc + load dcc + load flood + load notifylist + load perl + load otr + load proxy + ^quit' > irssi-test/startup + export LC_CTYPE=C.utf8 + irssi-build/bin/irssi --home irssi-test | perl -Mutf8 -C ~/render.pl + cat irc.log.* diff --git a/.gitignore b/.gitignore index 217ce3a8..ea2cd7ba 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,6 @@ src/fe-fuzz/oom-* Build subprojects/* !subprojects/*.wrap +Irssi-Dist +setup.cfg +*.egg-info diff --git a/.muon_fmt.ini b/.muon_fmt.ini new file mode 100644 index 00000000..47fce5d2 --- /dev/null +++ b/.muon_fmt.ini @@ -0,0 +1,14 @@ +# Irssi configuration for muon fmt +max_line_len = 108 +indent_style = space +indent_size = 2 +#indent_by = ' ' +space_array = true +kwargs_force_multiline = true +wide_colon = true +no_single_comma_function = true +insert_final_newline = true +sort_files = false +group_arg_value = true +sticky_parens = true +continuation_indent = true diff --git a/.obs/workflows.yml b/.obs/workflows.yml new file mode 100644 index 00000000..de815226 --- /dev/null +++ b/.obs/workflows.yml @@ -0,0 +1,13 @@ +workflow: + steps: + - branch_package: + source_project: home:ailin_nemui:irssi-git-an + source_package: irssi-git-an + target_project: home:ailin_nemui:CI + - set_flags: + flags: + - type: publish + status: enable + project: home:ailin_nemui:CI + filters: + event: pull_request diff --git a/INSTALL b/INSTALL index 9c6245a1..ac7c419f 100644 --- a/INSTALL +++ b/INSTALL @@ -4,11 +4,15 @@ To compile Irssi you need: -- meson-0.49 build system with ninja-1.5 or greater +- meson-0.53 build system with ninja-1.8 or greater +- pkg-config (or compatible) - glib-2.32 or greater - openssl (for ssl support) - perl-5.8 or greater (for building, and optionally Perl scripts) + (n.b a complete perl is needed, including ExtUtils::Embed and xsubpp) - terminfo or ncurses (for text frontend) +- utf8proc (optional, for additional char width calculation) +- libgcrypt (for OTR) For most people, this should work just fine: @@ -17,21 +21,12 @@ For most people, this should work just fine: su ninja -C Build install -For the moment, autotools is also supported: +meson options - ./autogen.sh (for people who just cloned the repository) - ./configure (if this script already exists, skip ./autogen.sh) - make - su - make install (not _really_ required except for perl support) - -configure options - - These options can be given to meson or ./configure. - The first syntax is for meson, the 2nd for ./configure + These options can be given to meson. For a complete list of options, run - meson configure / ./configure --help + meson configure --prefix @@ -39,33 +34,28 @@ configure options YES, you can install Irssi WITHOUT ROOT permissions by using --prefix=/home/dir - -Dwith-proxy=yes / --with-proxy + -Dwith-proxy=yes Build the Irssi proxy (see startup-HOWTO). - -Dwith-perl=[yes|no] / --with-perl=[yes|no|module] + -Dwith-perl=[yes|no] Enable Perl support yes enable builtin (default) no disable - module enable as module - -Dwith-perl-lib=[site|vendor|DIR] / --with-perl-lib=[site|vendor|DIR] + -Dwith-perl-lib=[site|vendor|DIR] Specify installation dir for Perl libraries site install in dir for site-specific modules (default) vendor install in dir for vendor-specific modules DIR install in DIR - [N/A] / --with-socks - - Build with socks library - - -Dwith-bot=yes / --with-bot + -Dwith-bot=yes Build irssi-bot - -Dwithout-textui=yes / --without-textui + -Dwithout-textui=yes Build without text frontend @@ -82,31 +72,18 @@ the -Dc_args and -Dc_link_args options variable, eg.: Perl support generates most of the problems. There's quite a many things that can go wrong: - - Compiling fails if you compile irssi with GCC in a system that has - perl compiled with some other C compiler. Very common problem with - non-Linux/BSD systems. You'll need to edit src/perl/*/Makefile files - and remove the parameters that gcc doesn't like. Mostly you'll just - need to keep the -I and -D parameters and add -fPIC. - If there's any weird crashing at startup, you might have older irssi's perl libraries installed somewhere, and you should remove those. - - Dynamic libraries don't want to work with some systems, so if your - system complains about some missing symbol in Irssi.so file, configure - irssi with --with-perl-staticlib option (NOT same as --with-perl=static). - - If configure complains that it doesn't find some perl stuff, you're + - If meson complains that it doesn't find some perl stuff, you're probably missing libperl.so or libperl.a. In debian, you'll need to do apt-get install libperl-dev - - For unprivileged home directory installations, you probably do not want - to specify --with-perl-lib=(site|vendor). Instead, you can use the - default perl installation target (below the irssi prefix). If you are - using local::lib you can also choose to install there by specifying - --with-perl-lib=$PERL_LOCAL_LIB_ROOT/lib/perl5 You can verify that the perl module is loaded and working with "/LOAD" command. It should print something like: Module Type Submodules ... -perl static core fe +perl dynamic fe core System specific notes @@ -134,16 +111,7 @@ would call: Getting perl scripting to work needs a few things: - - configure with --with-perl-staticlib - - - libperl.dll is required in linking and running irssi, it's normally - located somewhere around /usr/lib/perl5/5.6.1/cygwin/CORE/libperl5_6_1.dll - copy it to eg. /usr/bin/libperl.dll - - - -DUSEIMPORTLIB is needed to be defined while compiling src/perl directory. - It doesn't hurt to be defined everywhere, so configure irssi with: - - CFLAGS='-DUSEIMPORTLIB' ./configure --with-perl-staticlib + - TODO Apple MacOS / Darwin diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..2cff9eba --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,35 @@ +global-include meson.build + +recursive-include src *.c *.h meson.build +recursive-include src/perl *.c *.h *.xs *.pm *.pl typemap meson.build +recursive-include src/fe-fuzz *.c *.h *.txt meson.build +recursive-include tests *.c meson.build + +include meson_options.txt + +include subprojects/*.wrap +# prune subprojects/* + +include utils/*.pl utils/*.sh +exclude utils/make-dist.sh + +include irssi.conf +include themes/*.theme +include docs/*.1 docs/*.txt docs/*.html +include docs/help/in/[a-z]*.in +include scripts/*.pl scripts/examples/*.pl +include irssi-icon.png + +include NEWS +include INSTALL +include TODO +include ChangeLog + +include .clang-format + +# prune Build +# prune dist +prune *.egg-info + +# ignore fuzz-support/fuzz.diff +# ignore utils/clang-format-xs/* diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 74f81303..00000000 --- a/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -# create default-config.h -BUILT_SOURCES = default-config.h default-theme.h irssi-version.h -CLEANFILES = default-config.h default-theme.h - -@MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h - -default-config.h: $(srcdir)/irssi.conf - $(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h - -default-theme.h: $(srcdir)/themes/default.theme - $(srcdir)/utils/file2header.sh $(srcdir)/themes/default.theme default_theme > default-theme.h - -irssi-version.h: - VERSION="$(VERSION)" $(srcdir)/utils/irssi-version.sh $(srcdir) | \ - cmp -s - $@ || VERSION="$(VERSION)" $(srcdir)/utils/irssi-version.sh $(srcdir) >$@ - -SUBDIRS = src tests docs scripts themes utils - -confdir = $(sysconfdir) -conf_DATA = irssi.conf - -pkgconfig_DATA = irssi-1.pc - -pkginclude_HEADERS = irssi-config.h irssi-version.h - -EXTRA_DIST = \ - ChangeLog \ - autogen.sh \ - README.md \ - $(conf_DATA) \ - irssi-icon.png \ - meson.build \ - meson_options.txt diff --git a/NEWS b/NEWS index 204d8f32..571d251e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +v1.5-head 202x-xx-xx The Irssi team + v1.4.5 2023-10-03 The Irssi team + Add workaround for Perl 5.38.0 bug that breaks the Irssi locale and glyph rendering (scripts.irssi.org#857, #1498) diff --git a/README.md b/README.md index ea4b817b..bfe521d3 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ available. #### Development source installation -[Ninja](https://ninja-build.org/) 1.5 and [Meson](https://mesonbuild.com/) 0.49 +[Ninja](https://ninja-build.org/) 1.8 and [Meson](https://mesonbuild.com/) 0.53 ``` git clone https://github.com/irssi/irssi @@ -29,7 +29,7 @@ ninja -C Build && sudo ninja -C Build install #### Release source installation * Download [release](https://github.com/irssi/irssi/releases) -* [Verify](https://irssi.org/download/#release-sources) signature +* Verify signature ``` tar xJf irssi-*.tar.xz cd irssi-* @@ -41,15 +41,15 @@ ninja -C Build && sudo ninja -C Build install - [glib-2.32](https://wiki.gnome.org/Projects/GLib) or greater - [openssl](https://www.openssl.org/) -- [perl-5.6](https://www.perl.org/) or greater (for perl support) +- [perl-5.8](https://www.perl.org/) or greater (for perl support) - terminfo or ncurses (for text frontend) #### See the [INSTALL](INSTALL) file for details ## [Documentation](https://irssi.org/documentation/) -* [Frequently Asked Questions](https://irssi.org/documentation/faq) -* [Startup How-To](https://irssi.org/documentation/startup) +* [New users guide](https://irssi.org/New-users/) +* [Questions and Answers](https://irssi.org/documentation/qna/) * Check the built-in `/HELP`, it has all the details on command syntax ## [Themes](https://irssi-import.github.io/themes/) @@ -62,7 +62,7 @@ ninja -C Build && sudo ninja -C Build install Please report security issues to staff@irssi.org. Thanks! -## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / [Contributing](https://irssi.org/development/) +## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / Contributing Check the GitHub issues if it is already listed in there; if not, open an issue on GitHub or send a mail to [staff@irssi.org](mailto:staff@irssi.org). diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 17f60f89..00000000 --- a/autogen.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -PKG_NAME="Irssi" - -srcdir=`dirname "$0"` -test -z "$srcdir" && srcdir=. -mydir=`pwd` - -if test ! -f "$srcdir"/configure.ac; then - echo -n "**Error**: Directory \`$srcdir' does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -fi - -cd "$srcdir" - -# create help files -echo "Creating help files..." -perl utils/syntax.pl - -echo "Creating ChangeLog..." -git log > ChangeLog -if test "$?" -ne 0; then - echo "**Error**: ${PKG_NAME} Autogen must be run in a git clone, cannot proceed." - exit 1 -fi - -files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'` -cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am - -files=`echo $files|sed 's/\.in//g'` -cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am - -if test x$NOCONFIGURE = x && test -z "$*"; then - echo "**Warning**: I am going to run \`configure' with no arguments." - echo "If you wish to pass any to it, please specify them on the" - echo \`$0\'" command line." - echo -fi - -rm -f aclocal.m4 -echo "Running autoreconf ..." -autoreconf -i || exit $? - -# make sure perl hashes have correct length -find src/perl -name '*.c' -o -name '*.xs' -exec grep -n hv_store {} + | perl -l -ne 'if (/"(\w+)",\s*(\d+)/ && $2 != length $1) { $X=1; print "Incorrect key length in $_" } END { exit $X }' - -cd "$mydir" - -conf_flags="--enable-maintainer-mode" - -if test x$NOCONFIGURE = x; then - echo Running "$srcdir"/configure $conf_flags "$@" ... - "$srcdir"/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME || exit 1 -else - echo Skipping configure process. -fi - -if grep -q '==\|\[\[' "$srcdir"/build-aux/test-driver; then - echo - echo "************************************************************************" - echo "**Warning**: your build is not portable, please do not make dist" - echo " see https://bugzilla.opensuse.org/show_bug.cgi?id=1076146" - echo "************************************************************************" -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 9a5c2521..00000000 --- a/configure.ac +++ /dev/null @@ -1,821 +0,0 @@ -AC_INIT(irssi, 1.4.5) -AC_CONFIG_SRCDIR([src]) -AC_CONFIG_AUX_DIR(build-aux) -AC_PREREQ(2.50) - -AC_CONFIG_HEADERS([irssi-config.h]) -AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects nostdinc]) - -AM_SILENT_RULES([yes]) - -AM_MAINTAINER_MODE - -AC_PROG_CC -AC_PROG_CPP -AM_PROG_LIBTOOL - -AC_PATH_PROG(sedpath, sed) -AC_PATH_PROG(perlpath, perl) - -PKG_INSTALLDIR - -AC_CHECK_HEADERS(unistd.h dirent.h sys/ioctl.h sys/resource.h) - -# check posix headers.. -AC_CHECK_HEADERS(sys/socket.h sys/time.h sys/utsname.h) - -AC_SYS_LARGEFILE - -AC_ARG_WITH(socks, -[ --with-socks Build with socks support], - if test x$withval = xno; then - want_socks=no - else - want_socks=yes - fi, - want_socks=no) - -AC_ARG_WITH(textui, -[ --without-textui Build without text frontend], - if test x$withval = xno; then - want_textui=no - else - want_textui=yes - fi, - want_textui=yes) - -AC_ARG_WITH(bot, -[ --with-bot Build irssi-bot], - if test x$withval = xno; then - want_irssibot=no - else - want_irssibot=yes - fi, - want_irssibot=no) - -AC_ARG_WITH(fuzzer, -[ --with-fuzzer Build irssi-fuzzer], - if test x$withval = xno; then - want_irssifuzzer=no - else - want_irssifuzzer=yes - fi, - want_irssifuzzer=no) - -AC_ARG_WITH(fuzzer-lib, -[ --with-fuzzer-lib Specify path to fuzzer library], - fuzzerlibpath="$withval") - -AC_ARG_WITH(proxy, -[ --with-proxy Build irssi-proxy], - if test x$withval = xno; then - want_irssiproxy=no - else - want_irssiproxy=yes - fi, - want_irssiproxy=no) - -AC_ARG_WITH(modules, -[ --with-modules Specify what modules to build in binary], - if test x$withval != xyes -a x$withval != xno; then - build_modules="$withval" - fi) - -if test "x$prefix" != "xNONE"; then - prefix=`eval echo $prefix` - PERL_MM_PARAMS="INSTALLDIRS=perl INSTALL_BASE=$prefix" - perl_set_use_lib=yes - - perl_prefix_note=yes -fi - -AC_ARG_WITH(perl-staticlib, -[ --with-perl-staticlib Specify that we want to link perl libraries - statically in irssi, default is no], - if test x$withval = xno; then - want_staticperllib=no - else - want_staticperllib=yes - fi, - want_staticperllib=no) - - -AC_ARG_WITH(perl-lib, -[ --with-perl-lib=[perl|site|vendor|DIR] Specify where to install the - Perl libraries for irssi, default is site], - if test "x$withval" = xyes; then - want_perl=yes - elif test "x$withval" = xno; then - want_perl=no - elif test "x$withval" = xperl; then - want_perl=yes - perl_prefix_note=no - PERL_MM_PARAMS="INSTALLDIRS=perl" - perl_set_use_lib=no - elif test "x$withval" = xsite; then - want_perl=yes - perl_prefix_note=no - PERL_MM_PARAMS="" - perl_set_use_lib=no - elif test "x$withval" = xvendor; then - want_perl=yes - perl_prefix_note=no - if test -z "`$perlpath -v|grep '5\.0'`"; then - PERL_MM_PARAMS="INSTALLDIRS=vendor" - else - PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=`$perlpath -e 'use Config; print $Config{prefix}'`" - fi - perl_set_use_lib=no - else - want_perl=yes - perl_prefix_note=no - PERL_MM_PARAMS="INSTALLDIRS=perl LIB=$withval" - perl_set_use_lib=yes - fi, - want_perl=yes) - -AC_ARG_WITH(perl, -[ --with-perl[=yes|no|module] Build with Perl support - also specifies - if it should be built into main irssi binary - (static, default) or as module], - if test x$withval = xyes; then - want_perl=static - elif test x$withval = xstatic; then - want_perl=static - elif test x$withval = xmodule; then - want_perl=module - else - want_perl=no - fi, - want_perl=static) - -AC_ARG_WITH(otr, -[ --with-otr[=yes|no|static] Build with OTR support - also specifies - if it should be built into the main irssi - binary (static) or as a module (default)], - if test x$withval = xyes; then - want_otr=module - elif test x$withval = xstatic; then - want_otr=static - elif test x$withval = xmodule; then - want_otr=module - else - want_otr=no - fi, - want_otr=no) - -AC_ARG_ENABLE(true-color, -[ --enable-true-color Build with true color support in terminal], - if test x$enableval = xno ; then - want_truecolor=no - else - want_truecolor=yes - fi, - want_truecolor=no) - -AC_ARG_ENABLE(gregex, -[ --disable-gregex Build without GRegex (fall back to regex.h)], - if test x$enableval = xno ; then - want_gregex=no - else - want_gregex=yes - fi, - want_gregex=yes) - -AC_ARG_ENABLE(utf8proc, -[ --disable-utf8proc Build without Julia's utf8proc], - if test x$enableval = xno ; then - want_utf8proc=no - else - want_utf8proc=yes - fi, - want_utf8proc=yes) - -AC_ARG_WITH(capsicum, -[ --with-capsicum Build with Capsicum support], - if test x$withval = xno; then - want_capsicum=no - else - want_capsicum=yes - fi, - want_capsicum=yes) - -dnl ** -dnl ** just some generic stuff... -dnl ** - -dnl * OS specific options -case "$host_os" in - hpux*) - CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" - ;; - *) - ;; -esac - - -AC_SEARCH_LIBS([socket], [network socket]) - -AC_SEARCH_LIBS([inet_addr], [nsl]) - -dnl * gcc specific options -if test "x$ac_cv_prog_gcc" = "xyes"; then - CFLAGS="$CFLAGS -Wall" -fi - -AC_CHECK_TYPE(socklen_t, , - [AC_DEFINE([socklen_t], [int], [Define to 'int' if doesn't define.])], [ -AC_INCLUDES_DEFAULT -#ifdef HAVE_SYS_SOCKET_H -# include -#endif -]) - -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) -AC_CHECK_SIZEOF(long long) -AC_CHECK_SIZEOF(off_t) - -if test $ac_cv_sizeof_off_t = 8; then - offt_64bit=yes -else - offt_64bit=no -fi - -dnl ** -dnl ** check for socks -dnl ** - -if test "x$want_socks" = "xyes"; then - AC_CHECK_LIB(socks, connect, [ - AC_DEFINE(HAVE_SOCKS,, Build with socks support) - LIBS="$LIBS -lsocks" - AC_CHECK_HEADER(socks.h, [ - AC_DEFINE(HAVE_SOCKS_H) - CFLAGS="$CFLAGS -DSOCKS" - AC_MSG_RESULT(["socks5 library found, building with it"]) - ], [ - AC_MSG_RESULT(["socks4 library found, building with it"]) - CFLAGS="$CFLAGS -Dconnect=Rconnect -Dgetsockname=Rgetsockname -Dgetpeername=Rgetpeername -Dbind=Rbind -Daccept=Raccept -Dlisten=Rlisten -Dselect=Rselect" - ]) - ]) -fi - -dnl ** -dnl ** fe-text checks -dnl ** - -for try in 1 2; do - if test $try = 1; then - glib_modules=gmodule - else - echo "*** trying without -lgmodule" - glib_modules= - fi - AM_PATH_GLIB_2_0(2.32.0,,, $glib_modules) - if test "$GLIB_LIBS"; then - if test $glib_modules = gmodule; then - AC_DEFINE(HAVE_GMODULE) - have_gmodule=yes - fi - break - fi -done - -if test -z "$GLIB_LIBS"; then - echo - echo "*** If you don't have GLIB, you can get it from ftp://ftp.gtk.org/pub/glib/" - echo "*** We recommend you get the latest stable GLIB 2 version." - echo "*** Compile and install it, and make sure pkg-config finds it," - echo "*** by adding the path where the .pc file is located to PKG_CONFIG_PATH" - echo -n "*** Or alternatively install your distribution's package" - if test -f /etc/debian_version; then - echo : - echo "*** sudo apt-get install libglib2.0-dev" - elif test -f /etc/redhat-release; then - echo " (glib2-devel)" - else - echo . - fi - echo - - AC_ERROR([GLIB is required to build irssi.]) -fi - -LIBS="$LIBS $GLIB_LIBS" - -GLIB_TESTS - -dnl ** -dnl ** OpenSSL checks -dnl ** -PKG_CHECK_MODULES([OPENSSL], [openssl], [ - CFLAGS="$CFLAGS $OPENSSL_CFLAGS" - LIBS="$LIBS $OPENSSL_LIBS" -], [ - AC_CHECK_LIB([ssl], [SSL_library_init], [ - LIBS="$LIBS -lssl -lcrypto" - ], [ - AC_MSG_ERROR([The OpenSSL library was not found]) - ]) -]) - -dnl ** -dnl ** utf8proc -dnl ** -if test "x$want_utf8proc" != "xno"; then - AC_CHECK_HEADER([utf8proc.h], [ - AC_CHECK_LIB([utf8proc], [utf8proc_version], [ - want_utf8proc=yes - AC_DEFINE(HAVE_LIBUTF8PROC,, [Define to 1 if you have the `utf8proc' library (-lutf8proc).]) - LIBS="$LIBS -lutf8proc" - ], [ - want_utf8proc="no, library not found" - ]) - ], [ - want_utf8proc="no, library header not found" - ]) -fi - -dnl ** -dnl ** curses checks -dnl ** - -if test "x$want_textui" != "xno"; then - - TEXTUI_NO_LIBS="$LIBS" - LIBS= - AC_SEARCH_LIBS([setupterm], [tinfo ncursesw ncurses terminfo], [want_textui=yes], [ - AC_ERROR(Terminfo not found - install libncurses-dev or ncurses-devel package) - want_textui="no, Terminfo not found" - ]) - - TEXTUI_LIBS="$LIBS" - AC_SUBST(TEXTUI_LIBS) - LIBS="$TEXTUI_NO_LIBS" - - AC_CHECK_HEADER([term.h], [ - AC_DEFINE(HAVE_TERM_H, [], [Define to 1 if you have the `term.h' header.]) - ]) - -fi - -dnl ** -dnl ** irssifuzzer checks -dnl ** - -if test "$want_irssifuzzer" != "no"; then - dnl * we need to build with -fsanitize-coverage=trace-pc-guard - dnl * otherwise fuzzer won't be very successful at finding bugs :) - if test -z "$SANFLAGS"; then - SANFLAGS="-g -fsanitize=address -fsanitize-coverage=trace-pc-guard" - fi - CFLAGS="$CFLAGS $SANFLAGS" - CXXFLAGS="$CXXFLAGS $SANFLAGS" - - AC_MSG_CHECKING(for fuzzer library) - - if test -z "$fuzzerlibpath"; then - AC_MSG_RESULT([not found, building without fuzzer front end]) - want_irssifuzzer=no - else - FUZZER_LIBS="$fuzzerlibpath" - AC_SUBST(FUZZER_LIBS) - fi -fi - -dnl ** -dnl ** perl checks -dnl ** - -if test "$want_perl" != "no"; then - AC_MSG_CHECKING(for working Perl support) - - if test -z "$perlpath"; then - perl_check_error="perl binary not found" - else - PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null` - fi - - if test "x$ac_cv_prog_gcc" = "xyes" -a -z "`echo $host_os|grep 'bsd\|linux'`"; then - dnl * several systems have Perl compiled with native compiler - dnl * but irssi is being compiled with GCC. Here we try to - dnl * fix those command line options a bit so GCC won't - dnl * complain about them. Normally there's only few options - dnl * that we want to keep: - dnl * -Ddefine -Uundef -I/path -fopt -mopt -iwithsysroot - PERL_CFLAGS=`echo $PERL_CFLAGS | $perlpath -pe 's/^(.* )?-@<:@^DUIifm@:>@@<:@^ @:>@+/\1/g; s/^(.* )?\+@<:@^ @:>@+/\1/g'` - - PERL_EXTRA_OPTS="CCCDLFLAGS=\"-fPIC\"" - AC_SUBST(PERL_EXTRA_OPTS) - fi - - if test -z "$PERL_CFLAGS"; then - if test -n "$perl_check_error"; then - perl_check_error="Error getting perl CFLAGS" - fi - AC_MSG_RESULT([not found, building without Perl]) - want_perl=no - else - PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts 2>/dev/null` - - dnl * remove all database stuffs - dnl * nsl is already in ldflags - dnl * libc is of course linked without needing -lc - dnl * -rdynamic must not be in LIBADD line - for word in -ldb -ldbm -lndbm -lgdbm -lc -rdynamic; do - PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e "s/$word //" -e "s/$word$//"` - done - - case "$host_os" in - linux*) - PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e 's/-lposix //' -e 's/-lposix$//'` - ;; - hpux*) - if test "x$ac_cv_prog_gcc" = "xyes"; then - PERL_CFLAGS=`echo $PERL_CFLAGS | $sedpath -e 's/-Ae //' -e 's/-Ae$//'` - PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e 's/-Ae //' -e 's/-Ae$//'` - fi - ;; - *) - ;; - esac - - dnl * check that perl's ldflags actually work - echo "#include " > conftest.c - echo "#include " >> conftest.c - echo "int main(){perl_alloc(); return 0;}" >> conftest.c - $CC $CFLAGS $PERL_CFLAGS conftest.c -o conftest $LDFLAGS $PERL_LDFLAGS 2> perl.error.tmp > /dev/null - if test ! -s conftest -a "x$ignore_perl_errors" = "x"; then - perl_check_error="Error linking with perl libraries: $PERL_LDFLAGS: `cat perl.error.tmp`" - AC_MSG_RESULT([error linking with perl libraries, building without Perl]) - want_perl=no - fi - - rm -f perl.error.tmp - fi - - if test "x$want_perl" != "xno"; then - AC_MSG_RESULT(ok) - - if test "x$want_perl" = "xstatic"; then - dnl * building with static perl support - dnl * all PERL_LDFLAGS linking is done in fe-text - PERL_LINK_FLAGS="$PERL_LDFLAGS" - PERL_LINK_LIBS="../perl/libperl_core_static.la" - PERL_FE_LINK_LIBS="../perl/libfe_perl_static.la" - PERL_LDFLAGS= - AC_DEFINE(HAVE_STATIC_PERL) - - dnl * build only static library of perl module - perl_module_lib= - perl_module_fe_lib= - perl_static_lib=libperl_core_static.la - perl_static_fe_lib=libfe_perl_static.la - else - dnl * build dynamic library of perl module - perl_module_lib=libperl_core.la - perl_module_fe_lib=libfe_perl.la - perl_static_lib= - perl_static_fe_lib= - fi - - if test "x$want_staticperllib" = "xyes"; then - PERL_MM_PARAMS="$PERL_MM_PARAMS LINKTYPE=static" - PERL_LINK_LIBS="$PERL_LINK_LIBS ../perl/common/blib/arch/auto/Irssi/Irssi.a ../perl/irc/blib/arch/auto/Irssi/Irc/Irc.a ../perl/ui/blib/arch/auto/Irssi/UI/UI.a ../perl/textui/blib/arch/auto/Irssi/TextUI/TextUI.a" - PERL_STATIC_LIBS=1 - else - PERL_STATIC_LIBS=0 - fi - - # remove any prefix from PERL_MM_OPT - PERL_MM_OPT=`perl -MText::ParseWords -e 'sub qu{$_=shift;s{^(.*?)=(.*)$}{($a,$b)=($1,$2);$b=~s/"/\\\\"/g;qq{$a="$b"}}ge if /@<:@\s"@:>@/;$_} local $,=" "; print map qu($_), grep !/^(INSTALL_BASE|PREFIX)=/, shellwords(@ARGV)' "$PERL_MM_OPT"` - # figure out the correct @INC path - we'll need to do this - # through MakeMaker since it's difficult to get it right - # otherwise. - $perlpath -MExtUtils::MakeMaker -e 'WriteMakefile(NAME => "test", MAKEFILE => "Makefile.test", FIRST_MAKEFILE => "/dev/null", NO_META => 1, NO_MYMETA => 1);' $PERL_MM_PARAMS >/dev/null - echo 'show-INSTALLDIRS:' >> Makefile.test - echo ' @echo $(INSTALLDIRS)' >> Makefile.test - perl_INSTALLDIRS=`$am_make -s -f Makefile.test show-INSTALLDIRS` - if test "x$perl_INSTALLDIRS" = "xsite"; then - perl_library_dir="site default" - perl_INSTALL_VAR=INSTALLSITEARCH - elif test "x$perl_INSTALLDIRS" = "xvendor"; then - perl_library_dir="vendor default" - perl_INSTALL_VAR=INSTALLVENDORARCH - else - perl_library_dir="module default" - perl_INSTALL_VAR=INSTALLARCHLIB - fi - echo 'show-ARCHLIB:' >> Makefile.test - echo ' @echo $('"$perl_INSTALL_VAR"')' >> Makefile.test - perl_use_lib=`$am_make -s -f Makefile.test show-ARCHLIB` - rm -f Makefile.test - if test "x$perl_set_use_lib" = "xyes"; then - if $perlpath -e 'exit ! grep $_ eq $ARGV@<:@0@:>@, grep /^\//, @INC' "$perl_use_lib"; then - perl_library_dir="other path in @INC" - perl_set_use_lib=no - else - perl_library_dir="prepends to @INC with /set perl_use_lib" - PERL_USE_LIB="$perl_use_lib" - fi - fi - - AC_SUBST(perl_module_lib) - AC_SUBST(perl_static_lib) - AC_SUBST(perl_module_fe_lib) - AC_SUBST(perl_static_fe_lib) - - AC_SUBST(PERL_LINK_FLAGS) - AC_SUBST(PERL_LINK_LIBS) - AC_SUBST(PERL_FE_LINK_LIBS) - - AC_SUBST(PERL_LDFLAGS) - AC_SUBST(PERL_CFLAGS) - - AC_SUBST(PERL_USE_LIB) - AC_SUBST(PERL_MM_OPT) - AC_SUBST(PERL_MM_PARAMS) - AC_SUBST(PERL_STATIC_LIBS) - fi -fi - -dnl ** -dnl ** check for capsicum -dnl ** - -if test "x$want_capsicum" = "xyes"; then - AC_CHECK_LIB(c, cap_enter, [ - AC_CHECK_LIB(nv, nvlist_create, [ - AC_DEFINE(HAVE_CAPSICUM,, Build with Capsicum support) - LIBS="$LIBS -lnv" - ], [ - want_capsicum="no, nvlist_create not found" - ]) - ], [ - want_capsicum="no, cap_enter not found" - ]) -fi - -dnl ** -dnl ** OTR checks -dnl ** - -have_otr=no -if test "x$want_otr" != "xno"; then - AM_PATH_LIBGCRYPT(1:1.2.0, [], [AC_ERROR(libgcrypt 1.2.0 or newer is required.)]) - AM_PATH_LIBOTR(4.1.0, [], [AC_ERROR([libotr 4.1.0 or newer is required.])]) - - OTR_CFLAGS="$LIBOTR_CFLAGS $LIBGCRYPT_CFLAGS" - OTR_LDFLAGS="$LIBOTR_LIBS $LIBGCRYPT_LIBS" - - AC_SUBST(otr_module_lib) - AC_SUBST(otr_static_lib) - - if test "x$want_otr" != "xno"; then - if test "x$want_otr" = "xstatic"; then - otr_module_lib= - otr_static_lib=libotr_core_static.la - - OTR_LINK_LIBS="../otr/libotr_core_static.la" - OTR_LINK_FLAGS="$OTR_LDFLAGS" - - AC_DEFINE(HAVE_STATIC_OTR) - else - otr_module_lib=libotr_core.la - otr_static_lib= - fi - fi - - AC_SUBST(otr_module_lib) - AC_SUBST(otr_static_lib) - - AC_SUBST(OTR_CFLAGS) - AC_SUBST(OTR_LDFLAGS) - - AC_SUBST(OTR_LINK_LIBS) - AC_SUBST(OTR_LINK_FLAGS) - - have_otr=yes -fi - -dnl ** check what we want to build -AM_CONDITIONAL(BUILD_TEXTUI, test "$want_textui" = "yes") -AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "yes") -AM_CONDITIONAL(BUILD_IRSSIFUZZER, test "$want_irssifuzzer" = "yes") -AM_CONDITIONAL(BUILD_IRSSIPROXY, test "$want_irssiproxy" = "yes") -AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no") -AM_CONDITIONAL(HAVE_CAPSICUM, test "x$want_capsicum" = "xyes") -AM_CONDITIONAL(USE_GREGEX, test "x$want_gregex" = "xyes") -AM_CONDITIONAL(HAVE_OTR, test "x$have_otr" != "xno") - -# move LIBS to PROG_LIBS so they're not tried to be used when linking eg. perl libraries -PROG_LIBS=$LIBS -LIBS= -AC_SUBST(PROG_LIBS) - -dnl ** -dnl ** Keep all the libraries here so each frontend doesn't need to -dnl ** keep track of them all -dnl ** -dnl ** (these could be made configurable) - -CHAT_MODULES="irc" -irc_MODULES="dcc flood notifylist" -if test -n "$build_modules"; then - irc_MODULES="$irc_MODULES $build_modules" -fi - -dnl **************************************** - -AC_SUBST(CHAT_MODULES) -AC_SUBST(irc_MODULES) - -CORE_LIBS="../core/libcore.a ../lib-config/libirssi_config.a" -FE_COMMON_LIBS="" - -CHAT_LIBS="" -for c in $CHAT_MODULES; do - CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.a ../$c/core/lib${c}_core.a" - if test -f $srcdir/src/fe-common/$c/module.h; then - FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libfe_common_$c.a " - fi - for s in `eval echo \\$${c}_MODULES`; do - CHAT_LIBS="$CHAT_LIBS ../$c/$s/lib${c}_$s.a" - if test -f $srcdir/src/fe-common/$c/$s/module.h; then - FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/libfe_${c}_$s.a " - fi - done -done - -FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a" - -dnl ** common libraries needed by frontends -COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS" -COMMON_LIBS="$FE_COMMON_LIBS $COMMON_NOUI_LIBS" -AC_SUBST(COMMON_NOUI_LIBS) -AC_SUBST(COMMON_LIBS) - -if test "x$want_truecolor" = "xyes"; then - AC_DEFINE([TERM_TRUECOLOR], [], [true color support in terminal]) -else - want_truecolor=no -fi - -if test "x$want_gregex" = "xyes"; then - AC_DEFINE([USE_GREGEX], [], [use GRegex for regular expressions]) -else - want_gregex=no -fi - -AC_DEFINE([FHS_PREFIX], [""], [Alternate filesystem prefix for Termux]) -AH_TEMPLATE(HAVE_GMODULE) -AH_TEMPLATE(HAVE_SOCKS_H, [misc..]) -AH_TEMPLATE(HAVE_STATIC_PERL) -AH_TEMPLATE(HAVE_STATIC_OTR) -AH_TEMPLATE(PRIuUOFF_T, [printf()-format for uoff_t, eg. "u" or "lu" or "llu"]) -AH_TEMPLATE(UOFF_T_INT, [What type should be used for uoff_t]) -AH_TEMPLATE(UOFF_T_LONG) -AH_TEMPLATE(UOFF_T_LONG_LONG) - -AC_CONFIG_FILES([ -Makefile -src/Makefile -src/core/Makefile -src/irc/Makefile -src/irc/core/Makefile -src/irc/dcc/Makefile -src/irc/notifylist/Makefile -src/irc/proxy/Makefile -src/irc/flood/Makefile -src/fe-common/Makefile -src/fe-common/core/Makefile -src/fe-common/irc/Makefile -src/fe-common/irc/dcc/Makefile -src/fe-common/irc/notifylist/Makefile -src/fe-fuzz/Makefile -src/fe-fuzz/irc/Makefile -src/fe-fuzz/irc/core/Makefile -src/fe-fuzz/fe-common/Makefile -src/fe-fuzz/fe-common/core/Makefile -src/fe-none/Makefile -src/fe-text/Makefile -src/lib-config/Makefile -src/perl/Makefile -src/perl/common/Makefile.PL -src/perl/irc/Makefile.PL -src/perl/ui/Makefile.PL -src/perl/textui/Makefile.PL -src/otr/Makefile -scripts/Makefile -scripts/examples/Makefile -tests/Makefile -tests/fe-common/Makefile -tests/fe-common/core/Makefile -tests/fe-text/Makefile -tests/irc/Makefile -tests/irc/core/Makefile -tests/irc/flood/Makefile -docs/Makefile -docs/help/Makefile -docs/help/in/Makefile -utils/Makefile -themes/Makefile -irssi-1.pc -]) - -dnl ** make the paths like include headers later -AC_CONFIG_LINKS([irssi/irssi-config.h:irssi-config.h]) -AC_LINK_FILES([$srcdir/src],[irssi/src]) - -AC_OUTPUT -$LN_S ../irssi-version.h irssi/irssi-version.h - -dnl ** for building from objdir -old_dir=`pwd` && cd $srcdir && whole_dir=`pwd` && cd $old_dir -if test "x$old_dir" != "x$whole_dir"; then - $LN_S $srcdir/irssi-version.h irssi-version.h - if test "x$want_perl" != "xno"; then - subdirfiles="" - for i in $whole_dir/src/perl/common $whole_dir/src/perl/irc $whole_dir/src/perl/ui $whole_dir/src/perl/textui; do - subdirfiles=`echo $subdirfiles $i/typemap $i/*.h $i/*.pm $i/*.xs` - done - for file in $whole_dir/src/perl/module.h $subdirfiles; do - link=`echo $file|$sedpath "s?$whole_dir/??"` - rm -f $link - $LN_S $file $link - done - fi -fi - -echo - -echo "Building text frontend ........... : $want_textui" -echo "Building irssi bot ............... : $want_irssibot" -echo "Building irssi proxy ............. : $want_irssiproxy" -if test "x$have_gmodule" = "xyes"; then - echo "Building with module support ..... : yes" -else - echo "Building with module support : NO!! /LOAD will not work!" - echo " - You're missing gmodule (comes with glib) for some reason," - echo " or it doesn't work in your system." -fi - -if test "x$want_perl" = "xstatic"; then - echo "Building with Perl support ....... : static (in irssi binary)" -elif test "x$want_perl" = "xmodule"; then - echo "Building with Perl support ....... : module" -else - if test -z "$perl_check_error"; then - echo "Building with Perl support ....... : no" - else - echo "Building with Perl support ....... : NO!" - echo " - $perl_check_error" - if test -f /etc/debian_version; then - echo " - Try: sudo apt-get install libperl-dev" - elif test -f /etc/redhat-release; then - echo " - Try installing perl-devel" - fi - fi -fi - -if test "x$want_perl" != "xno" -a "x$perl_mod_error" != "x"; then - echo " - NOTE: Perl support will be compiled statically to irssi, not as" - echo " a module as requested. Reason:" - echo " $perl_mod_error" - - if test -f /etc/debian_version; then - echo " - Try: sudo apt-get install libperl-dev" - fi -fi - -if test "x$want_perl" != "xno"; then - echo "Perl library directory ........... : ($perl_library_dir - $perl_use_lib)" - if test "x$perl_prefix_note" = "xyes"; then - echo " - NOTE: This was automatically set to the same directory you gave with" - echo " --prefix. If you want the perl libraries to install to their 'correct'" - echo " path, you'll need to give --with-perl-lib=site option to configure." - echo " Anyway, installing perl to this directory should work just as well." - fi -fi -echo "Install prefix ................... : $prefix" - -echo - -echo "Building with 64bit DCC support .. : $offt_64bit" -echo "Building with true color support.. : $want_truecolor" -echo "Building with GRegex ............. : $want_gregex" -echo "Building with Capsicum ........... : $want_capsicum" -echo "Building with utf8proc ........... : $want_utf8proc" -if test "x$want_otr" = "xstatic"; then - echo "Building with OTR support ........ : static (in irssi binary)" -elif test "x$want_otr" = "xmodule"; then - echo "Building with OTR support ........ : module" -else - echo "Building with OTR support ........ : no" -fi - - -echo -echo "If there are any problems, read the INSTALL file." diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index 05ebb319..00000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -man_MANS = \ - irssi.1 - -doc_DATA = \ - capsicum.txt \ - design.html \ - design.txt \ - formats.txt \ - manual.txt \ - faq.html \ - faq.txt \ - perl.txt \ - signals.txt \ - special_vars.txt \ - startup-HOWTO.html \ - startup-HOWTO.txt - -EXTRA_DIST = $(doc_DATA) $(man_MANS) \ - meson.build - -SUBDIRS = help diff --git a/docs/New-users.html b/docs/New-users.html new file mode 100644 index 00000000..496f319e --- /dev/null +++ b/docs/New-users.html @@ -0,0 +1,110 @@ + +

New users guide

+
+

New to IRC

+

Internet Relay Chat was created in 1988 and has hardly changed. It can be used to exchange text messages (one message = single line) with other people, either privately (called query, PM, private message, MSG) or in a room (channel). Pictures are shared by uploading them to a temporary host like https://pomf.lain.la/ and then pasting the HTTP links. Code snippets or longer texts are shared by pasting them to a Pastebin like https://paste.opensuse.org/ and then sharing the HTTP link.

+

IRC does not have message history. You can only receive replies while your computer is turned on and connected to the channel you want to follow. Some people run their IRC programs on remote servers for that reason.

+

IRC is organised into networks. Each network consists of many servers. It (mostly) does not matter which server you connect to as long as it belongs to the network you want to use. Irssi supports connections to many networks at the same time.

+

Each network contains many channels, rooms that are often dedicated to discussing a specific topic. You can find many channels on https://netsplit.de/ or using a search engine with the keyword “IRC”. Irssi supports joining many channels at the same time.

+

There is a rather large IRC network catering to free and open-source software and peer directed projects at https://libera.chat/ and a smaller one at https://www.oftc.net/ – many free software projects still have support channels on these IRC networks (although some have moved to Matrix or proprietary platforms like Discord).

+
+
+

First start

+

After (compiling and) installing Irssi, to start it, open a shell (Terminal) and type:

+
irssi
+
+
+

You should be greeted by a blinking cursor behind [(status)]. You are now in the status window of Irssi. Window is the Irssi name for what you might nowadays call a “Web browser tab”.

+

If you’re confused about what you are seeing on the Irssi screen, you can find an annotated screenshot of it at User interface.

+

If you want, you can pick a nick name (handle) that will be shown to others reading your messages now, by typing

+
/set nick whatyouwant
+
+
+

Each command or message can be sent by pressing Enter. Commands in Irssi start with a /. If there is no /, then the line that you wrote will be sent as a message to the channel that you have open, for everyone to see.

+
+

Leaving

+

Type /quit to get out of Irssi.

+
+
+
+

Connecting to a network

+

Irssi comes with some predefined networks. You can see the current list of networks by typing

+
/network
+
+
+

(the list will be shown in your status window)

+

To connect to one of the networks in the list, type /connect networkname, for example:

+
/connect liberachat
+
+
+

You should see several messages scroll by. After a while, you should be connected to the Libera Chat network.

+
+

Attention

+

Irssi version 1.2 or older may be lacking the liberachat network entry. See https://github.com/shabble/irssi-docs/wiki/liberachat for how to add it.

+
+
+

Nickname registration

+

Many IRC networks (but not all) offer a way to register a user account. Sometimes (but not on all networks) the account registration also includes reserving a nick for you. How to register also differs by network. Some channels only allow users with registered accounts to join them, so it may be very important for you to register a user account.

+

User accounts are always specific to a network.

+

For the Libera Chat network, you can find instructions how to register and set up your account with Irssi on https://github.com/shabble/irssi-docs/wiki/liberachat#configure-sasl-automated-log-in

+
+
+
+

Joining a channel

+

Once you are connected to a network, you can join channels by typing /join #channelname, for example:

+
/join #irssi
+
+
+

Now, a new window will open and you can send messages to the channel.

+
+

Changing windows

+

You can change between windows using the Ctrl+n or Ctrl+p keys, or–if your terminal is configured properly–using Alt+1, Alt+2, … See bind -list for a list of all default key bindings.

+
+
+

Removing clutter

+

By default, Irssi shows when someone joins or leaves a channel. These messages can waste a lot of lines and obscure the actual chat. To hide them, type

+
/window hidelevel +joins +parts +quits
+
+
+

To get them back

+
/window hidelevel -joins -parts -quits
+
+
+

If you want to hide them by default, /set window_default_hidelevel hidden joins parts quits

+
+
+
+

Adding a new network

+

If you want to join a network that is not there, you first need to find at least one server of that network. Let’s say you have found the room #hackint on netsplit.de and want to join it. Then you can find that the server is irc.hackint.org, port 6697, SSL (TLS) on. To add it to Irssi, use the commands:

+
/network add hackint
+/server add -tls -network hackint irc.hackint.org 6697
+
+
+

Then, you can connect to the newly added network with

+
/connect hackint
+
+
+
+

Multiple networks

+

If you are connected to multiple networks, you can change which one you are “talking” to (which one to send commands) by using the Ctrl+x key in the status window.

+
+
+
+

On-line help

+

Most /commands have a help page, you can read it with

+
/help commandname
+
+
+

or on-line.

+

The settings that can be changed with /SET are described on Settings Documentation – the settingshelp script can be used to read it from within /help

+
+
+

About Scripts

+

You can enhance your Irssi by installing scripts. Many Perl scripts written by other Irssi users can be found on https://scripts.irssi.org/

+

Most of them should be compatible with Irssi 1.4 (but some may not, also see the Full Change log for some incompatible ones)

+
+
+

About Themes

+

Irssi’s look can be thoroughly changed with themes. Many themes created by other Irssi users can be found on https://themes.irssi.org/

+

If you want to modify the look of Irssi yourself, the default theme which can be found in your ~/.irssi folder is a good starting point. It also has a few comments explaining what some of the abstracts are used for

+
\ No newline at end of file diff --git a/docs/New-users.txt b/docs/New-users.txt new file mode 100644 index 00000000..5c5a268c --- /dev/null +++ b/docs/New-users.txt @@ -0,0 +1,193 @@ +# New users guide # + +## New to IRC ## + +Internet Relay Chat was created in 1988 and has hardly changed. It can be used +to exchange text messages (one message = single line) with other people, either +privately (called query, PM, private message, MSG) or in a room (channel). +Pictures are shared by uploading them to a temporary host like [1]https:// +pomf.lain.la/ and then pasting the HTTP links. Code snippets or longer texts +are shared by pasting them to a Pastebin like [2]https://paste.opensuse.org/ +and then sharing the HTTP link. + +IRC does not have message history. You can only receive replies while your +computer is turned on and connected to the channel you want to follow. Some +people run their IRC programs on remote servers for that reason. + +IRC is organised into networks. Each network consists of many servers. It +(mostly) does not matter which server you connect to as long as it belongs to +the network you want to use. Irssi supports connections to many networks at the +same time. + +Each network contains many channels, rooms that are often dedicated to +discussing a specific topic. You can find many channels on [3]https:// +netsplit.de/ or using a search engine with the keyword “IRC”. Irssi supports +joining many channels at the same time. + +There is a rather large IRC network catering to free and open-source software +and peer directed projects at [4]https://libera.chat/ and a smaller one at [5] +https://www.oftc.net/ – many free software projects still have support channels +on these IRC networks (although some have moved to Matrix or proprietary +platforms like Discord). + +## First start ## + +After (compiling and) installing Irssi, to start it, open a shell (Terminal) +and type: + +irssi + +You should be greeted by a blinking cursor behind [(status)]. You are now in +the status window of Irssi. Window is the Irssi name for what you might +nowadays call a “Web browser tab”. + +If you’re confused about what you are seeing on the Irssi screen, you can find +an annotated screenshot of it at [6]User interface. + +If you want, you can pick a nick name (handle) that will be shown to others +reading your messages now, by typing + +/set nick whatyouwant + +Each command or message can be sent by pressing Enter. Commands in Irssi start +with a /. If there is no /, then the line that you wrote will be sent as a +message to the channel that you have open, for everyone to see. + +### Leaving ### + +Type /quit to get out of Irssi. + +## Connecting to a network ## + +Irssi comes with some predefined networks. You can see the current list of +networks by typing + +/network + +(the list will be shown in your status window) + +To connect to one of the networks in the list, type /connect networkname, for +example: + +/connect liberachat + +You should see several messages scroll by. After a while, you should be +connected to the Libera Chat network. + +Attention + +Irssi version 1.2 or older may be lacking the liberachat network entry. See [7] +https://github.com/shabble/irssi-docs/wiki/liberachat for how to add it. + +### Nickname registration ### + +Many IRC networks (but not all) offer a way to register a user account. +Sometimes (but not on all networks) the account registration also includes +reserving a nick for you. How to register also differs by network. Some +channels only allow users with registered accounts to join them, so it may be +very important for you to register a user account. + +User accounts are always specific to a network. + +For the Libera Chat network, you can find instructions how to register and set +up your account with Irssi on [8]https://github.com/shabble/irssi-docs/wiki/ +liberachat#configure-sasl-automated-log-in + +## Joining a channel ## + +Once you are connected to a network, you can join channels by typing /join # +channelname, for example: + +/join #irssi + +Now, a new window will open and you can send messages to the channel. + +### Changing windows ### + +You can change between windows using the Ctrl+n or Ctrl+p keys, or–if your +terminal is configured properly–using Alt+1, Alt+2, … See [9]bind -list for a +list of all default key bindings. + +### Removing clutter ### + +By default, Irssi shows when someone joins or leaves a channel. These messages +can waste a lot of lines and obscure the actual chat. To hide them, type + +/window hidelevel +joins +parts +quits + +To get them back + +/window hidelevel -joins -parts -quits + +If you want to hide them by default, /set window_default_hidelevel hidden joins +parts quits + +## Adding a new network ## + +If you want to join a network that is not there, you first need to find at +least one server of that network. Let’s say you have found the room [10]# +hackint on netsplit.de and want to join it. Then you can find that the [11] +server is irc.hackint.org, port 6697, SSL (TLS) on. To add it to Irssi, use the +commands: + +/network add hackint +/server add -tls -network hackint irc.hackint.org 6697 + +Then, you can connect to the newly added network with + +/connect hackint + +### Multiple networks ### + +If you are connected to multiple networks, you can change which one you are +“talking” to (which one to send commands) by using the Ctrl+x key in the status +window. + +## On-line help ## + +Most /commands have a help page, you can read it with + +/help commandname + +or [12]on-line. + +The settings that can be changed with /SET are described on [13]Settings +Documentation – the settingshelp [14]script can be used to read it from within +/help + +## About Scripts ## + +You can enhance your Irssi by installing scripts. Many Perl scripts written by +other Irssi users can be found on [15]https://scripts.irssi.org/ + +Most of them should be compatible with Irssi 1.4 (but some may not, also see +the Full Change log for some incompatible ones) + +## About Themes ## + +Irssi’s look can be thoroughly changed with themes. Many themes created by +other Irssi users can be found on [16]https://themes.irssi.org/ + +If you want to modify the look of Irssi yourself, the default theme which can +be found in your ~/.irssi folder is a good starting point. It also has a few +comments explaining what some of the abstracts are used for + + +References: + +[1] https://pomf.lain.la/ +[2] https://paste.opensuse.org/ +[3] https://netsplit.de/ +[4] https://libera.chat/ +[5] https://www.oftc.net/ +[6] https://irssi.org/User-interface/ +[7] https://github.com/shabble/irssi-docs/wiki/liberachat +[8] https://github.com/shabble/irssi-docs/wiki/liberachat#configure-sasl-automated-log-in +[9] https://irssi.org/documentation/help/bind_-list/ +[10] https://netsplit.de/channels/details.php?room=%23hackint&net=hackint +[11] https://netsplit.de/servers/?net=hackint +[12] https://irssi.org/documentation/help/ +[13] https://irssi.org/documentation/settings/ +[14] https://irssi.org/New-users/#about-scripts +[15] https://scripts.irssi.org/ +[16] https://themes.irssi.org/ diff --git a/docs/capsicum.txt b/docs/capsicum.txt index a3a1b8a7..d2ad920c 100644 --- a/docs/capsicum.txt +++ b/docs/capsicum.txt @@ -9,13 +9,13 @@ To make Irssi enter capability mode on startup, add capsicum = "yes"; awaylog_file = "~/irclogs/away.log"; -to your ~/.irssi/config and restart the client. Alternatively you can -enter it "by hand", using the "/capsicum enter" command. From the security -point of view it's strongly preferable to use the former method, to avoid -establishing connections without the sandbox protection; the "/capsicum" -command is only intended for experimentation, and in cases where you need -to do something that's not possible in capability mode - run scripts, -for example - before continuing. +to your ~/.irssi/config in the settings/core section, and restart the +client. Alternatively you can enter it "by hand", using the +"/capsicum enter" command. From the security point of view it's strongly +preferable to use the former method, to avoid establishing connections +without the sandbox protection; the "/capsicum" command is only intended +for experimentation, and in cases where you need to do something that's not +possible in capability mode - run scripts, for example - before continuing. There is no way to leave the capability mode, apart from exiting Irssi. When running in capability mode, there are certain restrictions - Irssi diff --git a/docs/design.html b/docs/design.html index 3865a7fb..e4f9bb06 100644 --- a/docs/design.html +++ b/docs/design.html @@ -162,4 +162,4 @@ server reconnections and irc network splits
  • placing channels and queries in windows
  • nick completion
  • printing infomation of some events
    • - \ No newline at end of file + diff --git a/docs/faq.html b/docs/faq.html index 50b404a0..7909b5b4 100644 --- a/docs/faq.html +++ b/docs/faq.html @@ -78,4 +78,4 @@

    Q: How to pronounce Irssi?

    -

    A: Check here

    \ No newline at end of file +

    A: Check here

    diff --git a/docs/help/Makefile.am.gen b/docs/help/Makefile.am.gen deleted file mode 100644 index 917abe64..00000000 --- a/docs/help/Makefile.am.gen +++ /dev/null @@ -1,13 +0,0 @@ -# Makefile.am is autogenerated by autogen.sh from Makefile.am.gen - -helpdir = $(datadir)/irssi/help - -help_DATA = \ -@HELPFILES@ - -EXTRA_DIST = \ - Makefile.am.gen \ - $(help_DATA) \ - meson.build - -SUBDIRS = in diff --git a/docs/help/in/Makefile.am.gen b/docs/help/in/Makefile.am.gen deleted file mode 100644 index 9b0f2aaa..00000000 --- a/docs/help/in/Makefile.am.gen +++ /dev/null @@ -1,5 +0,0 @@ -# Makefile.am is autogenerated by autogen.sh from Makefile.am.gen - -EXTRA_DIST = \ - Makefile.am.gen \ -@HELPFILES@ diff --git a/docs/help/in/bind.in b/docs/help/in/bind.in index 8fcc744b..761d971e 100644 --- a/docs/help/in/bind.in +++ b/docs/help/in/bind.in @@ -17,13 +17,15 @@ Details: Adds or removes a binding; the binding itself is case-sensitive and may contain as many characters as you want. - Uppercase characters usually indicate that you need to keep the shift-key - pressed to use the binding. + Key bindings are case sensitive so uppercase letters mean you also have + to use the shift key, except for ctrl which does not support shift but + the keys must always be typed in uppercase. %9Examples:%9 /BIND /BIND meta-c /CLEAR + /BIND meta-C /CYCLE /BIND meta-q change_window 16 /BIND -delete meta-y /BIND ^W^C /WINDOW NEW HIDE diff --git a/docs/help/in/levels.in b/docs/help/in/levels.in index b6eb9fbf..3c61263d 100644 --- a/docs/help/in/levels.in +++ b/docs/help/in/levels.in @@ -20,9 +20,10 @@ MODES A channel mode is modified. MSGS Private messages. NICKS A nickname changes to another nickname. - NOTICES Notices sent from a nickname. + NOTICES Private notices. PARTS A nickname leaves a channel. PUBLIC Public messages in a channel. + PUBNOTICES Public notices in a channel. QUITS A nickname disconnects from IRC. SNOTES Notices sent from a server. TOPICS A channel topic is modified. diff --git a/docs/help/in/lusers.in b/docs/help/in/lusers.in index f9edf535..99089fb7 100644 --- a/docs/help/in/lusers.in +++ b/docs/help/in/lusers.in @@ -5,7 +5,7 @@ %9Parameters:%9 - The server to search on and the remote sever to search on; if no arguments + The server to search on and the remote server to search on; if no arguments are given, the active server will be used. %9Description:%9 diff --git a/docs/help/in/network.in b/docs/help/in/network.in index 788c1c65..16ff9f47 100644 --- a/docs/help/in/network.in +++ b/docs/help/in/network.in @@ -36,8 +36,8 @@ -cmdmax: Specifies the maximum number of commands to perform before starting the internal flood protection. -sasl_mechanism Specifies the mechanism to use for the SASL authentication. - At the moment irssi only supports the 'plain' and the - 'external' mechanisms. + Irssi supports: PLAIN, EXTERNAL, SCRAM-SHA-1, SCRAM-SHA-256 + and SCRAM-SHA-512 Use '' to disable the authentication. -sasl_username Specifies the username to use during the SASL authentication. -sasl_password Specifies the password to use during the SASL authentication. diff --git a/docs/help/in/scrollback.in b/docs/help/in/scrollback.in index 5f59d842..e91513cd 100644 --- a/docs/help/in/scrollback.in +++ b/docs/help/in/scrollback.in @@ -20,10 +20,10 @@ %9Description:%9 - Manipulate the text in the window to go to a to the given line number, or + Manipulate the text in the window to go to the given line number, or clear the buffers. - The timestamp format is format is '[dd[.mm] | -] hh:mi[:ss]'. + The timestamp format is '[dd[.mm] | -] hh:mi[:ss]'. %9Examples:%9 diff --git a/docs/help/in/toggle.in b/docs/help/in/toggle.in index f87a6462..9469ba5c 100644 --- a/docs/help/in/toggle.in +++ b/docs/help/in/toggle.in @@ -15,7 +15,6 @@ %9Examples:%9 - /TOGGLE resolve_prefer_ipv6 /TOGGLE channels_rejoin_unavailable ON %9See also:%9 SET diff --git a/docs/help/in/window.in b/docs/help/in/window.in index 2566668b..5a8ecbd0 100644 --- a/docs/help/in/window.in +++ b/docs/help/in/window.in @@ -74,5 +74,5 @@ /WINDOW HIDELEVEL ^JOINS ^PARTS ^QUITS /WINDOW LOGFILE ~/logs/notices.log -%9See also:%9 JOIN, LEVELS, LOG, QUERY +%9See also:%9 JOIN, LEVELS, LOG, QUERY, SET window_default_level, SET window_default_hidelevel diff --git a/docs/help/meson.build b/docs/help/meson.build index 7fe95d43..6eaa3025 100644 --- a/docs/help/meson.build +++ b/docs/help/meson.build @@ -116,6 +116,7 @@ install_data( 'whowas', 'window', ), - install_dir : helpdir) + install_dir : helpdir, +) # subdir('in') diff --git a/docs/manual.txt b/docs/manual.txt index d55e362e..073abe18 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -373,9 +373,6 @@ After connected to server, Irssi can automatically change your user mode. You can set it with /SET usermode , default is +i. - /SET resolve_prefer_ipv6 - If ON, prefer IPv6 for hosts that - have both v4 and v6 addresses. - 5.5 Automatic reconnecting If you get disconnected from server, Irssi will try to reconnect diff --git a/docs/meson.build b/docs/meson.build index a58faed3..f6761200 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -13,6 +13,7 @@ install_data( 'startup-HOWTO.html', 'startup-HOWTO.txt', ), - install_dir : docdir) + install_dir : docdir, +) subdir('help') diff --git a/docs/perl.txt b/docs/perl.txt index 761b2f4d..b8e097c7 100644 --- a/docs/perl.txt +++ b/docs/perl.txt @@ -205,6 +205,12 @@ Window::command(cmd) Windowitem::command(cmd) Send a command `cmd' (in current channel). The '/' char isn't needed. +version() - return client release date and time (format YYYYMMDD.hhmm) + +parse_special(cmd, data="", flags=0) +Server::parse_special(cmd, data="", flags=0) +Windowitem::parse_special(cmd, data="", flags=0) + evaluate a string with special vars *** Themes @@ -516,6 +522,8 @@ Connect->{} address - Address where we connected (irc.blah.org) port - Port where we connected chatnet - Chat network + chosen_family - IP family chosen to connect to + ipaddr - IP address connected to password - Password we used in connection. wanted_nick - Nick which we would prefer to use diff --git a/docs/qna.html b/docs/qna.html new file mode 100644 index 00000000..a61ee40d --- /dev/null +++ b/docs/qna.html @@ -0,0 +1,52 @@ + + +

    Right-aligned nicks

    +

    To create a “tabular” effect of the chat view, or to align nick names in a column, you can use Irssi’s theme/format system. The basic commands are the following:

    +
    /format own_msg {ownmsgnick $2 {ownnick $[-9]0}}$1
+/format own_msg_channel {ownmsgnick $3 {ownnick $[-9]0}{msgchannel $1}}$2
+/format pubmsg_me {pubmsgmenick $2 {menick $[-9]0}}$1
+/format pubmsg_me_channel {pubmsgmenick $3 {menick $[-9]0}{msgchannel $1}}$2
+/format pubmsg_hilight {pubmsghinick $0 $3 $[-9]1}$2
+/format pubmsg_hilight_channel {pubmsghinick $0 $4 $[-9]1{msgchannel $2}}$3
+/format pubmsg {pubmsgnick $2 {pubnick $[-9]0}}$1
+/format pubmsg_channel {pubmsgnick $3 {pubnick $[-9]0}{msgchannel $1}}$2
+
    +
    +

    These are copied from the default theme’s default values, which are responsible for displaying your own messages sent to a channel (own_msg) as well as received messages (pubmsg) and the two basic highlightings (me and hilight).

    +

    Then, in front of the argument that contains the nick name ($0 in most cases, but $1 in pubmsg_hilight), an alignment modifier (see Appendix B: Special Variables and Expandos) has been added: [-9]. This means that the nicks will be right-aligned and truncated to 9 characters.

    +

    Note: Modifiers only work in the /format section of a theme (this may change in the future)

    +

    There are also some scripts that try to do the alignment for you, like: nm, nm2.

    +

    There are also some nice themes that extend the alignment to further formats, like: weed.

    +

    Automatic log-in to NickServ

    +

    Please check here => Automatic log-in to NickServ

    +

    CertFP Log-in

    +

    CertFP, short for Certificate Finger Print, is another method to log you in to NickServ. Instead of a password, it uses a Client Certificate.

    +

    In order to use it, you

    +
      +

    • first need a certificate,

      • +

    • then configure Irssi to use this certificate,

      • +

    • and finally register the certificate with NickServ.

      • +
    +

    Irssi does not have built-in certificate management commands, so you need to use an external tool like openssl to create the certificate.

    +

    A step-by-step guide for the Libera Chat network can be found here => https://github.com/shabble/irssi-docs/wiki/liberachat_certfp

    +

    It is necessary that the certificate be available as a file; PKCS#11 is not supported.

    +

    Tor (The Onion Router)

    +

    Tor is an overlay network for anonymous communication. It operates a local SOCKS proxy for applications to use.

    +

    Unfortunately, Irssi currently does not support SOCKS proxies natively. As a workaround, you can install the ProxyChains-NG program (note, it must be the NG version).

    +

    Afterwards, you can launch Irssi like this:

    +
    proxychains4 irssi
+
    +
    +

    Now your connections will go through the Proxy configured in ProxyChains-NG (Tor by default).

    +

    IRC networks may have different requirements to be able to connect via Tor. For the Libera Chat network, you will first need to set up CertFP Log-in using a clearnet connection, and then connect to their Onion Service palladium.libera.chat. More detailed instructions can be found here => https://github.com/shabble/irssi-docs/wiki/liberator

    +

    The following signatures were invalid: EXPKEYSIG

    +

    If you see such a message

    +
    Err:4 home:/ailin_nemui:/irssi-an  InRelease
+  The following signatures were invalid: EXPKEYSIG EDB7AED941EEDB57 home:ailin_nemui OBS Project <home:ailin_nemui@build.opensuse.org>
+
    +
    +

    this means that the automatic signing key used by the Open Build Service expired. OBS renews the key periodically, but Debian does not support this.

    +
    +

    Fix

    +

    Download the key again, following the regular OBS instructions. If it still does not work, verify if there is a second expired copy of the key in /etc/apt/trusted.gpg.d or in apt-key list and remove it as well.

    +
    \ No newline at end of file diff --git a/docs/qna.txt b/docs/qna.txt new file mode 100644 index 00000000..92f4f64c --- /dev/null +++ b/docs/qna.txt @@ -0,0 +1,111 @@ +# Right-aligned nicks # + +To create a “tabular” effect of the chat view, or to align nick names in a +column, you can use Irssi’s theme/format system. The basic commands are the +following: + +/format own_msg {ownmsgnick $2 {ownnick $[-9]0}}$1 +/format own_msg_channel {ownmsgnick $3 {ownnick $[-9]0}{msgchannel $1}}$2 +/format pubmsg_me {pubmsgmenick $2 {menick $[-9]0}}$1 +/format pubmsg_me_channel {pubmsgmenick $3 {menick $[-9]0}{msgchannel $1}}$2 +/format pubmsg_hilight {pubmsghinick $0 $3 $[-9]1}$2 +/format pubmsg_hilight_channel {pubmsghinick $0 $4 $[-9]1{msgchannel $2}}$3 +/format pubmsg {pubmsgnick $2 {pubnick $[-9]0}}$1 +/format pubmsg_channel {pubmsgnick $3 {pubnick $[-9]0}{msgchannel $1}}$2 + +These are copied from the default theme’s default values, which are responsible +for displaying your own messages sent to a channel (own_msg) as well as +received messages (pubmsg) and the two basic highlightings (me and hilight). + +Then, in front of the argument that contains the nick name ($0 in most cases, +but $1 in pubmsg_hilight), an alignment modifier (see [1]Appendix B: Special +Variables and Expandos) has been added: [-9]. This means that the nicks will be +right-aligned and truncated to 9 characters. + +Note: Modifiers only work in the /format section of a theme (this may change in +the future) + +There are also some scripts that try to do the alignment for you, like: nm, +nm2. + +There are also some nice themes that extend the alignment to further formats, +like: [2]weed. + +# Automatic log-in to NickServ # + +Please check here => [3]Automatic log-in to NickServ + +# CertFP Log-in # + +CertFP, short for Certificate Finger Print, is another method to log you in to +NickServ. Instead of a password, it uses a [4]Client Certificate. + +In order to use it, you + + • first need a certificate, + + • then configure Irssi to use this certificate, + + • and finally register the certificate with NickServ. + +Irssi does not have built-in certificate management commands, so you need to +use an external tool like openssl to create the certificate. + +A step-by-step guide for the Libera Chat network can be found here => [5]https: +//github.com/shabble/irssi-docs/wiki/liberachat_certfp + +It is necessary that the certificate be available as a file; PKCS#11 is not +supported. + +# Tor (The Onion Router) # + +[6]Tor is an overlay network for anonymous communication. It operates a local +[7]SOCKS proxy for applications to use. + +Unfortunately, Irssi currently does not support SOCKS proxies natively. As a +workaround, you can install the [8]ProxyChains-NG program (note, it must be the +NG version). + +Afterwards, you can launch Irssi like this: + +proxychains4 irssi + +Now your connections will go through the Proxy configured in ProxyChains-NG +(Tor by default). + +IRC networks may have different requirements to be able to connect via Tor. For +the Libera Chat network, you will first need to set up [9]CertFP Log-in using a +clearnet connection, and then connect to their [10]Onion Service +palladium.libera.chat. More detailed instructions can be found here => [11] +https://github.com/shabble/irssi-docs/wiki/liberator + +# The following signatures were invalid: EXPKEYSIG # + +If you see such a message + +Err:4 home:/ailin_nemui:/irssi-an InRelease + The following signatures were invalid: EXPKEYSIG EDB7AED941EEDB57 home:ailin_nemui OBS Project + +this means that the automatic signing key used by the Open Build Service +expired. OBS renews the key periodically, but Debian does not support this. + +## Fix ## + +Download the key again, following the regular OBS instructions. If it still +does not work, verify if there is a second expired copy of the key in /etc/apt/ +trusted.gpg.d or in apt-key list and remove it as well. + + +References: + +[1] https://irssi.org/documentation/settings/#a-b +[2] https://github.com/ronilaukkarinen/weed +[3] https://irssi.org/documentation/manual/automation/#automatic-log-in-to-nickserv +[4] https://en.wikipedia.org/wiki/Client_certificate +[5] https://github.com/shabble/irssi-docs/wiki/liberachat_certfp +[6] https://www.torproject.org/ +[7] https://en.wikipedia.org/wiki/SOCKS +[8] https://github.com/rofl0r/proxychains-ng +[9] https://irssi.org/documentation/qna/certfp/ +[10] https://libera.chat/guides/connect#accessing-liberachat-via-tor +[11] https://github.com/shabble/irssi-docs/wiki/liberator diff --git a/docs/special_vars.txt b/docs/special_vars.txt index 36517f78..1101c8a6 100644 --- a/docs/special_vars.txt +++ b/docs/special_vars.txt @@ -94,6 +94,8 @@ $A .. $Z is important. $winname window name $itemname like $T, but use item's visible_name which may be different (eg. $T = !12345chan, $itemname = !chan) + $abiversion IRSSI_ABI_VERSION + https://github.com/irssi/irssi/wiki/irssi_abi_version For example, assume you have the following alias: diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html index 696dea4d..787094d0 100644 --- a/docs/startup-HOWTO.html +++ b/docs/startup-HOWTO.html @@ -515,12 +515,12 @@ Ctrl-X - set the next server in list active

    SOCKS

    -

    Irssi can be compiled with socks support (--with-socks option to configure), which requires “dante” and routes all connections through the proxy specified in the system-wide /etc/socks.conf. This method is known to have issues in Mac OS X.

    +

    Using proxychains-ng is recommended for using irssi with a socks proxy.

    + +

    Irssi does not support socks proxy natively.

    Note that /SET proxy settings don’t have anything to do with socks.

    -

    Using proxychains-ng is recommended over recompiling irssi.

    -

    Others

    IRC bouncers usually work like IRC servers, and want a password. You can give it with:

    @@ -683,4 +683,4 @@ Ctrl-X - set the next server in list active /STATUSBAR <name> REMOVE <item> -

    For statusbar scripts, the item name is usually equivalent to the script name. The documentation of the script ought to tell you if this is not the case. For example, to add mail.pl before the window activity item, use: /STATUSBAR window ADD -before act mail.

    \ No newline at end of file +

    For statusbar scripts, the item name is usually equivalent to the script name. The documentation of the script ought to tell you if this is not the case. For example, to add mail.pl before the window activity item, use: /STATUSBAR window ADD -before act mail.

    diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt index 90d278de..5cc86af3 100644 --- a/docs/startup-HOWTO.txt +++ b/docs/startup-HOWTO.txt @@ -578,15 +578,12 @@ Irssi proxy works fine with other IRC clients as well. SOCKS -Irssi can be compiled with socks support (--with-socks option to configure), -which requires “dante” and routes all connections through the proxy specified -in the system-wide /etc/socks.conf. This method is known to have issues in Mac -OS X. +Using [4]proxychains-ng is recommended for using irssi with a socks proxy. + +Irssi does not support socks proxy natively. Note that /SET proxy settings don’t have anything to do with socks. -Using [4]proxychains-ng is recommended over recompiling irssi. - Others IRC bouncers usually work like IRC servers, and want a password. You can give diff --git a/irssi-1.pc.in b/irssi-1.pc.in deleted file mode 100644 index a1c00f5c..00000000 --- a/irssi-1.pc.in +++ /dev/null @@ -1,20 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -prog_libs="@PROG_LIBS@" -common_libs="@COMMON_LIBS@" - -perl_link_libs="@PERL_LINK_LIBS@" -perl_fe_link_libs="@PERL_FE_LINK_LIBS@" -perl_link_flags="@PERL_LINK_FLAGS@" - -chat_modules="@CHAT_MODULES@" -irc_modules="@irc_MODULES@" - -Name: Irssi -Description: Irssi chat client -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @OPENSSL_CFLAGS@ -Requires: glib-2.0 \ No newline at end of file diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4 deleted file mode 100644 index 5b7c84c0..00000000 --- a/m4/glib-2.0.m4 +++ /dev/null @@ -1,208 +0,0 @@ -# Configure paths for GLIB -# Owen Taylor 1997-2001 - -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or -dnl gthread is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - pkg_config_args=glib-2.0 - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done - - PKG_PROG_PKG_CONFIG([0.7]) - - no_glib="" - - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi - - min_glib_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - - if test "x$PKG_CONFIG" != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi - - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi - - if test x"$no_glib" = x ; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - AC_SUBST(GLIB_GENMARSHAL) - AC_SUBST(GOBJECT_QUERY) - AC_SUBST(GLIB_MKENUMS) - rm -f conf.glibtest -]) diff --git a/m4/glibtests.m4 b/m4/glibtests.m4 deleted file mode 100644 index 7d5920a4..00000000 --- a/m4/glibtests.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl GLIB_TESTS -dnl - -AC_DEFUN([GLIB_TESTS], -[ - AC_ARG_ENABLE(installed-tests, - AS_HELP_STRING([--enable-installed-tests], - [Enable installation of some test cases]), - [case ${enableval} in - yes) ENABLE_INSTALLED_TESTS="1" ;; - no) ENABLE_INSTALLED_TESTS="" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;; - esac]) - AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1") - AC_ARG_ENABLE(always-build-tests, - AS_HELP_STRING([--enable-always-build-tests], - [Enable always building tests during 'make all']), - [case ${enableval} in - yes) ENABLE_ALWAYS_BUILD_TESTS="1" ;; - no) ENABLE_ALWAYS_BUILD_TESTS="" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;; - esac]) - AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1") - if test "$ENABLE_INSTALLED_TESTS" = "1"; then - AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME) - AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME) - fi -]) diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 deleted file mode 100644 index c67cfece..00000000 --- a/m4/libgcrypt.m4 +++ /dev/null @@ -1,143 +0,0 @@ -# libgcrypt.m4 - Autoconf macros to detect libgcrypt -# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This file is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Last-changed: 2014-10-02 - - -dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, -dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. -dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed -dnl with the API version to also check the API compatibility. Example: -dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed -dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using -dnl this features allows to prevent build against newer versions of libgcrypt -dnl with a changed API. -dnl -dnl If a prefix option is not used, the config script is first -dnl searched in $SYSROOT/bin and then along $PATH. If the used -dnl config script does not match the host specification the script -dnl is added to the gpg_config_script_warn variable. -dnl -AC_DEFUN([AM_PATH_LIBGCRYPT], -[ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_ARG_WITH(libgcrypt-prefix, - AC_HELP_STRING([--with-libgcrypt-prefix=PFX], - [prefix where LIBGCRYPT is installed (optional)]), - libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") - if test x"${LIBGCRYPT_CONFIG}" = x ; then - if test x"${libgcrypt_config_prefix}" != x ; then - LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config" - else - case "${SYSROOT}" in - /*) - if test -x "${SYSROOT}/bin/libgcrypt-config" ; then - LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config" - fi - ;; - '') - ;; - *) - AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) - ;; - esac - fi - fi - - AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) - tmp=ifelse([$1], ,1:1.2.0,$1) - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` - min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` - else - req_libgcrypt_api=0 - min_libgcrypt_version="$tmp" - fi - - AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) - ok=no - if test "$LIBGCRYPT_CONFIG" != "no" ; then - req_major=`echo $min_libgcrypt_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - req_minor=`echo $min_libgcrypt_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - req_micro=`echo $min_libgcrypt_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` - major=`echo $libgcrypt_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $libgcrypt_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` - micro=`echo $libgcrypt_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - if test "$major" -gt "$req_major"; then - ok=yes - else - if test "$major" -eq "$req_major"; then - if test "$minor" -gt "$req_minor"; then - ok=yes - else - if test "$minor" -eq "$req_minor"; then - if test "$micro" -ge "$req_micro"; then - ok=yes - fi - fi - fi - fi - fi - fi - if test $ok = yes; then - AC_MSG_RESULT([yes ($libgcrypt_config_version)]) - else - AC_MSG_RESULT(no) - fi - if test $ok = yes; then - # If we have a recent libgcrypt, we should also check that the - # API is compatible - if test "$req_libgcrypt_api" -gt 0 ; then - tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - AC_MSG_CHECKING([LIBGCRYPT API version]) - if test "$req_libgcrypt_api" -eq "$tmp" ; then - AC_MSG_RESULT([okay]) - else - ok=no - AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) - fi - fi - fi - fi - if test $ok = yes; then - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` - ifelse([$2], , :, [$2]) - libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` - if test x"$libgcrypt_config_host" != xnone ; then - if test x"$libgcrypt_config_host" != x"$host" ; then - AC_MSG_WARN([[ -*** -*** The config script $LIBGCRYPT_CONFIG was -*** built for $libgcrypt_config_host and thus may not match the -*** used host $host. -*** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script or use \$SYSROOT. -***]]) - gpg_config_script_warn="$gpg_config_script_warn libgcrypt" - fi - fi - else - LIBGCRYPT_CFLAGS="" - LIBGCRYPT_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(LIBGCRYPT_CFLAGS) - AC_SUBST(LIBGCRYPT_LIBS) -]) diff --git a/m4/libotr.m4 b/m4/libotr.m4 deleted file mode 100644 index 80b25f86..00000000 --- a/m4/libotr.m4 +++ /dev/null @@ -1,134 +0,0 @@ -dnl -dnl Off-the-Record Messaging library -dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov -dnl -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of version 2.1 of the GNU Lesser General -dnl Public License as published by the Free Software Foundation. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -dnl - -dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate. -dnl enables arguments --with-libotr-prefix= -dnl --with-libotr-inc-prefix= -dnl -dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT -dnl -dnl Adapted from alsa.m4, originally by -dnl Richard Boulton -dnl Christopher Lansdown -dnl Jaroslav Kysela - -AC_DEFUN([AM_PATH_LIBOTR], -[dnl Save the original CFLAGS, LDFLAGS, and LIBS -libotr_save_CFLAGS="$CFLAGS" -libotr_save_LDFLAGS="$LDFLAGS" -libotr_save_LIBS="$LIBS" -libotr_found=yes - -dnl -dnl Get the cflags and libraries for libotr -dnl -AC_ARG_WITH(libotr-prefix, -[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)], -[libotr_prefix="$withval"], [libotr_prefix=""]) - -AC_ARG_WITH(libotr-inc-prefix, -[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)], -[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""]) - -dnl Add any special include directories -AC_MSG_CHECKING(for libotr CFLAGS) -if test "$libotr_inc_prefix" != "" ; then - LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix" - CFLAGS="$CFLAGS $LIBOTR_CFLAGS" -fi -AC_MSG_RESULT($LIBOTR_CFLAGS) - -dnl add any special lib dirs -AC_MSG_CHECKING(for libotr LIBS) -if test "$libotr_prefix" != "" ; then - LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix" - LDFLAGS="$LDFLAGS $LIBOTR_LIBS" -fi - -dnl add the libotr library -LIBOTR_LIBS="$LIBOTR_LIBS -lotr" -LIBS="$LIBOTR_LIBS $LIBS" -AC_MSG_RESULT($LIBOTR_LIBS) - -dnl Check for a working version of libotr that is of the right version. -min_libotr_version=ifelse([$1], ,3.0.0,$1) -no_libotr="" - libotr_min_major_version=`echo $min_libotr_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - libotr_min_minor_version=`echo $min_libotr_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - libotr_min_sub_version=`echo $min_libotr_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version) - -AC_LANG_SAVE -AC_LANG_C -AC_TRY_COMPILE([ -#include -#include -], [ -# if(OTRL_VERSION_MAJOR != $libotr_min_major_version) -# error not present -# else - -# if(OTRL_VERSION_MINOR > $libotr_min_minor_version) - exit(0); -# else -# if(OTRL_VERSION_MINOR < $libotr_min_minor_version) -# error not present -# endif - -# if(OTRL_VERSION_SUB < $libotr_min_sub_version) -# error not present -# endif -# endif -# endif -exit(0); -], - [AC_MSG_RESULT(found.)], - [AC_MSG_RESULT(not present.) - ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)]) - libotr_found=no] -) -AC_LANG_RESTORE - -dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. -AC_CHECK_LIB([otr], [otrl_message_receiving],, - [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)]) - libotr_found=no], - $LIBGCRYPT_LIBS -) - -LDFLAGS="$libotr_save_LDFLAGS" -LIBS="$libotr_save_LIBS" - -if test "x$libotr_found" = "xyes" ; then - ifelse([$2], , :, [$2]) -else - LIBOTR_CFLAGS="" - LIBOTR_LIBS="" - ifelse([$3], , :, [$3]) -fi - -dnl That should be it. Now just export our symbols: -AC_SUBST(LIBOTR_CFLAGS) -AC_SUBST(LIBOTR_LIBS) -]) - diff --git a/m4/pkg.m4 b/m4/pkg.m4 deleted file mode 100644 index 13a88901..00000000 --- a/m4/pkg.m4 +++ /dev/null @@ -1,275 +0,0 @@ -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 12 (pkg-config-0.29.2) - -dnl Copyright © 2004 Scott James Remnant . -dnl Copyright © 2012-2015 Dan Nicholson -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -dnl 02111-1307, USA. -dnl -dnl As a special exception to the GNU General Public License, if you -dnl distribute this file as part of a program that contains a -dnl configuration script generated by Autoconf, you may include it under -dnl the same distribution terms that you use for the rest of that -dnl program. - -dnl PKG_PREREQ(MIN-VERSION) -dnl ----------------------- -dnl Since: 0.29 -dnl -dnl Verify that the version of the pkg-config macros are at least -dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's -dnl installed version of pkg-config, this checks the developer's version -dnl of pkg.m4 when generating configure. -dnl -dnl To ensure that this macro is defined, also add: -dnl m4_ifndef([PKG_PREREQ], -dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) -dnl -dnl See the "Since" comment for each macro you use to see what version -dnl of the macros you require. -m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.2]) -m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, - [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) -])dnl PKG_PREREQ - -dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) -dnl ---------------------------------- -dnl Since: 0.16 -dnl -dnl Search for the pkg-config tool and set the PKG_CONFIG variable to -dnl first found in the path. Checks that the version of pkg-config found -dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is -dnl used since that's the first version where most current features of -dnl pkg-config existed. -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])dnl PKG_PROG_PKG_CONFIG - -dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------------------------------- -dnl Since: 0.18 -dnl -dnl Check to see whether a particular set of modules exists. Similar to -dnl PKG_CHECK_MODULES(), but does not set variables or print errors. -dnl -dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place -dnl it's called might be skipped (such as if it is within an "if", you -dnl have to call PKG_CHECK_EXISTS manually -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -dnl --------------------------------------------- -dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting -dnl pkg_failed based on the result. -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])dnl _PKG_CONFIG - -dnl _PKG_SHORT_ERRORS_SUPPORTED -dnl --------------------------- -dnl Internal check to see if pkg-config supports short errors. -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])dnl _PKG_SHORT_ERRORS_SUPPORTED - - -dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl -------------------------------------------------------------- -dnl Since: 0.4.0 -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES might not happen, you should be sure to include an -dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $2]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])dnl PKG_CHECK_MODULES - - -dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl --------------------------------------------------------------------- -dnl Since: 0.29 -dnl -dnl Checks for existence of MODULES and gathers its build flags with -dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags -dnl and VARIABLE-PREFIX_LIBS from --libs. -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to -dnl include an explicit call to PKG_PROG_PKG_CONFIG in your -dnl configure.ac. -AC_DEFUN([PKG_CHECK_MODULES_STATIC], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -_save_PKG_CONFIG=$PKG_CONFIG -PKG_CONFIG="$PKG_CONFIG --static" -PKG_CHECK_MODULES($@) -PKG_CONFIG=$_save_PKG_CONFIG[]dnl -])dnl PKG_CHECK_MODULES_STATIC - - -dnl PKG_INSTALLDIR([DIRECTORY]) -dnl ------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable pkgconfigdir as the location where a module -dnl should install pkg-config .pc files. By default the directory is -dnl $libdir/pkgconfig, but the default can be changed by passing -dnl DIRECTORY. The user can override through the --with-pkgconfigdir -dnl parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_INSTALLDIR - - -dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) -dnl -------------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable noarch_pkgconfigdir as the location where a -dnl module should install arch-independent pkg-config .pc files. By -dnl default the directory is $datadir/pkgconfig, but the default can be -dnl changed by passing DIRECTORY. The user can override through the -dnl --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_NOARCH_INSTALLDIR - - -dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------- -dnl Since: 0.28 -dnl -dnl Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])dnl PKG_CHECK_VAR diff --git a/meson.build b/meson.build index 99809868..bb6d2829 100644 --- a/meson.build +++ b/meson.build @@ -1,84 +1,115 @@ -project('irssi', 'c', - version : '1.4.5', - meson_version : '>=0.49', - default_options : ['warning_level=1']) +project( + 'irssi', + 'c', + version : '1.5-head', + meson_version : '>=0.53', + default_options : [ 'warning_level=1' ], +) ############################ ############################ -glib_internal_version = 'glib-2.58.3' # keep this in sync with subprojects/glib.wrap +glib_internal_version = 'glib-2.74.7' # keep this in sync with subprojects/glib.wrap +glib_pcre2_internal_version = 'pcre2-10.40' +glib_libffi_internal_version = 'libffi' cc = meson.get_compiler('c') rootinc = include_directories('.') -dep = [] -textui_dep = [] +dep = [ ] +textui_dep = [ ] need_dl_cross_link = false +need_dl_cross_link_main = false +dl_cross_irssi_main = [ ] # The Android environment requires that all modules are linked to each other. # See https://github.com/android/ndk/issues/201 if host_machine.system() == 'android' need_dl_cross_link = true +elif host_machine.system() == 'cygwin' + need_dl_cross_link = true + need_dl_cross_link_main = true endif -includedir = get_option('includedir') -incdir = 'irssi' -moduledir = get_option('libdir') / incdir / 'modules' -helpdir = get_option('datadir') / incdir / 'help' -themedir = get_option('datadir') / incdir / 'themes' -scriptdir = get_option('datadir') / incdir / 'scripts' -docdir = get_option('docdir') != '' ? get_option('docdir') : (get_option('datadir') / 'doc' / incdir) +includedir = get_option('includedir') +incdir = 'irssi' +moduledir = get_option('libdir') / incdir / 'modules' +helpdir = get_option('datadir') / incdir / 'help' +themedir = get_option('datadir') / incdir / 'themes' +scriptdir = get_option('datadir') / incdir / 'scripts' +docdir = get_option('docdir') != '' ? get_option('docdir') : (get_option('datadir') / 'doc' / incdir) -want_textui = get_option('without-textui') != 'yes' -want_bot = get_option('with-bot') == 'yes' -want_fuzzer = get_option('with-fuzzer') == 'yes' -fuzzer_lib = get_option('with-fuzzer-lib') +want_textui = get_option('without-textui') != 'yes' +want_bot = get_option('with-bot') == 'yes' +want_fuzzer = get_option('with-fuzzer') == 'yes' +fuzzer_lib = get_option('with-fuzzer-lib') fuzzer_link_language = get_option('fuzzer-link-language') -want_proxy = get_option('with-proxy') == 'yes' -want_truecolor = get_option('enable-true-color') == 'yes' -want_gregex = get_option('disable-gregex') != 'yes' +want_proxy = get_option('with-proxy') == 'yes' -require_capsicum = get_option('with-capsicum') == 'yes' -want_capsicum = get_option('with-capsicum') != 'no' +require_capsicum = get_option('with-capsicum') == 'yes' +want_capsicum = get_option('with-capsicum') != 'no' require_libutf8proc = get_option('disable-utf8proc') == 'no' -want_libutf8proc = get_option('disable-utf8proc') != 'yes' +want_libutf8proc = get_option('disable-utf8proc') != 'yes' -require_perl = get_option('with-perl') == 'yes' -want_perl = get_option('with-perl') != 'no' -with_perl_lib = get_option('with-perl-lib') +require_perl = get_option('with-perl') == 'yes' +want_perl = get_option('with-perl') != 'no' +with_perl_lib = get_option('with-perl-lib') -require_otr = get_option('with-otr') == 'yes' -want_otr = get_option('with-otr') != 'no' +require_otr = get_option('with-otr') == 'yes' +want_otr = get_option('with-otr') != 'no' -want_glib_internal = get_option('install-glib') != 'no' +want_glib_internal = get_option('install-glib') != 'no' require_glib_internal = get_option('install-glib') == 'force' want_static_dependency = get_option('static-dependency') == 'yes' -package_version = get_option('PACKAGE_VERSION') != '' ? get_option('PACKAGE_VERSION') : meson.project_version() +package_version = get_option('PACKAGE_VERSION') != '' ? get_option('PACKAGE_VERSION') : meson.project_version() + +fs = import('fs') +if fs.exists('config.status') or fs.exists('irssi-version.h') or fs.exists('default-config.h') or fs.exists('default-theme.h') or fs.exists('src/perl/irssi-core.pl.h') or fs.exists('src/perl/perl-signals-list.h') or fs.exists('irssi-config.h') + error('this tree has been configured with autotools, cannot proceed') +endif UNSET = '=INVALID=' -UNSET_ARR = [UNSET] +UNSET_ARR = [ UNSET ] -chat_modules = ['irc'] +chat_modules = [ 'irc' ] -run_command('mkdir', meson.current_build_dir() / incdir) -run_command('ln', '-s', meson.current_source_dir() / 'src', meson.current_build_dir() / incdir) -run_command('ln', '-s', meson.current_build_dir() / 'irssi-config.h', meson.current_build_dir() / incdir) -run_command('ln', '-s', meson.current_build_dir() / 'irssi-version.h', meson.current_build_dir() / incdir) +run_command( + 'mkdir', + meson.current_build_dir() / incdir, + check : false, +) +run_command( + 'ln', + '-s', meson.current_source_dir() / 'src', + meson.current_build_dir() / incdir, + check : false, +) +run_command( + 'ln', + '-s', meson.current_build_dir() / 'irssi-config.h', + meson.current_build_dir() / incdir, + check : false, +) +run_command( + 'ln', + '-s', meson.current_build_dir() / 'irssi-version.h', + meson.current_build_dir() / incdir, + check : false, +) -def_moduledir = '-D' + 'MODULEDIR' + '="' + (get_option('prefix') / moduledir) + '"' +def_moduledir = '-D' + 'MODULEDIR' + '="' + (get_option('prefix') / moduledir) + '"' def_sysconfdir = '-D' + 'SYSCONFDIR' + '="' + (get_option('prefix') / get_option('sysconfdir')) + '"' -def_helpdir = '-D' + 'HELPDIR' + '="' + (get_option('prefix') / helpdir) + '"' -def_themesdir = '-D' + 'THEMESDIR' + '="' + (get_option('prefix') / themedir) + '"' -def_scriptdir = '-D' + 'SCRIPTDIR' + '="' + (get_option('prefix') / scriptdir) + '"' +def_helpdir = '-D' + 'HELPDIR' + '="' + (get_option('prefix') / helpdir) + '"' +def_themesdir = '-D' + 'THEMESDIR' + '="' + (get_option('prefix') / themedir) + '"' +def_scriptdir = '-D' + 'SCRIPTDIR' + '="' + (get_option('prefix') / scriptdir) + '"' def_suppress_printf_fallback = '-D' + 'SUPPRESS_PRINTF_FALLBACK' - -module_suffix = [] -perl_module_suffix = [] +module_suffix = [ ] +perl_module_suffix = [ ] # Meson uses the wrong module extensions on Mac. # https://gitlab.gnome.org/GNOME/glib/issues/520 -if ['darwin', 'ios'].contains(host_machine.system()) +if [ 'darwin', 'ios' ].contains(host_machine.system()) module_suffix = 'so' perl_module_suffix = 'bundle' endif @@ -87,13 +118,20 @@ endif # Help files # ############## -build_perl = find_program('perl', native : true) +build_perl = find_program( + 'perl', + native : true, +) if meson.is_cross_build() cross_perl = find_program('perl') else cross_perl = build_perl endif -run_command(build_perl, files('utils/syntax.pl')) +run_command( + build_perl, + files('utils/syntax.pl'), + check : true, +) ################### # irssi-version.h # @@ -101,12 +139,12 @@ run_command(build_perl, files('utils/syntax.pl')) env = find_program('env') irssi_version_sh = find_program('utils/irssi-version.sh') -irssi_version_h = custom_target('irssi-version.h', +irssi_version_h = custom_target( + 'irssi-version.h', build_by_default : true, build_always_stale : true, capture : true, - command : [env, 'VERSION=' + meson.project_version(), - irssi_version_sh, meson.current_source_dir()], + command : [ env, 'VERSION=' + meson.project_version(), irssi_version_sh, meson.current_source_dir() ], output : 'irssi-version.h', install : true, install_dir : includedir / incdir, @@ -117,22 +155,24 @@ irssi_version_h = custom_target('irssi-version.h', #################### file2header = find_program('utils/file2header.sh') -default_config_h = custom_target('default-config.h', +default_config_h = custom_target( + 'default-config.h', input : files('irssi.conf'), output : 'default-config.h', capture : true, - command : [file2header, '@INPUT@', 'default_config'], + command : [ file2header, '@INPUT@', 'default_config' ], ) ################### # default-theme.h # ################### -default_theme_h = custom_target('default-theme.h', +default_theme_h = custom_target( + 'default-theme.h', input : files('themes/default.theme'), output : 'default-theme.h', capture : true, - command : [file2header, '@INPUT@', 'default_theme'], + command : [ file2header, '@INPUT@', 'default_theme' ], ) ################ @@ -141,12 +181,18 @@ default_theme_h = custom_target('default-theme.h', #### inet_addr #### inet_addr_found = false -foreach inet_addr_provider : ['', 'nsl'] - prov_lib = [] +foreach inet_addr_provider : [ '', 'nsl' ] + prov_lib = [ ] if inet_addr_provider != '' - prov_lib += cc.find_library(inet_addr_provider, required : false) + prov_lib += cc.find_library( + inet_addr_provider, + required : false, + ) endif - if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('inet_addr', dependencies : prov_lib) + if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function( + 'inet_addr', + dependencies : prov_lib, + ) dep += prov_lib inet_addr_found = true break @@ -158,12 +204,18 @@ endif #### socket #### socket_found = false -foreach socket_provider : ['', 'socket', 'network'] - prov_lib = [] +foreach socket_provider : [ '', 'socket', 'network' ] + prov_lib = [ ] if socket_provider != '' - prov_lib += cc.find_library(socket_provider, required : false) + prov_lib += cc.find_library( + socket_provider, + required : false, + ) endif - if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('socket', dependencies : prov_lib) + if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function( + 'socket', + dependencies : prov_lib, + ) dep += prov_lib socket_found = true break @@ -173,7 +225,7 @@ if not socket_found error('socket not found') endif -built_src = [] +built_src = [ ] glib_internal = false message('*** If you don\'t have GLib, you can run meson ... -Dinstall-glib=yes') message('*** to download and build it automatically') @@ -181,59 +233,82 @@ message('*** Or alternatively install your distribution\'s package') message('*** On Debian: sudo apt-get install libglib2.0-dev') message('*** On Redhat: dnf install glib2-devel') if not require_glib_internal - glib_dep = dependency('glib-2.0', version : '>=2.32', required : not want_glib_internal, static : want_static_dependency, include_type : 'system') + glib_dep = dependency( + 'glib-2.0', + version : '>=2.32', + required : not want_glib_internal, + static : want_static_dependency, + include_type : 'system', + ) else - glib_dep = dependency('', required : false) + glib_dep = dependency( + '', + required : false, + ) endif if not glib_dep.found() glib_internal = true meson_cmd = find_program('meson') ninja = find_program('ninja') - glib_internal_download_t = custom_target('glib-internal-download', + glib_internal_download_t = custom_target( + 'glib-internal-download', command : [ meson_cmd, 'subprojects', 'download', 'glib', '--sourcedir', meson.current_source_dir() ], console : true, - output : ['glib-internal-download'], + output : [ 'glib-internal-download' ], ) glib_internal_dependencies = [ dependency('threads'), ] - glib_internal_configure_args = [] + glib_internal_configure_args = [ ] glib_internal_usr_local = false if not cc.has_function('iconv_open') - prov_lib = cc.find_library('iconv', required : false) + prov_lib = cc.find_library( + 'iconv', + required : false, + ) if not prov_lib.found() - prov_lib = cc.find_library('iconv', dirs : '/usr/local/lib') + prov_lib = cc.find_library( + 'iconv', + dirs : '/usr/local/lib', + ) glib_internal_usr_local = true endif - if cc.has_function('libiconv_open', dependencies : prov_lib) - glib_internal_configure_args += '-Diconv=gnu' - else - glib_internal_configure_args += '-Diconv=native' - endif glib_internal_dependencies += prov_lib endif if not cc.has_function('ngettext') - prov_lib = cc.find_library('intl', required : false) + prov_lib = cc.find_library( + 'intl', + required : false, + ) if not prov_lib.found() - prov_lib = cc.find_library('intl', dirs : '/usr/local/lib') + prov_lib = cc.find_library( + 'intl', + dirs : '/usr/local/lib', + ) glib_internal_usr_local = true endif glib_internal_dependencies += prov_lib endif if glib_internal_usr_local - glib_internal_configure_args += ['-Dc_args=-I/usr/local/include', '-Dc_link_args=-L/usr/local/lib'] + glib_internal_configure_args += [ '-Dc_args=-I/usr/local/include', '-Dc_link_args=-L/usr/local/lib' ] endif if not cc.has_function('getxattr') or not cc.has_header('sys/xattr.h') if cc.has_header_symbol('attr/xattr.h', 'getxattr') - prov_lib = cc.find_library('xattr', required : false) + prov_lib = cc.find_library( + 'xattr', + required : false, + ) else - prov_lib = dependency('', required : false) + prov_lib = dependency( + '', + required : false, + ) endif if prov_lib.found() glib_internal_dependencies += prov_lib @@ -242,23 +317,41 @@ if not glib_dep.found() endif endif - glib_internal_configure_t = custom_target('glib-internal-configure', - command : [ meson_cmd, 'setup', '--prefix=/irssi-glib-internal', + glib_internal_configure_t = custom_target( + 'glib-internal-configure', + command : [ + meson_cmd, + 'setup', + '--prefix=/irssi-glib-internal', '--buildtype=' + get_option('buildtype'), - '-Dlibmount=false', '-Dselinux=false', '-Ddefault_library=static', '-Dinternal_pcre=true', + '-Dlibmount=disabled', + '-Dselinux=disabled', + '-Ddefault_library=static', + '-Dforce_fallback_for=pcre2,libffi', glib_internal_configure_args, (meson.current_build_dir() / 'build-subprojects' / 'glib'), - (meson.current_source_dir() / 'subprojects' / glib_internal_version) ], + (meson.current_source_dir() / 'subprojects' / glib_internal_version), + ], console : true, - output : ['glib-internal-configure'], - depends : glib_internal_download_t,) - glib_internal_build_t = custom_target('glib-internal-build', - command : [ ninja, '-C', meson.current_build_dir() / 'build-subprojects' / 'glib', + output : [ 'glib-internal-configure' ], + depends : glib_internal_download_t, + ) + glib_internal_build_t = custom_target( + 'glib-internal-build', + command : [ + ninja, + '-C', meson.current_build_dir() / 'build-subprojects' / 'glib', + 'subprojects' / glib_libffi_internal_version / 'src' / 'libffi.a', + 'subprojects' / glib_pcre2_internal_version / 'libpcre2-8.a', 'glib' / 'libglib-2.0.a', - 'gmodule' / 'libgmodule-2.0.a'], + 'gmodule' / 'libgmodule-2.0.a', + 'gobject' / 'libgobject-2.0.a', + 'gio' / 'libgio-2.0.a', + ], console : true, - output : ['glib-internal-build'], - depends : glib_internal_configure_t,) + output : [ 'glib-internal-build' ], + depends : glib_internal_configure_t, + ) glib_dep = declare_dependency( dependencies : glib_internal_dependencies, sources : glib_internal_build_t, @@ -267,32 +360,84 @@ if not glib_dep.found() '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version), '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'), ], - link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a' ], + link_args : [ + meson.current_build_dir() / 'build-subprojects' / 'glib' / 'subprojects' / glib_pcre2_internal_version / 'libpcre2-8.a', + meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a', + ], ) built_src += glib_internal_build_t - libdl_dep = [] - prov_lib = cc.find_library('dl', required : false) - if prov_lib.found() and cc.has_function('dlopen', dependencies : prov_lib) + libdl_dep = [ ] + prov_lib = cc.find_library( + 'dl', + required : false, + ) + if prov_lib.found() and cc.has_function( + 'dlopen', + dependencies : prov_lib, + ) libdl_dep += prov_lib endif - gmodule_dep = declare_dependency(sources : glib_internal_build_t, + gmodule_dep = declare_dependency( + sources : glib_internal_build_t, dependencies : libdl_dep, compile_args : [ '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gmodule'), ], link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gmodule' / 'libgmodule-2.0.a' ], ) + gobject_dep = declare_dependency( + sources : glib_internal_build_t, + compile_args : [ + '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib'), + ], + link_args : [ + meson.current_build_dir() / 'build-subprojects' / 'glib' / 'subprojects' / glib_libffi_internal_version / 'src' / 'libffi.a', + meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gobject' / 'libgobject-2.0.a', + ], + ) + gio_dep = declare_dependency( + sources : glib_internal_build_t, + dependencies : cc.find_library('z'), + compile_args : [ + '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gio'), + '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib'), + ], + link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gio' / 'libgio-2.0.a' ], + ) else - gmodule_dep = dependency('gmodule-2.0', static : want_static_dependency, include_type : 'system') + gmodule_dep = dependency( + 'gmodule-2.0', + static : want_static_dependency, + include_type : 'system', + ) + gobject_dep = dependency( + 'gobject-2.0', + static : want_static_dependency, + include_type : 'system', + ) + gio_dep = dependency( + 'gio-2.0', + static : want_static_dependency, + include_type : 'system', + ) endif dep += glib_dep dep += gmodule_dep +dep += gobject_dep +dep += gio_dep if glib_internal and want_static_dependency and want_fuzzer - openssl_proj = subproject('openssl', default_options : ['default_library=static', 'asm=disabled']) + openssl_proj = subproject( + 'openssl', + default_options : [ 'default_library=static', 'asm=disabled' ], + ) openssl_dep = openssl_proj.get_variable('openssl_dep') else - openssl_dep = dependency('openssl', static : want_static_dependency, include_type : 'system') + openssl_dep = dependency( + 'openssl', + static : want_static_dependency, + include_type : 'system', + ) endif dep += openssl_dep @@ -301,10 +446,16 @@ dep += openssl_dep ############ have_libutf8proc = false -libutf8proc = [] +libutf8proc = [ ] if want_libutf8proc - libutf8proc = cc.find_library('utf8proc', required : require_libutf8proc) - have_libutf8proc = cc.has_function('utf8proc_version', dependencies : libutf8proc) + libutf8proc = cc.find_library( + 'utf8proc', + required : require_libutf8proc, + ) + have_libutf8proc = cc.has_function( + 'utf8proc_version', + dependencies : libutf8proc, + ) if have_libutf8proc dep += libutf8proc endif @@ -319,9 +470,15 @@ endif if want_textui setupterm_found = false - foreach setupterm_provider : ['tinfo', 'ncursesw', 'ncurses', 'terminfo'] - prov_lib = cc.find_library(setupterm_provider, required : false) - if prov_lib.found() and cc.has_function('setupterm', dependencies : prov_lib) + foreach setupterm_provider : [ 'tinfo', 'ncursesw', 'ncurses', 'terminfo' ] + prov_lib = cc.find_library( + setupterm_provider, + required : false, + ) + if prov_lib.found() and cc.has_function( + 'setupterm', + dependencies : prov_lib, + ) textui_dep += prov_lib setupterm_found = true break @@ -338,15 +495,20 @@ endif have_perl = false if want_perl - perl_cflags = [] - perl_ldflags = [] - perl_rpath_flags = [] + perl_cflags = [ ] + perl_ldflags = [ ] + perl_rpath_flags = [ ] perl_rpath = '' #### ccopts #### perl_ccopts = meson.get_cross_property('perl_ccopts', UNSET_ARR) if perl_ccopts == UNSET_ARR - res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ccopts') + res = run_command( + cross_perl, + '-MExtUtils::Embed', + '-e', 'ccopts', + check : true, + ) perl_ccopts = res.stdout().strip().split() endif foreach fl : perl_ccopts @@ -363,10 +525,15 @@ if want_perl #### ldopts #### perl_ldopts = meson.get_cross_property('perl_ldopts', UNSET_ARR) if perl_ldopts == UNSET_ARR - res = run_command(cross_perl, '-MExtUtils::Embed', '-e', 'ldopts') + res = run_command( + cross_perl, + '-MExtUtils::Embed', + '-e', 'ldopts', + check : true, + ) perl_ldopts = res.stdout().strip().split() endif - skip_libs = ['-ldb', '-ldbm', '-lndbm', '-lgdbm', '-lc', '-lposix', '-rdynamic'] + skip_libs = [ '-ldb', '-ldbm', '-lndbm', '-lgdbm', '-lc', '-lposix', '-rdynamic' ] foreach fl : perl_ldopts if not fl.startswith('-A') and not skip_libs.contains(fl) if fl.startswith('-Wl,-rpath,') @@ -380,18 +547,26 @@ if want_perl perl_version = meson.get_cross_property('perl_version', UNSET) if perl_version == UNSET - perl_version = run_command(cross_perl, '-V::version:').stdout().split('\'')[1] + perl_version = run_command( + cross_perl, + '-V::version:', + check : true, + ).stdout().split('\'')[1] endif # disable clang warning if perl_version.version_compare('<5.35.2') perl_cflags += cc.get_supported_arguments('-Wno-compound-token-split-by-macro') endif - perl_dep = declare_dependency(compile_args : perl_cflags, link_args : perl_ldflags, - version : perl_version) + perl_dep = declare_dependency( + compile_args : perl_cflags, + link_args : perl_ldflags, + version : perl_version, + ) #### - if not cc.links(''' + if not cc.links( + ''' #include #include int main() @@ -399,8 +574,10 @@ int main() perl_alloc(); return 0; } -''', args : perl_cflags + perl_ldflags + perl_rpath_flags, - name : 'working Perl support') +''', + args : perl_cflags + perl_ldflags + perl_rpath_flags, + name : 'working Perl support', + ) if require_perl error('error linking with perl libraries') else @@ -409,9 +586,15 @@ int main() else xsubpp_file_c = meson.get_cross_property('perl_xsubpp', UNSET) if xsubpp_file_c == UNSET - xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-e($r = $INC{"ExtUtils/ParseXS.pm"}) =~ s{ParseXS\\.pm$}{xsubpp}; print $r').stdout() + xsubpp_file_c = run_command( + build_perl, + '-MExtUtils::ParseXS', + '-e($r = $INC{"ExtUtils/ParseXS.pm"}) =~ s{ParseXS\\.pm$}{xsubpp}; print $r', + check : true, + ).stdout() endif - xsubpp = generator(build_perl, + xsubpp = generator( + build_perl, output : '@BASENAME@.c', capture : true, arguments : [ xsubpp_file_c, '@EXTRA_ARGS@', '@INPUT@' ], @@ -419,31 +602,44 @@ int main() xsubpp_file = files(xsubpp_file_c) if with_perl_lib == 'module' - perl_install_base = run_command(build_perl, '-MText::ParseWords=shellwords', '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}').stdout() + perl_install_base = run_command( + build_perl, + '-MText::ParseWords=shellwords', + '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}', + check : true, + ).stdout() if perl_install_base == '' with_perl_lib = '' endif endif if with_perl_lib == '' - if get_option('prefix') in ['/usr/local', 'C:/'] + if get_option('prefix') in [ '/usr/local', 'C:/' ] with_perl_lib = 'site' - elif get_option('prefix') in ['/usr'] + elif get_option('prefix') in [ '/usr' ] with_perl_lib = 'vendor' endif endif perlmoddir = '' - if with_perl_lib in ['site', 'vendor', 'module'] + if with_perl_lib in [ 'site', 'vendor', 'module' ] set_perl_use_lib = false perl_library_dir = with_perl_lib + ' default' - if with_perl_lib in ['site', 'vendor'] + if with_perl_lib in [ 'site', 'vendor' ] perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', UNSET) if perlmoddir == UNSET - perlmoddir = run_command(cross_perl, '-V::install' + with_perl_lib + 'arch:').stdout().split('\'')[1] + perlmoddir = run_command( + cross_perl, + '-V::install' + with_perl_lib + 'arch:', + check : true, + ).stdout().split('\'')[1] endif elif with_perl_lib == 'module' perl_archname = meson.get_cross_property('perl_archname', UNSET) if perl_archname == UNSET - perl_archname = run_command(cross_perl, '-V::archname:').stdout().split('\'')[1] + perl_archname = run_command( + cross_perl, + '-V::archname:', + check : true, + ).stdout().split('\'')[1] endif perlmoddir = perl_install_base / 'lib' / 'perl5' / perl_archname endif @@ -464,7 +660,12 @@ int main() if set_perl_use_lib perl_inc = meson.get_cross_property('perl_inc', UNSET_ARR) if perl_inc == UNSET_ARR - set_perl_use_lib = run_command(cross_perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib).returncode() != 0 + set_perl_use_lib = run_command( + cross_perl, + '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', + perl_use_lib, + check : false, + ).returncode() != 0 else set_perl_use_lib = not perl_inc.contains(perl_use_lib) endif @@ -490,8 +691,20 @@ endif have_otr = false if want_otr - libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr, static : want_static_dependency, include_type : 'system') - libotr = dependency('libotr', version : '>=4.1.0', required : require_otr, static : want_static_dependency, include_type : 'system') + libgcrypt = dependency( + 'libgcrypt', + version : '>=1.2.0', + required : require_otr, + static : want_static_dependency, + include_type : 'system', + ) + libotr = dependency( + 'libotr', + version : '>=4.1.0', + required : require_otr, + static : want_static_dependency, + include_type : 'system', + ) if libgcrypt.found() and libotr.found() dep += libgcrypt dep += libotr @@ -505,9 +718,19 @@ endif have_capsicum = false if want_capsicum - if cc.has_function('cap_enter', dependencies : cc.find_library('c')) - libnv = cc.find_library('nv', required : require_capsicum) - nvlist_create_found = libnv.found() and cc.has_function('nvlist_create', dependencies : libnv, prefix : '#include ') + if cc.has_function( + 'cap_enter', + dependencies : cc.find_library('c'), + ) + libnv = cc.find_library( + 'nv', + required : require_capsicum, + ) + nvlist_create_found = libnv.found() and cc.has_function( + 'nvlist_create', + dependencies : libnv, + prefix : '#include ', + ) if nvlist_create_found dep += libnv have_capsicum = true @@ -524,11 +747,14 @@ if want_capsicum endif # dependency helper sets -dep_cflagsonly = [] +dep_cflagsonly = [ ] foreach d : dep - dep_cflagsonly += d.partial_dependency(includes : true, compile_args : true) + dep_cflagsonly += d.partial_dependency( + includes : true, + compile_args : true, + ) endforeach -dl_cross_dep = [] +dl_cross_dep = [ ] if need_dl_cross_link dl_cross_dep = dep endif @@ -539,12 +765,19 @@ endif conf = configuration_data() -conf.set('HAVE_CAPSICUM', have_capsicum, description : 'Build with Capsicum support') +conf.set( + 'HAVE_CAPSICUM', + have_capsicum, + description : 'Build with Capsicum support', +) conf.set('HAVE_GMODULE', true) -conf.set('HAVE_SOCKS', false, description : 'Build with socks support') -conf.set('TERM_TRUECOLOR', want_truecolor, description : 'true color support in terminal') -conf.set('USE_GREGEX', want_gregex, description : 'use GRegex for regular expressions') -conf.set10('_DARWIN_USE_64_BIT_INODE', true, description : 'Enable large inode numbers on Mac OS X 10.5.') +conf.set('TERM_TRUECOLOR', true) +conf.set('USE_GREGEX', true) +conf.set10( + '_DARWIN_USE_64_BIT_INODE', + true, + description : 'Enable large inode numbers on Mac OS X 10.5.', +) conf.set_quoted('FHS_PREFIX', get_option('fhs-prefix')) headers = [ @@ -558,29 +791,110 @@ headers = [ ] foreach h : headers if cc.has_header(h) - conf.set('HAVE_' + h.underscorify().to_upper(), 1, description : 'Define to 1 if you have the <' + h + '> header file.') + conf.set( + 'HAVE_' + h.underscorify().to_upper(), + 1, + description : 'Define to 1 if you have the <' + h + '> header file.', + ) endif endforeach +if want_textui and conf.get('HAVE_TERM_H', 0) == 1 + if cc.links( + ''' +#include +#include +int main (void) { + return tputs("x", 1, putchar); +} +''', + args : '-pedantic-errors', + dependencies : textui_dep, + name : 'Curses working', + ) + # ok + else + has_curses_h = cc.has_header('curses.h') + if has_curses_h and cc.links( + ''' +#include +#include +int main (void) { + return tputs("x", 1, putchar); +} +''', + args : '-pedantic-errors', + dependencies : textui_dep, + name : 'Curses working with curses.h', + ) + conf.set( + 'NEED_CURSES_H', + 1, + description : 'tputs needs curses.h', + ) + else + if has_curses_h and cc.links( + ''' +#include +#include +int char_putchar (char c) { + return putchar(c); +} +int main (void) { + return tputs("x", 1, char_putchar); +} +''', + args : '-pedantic-errors', + dependencies : textui_dep, + name : 'Curses with tputs third argument arg char', + ) + conf.set( + 'NEED_CURSES_H', + 1, + description : 'tputs needs curses.h', + ) + conf.set( + 'TPUTS_SVR4', + 1, + description : 'third argument of tputs has the type int (*)(char)', + ) + else + error('could not link terminfo') + endif + endif + endif +endif + conf.set('HAVE_LIBUTF8PROC', have_libutf8proc) conf.set_quoted('PACKAGE_VERSION', package_version) conf.set_quoted('PACKAGE_TARNAME', meson.project_name()) -configure_file(output : 'irssi-config.h', +configure_file( + output : 'irssi-config.h', configuration : conf, - install_dir : includedir / incdir) + install_dir : includedir / incdir, +) ########## # CFLAGS # ########## #### warnings #### -add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-statement'), language : 'c') +add_project_arguments( + cc.get_supported_arguments('-Werror=declaration-after-statement'), + language : 'c', +) #### personality #### -add_project_arguments(cc.get_supported_arguments('-fno-strict-aliasing'), language : 'c') +add_project_arguments( + cc.get_supported_arguments('-fno-strict-aliasing'), + language : 'c', +) if get_option('buildtype').contains('debug') - add_project_arguments(cc.get_supported_arguments('-fno-omit-frame-pointer'), language : 'c') + add_project_arguments( + cc.get_supported_arguments('-fno-omit-frame-pointer'), + language : 'c', + ) endif if want_fuzzer @@ -588,7 +902,10 @@ if want_fuzzer if not cc.has_argument('-fsanitize=fuzzer-no-link') error('compiler does not support -fsanitize=fuzzer-no-link, try clang?') endif - add_project_arguments('-fsanitize=fuzzer-no-link', language : 'c') + add_project_arguments( + '-fsanitize=fuzzer-no-link', + language : 'c', + ) endif if fuzzer_link_language != 'c' add_languages(fuzzer_link_language) @@ -600,7 +917,7 @@ endif ############## pc = import('pkgconfig') -pc_requires = [] +pc_requires = [ ] if not glib_internal pc_requires += glib_dep endif @@ -615,15 +932,14 @@ if signalsfile.startswith('/') else signalsfile = '${prefix}' / signalsfile endif -pc.generate(filebase : 'irssi-1', +pc.generate( + filebase : 'irssi-1', name : 'Irssi', description : 'Irssi chat client', version : package_version, requires : pc_requires, - variables : [ - 'irssimoduledir=${libdir}' / incdir / 'modules', - 'signalsfile=' + signalsfile - ]) + variables : [ 'irssimoduledir=${libdir}' / incdir / 'modules', 'signalsfile=' + signalsfile ], +) ########### # irssi.1 # @@ -663,8 +979,6 @@ if have_perl endif message('Install prefix ................... : ' + get_option('prefix')) message('') -message('Building with true color support.. : ' + want_truecolor.to_string('yes', 'no')) -message('Building with GRegex ............. : ' + want_gregex.to_string('yes', 'no')) message('Building with Capsicum ........... : ' + have_capsicum.to_string('yes', 'no')) message('Building with utf8proc ........... : ' + have_libutf8proc.to_string('yes', 'no')) message('Building with OTR support ........ : ' + have_otr.to_string('yes', 'no')) diff --git a/meson_options.txt b/meson_options.txt index 1013166d..a5b4ffbb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,8 +7,6 @@ option('with-proxy', type : 'combo', description : 'Build irssi-proxy', option('with-perl-lib', type : 'string', description : 'Specify where to install the Perl libraries for Irssi') option('with-perl', type : 'combo', description : 'Build with Perl support', choices : ['auto', 'yes', 'no']) option('with-otr', type : 'combo', description : 'Build with OTR support', choices : ['auto', 'yes', 'no']) -option('enable-true-color', type : 'combo', description : 'Build with true color support in terminal', choices : ['no', 'yes']) -option('disable-gregex', type : 'combo', description : 'Build without GRegex (fall back to regex.h)', choices : ['no', 'yes']) option('disable-utf8proc', type : 'combo', description : 'Build without Julia\'s utf8proc', choices : ['auto', 'yes', 'no']) option('with-capsicum', type : 'combo', description : 'Build with Capsicum support', choices : ['auto', 'yes', 'no']) option('static-dependency', type : 'combo', description : 'Request static dependencies', choices : ['no', 'yes']) diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index 42b3ea7b..00000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -SUBDIRS = examples - -scriptdir = $(datadir)/irssi/scripts - -script_DATA = \ - autoop.pl \ - autorejoin.pl \ - buf.pl \ - dns.pl \ - kills.pl \ - mail.pl \ - mlock.pl \ - quitmsg.pl \ - scriptassist.pl \ - usercount.pl - -EXTRA_DIST = $(script_DATA) \ - meson.build diff --git a/scripts/autoop.pl b/scripts/autoop.pl index b72def15..ce37e705 100644 --- a/scripts/autoop.pl +++ b/scripts/autoop.pl @@ -5,7 +5,7 @@ use Irssi; use strict; use vars qw($VERSION %IRSSI); -$VERSION = "1.10"; +$VERSION = "1.11"; %IRSSI = ( authors => 'Timo Sirainen & Jostein Kjønigsen', name => 'autoop', @@ -98,10 +98,11 @@ sub load_autoops { %opnicks = (); open(CONF, "<", "$file") or return; while (my $line = ) { - if ($line !=~ /^\s*$/) { - cmd_autoop($line); - $count++; - } + chomp($line); + if ($line !~ /^\s*$/) { + cmd_autoop($line); + $count++; + } } close(CONF); diff --git a/scripts/examples/Makefile.am b/scripts/examples/Makefile.am deleted file mode 100644 index c8d8c8e0..00000000 --- a/scripts/examples/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -scriptdir = $(datadir)/irssi/scripts - -script_DATA = \ - command.pl \ - msg-event.pl \ - redirect.pl - -EXTRA_DIST = $(script_DATA) diff --git a/scripts/mail.pl b/scripts/mail.pl index 23f99c01..bf14503a 100644 --- a/scripts/mail.pl +++ b/scripts/mail.pl @@ -1,6 +1,6 @@ use strict; use vars qw($VERSION %IRSSI); -$VERSION = "2.92"; +$VERSION = "2.93"; %IRSSI = ( authors => "Timo Sirainen, Matti Hiljanen, Joost Vunderink, Bart Matthaei", contact => "tss\@iki.fi, matti\@hiljanen.com, joost\@carnique.nl, bart\@dreamflow.nl", @@ -63,8 +63,8 @@ sub cmd_print_help { "/MAILBOX SHOW\n". " - Shows a list of the defined mailboxes.\n\n". "Use the following commands to change the behaviour:\n\n". - "/SET MAILDIRMODE on|off\n". - " - If maildirmode is on, the mailboxes in the list are assumed to be ". + "/SET MAILDIR_MODE on|off\n". + " - If maildir_mode is on, the mailboxes in the list are assumed to be ". "directories. Otherwise they are assumed to be spool files.\n". " Default: off.\n". "/SET MAIL_OLDNOTNEW on|off\n". diff --git a/scripts/meson.build b/scripts/meson.build index 072ac3ea..10fdc34b 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -11,4 +11,5 @@ install_data( 'scriptassist.pl', 'usercount.pl', ), - install_dir : scriptdir) + install_dir : scriptdir, +) diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl index 5cad3838..665615db 100644 --- a/scripts/scriptassist.pl +++ b/scripts/scriptassist.pl @@ -5,7 +5,7 @@ use strict; -our $VERSION = '2022053100'; +our $VERSION = '2023111700'; our %IRSSI = ( authors => 'Stefan \'tommie\' Tomanek', contact => 'stefan@pico.ruhr.de', @@ -22,6 +22,8 @@ our ($forked, %remote_db, $have_gpg, @complist); use Irssi 20020324; use CPAN::Meta::YAML; use LWP::UserAgent; +use Hash::Util qw(lock_ref_keys); +use JSON::PP; use POSIX; use version; @@ -43,7 +45,7 @@ sub show_help { /scriptassist info Display information about /scriptassist ratings - Retrieve the average ratings of the the scripts + Retrieve the average ratings of the scripts /scriptassist top Retrieve the first top rated scripts /scriptassist new @@ -199,87 +201,163 @@ sub get_unknown { } sub get_names { - my ($sname, $db) = shift; + my ($sname, $db, $votes) = @_; $sname =~ s/\s+$//; - $sname =~ s/\.pl$//; - my $plname = "$sname.pl"; + my $ext = 'pl'; # default extension + if ($sname =~ s/\.(\w{2,3})$//) { + $ext = $1; + } + my $plname = "$sname.$ext"; $sname =~ s/^.*\///; my $xname = $sname; $xname =~ s/\W/_/g; my $pname = "${xname}::"; if ($xname ne $sname || $sname =~ /_/) { my $dir = Irssi::get_irssi_dir()."/scripts/"; - if ($db && exists $db->{"$sname.pl"}) { + if ($db && exists $db->{$plname}) { # $found = 1; - } elsif (-e $dir.$plname || -e $dir."$sname.pl" || -e $dir."autorun/$sname.pl") { + } elsif (-e $dir.$plname || -e $dir."autorun/".$plname) { # $found = 1; } else { # not found my $pat = $xname; $pat =~ y/_/?/; my $re = "\Q$xname"; $re =~ s/\Q_/./g; if ($db) { - my ($cand) = grep /^$re\.pl$/, sort keys %$db; + my ($cand) = grep /^$re\.\Q$ext\E$/, sort keys %$db; if ($cand) { - return get_names($cand, $db); + return get_names($cand, $db, $votes); } } - my ($cand) = glob "'$dir$pat.pl' '${dir}autorun/$pat.pl'"; + my ($cand) = glob "'$dir$pat.$ext' '${dir}autorun/$pat.$ext'"; if ($cand) { $cand =~ s/^.*\///; - return get_names($cand, $db); + return get_names($cand, $db, $votes); } } } - ($sname, $plname, $pname, $xname) + my ($script_stash, $script_irssi, $script_db, $local_version); + $script_db = $db->{$plname} if $db && exists $db->{$plname}; + if (lc $ext eq 'pl') { + $script_stash = $Irssi::Script::{$pname}; + } + elsif (lc $ext eq 'py' && is_python_loaded()) { + my $filename; + capture_print_text_command( + 'py list', + sub { + for my $line (@_[ 1 .. $#_ ]) { + my ($script, $fn) = split ' ', $line, 2; + if ($script eq $sname) { + $filename = $fn; + } + } + }); + if (defined $filename) { + my $filename_quoted = $filename; + $filename_quoted =~ s/[\\']/\\$&/g; + capture_print_text_command( + # make sure the command line stays short + 'py exec ' . + (join ';', split /\n/, < $doc->{IRSSI}, VERSION => \($doc->{__version__}) }; + }; + } + ); + } + } + if (defined $script_stash) { + $script_irssi = $script_stash->{IRSSI}; + $local_version = ${$script_stash->{VERSION}} + if $script_stash->{VERSION}; + } + lock_ref_keys({ + sname => $ext eq 'pl' ? $sname : $plname, + plname => $plname, + pname => $pname, + xname => $xname, + stash => $script_stash, + irssi => $script_irssi, + db => $script_db, + db_version => ($script_db ? $script_db->{version} : undef), + local_version => $local_version, + ($votes ? (votes => $votes->{$plname}) : ()), + }) } sub script_info { my ($scripts) = @_; my %result; my $xml = get_scripts(); + my $py = is_python_loaded(); foreach (@{$scripts}) { - my ($sname, $plname, $pname) = get_names($_, $xml); - next unless (defined $xml->{$plname} || ( exists $Irssi::Script::{$pname} && exists $Irssi::Script::{$pname}{IRSSI} )); - $result{$sname}{version} = get_remote_version($sname, $xml); + my %r; + my $n = get_names($_, $xml); + next unless (defined $n->{db} || defined $n->{irssi}); + $r{version} = $n->{db_version}; my @headers = ('authors', 'contact', 'description', 'license', 'source'); foreach my $entry (@headers) { - $result{$sname}{$entry} = $Irssi::Script::{$pname}{IRSSI}{$entry}; - if (defined $xml->{$plname}{$entry}) { - $result{$sname}{$entry} = $xml->{$plname}{$entry}; + $r{$entry} = $n->{irssi}{$entry}; + if ($n->{db} && defined $n->{db}{$entry}) { + $r{$entry} = $n->{db}{$entry}; } } - if ($xml->{$plname}{signature_available}) { - $result{$sname}{signature_available} = 1; + if ($n->{db} && $n->{db}{signature_available}) { + $r{signature_available} = 1; } - if (defined $xml->{$plname}{modules}) { - my $modules = $xml->{$plname}{modules}; + if ($n->{db} && defined $n->{db}{modules}) { + my $modules = $n->{db}{modules}; foreach my $mod (split(/ /, $modules)) { my $opt = ($mod =~ /\((.*)\)/)? 1 : 0; $mod = $1 if $1; - $result{$sname}{modules}{$mod}{optional} = $opt; - $result{$sname}{modules}{$mod}{installed} = module_exist($mod); + $r{modules}{$mod}{optional} = $opt; + $r{modules}{$mod}{installed} = module_exist($mod); } - } elsif (defined $Irssi::Script::{$pname}{IRSSI}{modules}) { - my $modules = $Irssi::Script::{$pname}{IRSSI}{modules}; + } elsif ($n->{irssi} && defined $n->{irssi}{modules}) { + my $modules = $n->{irssi}{modules}; foreach my $mod (split(/ /, $modules)) { my $opt = ($mod =~ /\((.*)\)/)? 1 : 0; $mod = $1 if $1; - $result{$sname}{modules}{$mod}{optional} = $opt; - $result{$sname}{modules}{$mod}{installed} = module_exist($mod); + $r{modules}{$mod}{optional} = $opt; + $r{modules}{$mod}{installed} = module_exist($mod); } } - # if (defined $xml->{$plname}{depends}) { - # my $depends = $xml->{$plname}{depends}; + if (!$py && $n->{db} && $n->{db}{language} eq 'Python') { # py + $r{modules}{'irssi-python module'}{installed} = 0; + } + # if (defined $n->{db}{depends}) { + # my $depends = $n->{db}{depends}; # foreach my $dep (split(/ /, $depends)) { - # $result{$sname}{depends}{$dep}{installed} = 1; #(defined ${ 'Irssi::Script::'.$dep }); + # $r{depends}{$dep}{installed} = 1; #(defined ${ 'Irssi::Script::'.$dep }); # } # } + $result{$n->{sname}} = \%r; } return \%result; } sub get_rate_url { my ($src) = @_; + if (ref $src) { ($src) = grep { $_ } map { $_->{source} } values %$src; } + die("No script source address found\n") unless $src; my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30); $ua->agent('ScriptAssist/'.$VERSION); my $request = HTTP::Request->new('GET', $src); @@ -288,6 +366,9 @@ sub get_rate_url { my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), ''; die("Fetching ratings location failed: $error"); } + if (my $error = $response->header('X-Died')) { + die("$error\n"); + } my $votes_url; for my $tag ($response->content() =~ /]*)>/g) { my $attr = " $tag "; @@ -299,7 +380,7 @@ sub get_rate_url { } $request = HTTP::Request->new('GET', $votes_url); $response = $ua->request($request); - if (!$response->is_success) { + if (!$response->is_success || $response->header('X-Died')) { my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), ''; die("Fetching ratings failed: $error"); } @@ -311,16 +392,16 @@ sub get_rate_url { sub rate_script { my ($script, $stars) = @_; my $xml = get_scripts(); - my $votes = get_rate_url(map { $_->{source} } values %$xml); - my ($sname, $plname, $pname) = get_names($script, $xml); - die "Script $script not found\n" unless $votes->{$plname}; - return $votes->{$plname}{u} + my $votes = get_rate_url($xml); + my $n = get_names($script, $xml, $votes); + die "Script $script not found\n" unless $n->{votes}; + return $n->{votes}{u} } sub get_ratings { my ($scripts, $limit) = @_; my $xml = get_scripts(); - my $votes = get_rate_url(map { $_->{source} } values %$xml); + my $votes = get_rate_url($xml); foreach (keys %{$votes}) { if ($xml->{$_}) { $xml->{$_}{votes} = $votes->{$_}{v}; @@ -329,9 +410,9 @@ sub get_ratings { my %result; if (@{$scripts}) { foreach (@{$scripts}) { - my ($sname, $plname, $pname) = get_names($_, $xml); - next unless (defined $xml->{$plname} || ( exists $Irssi::Script::{$pname} && exists $Irssi::Script::{$pname}{IRSSI} )); - $result{$plname} = [$xml->{$plname}{votes}]; + my $n = get_names($_, $xml); + next unless ($n->{db} || $n->{irssi}); + $result{$n->{plname}} = [$n->{db}{votes}]; } } else { my @keys = sort { $xml->{$b}{votes} <=> $xml->{$a}{votes} @@ -371,16 +452,22 @@ sub debug_scripts { my ($scripts) = @_; my %result; my $xml = get_scripts(); + my $py = is_python_loaded(); foreach (@{$scripts}) { - my ($sname, $plname) = get_names($_, $xml); - if (defined $xml->{$plname}{modules}) { - my $modules = $xml->{$plname}{modules}; + my %r; + my $n = get_names($_, $xml); + if ($n->{db} && defined $n->{db}{modules}) { + my $modules = $n->{db}{modules}; foreach my $mod (split(/ /, $modules)) { my $opt = ($mod =~ /\((.*)\)/)? 1 : 0; $mod = $1 if $1; - $result{$sname}{$mod}{optional} = $opt; - $result{$sname}{$mod}{installed} = module_exist($mod); + $r{$mod}{optional} = $opt; + $r{$mod}{installed} = module_exist($mod); } + $result{$n->{sname}} = \%r; + } + if (!$py && $n->{db} && $n->{db}{language} eq 'Python') { # py + $result{$n->{sname}}{'irssi-python module'}{installed} = 0; } } return(\%result); @@ -391,11 +478,11 @@ sub install_scripts { my %success; my $dir = Irssi::get_irssi_dir()."/scripts/"; foreach (@{$scripts}) { - my ($sname, $plname, $pname) = get_names($_, $xml); - if (get_local_version($sname) && (-e $dir.$plname)) { - $success{$sname}{installed} = -2; + my $n = get_names($_, $xml); + if ($n->{stash} && (-e $dir.$n->{plname})) { + $success{$n->{sname}}{installed} = -2; } else { - $success{$sname} = download_script($sname, $xml); + $success{$n->{sname}} = download_script($n->{sname}, $xml); } } return \%success; @@ -406,24 +493,24 @@ sub update_scripts { $list = loaded_scripts() if ($list->[0] eq "all" || scalar(@$list) == 0); my %status; foreach (@{$list}) { - my ($sname) = get_names($_, $database); - my $local = get_local_version($sname); - my $remote = get_remote_version($sname, $database); + my $n = get_names($_, $database); + my $local = $n->{local_version}; + my $remote = $n->{db_version}; next if $local eq '' || $remote eq ''; if (compare_versions($local, $remote) eq "older") { - $status{$sname} = download_script($sname, $database); + $status{$n->{sname}} = download_script($n->{sname}, $database); } else { - $status{$sname}{installed} = -2; + $status{$n->{sname}}{installed} = -2; } - $status{$sname}{remote} = $remote; - $status{$sname}{local} = $local; + $status{$n->{sname}}{remote} = $remote; + $status{$n->{sname}}{local} = $local; } return \%status; } sub search_scripts { my ($query, $database) = @_; - $query =~ s/\.pl\Z//; + $query =~ s/\.pl\Z//; # pl my %result; foreach (sort keys %{$database}) { my %entry = %{$database->{$_}}; @@ -432,7 +519,7 @@ sub search_scripts { $string .= $entry{description} if defined $entry{description}; if ($string =~ /$query/i) { my $name = $_; - $name =~ s/\.pl$//; + $name =~ s/\.pl$//; # pl if (defined $entry{description}) { $result{$name}{desc} = $entry{description}; } else { @@ -443,7 +530,7 @@ sub search_scripts { } else { $result{$name}{authors} = ""; } - if (get_local_version($name)) { + if (get_names($name, $database)->{stash}) { $result{$name}{installed} = 1; } else { $result{$name}{installed} = 0; @@ -531,8 +618,8 @@ sub print_unknown { my $text .= "The command '/".$cmd."' is provided by the script '".$data->{$cmd}{$_}{name}."'.\n"; $text .= "This script is currently not installed on your system.\n"; $text .= "If you want to install the script, enter\n"; - my ($name) = get_names($_); - $text .= " %U/script install ".$name."%U "; + my $n = get_names($_); + $text .= " %U/script install ".$n->{sname}."%U "; my $output = draw_box("ScriptAssist", $text, "'".$_."' missing", 1); print CLIENTCRAP $output; } @@ -541,10 +628,10 @@ sub print_unknown { sub check_autorun { my ($script) = @_; - my (undef, $plname) = get_names($script); + my $n = get_names($script); my $dir = Irssi::get_irssi_dir()."/scripts/"; - if (-e $dir."/autorun/".$plname) { - if (readlink($dir."/autorun/".$plname) eq "../".$plname) { + if (-e $dir."/autorun/".$n->{plname}) { + if (readlink($dir."/autorun/".$n->{plname}) eq "../".$n->{plname}) { return 1; } } @@ -582,14 +669,15 @@ sub print_info { my $line; foreach my $script (sort keys(%data)) { my ($local, $autorun); - if (get_local_version($script)) { + my $n = get_names($script); + if ($n->{stash}) { $line .= "%go%n "; - $local = get_local_version($script); + $local = $n->{local_version}; } else { $line .= "%ro%n "; $local = undef; } - if (defined $local || check_autorun($script)) { + if ($n->{stash} || check_autorun($script)) { $autorun = "no"; $autorun = "yes" if check_autorun($script); } else { @@ -643,7 +731,7 @@ sub print_ratings { my @table; foreach my $script (sort {$data{$b}{rating}<=>$data{$a}{rating}} keys(%data)) { my @line; - if (get_local_version($script)) { + if (get_names($script)->{stash}) { push @line, "%go%n"; } else { push @line, "%yo%n"; @@ -660,13 +748,13 @@ sub print_new { my @table; foreach (sort {$list->{$b}{modified} cmp $list->{$a}{modified}} keys %$list) { my @line; - my ($name) = get_names($_); - if (get_local_version($name)) { + my $n = get_names($_); + if ($n->{stash}) { push @line, "%go%n"; } else { push @line, "%yo%n"; } - push @line, "%9".$name."%9"; + push @line, "%9".$n->{sname}."%9"; push @line, $list->{$_}{modified}; push @table, \@line; } @@ -678,14 +766,23 @@ sub print_debug { my $line; foreach my $script (sort keys %data) { $line .= "%ro%n %9".$script."%9 failed to load\n"; - $line .= " Make sure you have the following perl modules installed:\n"; + my $py = $data{$script}{'irssi-python module'}; + if ($py) { # py + $line .= " You are attempting to load a Python script!\n"; + } else { + $line .= " Make sure you have the following perl modules installed:\n"; + } foreach (sort keys %{$data{$script}}) { if ( $data{$script}{$_}{installed} == 1 ) { $line .= " %g->%n ".$_." (found)"; } else { $line .= " %r->%n ".$_." (not found)\n"; $line .= " [This module is optional]\n" if $data{$script}{$_}{optional}; - $line .= " [Try /scriptassist cpan ".$_."]"; + if ($py) { # py + $line .= " [If you have it installed, try: /load python]"; + } else { + $line .= " [Try /scriptassist cpan ".$_."]"; + } } $line .= "\n"; } @@ -695,7 +792,13 @@ sub print_debug { sub load_script { my ($script) = @_; - Irssi::command('script load '.$script); + if ($script =~ s/\.py$//i) { # py + if (is_python_loaded()) { + Irssi::command('py load '.$script); + } + } else { + Irssi::command('script load '.$script); # pl + } } sub print_install { @@ -715,7 +818,7 @@ sub print_install { } else { load_script($script) unless (lc($script) eq lc($IRSSI{name})); } - if (get_local_version($script) && not lc($script) eq lc($IRSSI{name})) { + if (get_names($script)->{stash} && not lc($script) eq lc($IRSSI{name})) { $line .= "%go%n %9".$script."%9 installed\n"; push @installed, $script; } elsif (lc($script) eq lc($IRSSI{name})) { @@ -751,16 +854,14 @@ sub list_sbitems { my ($scripts) = @_; my $text; foreach (@$scripts) { - next unless exists $Irssi::Script::{"${_}::"}; - next unless exists $Irssi::Script::{"${_}::"}{IRSSI}; - my $header = $Irssi::Script::{"${_}::"}{IRSSI}; - next unless $header->{sbitems}; + my $n = get_names($_); + next unless $n->{irssi}{sbitems}; $text .= '%9"'.$_.'"%9 provides the following statusbar item(s):'."\n"; - $text .= ' ->'.$_."\n" foreach (split / /, $header->{sbitems}); + $text .= ' ->'.$_."\n" foreach (split / /, $n->{irssi}{sbitems}); } return unless $text; $text .= "\n"; - $text .= "Enter '/statusbar window add ' to add an item."; + $text .= "Enter '/statusbar additem window' to add an item."; print CLIENTCRAP draw_box('ScriptAssist', $text, 'sbitems', 1); } @@ -838,14 +939,12 @@ sub print_update { sub contact_author { my ($script) = @_; - my ($sname, $plname, $pname) = get_names($script); - return unless exists $Irssi::Script::{$pname}; - my $header = $Irssi::Script::{$pname}{IRSSI}; - if ($header && defined $header->{contact}) { - my @ads = split(/ |,/, $header->{contact}); + my $n = get_names($script); + if ($n->{irssi} && defined $n->{irssi}{contact}) { + my @ads = split(/ |,/, $n->{irssi}{contact}); my $address = $ads[0]; $address .= '?subject='.$script; - $address .= '_'.get_local_version($script) if defined get_local_version($script); + $address .= '_'.$n->{local_version} if $n->{local_version}; call_openurl($address) if $address =~ /[\@:]/; } } @@ -874,6 +973,10 @@ sub get_scripts { $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), ''; next; } + if (my $died = $response->header('X-Died')) { + $error = $died; + next; + } $fetched = 1; my $data = $response->content(); my $src = $site; @@ -929,20 +1032,6 @@ sub get_scripts { return $remote_db{db}; } -sub get_remote_version { - my ($script, $database) = @_; - my $plname = (get_names($script, $database))[1]; - return $database->{$plname}{version}; -} - -sub get_local_version { - my ($script) = @_; - my $pname = (get_names($script))[2]; - return unless exists $Irssi::Script::{$pname}; - my $vref = $Irssi::Script::{$pname}{VERSION}; - return $vref ? $$vref : undef; -} - sub compare_versions { my ($ver1, $ver2) = @_; for ($ver1, $ver2) { @@ -959,11 +1048,42 @@ sub compare_versions { return 'equal'; } +sub is_python_loaded { + !! grep { $_->{cmd} eq 'py' } Irssi::commands +} + +my @print_text_capture; +sub capture_print_text { + my ($dest, $text, $plain) = @_; + push @print_text_capture, $plain; + Irssi::signal_stop; +} + +sub capture_print_text_command { + my ($command, $sub) = @_; + Irssi::signal_add_first('print text', 'capture_print_text'); + @print_text_capture = (); + Irssi::command($command); + my @capture = @print_text_capture; + Irssi::signal_remove('print text', 'capture_print_text'); + @print_text_capture = (); + $sub->(@capture); +} + sub loaded_scripts { my @modules; - foreach (sort grep(s/::$//, keys %Irssi::Script::)) { + foreach (sort grep(s/::$//, keys %Irssi::Script::)) { # pl push @modules, $_; } + if (is_python_loaded()) { + capture_print_text_command( + 'py list', sub { + for my $line (@_[ 1 .. $#_ ]) { + my ($script, $file) = split ' ', $line, 2; + push @modules, "$script.py"; + } + }); + } return \@modules; } @@ -971,9 +1091,9 @@ sub check_scripts { my ($data) = @_; my %versions; foreach (@{loaded_scripts()}) { - my ($sname) = get_names($_, $data); - my $remote = get_remote_version($sname, $data); - my $local = get_local_version($sname); + my $n = get_names($_, $data); + my $remote = $n->{db_version}; + my $local = $n->{local_version}; my $state; if ($local && $remote) { $state = compare_versions($local, $remote); @@ -986,9 +1106,9 @@ sub check_scripts { $remote = '/'; } if ($state) { - $versions{$sname}{state} = $state; - $versions{$sname}{remote} = $remote; - $versions{$sname}{local} = $local; + $versions{$n->{sname}}{state} = $state; + $versions{$n->{sname}}{remote} = $remote; + $versions{$n->{sname}}{local} = $local; } } return \%versions; @@ -996,40 +1116,40 @@ sub check_scripts { sub download_script { my ($script, $xml) = @_; - my ($sname, $plname) = get_names($script, $xml); + my $n = get_names($script, $xml); + my $site = $n->{db}{source}; my %result; - my $site = $xml->{$plname}{source}; $result{installed} = 0; $result{signed} = 0; my $dir = Irssi::get_irssi_dir(); - my $ua = LWP::UserAgent->new(env_proxy => 1,keep_alive => 1,timeout => 30); + my $ua = LWP::UserAgent->new(env_proxy => 1, keep_alive => 1, timeout => 30); $ua->agent('ScriptAssist/'.2003020803); - my $request = HTTP::Request->new('GET', $site.'/scripts/'.$script.'.pl'); + my $request = HTTP::Request->new('GET', $site.'/scripts/'.$n->{plname}); my $response = $ua->request($request); - if ($response->is_success()) { + if ($response->is_success() && !$response->header('X-Died')) { my $file = $response->content(); mkdir $dir.'/scripts/' unless (-e $dir.'/scripts/'); - open(my $F, '>', $dir.'/scripts/'.$plname.'.new'); - print $F $file; - close($F); + open(my $f, '>', $dir.'/scripts/'.$n->{plname}.'.new'); + print $f $file; + close($f); if ($have_gpg && Irssi::settings_get_bool('scriptassist_use_gpg')) { my $ua2 = LWP::UserAgent->new(env_proxy => 1,keep_alive => 1,timeout => 30); $ua->agent('ScriptAssist/'.2003020803); - my $request2 = HTTP::Request->new('GET', $site.'/signatures/'.$plname.'.asc'); + my $request2 = HTTP::Request->new('GET', $site.'/signatures/'.$n->{plname}.'.asc'); my $response2 = $ua->request($request2); - if ($response2->is_success()) { + if ($response2->is_success() && !$response->header('X-Died')) { my $sig_dir = $dir.'/scripts/signatures/'; mkdir $sig_dir unless (-e $sig_dir); - open(my $S, '>', $sig_dir.$plname.'.asc'); + open(my $s, '>', $sig_dir.$n->{plname}.'.asc'); my $file2 = $response2->content(); - print $S $file2; - close($S); + print $s $file2; + close($s); my $sig; foreach (1..2) { # FIXME gpg needs two rounds to load the key my $gpg = new GnuPG(); eval { - $sig = $gpg->verify( file => $dir.'/scripts/'.$plname.'.new', signature => $sig_dir.$plname.'.asc' ); + $sig = $gpg->verify( file => $dir.'/scripts/'.$n->{plname}.'.new', signature => $sig_dir.$n->{plname}.'.asc' ); }; } if (defined $sig->{user}) { @@ -1055,8 +1175,8 @@ sub download_script { if ($result{installed}) { my $old_dir = "$dir/scripts/old/"; mkdir $old_dir unless (-e $old_dir); - rename "$dir/scripts/$plname", "$old_dir/$plname.old" if -e "$dir/scripts/$plname"; - rename "$dir/scripts/$plname.new", "$dir/scripts/$plname"; + rename "$dir/scripts/".$n->{plname}, "$old_dir/".$n->{plname}.".old" if -e "$dir/scripts/".$n->{plname}; + rename "$dir/scripts/".$n->{plname}.".new", "$dir/scripts/".$n->{plname}; } return \%result; } @@ -1083,23 +1203,23 @@ sub print_check { sub toggle_autorun { my ($script) = @_; - my ($sname, $plname) = get_names($script); + my $n = get_names($script); my $dir = Irssi::get_irssi_dir()."/scripts/"; mkdir $dir."autorun/" unless (-e $dir."autorun/"); - return unless (-e $dir.$plname); - if (-e $dir."/autorun/".$plname) { - if (readlink($dir."/autorun/".$plname) eq "../".$plname) { - if (unlink($dir."/autorun/".$plname)) { - print CLIENTCRAP "%R>>%n Autorun of ".$sname." disabled"; + return unless (-e $dir.$n->{plname}); + if (-e $dir."/autorun/".$n->{plname}) { + if (readlink($dir."/autorun/".$n->{plname}) eq "../".$n->{plname}) { + if (unlink($dir."/autorun/".$n->{plname})) { + print CLIENTCRAP "%R>>%n Autorun of ".$n->{sname}." disabled"; } else { print CLIENTCRAP "%R>>%n Unable to delete link"; } } else { - print CLIENTCRAP "%R>>%n ".$dir."/autorun/".$plname." is not a correct link"; + print CLIENTCRAP "%R>>%n ".$dir."/autorun/".$n->{plname}." is not a correct link"; } } else { - if (symlink("../".$plname, $dir."/autorun/".$plname)) { - print CLIENTCRAP "%R>>%n Autorun of ".$sname." enabled"; + if (symlink("../".$n->{plname}, $dir."/autorun/".$n->{plname})) { + print CLIENTCRAP "%R>>%n Autorun of ".$n->{sname}." enabled"; } else { print CLIENTCRAP "%R>>%n Unable to create autorun link"; } @@ -1178,9 +1298,9 @@ sub cmd_help { sub sig_command_script_load { my ($script, $server, $witem) = @_; - my ($sname, $plname, $pname, $xname) = get_names($script); - if ( exists $Irssi::Script::{$pname} ) { - if (my $code = "Irssi::Script::${pname}"->can('pre_unload')) { + my $n = get_names($script); + if ( $n->{stash} ) { + if (my $code = ("Irssi::Script::".$n->{pname})->can('pre_unload')) { print CLIENTCRAP "%R>>%n Triggering pre_unload function of $script..."; $code->(); } diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 83fb562f..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -if BUILD_TEXTUI -TEXTUI=fe-text -endif - -if BUILD_IRSSIBOT -BOTUI=fe-none -endif - -if BUILD_IRSSIFUZZER -FUZZERUI=fe-fuzz -endif - -if HAVE_PERL -PERLDIR=perl -endif - -if HAVE_OTR -OTRDIR=otr -endif - -pkginc_srcdir=$(pkgincludedir)/src -pkginc_src_HEADERS = \ - common.h - -SUBDIRS = lib-config core irc fe-common $(PERLDIR) $(OTRDIR) $(TEXTUI) $(BOTUI) $(FUZZERUI) - -EXTRA_DIST = meson.build diff --git a/src/common.h b/src/common.h index 7271c149..4e9b5c79 100644 --- a/src/common.h +++ b/src/common.h @@ -6,7 +6,7 @@ #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */ #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */ -#define IRSSI_ABI_VERSION 46 +#define IRSSI_ABI_VERSION 58 #define DEFAULT_SERVER_ADD_PORT 6667 #define DEFAULT_SERVER_ADD_TLS_PORT 6697 @@ -37,9 +37,8 @@ #include #include -#ifdef HAVE_GMODULE -# include -#endif +#include +#include typedef guint64 uoff_t; #define PRIuUOFF_T G_GUINT64_FORMAT diff --git a/src/core/Makefile.am b/src/core/Makefile.am deleted file mode 100644 index 493c42b2..00000000 --- a/src/core/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -noinst_LIBRARIES = libcore.a - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DMODULEDIR=\""$(libdir)/irssi/modules"\" - -if USE_GREGEX -regex_impl=iregex-gregex.c -else -regex_impl=iregex-regexh.c -endif - -libcore_a_SOURCES = \ - args.c \ - channels.c \ - channels-setup.c \ - commands.c \ - chat-commands.c \ - chat-protocols.c \ - chatnets.c \ - core.c \ - expandos.c \ - ignore.c \ - levels.c \ - line-split.c \ - log.c \ - log-away.c \ - masks.c \ - misc.c \ - modules.c \ - modules-load.c \ - net-disconnect.c \ - net-nonblock.c \ - net-sendbuffer.c \ - network.c \ - network-openssl.c \ - nicklist.c \ - nickmatch-cache.c \ - pidwait.c \ - queries.c \ - rawlog.c \ - recode.c \ - refstrings.c \ - servers.c \ - servers-reconnect.c \ - servers-setup.c \ - session.c \ - settings.c \ - signals.c \ - special-vars.c \ - utf8.c \ - $(regex_impl) \ - wcwidth.c \ - wcwidth-wrapper.c \ - tls.c \ - write-buffer.c - -if HAVE_CAPSICUM -libcore_a_SOURCES += \ - capsicum.c -endif - -structure_headers = \ - channel-rec.h \ - channel-setup-rec.h \ - chatnet-rec.h \ - query-rec.h \ - server-rec.h \ - server-setup-rec.h \ - server-connect-rec.h \ - window-item-rec.h - -pkginc_coredir=$(pkgincludedir)/src/core -pkginc_core_HEADERS = \ - args.h \ - capsicum.h \ - channels.h \ - channels-setup.h \ - commands.h \ - chat-protocols.h \ - chatnets.h \ - core.h \ - expandos.h \ - ignore.h \ - levels.h \ - line-split.h \ - log.h \ - masks.h \ - misc.h \ - module.h \ - modules.h \ - modules-load.h \ - net-disconnect.h \ - net-nonblock.h \ - net-sendbuffer.h \ - network.h \ - network-openssl.h \ - nick-rec.h \ - nicklist.h \ - nickmatch-cache.h \ - pidwait.h \ - queries.h \ - rawlog.h \ - recode.h \ - refstrings.h \ - servers.h \ - servers-reconnect.h \ - servers-setup.h \ - session.h \ - settings.h \ - signals.h \ - special-vars.h \ - utf8.h \ - iregex.h \ - window-item-def.h \ - tls.h \ - write-buffer.h \ - $(structure_headers) - -EXTRA_DIST = meson.build diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c index c72f057c..5e2930ad 100644 --- a/src/core/channels-setup.c +++ b/src/core/channels-setup.c @@ -227,8 +227,7 @@ void channels_setup_init(void) setupchannels = NULL; source_host_ok = FALSE; - signal_add("setup reread", (SIGNAL_FUNC) channels_read_config); - signal_add("irssi init read settings", (SIGNAL_FUNC) channels_read_config); + signal_add("setup reread channels", (SIGNAL_FUNC) channels_read_config); } void channels_setup_deinit(void) @@ -236,6 +235,5 @@ void channels_setup_deinit(void) while (setupchannels != NULL) channel_setup_destroy(setupchannels->data); - signal_remove("setup reread", (SIGNAL_FUNC) channels_read_config); - signal_remove("irssi init read settings", (SIGNAL_FUNC) channels_read_config); + signal_remove("setup reread channels", (SIGNAL_FUNC) channels_read_config); } diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c index faeec451..9e2b80e8 100644 --- a/src/core/chat-commands.c +++ b/src/core/chat-commands.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -91,7 +92,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, return NULL; } - if (strchr(addr, '/') != NULL) + if (strchr(addr, '/') != NULL && chatnet_find(addr) == NULL) conn->unix_socket = TRUE; /* TLS options are handled in server_create_conn_opt ... -> server_setup_fill_optlist */ @@ -100,10 +101,11 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, host = g_hash_table_lookup(optlist, "host"); if (host != NULL && *host != '\0') { - IPADDR ip4, ip6; - - if (net_gethostbyname(host, &ip4, &ip6) == 0) - server_connect_own_ip_save(conn, &ip4, &ip6); + IPADDR ip4 = { 0 }; + IPADDR ip6 = { 0 }; + if (net_gethostbyname_first_ips(host, G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT, &ip4, + &ip6) == 0) + server_connect_own_ip_save(conn, &ip4, &ip6); } cmd_params_free(free_arg); diff --git a/src/core/chat-protocols.c b/src/core/chat-protocols.c index c53b01b3..1a6ecbb3 100644 --- a/src/core/chat-protocols.c +++ b/src/core/chat-protocols.c @@ -47,7 +47,7 @@ int chat_protocol_lookup(const char *name) g_return_val_if_fail(name != NULL, -1); rec = chat_protocol_find(name); - return rec == NULL ? -1 : rec->id; + return rec == NULL ? -1 : rec->not_initialized ? CHAT_PROTOCOL_NOT_INITIALIZED : rec->id; } CHAT_PROTOCOL_REC *chat_protocol_find(const char *name) @@ -99,6 +99,22 @@ CHAT_PROTOCOL_REC *chat_protocol_find_net(GHashTable *optlist) return NULL; } +static void chat_protocol_destroy(CHAT_PROTOCOL_REC *rec) +{ + g_return_if_fail(rec != NULL); + + chat_protocols = g_slist_remove(chat_protocols, rec); + + if (default_proto == rec) { + chat_protocol_set_default(chat_protocols == NULL ? NULL : chat_protocols->data); + } + + signal_emit("chat protocol destroyed", 1, rec); + + g_free(rec->name); + g_free(rec); +} + /* Register new chat protocol. */ CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec) { @@ -108,7 +124,11 @@ CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec) g_return_val_if_fail(rec != NULL, NULL); newrec = chat_protocol_find(rec->name); - created = newrec == NULL; + if (newrec != NULL && newrec->not_initialized) { + chat_protocol_destroy(newrec); + newrec = NULL; + } + created = newrec == NULL; if (newrec == NULL) { newrec = g_new0(CHAT_PROTOCOL_REC, 1); chat_protocols = g_slist_append(chat_protocols, newrec); @@ -131,23 +151,6 @@ CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec) return newrec; } -static void chat_protocol_destroy(CHAT_PROTOCOL_REC *rec) -{ - g_return_if_fail(rec != NULL); - - chat_protocols = g_slist_remove(chat_protocols, rec); - - if (default_proto == rec) { - chat_protocol_set_default(chat_protocols == NULL ? NULL : - chat_protocols->data); - } - - signal_emit("chat protocol destroyed", 1, rec); - - g_free(rec->name); - g_free(rec); -} - /* Unregister chat protocol. */ void chat_protocol_unregister(const char *name) { @@ -191,15 +194,6 @@ static CHANNEL_SETUP_REC *create_channel_setup(void) return g_new0(CHANNEL_SETUP_REC, 1); } -static SERVER_CONNECT_REC *create_server_connect(void) -{ - return g_new0(SERVER_CONNECT_REC, 1); -} - -static void destroy_server_connect(SERVER_CONNECT_REC *conn) -{ -} - /* Return "unknown chat protocol" record. Used when protocol name is specified but it isn't registered yet. */ CHAT_PROTOCOL_REC *chat_protocol_get_unknown(const char *name) @@ -218,8 +212,10 @@ CHAT_PROTOCOL_REC *chat_protocol_get_unknown(const char *name) rec->create_chatnet = create_chatnet; rec->create_server_setup = create_server_setup; rec->create_channel_setup = create_channel_setup; + /* rec->create_server_connect = create_server_connect; rec->destroy_server_connect = destroy_server_connect; + */ newrec = chat_protocol_register(rec); g_free(rec); diff --git a/src/core/chat-protocols.h b/src/core/chat-protocols.h index ab7327bd..2a51c8c4 100644 --- a/src/core/chat-protocols.h +++ b/src/core/chat-protocols.h @@ -35,6 +35,8 @@ void *chat_protocol_check_cast(void *object, int type_pos, const char *id); ((object) == NULL ? chat_protocol_get_default() : \ chat_protocol_find_id((object)->chat_type)) +#define CHAT_PROTOCOL_NOT_INITIALIZED -2 + /* Register new chat protocol. */ CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec); diff --git a/src/core/chatnets.c b/src/core/chatnets.c index 2d49a6df..770c7595 100644 --- a/src/core/chatnets.c +++ b/src/core/chatnets.c @@ -24,12 +24,13 @@ #include #include #include +#include #include #include #include -GSList *chatnets; /* list of available chat networks */ +GSList *chatnets, *chatnets_unavailable; /* list of available chat networks */ static void chatnet_config_save(CHATNET_REC *chatnet) { @@ -60,8 +61,9 @@ static void chatnet_config_remove(CHATNET_REC *chatnet) void chatnet_create(CHATNET_REC *chatnet) { g_return_if_fail(chatnet != NULL); + g_return_if_fail(!CHAT_PROTOCOL(chatnet)->not_initialized); - chatnet->type = module_get_uniq_id("CHATNET", 0); + chatnet->type = module_get_uniq_id("CHATNET", 0); if (g_slist_find(chatnets, chatnet) == NULL) chatnets = g_slist_append(chatnets, chatnet); @@ -112,6 +114,21 @@ CHATNET_REC *chatnet_find(const char *name) return NULL; } +gboolean chatnet_find_unavailable(const char *name) +{ + CHAT_PROTOCOL_REC *proto; + + if (i_slist_find_icase_string(chatnets_unavailable, name) != NULL) + return TRUE; + + proto = CHAT_PROTOCOL(chatnet_find(name)); + + if (proto == NULL || proto->not_initialized) + return TRUE; + + return FALSE; +} + static void sig_connected(SERVER_REC *server) { CHATNET_REC *rec; @@ -136,14 +153,22 @@ static void chatnet_read(CONFIG_NODE *node) return; type = config_node_get_str(node, "type", NULL); - proto = type == NULL ? NULL : chat_protocol_find(type); - if (proto == NULL) { - proto = type == NULL ? chat_protocol_get_default() : - chat_protocol_get_unknown(type); + if (type == NULL) { + proto = chat_protocol_get_default(); + } else { + proto = chat_protocol_find(type); } - if (type == NULL) + if (proto == NULL) { + /* protocol not loaded */ + if (i_slist_find_icase_string(chatnets_unavailable, node->key) == NULL) + chatnets_unavailable = + g_slist_append(chatnets_unavailable, g_strdup(node->key)); + + return; + } else if (type == NULL) { iconfig_node_set_str(node, "type", proto->name); + } rec = proto->create_chatnet(); rec->type = module_get_uniq_id("CHATNET", 0); @@ -167,6 +192,12 @@ static void read_chatnets(void) while (chatnets != NULL) chatnet_destroy(chatnets->data); + while (chatnets_unavailable != NULL) { + char *name = chatnets_unavailable->data; + chatnets_unavailable = g_slist_remove(chatnets_unavailable, name); + g_free(name); + } + node = iconfig_node_traverse("chatnets", FALSE); if (node != NULL) { tmp = config_node_first(node->value); @@ -180,8 +211,7 @@ void chatnets_init(void) chatnets = NULL; signal_add_first("event connected", (SIGNAL_FUNC) sig_connected); - signal_add("setup reread", (SIGNAL_FUNC) read_chatnets); - signal_add_first("irssi init read settings", (SIGNAL_FUNC) read_chatnets); + signal_add("setup reread chatnets", (SIGNAL_FUNC) read_chatnets); } void chatnets_deinit(void) @@ -189,6 +219,5 @@ void chatnets_deinit(void) module_uniq_destroy("CHATNET"); signal_remove("event connected", (SIGNAL_FUNC) sig_connected); - signal_remove("setup reread", (SIGNAL_FUNC) read_chatnets); - signal_remove("irssi init read settings", (SIGNAL_FUNC) read_chatnets); + signal_remove("setup reread chatnets", (SIGNAL_FUNC) read_chatnets); } diff --git a/src/core/chatnets.h b/src/core/chatnets.h index 6f36fe33..accdd0ad 100644 --- a/src/core/chatnets.h +++ b/src/core/chatnets.h @@ -25,6 +25,8 @@ void chatnet_destroy(CHATNET_REC *chatnet); /* Find the chat network by name */ CHATNET_REC *chatnet_find(const char *name); +/* Check if this chatnet is unavailable because the protocol is not loaded */ +gboolean chatnet_find_unavailable(const char *name); void chatnets_init(void); void chatnets_deinit(void); diff --git a/src/core/core.c b/src/core/core.c index cbe3eb7c..5d72ca0a 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -68,6 +68,7 @@ void wcwidth_wrapper_deinit(void); int irssi_gui; int irssi_init_finished; int sighup_received; +int sigterm_received; time_t client_start_time; static char *irssi_dir, *irssi_config_file; @@ -89,6 +90,11 @@ static void sig_hup(int signo) sighup_received = TRUE; } +static void sig_term(int signo) +{ + sigterm_received = TRUE; +} + static void read_settings(void) { static int signals[] = { @@ -113,8 +119,15 @@ static void read_settings(void) sigaction(SIGHUP, &act, NULL); for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) { - act.sa_handler = find_substr(ignores, signames[n]) ? - SIG_IGN : SIG_DFL; + if (find_substr(ignores, signames[n])) { + act.sa_handler = SIG_IGN; + } else { + /* set default handlers */ + if (signals[n] == SIGTERM) + act.sa_handler = sig_term; + else + act.sa_handler = SIG_DFL; + } sigaction(signals[n], &act, NULL); } @@ -223,6 +236,13 @@ static void sig_irssi_init_finished(void) irssi_init_finished = TRUE; } +static void reread_setup(void) +{ + signal_emit("setup reread chatnets", 0); + signal_emit("setup reread servers", 0); + signal_emit("setup reread channels", 0); +} + void core_init(void) { dialog_type_queue = NULL; @@ -269,13 +289,16 @@ void core_init(void) settings_add_str("misc", "ignore_signals", ""); settings_add_bool("misc", "override_coredump_limit", FALSE); settings_add_bool("misc", "quit_on_hup", FALSE); - settings_add_str("misc", "autoload_modules", "perl otr"); + settings_add_str("misc", "autoload_modules", "irc dcc flood notifylist perl otr"); #ifdef HAVE_SYS_RESOURCE_H getrlimit(RLIMIT_CORE, &orig_core_rlimit); #endif read_settings(); signal_add("setup changed", (SIGNAL_FUNC) read_settings); + signal_add("setup reread", (SIGNAL_FUNC) reread_setup); + signal_add("irssi init read settings", (SIGNAL_FUNC) reread_setup); + signal_add_last("chat protocol created", (SIGNAL_FUNC) reread_setup); signal_add("irssi init finished", (SIGNAL_FUNC) sig_irssi_init_finished); settings_check(); @@ -288,6 +311,9 @@ void core_deinit(void) module_uniq_destroy("WINDOW ITEM TYPE"); signal_remove("setup changed", (SIGNAL_FUNC) read_settings); + signal_remove("setup reread", (SIGNAL_FUNC) reread_setup); + signal_remove("irssi init read settings", (SIGNAL_FUNC) reread_setup); + signal_remove("chat protocol created", (SIGNAL_FUNC) reread_setup); signal_remove("irssi init finished", (SIGNAL_FUNC) sig_irssi_init_finished); wcwidth_wrapper_deinit(); diff --git a/src/core/core.h b/src/core/core.h index 3c544753..62c54b22 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -14,6 +14,7 @@ extern int irssi_gui; extern int irssi_init_finished; /* TRUE after "irssi init finished" signal is sent */ extern int sighup_received; /* TRUE after received SIGHUP. */ +extern int sigterm_received; /* TRUE after received SIGTERM. */ extern time_t client_start_time; void core_preinit(const char *path); diff --git a/src/core/iregex-regexh.c b/src/core/iregex-regexh.c deleted file mode 100644 index aae8ecdf..00000000 --- a/src/core/iregex-regexh.c +++ /dev/null @@ -1,99 +0,0 @@ -#include - -Regex * -i_regex_new (const gchar *pattern, - GRegexCompileFlags compile_options, - GRegexMatchFlags match_options, - GError **error) -{ - Regex *regex; - char *errbuf; - int cflags; - int errcode, errbuf_len; - - regex = g_new0(Regex, 1); - cflags = REG_EXTENDED; - if (compile_options & G_REGEX_CASELESS) - cflags |= REG_ICASE; - if (compile_options & G_REGEX_MULTILINE) - cflags |= REG_NEWLINE; - if (match_options & G_REGEX_MATCH_NOTBOL) - cflags |= REG_NOTBOL; - if (match_options & G_REGEX_MATCH_NOTEOL) - cflags |= REG_NOTEOL; - - errcode = regcomp(regex, pattern, cflags); - if (errcode != 0) { - errbuf_len = regerror(errcode, regex, 0, 0); - errbuf = g_malloc(errbuf_len); - regerror(errcode, regex, errbuf, errbuf_len); - g_set_error(error, G_REGEX_ERROR, errcode, "%s", errbuf); - g_free(errbuf); - g_free(regex); - return NULL; - } else { - return regex; - } -} - -void -i_regex_unref (Regex *regex) -{ - regfree(regex); - g_free(regex); -} - -gboolean -i_regex_match (const Regex *regex, - const gchar *string, - GRegexMatchFlags match_options, - MatchInfo **match_info) -{ - int groups; - int eflags; - - g_return_val_if_fail(regex != NULL, FALSE); - - if (match_info != NULL) { - groups = 1 + regex->re_nsub; - *match_info = g_new0(MatchInfo, groups); - } else { - groups = 0; - } - - eflags = 0; - if (match_options & G_REGEX_MATCH_NOTBOL) - eflags |= REG_NOTBOL; - if (match_options & G_REGEX_MATCH_NOTEOL) - eflags |= REG_NOTEOL; - - return regexec(regex, string, groups, groups ? *match_info : NULL, eflags) == 0; -} - -gboolean -i_match_info_fetch_pos (const MatchInfo *match_info, - gint match_num, - gint *start_pos, - gint *end_pos) -{ - if (start_pos != NULL) - *start_pos = match_info[match_num].rm_so; - if (end_pos != NULL) - *end_pos = match_info[match_num].rm_eo; - - return TRUE; -} - -gboolean -i_match_info_matches (const MatchInfo *match_info) -{ - g_return_val_if_fail(match_info != NULL, FALSE); - - return match_info[0].rm_so != -1; -} - -void -i_match_info_free (MatchInfo *match_info) -{ - g_free(match_info); -} diff --git a/src/core/iregex.h b/src/core/iregex.h index 53263944..68156e02 100644 --- a/src/core/iregex.h +++ b/src/core/iregex.h @@ -3,20 +3,10 @@ #include -#ifdef USE_GREGEX - #include typedef GRegex Regex; typedef struct _MatchInfo MatchInfo; -#else - -#include -typedef regex_t Regex; -typedef regmatch_t MatchInfo; - -#endif - gboolean i_match_info_matches (const MatchInfo *match_info); diff --git a/src/core/levels.c b/src/core/levels.c index 62d7a00a..0cd99b10 100644 --- a/src/core/levels.c +++ b/src/core/levels.c @@ -19,14 +19,17 @@ */ #include "module.h" +#include #include /* the order of these levels must match the bits in levels.h */ static const char *levels[] = { + /* clang-format off */ "CRAP", "MSGS", "PUBLICS", "NOTICES", + "PUBNOTICES", "SNOTES", "CTCPS", "ACTIONS", @@ -46,6 +49,7 @@ static const char *levels[] = { "CLIENTERRORS", "HILIGHTS", NULL + /* clang-format on */ }; int level_get(const char *level) @@ -166,8 +170,7 @@ char *bits2level(int bits) if (str->len > 0) g_string_truncate(str, str->len-1); - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); return ret; } diff --git a/src/core/levels.h b/src/core/levels.h index 7f1aa931..35cf064c 100644 --- a/src/core/levels.h +++ b/src/core/levels.h @@ -13,26 +13,27 @@ enum { MSGLEVEL_MSGS = 0x0000002, MSGLEVEL_PUBLIC = 0x0000004, MSGLEVEL_NOTICES = 0x0000008, - MSGLEVEL_SNOTES = 0x0000010, - MSGLEVEL_CTCPS = 0x0000020, - MSGLEVEL_ACTIONS = 0x0000040, - MSGLEVEL_JOINS = 0x0000080, - MSGLEVEL_PARTS = 0x0000100, - MSGLEVEL_QUITS = 0x0000200, - MSGLEVEL_KICKS = 0x0000400, - MSGLEVEL_MODES = 0x0000800, - MSGLEVEL_TOPICS = 0x0001000, - MSGLEVEL_WALLOPS = 0x0002000, - MSGLEVEL_INVITES = 0x0004000, - MSGLEVEL_NICKS = 0x0008000, - MSGLEVEL_DCC = 0x0010000, - MSGLEVEL_DCCMSGS = 0x0020000, - MSGLEVEL_CLIENTNOTICE = 0x0040000, - MSGLEVEL_CLIENTCRAP = 0x0080000, - MSGLEVEL_CLIENTERROR = 0x0100000, - MSGLEVEL_HILIGHT = 0x0200000, + MSGLEVEL_PUBNOTICES = 0x0000010, + MSGLEVEL_SNOTES = 0x0000020, + MSGLEVEL_CTCPS = 0x0000040, + MSGLEVEL_ACTIONS = 0x0000080, + MSGLEVEL_JOINS = 0x0000100, + MSGLEVEL_PARTS = 0x0000200, + MSGLEVEL_QUITS = 0x0000400, + MSGLEVEL_KICKS = 0x0000800, + MSGLEVEL_MODES = 0x0001000, + MSGLEVEL_TOPICS = 0x0002000, + MSGLEVEL_WALLOPS = 0x0004000, + MSGLEVEL_INVITES = 0x0008000, + MSGLEVEL_NICKS = 0x0010000, + MSGLEVEL_DCC = 0x0020000, + MSGLEVEL_DCCMSGS = 0x0040000, + MSGLEVEL_CLIENTNOTICE = 0x0080000, + MSGLEVEL_CLIENTCRAP = 0x0100000, + MSGLEVEL_CLIENTERROR = 0x0200000, + MSGLEVEL_HILIGHT = 0x0400000, - MSGLEVEL_ALL = 0x03fffff, + MSGLEVEL_ALL = 0x07fffff, MSGLEVEL_NOHILIGHT = 0x1000000, /* Don't highlight this message */ MSGLEVEL_NO_ACT = 0x2000000, /* Don't trigger channel activity */ diff --git a/src/core/meson.build b/src/core/meson.build index c0e9b90e..521015d4 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -1,18 +1,13 @@ # this file is part of irssi -if want_gregex - regex_impl = files('iregex-gregex.c') -else - regex_impl = files('iregex-regexh.c') -endif - if have_capsicum core_capsicum_source = files('capsicum.c') else - core_capsicum_source = [] + core_capsicum_source = [ ] endif -libcore_a = static_library('core', +libcore_a = static_library( + 'core', files( 'args.c', 'channels-setup.c', @@ -24,6 +19,7 @@ libcore_a = static_library('core', 'core.c', 'expandos.c', 'ignore.c', + 'iregex-gregex.c', 'levels.c', 'line-split.c', 'log-away.c', @@ -58,7 +54,6 @@ libcore_a = static_library('core', 'write-buffer.c', ) + core_capsicum_source - + regex_impl + [ default_config_h, irssi_version_h, @@ -69,7 +64,8 @@ libcore_a = static_library('core', def_moduledir, def_sysconfdir, ], - dependencies : dep) + dependencies : dep, +) install_headers( files( @@ -128,4 +124,5 @@ install_headers( 'window-item-def.h', 'write-buffer.h', ), - subdir : incdir / 'src' / 'core') + subdir : incdir / 'src' / 'core', +) diff --git a/src/core/misc.c b/src/core/misc.c index f0bbf4e0..9ee549a1 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -135,6 +135,15 @@ GDateTime *g_date_time_new_from_iso8601(const gchar *iso_date, GTimeZone *defaul } #endif +#if GLIB_CHECK_VERSION(2, 76, 0) +/* nothing */ +#else +gchar *g_string_free_and_steal(GString *string) +{ + return g_string_free(string, FALSE); +} +#endif + int find_substr(const char *list, const char *item) { const char *ptr; @@ -261,8 +270,7 @@ char *gslistptr_to_string(GSList *list, int offset, const char *delimiter) list = list->next; } - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); return ret; } @@ -280,8 +288,7 @@ char *i_slist_to_string(GSList *list, const char *delimiter) list = list->next; } - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); return ret; } diff --git a/src/core/misc.h b/src/core/misc.h index 622470f7..c7355fc0 100644 --- a/src/core/misc.h +++ b/src/core/misc.h @@ -26,6 +26,12 @@ long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATE GDateTime *g_date_time_new_from_iso8601(const gchar *iso_date, GTimeZone *default_tz); #endif +#if GLIB_CHECK_VERSION(2, 76, 0) +/* nothing */ +#else +gchar *g_string_free_and_steal(GString *string); +#endif + GSList *i_slist_find_string(GSList *list, const char *key); GSList *i_slist_find_icase_string(GSList *list, const char *key); GList *i_list_find_string(GList *list, const char *key); diff --git a/src/core/modules-load.c b/src/core/modules-load.c index a3598c65..f4278897 100644 --- a/src/core/modules-load.c +++ b/src/core/modules-load.c @@ -27,8 +27,6 @@ #include #include -#ifdef HAVE_GMODULE - /* Returns the module name without path, "lib" prefix or ".so" suffix */ static char *module_get_name(const char *path, int *start, int *end) { @@ -44,7 +42,7 @@ static char *module_get_name(const char *path, int *start, int *end) if (name == NULL) name = path; - if (strncmp(name, "lib", 3) == 0) + if (strncmp(name, "lib", 3) == 0 || strncmp(name, "cyg", 3) == 0) name += 3; module_name = g_strdup(name); @@ -104,10 +102,41 @@ static char *module_get_sub(const char *name, const char *root) return g_strdup(name); } -static GModule *module_open(const char *name, int *found) +static GModule *module_open(const char *name) { - struct stat statbuf; GModule *module; +#if GLIB_CHECK_VERSION(2, 75, 0) + /* in this version of glib, g_module_open knows how to construct system-dependent module + file names, and g_module_build_path is deprecated. */ + + char *path; + + if (g_path_is_absolute(name) || *name == '~' || + (*name == '.' && name[1] == G_DIR_SEPARATOR)) + path = g_strdup(name); + else { + /* first try from home dir */ + path = g_strdup_printf("%s/modules/%s", get_irssi_dir(), name); + + module = g_module_open(path, (GModuleFlags) 0); + g_free(path); + if (module != NULL) { + return module; + } + + /* module not found from home dir, try global module dir */ + path = g_strdup_printf("%s/%s", MODULEDIR, name); + } + + module = g_module_open(path, (GModuleFlags) 0); + g_free(path); + return module; + +#else /* GLib < 2.75.0 */ + /* in this version of glib, we build the module path with g_module_build_path. + unfortunately, this is broken on Darwin when compiled with meson. */ + + struct stat statbuf; char *path, *str; if (g_path_is_absolute(name) || *name == '~' || @@ -122,7 +151,6 @@ static GModule *module_open(const char *name, int *found) if (stat(path, &statbuf) == 0) { module = g_module_open(path, (GModuleFlags) 0); g_free(path); - *found = TRUE; return module; } @@ -131,10 +159,11 @@ static GModule *module_open(const char *name, int *found) path = g_module_build_path(MODULEDIR, name); } - *found = stat(path, &statbuf) == 0; module = g_module_open(path, (GModuleFlags) 0); g_free(path); return module; + +#endif } static char *module_get_func(const char *rootmodule, const char *submodule, @@ -153,8 +182,7 @@ static char *module_get_func(const char *rootmodule, const char *submodule, signal_emit("module error", 4, GINT_TO_POINTER(error), text, \ rootmodule, submodule) -/* Returns 1 if ok, 0 if error in module and - -1 if module wasn't found */ +/* Returns 1 if ok, 0 if not */ static int module_load_name(const char *path, const char *rootmodule, const char *submodule, int silent) { @@ -168,15 +196,15 @@ static int module_load_name(const char *path, const char *rootmodule, gpointer value1, value2 = NULL; char *versionfunc, *initfunc, *deinitfunc; int module_abi_version = 0; - int found; + int valid; - gmodule = module_open(path, &found); + gmodule = module_open(path); if (gmodule == NULL) { - if (!silent || found) { + if (!silent) { module_error(MODULE_ERROR_LOAD, g_module_error(), rootmodule, submodule); } - return found ? 0 : -1; + return 0; } /* get the module's irssi abi version and bail out on mismatch */ @@ -203,12 +231,12 @@ static int module_load_name(const char *path, const char *rootmodule, /* get the module's init() and deinit() functions */ initfunc = module_get_func(rootmodule, submodule, "init"); deinitfunc = module_get_func(rootmodule, submodule, "deinit"); - found = g_module_symbol(gmodule, initfunc, &value1) && - g_module_symbol(gmodule, deinitfunc, &value2); + valid = g_module_symbol(gmodule, initfunc, &value1) && + g_module_symbol(gmodule, deinitfunc, &value2); g_free(initfunc); g_free(deinitfunc); - if (!found) { + if (!valid) { module_error(MODULE_ERROR_INVALID, NULL, rootmodule, submodule); g_module_close(gmodule); @@ -312,7 +340,7 @@ static int module_load_full(const char *path, const char *rootmodule, /* check if the given module exists.. */ try_prefixes = g_strcmp0(rootmodule, submodule) == 0; status = module_load_name(path, rootmodule, submodule, try_prefixes); - if (status == -1 && try_prefixes) { + if (status <= 0 && try_prefixes) { /* nope, try loading the module_core, fe_module, etc. */ status = module_load_prefixes(path, rootmodule, @@ -395,15 +423,6 @@ static void module_file_deinit_gmodule(MODULE_FILE_REC *file) g_module_close(file->gmodule); } -#else /* !HAVE_GMODULE - modules are not supported */ - -int module_load(const char *path, char **prefixes) -{ - return FALSE; -} - -#endif - void module_file_unload(MODULE_FILE_REC *file) { MODULE_REC *root; @@ -414,10 +433,8 @@ void module_file_unload(MODULE_FILE_REC *file) if (file->initialized) signal_emit("module unloaded", 2, file->root, file); -#ifdef HAVE_GMODULE if (file->gmodule != NULL) module_file_deinit_gmodule(file); -#endif g_free(file->name); g_free(file->defined_module_name); diff --git a/src/core/modules.h b/src/core/modules.h index 1e707c0c..b1ccbae4 100644 --- a/src/core/modules.h +++ b/src/core/modules.h @@ -16,13 +16,7 @@ #define MODULE_DATA(rec) \ g_hash_table_lookup((rec)->module_data, MODULE_NAME) - -#ifdef HAVE_GMODULE -# define MODULE_IS_STATIC(rec) \ - ((rec)->gmodule == NULL) -#else -# define MODULE_IS_STATIC(rec) TRUE -#endif +#define MODULE_IS_STATIC(rec) ((rec)->gmodule == NULL) #define MODULE_ABICHECK(fn_modulename) \ void fn_modulename ## _abicheck(int *version) \ @@ -45,9 +39,7 @@ typedef struct { char *defined_module_name; void (*module_deinit) (void); -#ifdef HAVE_GMODULE GModule *gmodule; /* static, if NULL */ -#endif unsigned int initialized:1; } MODULE_FILE_REC; diff --git a/src/core/net-disconnect.c b/src/core/net-disconnect.c index a2f7e290..2ed3a421 100644 --- a/src/core/net-disconnect.c +++ b/src/core/net-disconnect.c @@ -21,6 +21,8 @@ #include "module.h" #include +#include + /* when quitting, wait for max. 5 seconds before forcing to close the socket */ #define MAX_QUIT_CLOSE_WAIT 5 diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c index 643884ee..1a06a662 100644 --- a/src/core/net-nonblock.c +++ b/src/core/net-nonblock.c @@ -22,86 +22,94 @@ #include -#include +#include #include -/* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is - written to pipe when found PID of the resolver child is returned */ -int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe, int reverse_lookup) -{ - RESOLVED_IP_REC rec; - const char *errorstr; - int pid; +typedef struct { + GResolverNameLookupFlags flags; + NetGethostbynameContinuationFunc cont; + void *cont_data; +} NET_GETHOSTBYNAME_CALLBACK_DATA; - (void) reverse_lookup; /* Kept for API backward compatibility */ +static void net_gethostbyname_callback(GResolver *resolver, GAsyncResult *result, + NET_GETHOSTBYNAME_CALLBACK_DATA *data) +{ + /* GList */ + GList *ailist; + GError *error; + RESOLVED_IP_REC *iprec; + + error = NULL; +#if GLIB_CHECK_VERSION(2, 59, 0) + ailist = g_resolver_lookup_by_name_with_flags_finish(resolver, result, &error); +#else + /* compatibility code for old GLib */ + ailist = g_resolver_lookup_by_name_finish(resolver, result, &error); + if (error == NULL && data->flags) { + GList *ll, *lll; + + for (ll = ailist; ll != NULL; ll = lll) { + GInetAddress *address; + GSocketFamily family; + + address = G_INET_ADDRESS(ll->data); + family = g_inet_address_get_family(address); + lll = ll->next; + + if ((data->flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY && + family == G_SOCKET_FAMILY_IPV6) || + (data->flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV6_ONLY && + family == G_SOCKET_FAMILY_IPV4)) { + g_object_unref(address); + ailist = g_list_delete_link(ailist, ll); + } + } + + if (ailist == NULL) { + g_set_error(&error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND, + data->flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY ? + "IPv4 address not found for host" : + "IPv6 address not found for host"); + } + } +#endif + iprec = g_new0(RESOLVED_IP_REC, 1); + if (error != NULL) { + iprec->error = error; + } else { + iprec->ailist = ailist; + } + g_object_unref(resolver); + resolved_ip_ref(iprec); + + data->cont(iprec, data->cont_data); + g_free(data); +} + +/* nonblocking gethostbyname() */ +GCancellable *net_gethostbyname_nonblock(const char *addr, GResolverNameLookupFlags flags, + NetGethostbynameContinuationFunc cont, void *cont_data) +{ + GResolver *resolver; + GCancellable *cancellable; + NET_GETHOSTBYNAME_CALLBACK_DATA *data; g_return_val_if_fail(addr != NULL, FALSE); - pid = fork(); - if (pid > 0) { - /* parent */ - pidwait_add(pid); - return pid; - } - - if (pid != 0) { - /* failed! */ - g_warning("net_connect_thread(): fork() failed! " - "Using blocking resolving"); - } - - /* child */ - srand(time(NULL)); - - memset(&rec, 0, sizeof(rec)); - rec.error = net_gethostbyname(addr, &rec.ip4, &rec.ip6); - if (rec.error == 0) { - errorstr = NULL; - } else { - errorstr = net_gethosterror(rec.error); - rec.errlen = errorstr == NULL ? 0 : strlen(errorstr)+1; - } - - i_io_channel_write_block(pipe, &rec, sizeof(rec)); - if (rec.errlen != 0) - i_io_channel_write_block(pipe, (void *) errorstr, rec.errlen); - - if (pid == 0) - _exit(99); - - /* we used blocking lookup */ - return 0; -} - -/* get the resolved IP address */ -int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec) -{ - rec->error = -1; - rec->errorstr = NULL; - - fcntl(g_io_channel_unix_get_fd(pipe), F_SETFL, O_NONBLOCK); - - /* get ip+error */ - if (i_io_channel_read_block(pipe, rec, sizeof(*rec)) == -1) { - rec->errorstr = g_strdup_printf("Host name lookup: %s", - g_strerror(errno)); - return -1; - } - - if (rec->error) { - /* read error string, if we can't read everything for some - reason, just ignore it. */ - rec->errorstr = g_malloc0(rec->errlen+1); - i_io_channel_read_block(pipe, rec->errorstr, rec->errlen); - } - - return 0; -} - -/* Kill the resolver child */ -void net_disconnect_nonblock(int pid) -{ - g_return_if_fail(pid > 0); - - kill(pid, SIGKILL); + resolver = g_resolver_get_default(); + cancellable = g_cancellable_new(); + data = g_new0(NET_GETHOSTBYNAME_CALLBACK_DATA, 1); + data->flags = flags; + data->cont = cont; + data->cont_data = cont_data; +#if GLIB_CHECK_VERSION(2, 59, 0) + g_resolver_lookup_by_name_with_flags_async(resolver, addr, flags, cancellable, + (GAsyncReadyCallback) net_gethostbyname_callback, + data); +#else + /* compatibility code for old GLib */ + g_resolver_lookup_by_name_async(resolver, addr, cancellable, + (GAsyncReadyCallback) net_gethostbyname_callback, data); +#endif + return cancellable; } diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h index c93dd9e3..c4cb7824 100644 --- a/src/core/net-nonblock.h +++ b/src/core/net-nonblock.h @@ -3,20 +3,10 @@ #include -typedef struct { - IPADDR ip4, ip6; /* resolved ip addresses */ - int error; /* error, 0 = no error, -1 = error: */ - int errlen; /* error text length */ - char *errorstr; /* error string - dynamically allocated, you'll - need to free() it yourself unless it's NULL */ -} RESOLVED_IP_REC; +typedef void (*NetGethostbynameContinuationFunc)(RESOLVED_IP_REC *, void *); -/* nonblocking gethostbyname(), PID of the resolver child is returned. */ -int net_gethostbyname_nonblock(const char *addr, GIOChannel *pipe, int reverse_lookup); -/* get the resolved IP address. returns -1 if some error occurred with read() */ -int net_gethostbyname_return(GIOChannel *pipe, RESOLVED_IP_REC *rec); - -/* Kill the resolver child */ -void net_disconnect_nonblock(int pid); +/* nonblocking gethostbyname(), Cancellable of the resolver child is returned. */ +GCancellable *net_gethostbyname_nonblock(const char *addr, GResolverNameLookupFlags flags, + NetGethostbynameContinuationFunc cont, void *cont_data); #endif diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c index 9956f217..5104e7dd 100644 --- a/src/core/network-openssl.c +++ b/src/core/network-openssl.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -751,44 +752,49 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl) #ifdef SSL_get_server_tmp_key /* Show ephemeral key information. */ EVP_PKEY *ephemeral_key = NULL; - - /* OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598 */ -#ifndef OPENSSL_NO_EC - EC_KEY *ec_key = NULL; -#endif char *ephemeral_key_algorithm = NULL; - char *cname = NULL; - int nid; g_return_if_fail(tls != NULL); g_return_if_fail(ssl != NULL); if (SSL_get_server_tmp_key(ssl, &ephemeral_key)) { - switch (EVP_PKEY_id(ephemeral_key)) { - case EVP_PKEY_DH: - tls_rec_set_ephemeral_key_algorithm(tls, "DH"); - tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key)); - break; + int keytype = EVP_PKEY_id(ephemeral_key); + switch (keytype) { + case EVP_PKEY_DH: + tls_rec_set_ephemeral_key_algorithm(tls, "DH"); + tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key)); + break; + /* OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598 */ #ifndef OPENSSL_NO_EC - case EVP_PKEY_EC: - ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key); - nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key)); - EC_KEY_free(ec_key); - cname = (char *)OBJ_nid2sn(nid); - ephemeral_key_algorithm = g_strdup_printf("ECDH: %s", cname); + case EVP_PKEY_EC: { +#if (OPENSSL_VERSION_NUMBER >= 0x30000000L) + char cname[50]; + EVP_PKEY_get_group_name(ephemeral_key, cname, sizeof(cname), NULL); +#else + EC_KEY *ec_key = NULL; + char *cname = NULL; + int nid; - tls_rec_set_ephemeral_key_algorithm(tls, ephemeral_key_algorithm); - tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key)); + ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key); + nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key)); + EC_KEY_free(ec_key); + cname = (char *) OBJ_nid2sn(nid); +#endif + ephemeral_key_algorithm = g_strdup_printf("ECDH: %s", cname); - g_free_and_null(ephemeral_key_algorithm); - break; + tls_rec_set_ephemeral_key_algorithm(tls, ephemeral_key_algorithm); + tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key)); + + g_free_and_null(ephemeral_key_algorithm); + break; + } #endif - default: - tls_rec_set_ephemeral_key_algorithm(tls, "Unknown"); - tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key)); - break; + default: + tls_rec_set_ephemeral_key_algorithm(tls, OBJ_nid2ln(keytype)); + tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key)); + break; } EVP_PKEY_free(ephemeral_key); diff --git a/src/core/network.c b/src/core/network.c index 85fe9896..c641b203 100644 --- a/src/core/network.c +++ b/src/core/network.c @@ -81,27 +81,14 @@ int i_io_channel_read_block(GIOChannel *channel, void *data, int len) return received < len ? -1 : 0; } -IPADDR ip4_any = { - AF_INET, +IPADDR ip4_any = { AF_INET, #if defined(IN6ADDR_ANY_INIT) - IN6ADDR_ANY_INIT + IN6ADDR_ANY_INIT #else - { INADDR_ANY } + { INADDR_ANY } #endif }; -int net_ip_compare(IPADDR *ip1, IPADDR *ip2) -{ - if (ip1->family != ip2->family) - return 0; - - if (ip1->family == AF_INET6) - return memcmp(&ip1->ip, &ip2->ip, sizeof(ip1->ip)) == 0; - - return memcmp(&ip1->ip, &ip2->ip, 4) == 0; -} - - static void sin_set_ip(union sockaddr_union *so, const IPADDR *ip) { if (ip == NULL) { @@ -392,95 +379,119 @@ int net_getsockname(GIOChannel *handle, IPADDR *addr, int *port) return 0; } -/* Get IP addresses for host, both IPv4 and IPv6 if possible. - If ip->family is 0, the address wasn't found. - Returns 0 = ok, others = error code for net_gethosterror() */ -int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6) +void resolved_ip_ref(RESOLVED_IP_REC *iprec) { - union sockaddr_union *so; - struct addrinfo hints, *ai, *ailist; - int ret, count_v4, count_v6, use_v4, use_v6; + iprec->refcount++; +} + +int resolved_ip_unref(RESOLVED_IP_REC *iprec) +{ + if (--iprec->refcount > 0) { + return TRUE; + } + + g_resolver_free_addresses(iprec->ailist); + if (iprec->error != NULL) { + g_error_free(iprec->error); + } + g_free(iprec); + + return FALSE; +} + +/* Get IP addresses for host, both IPv4 and IPv6 if possible. */ +static RESOLVED_IP_REC *net_gethostbyname(const char *addr, GResolverNameLookupFlags flags) +{ + /* GList */ + GList *ailist; + GError *error; + GResolver *resolver; + RESOLVED_IP_REC *iprec; + + g_return_val_if_fail(addr != NULL, NULL); + + error = NULL; + resolver = g_resolver_get_default(); +#if GLIB_CHECK_VERSION(2, 59, 0) + ailist = g_resolver_lookup_by_name_with_flags(resolver, addr, flags, NULL, &error); +#else + /* compatibility code for old GLib */ + ailist = g_resolver_lookup_by_name(resolver, addr, NULL, &error); + if (error == NULL && flags) { + GList *ll, *lll; + + for (ll = ailist; ll != NULL; ll = lll) { + GInetAddress *address; + GSocketFamily family; + + address = G_INET_ADDRESS(ll->data); + family = g_inet_address_get_family(address); + lll = ll->next; + + if ((flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY && + family == G_SOCKET_FAMILY_IPV6) || + (flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV6_ONLY && + family == G_SOCKET_FAMILY_IPV4)) { + g_object_unref(address); + ailist = g_list_delete_link(ailist, ll); + } + } + + if (ailist == NULL) { + g_set_error(&error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND, + flags == G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY ? + "IPv4 address not found for host" : + "IPv6 address not found for host"); + } + } +#endif + iprec = g_new0(RESOLVED_IP_REC, 1); + if (error != NULL) { + iprec->error = error; + } else { + iprec->ailist = ailist; + } + g_object_unref(resolver); + resolved_ip_ref(iprec); + + return iprec; +} + +int net_gethostbyname_first_ips(const char *addr, GResolverNameLookupFlags flags, IPADDR *ip4, + IPADDR *ip6) +{ + RESOLVED_IP_REC *iprec; #ifdef HAVE_CAPSICUM if (capsicum_enabled()) return (capsicum_net_gethostbyname(addr, ip4, ip6)); #endif - g_return_val_if_fail(addr != NULL, -1); + iprec = net_gethostbyname(addr, flags); + if (iprec->error == NULL) { + GList *curr; - memset(ip4, 0, sizeof(IPADDR)); - memset(ip6, 0, sizeof(IPADDR)); + for (curr = iprec->ailist; curr; curr = curr->next) { + unsigned short family; + GInetAddress *addr; - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_ADDRCONFIG; - - /* save error to host_error for later use */ - ret = getaddrinfo(addr, NULL, &hints, &ailist); - if (ret != 0) - return ret; - - /* count IPs */ - count_v4 = count_v6 = 0; - for (ai = ailist; ai != NULL; ai = ai->ai_next) { - if (ai->ai_family == AF_INET) - count_v4++; - else if (ai->ai_family == AF_INET6) - count_v6++; - } - - if (count_v4 == 0 && count_v6 == 0) - return HOST_NOT_FOUND; /* shouldn't happen? */ - - /* if there are multiple addresses, return random one */ - use_v4 = count_v4 <= 1 ? 0 : rand() % count_v4; - use_v6 = count_v6 <= 1 ? 0 : rand() % count_v6; - - count_v4 = count_v6 = 0; - for (ai = ailist; ai != NULL; ai = ai->ai_next) { - so = (union sockaddr_union *) ai->ai_addr; - - if (ai->ai_family == AF_INET) { - if (use_v4 == count_v4) - sin_get_ip(so, ip4); - count_v4++; - } else if (ai->ai_family == AF_INET6) { - if (use_v6 == count_v6) - sin_get_ip(so, ip6); - count_v6++; + addr = curr->data; + family = g_inet_address_get_family(addr); + if (ip4->family == 0 && family == AF_INET) { + ip4->family = AF_INET; + memcpy(&ip4->ip, g_inet_address_to_bytes(addr), sizeof(ip4->ip)); + } else if (ip6->family == 0 && family == AF_INET6) { + ip6->family = AF_INET6; + memcpy(&ip6->ip, g_inet_address_to_bytes(addr), sizeof(ip6->ip)); + } } + + resolved_ip_unref(iprec); + return 0; + } else { + resolved_ip_unref(iprec); + return -1; } - freeaddrinfo(ailist); - return 0; -} - -/* Get name for host, *name should be g_free()'d unless it's NULL. - Return values are the same as with net_gethostbyname() */ -int net_gethostbyaddr(IPADDR *ip, char **name) -{ - union sockaddr_union so; - int host_error; - char hostname[NI_MAXHOST]; - - g_return_val_if_fail(ip != NULL, -1); - g_return_val_if_fail(name != NULL, -1); - - *name = NULL; - - memset(&so, 0, sizeof(so)); - sin_set_ip(&so, ip); - - /* save error to host_error for later use */ - host_error = getnameinfo((struct sockaddr *)&so, sizeof(so), - hostname, sizeof(hostname), - NULL, 0, - NI_NAMEREQD); - if (host_error != 0) - return host_error; - - *name = g_strdup(hostname); - - return 0; } int net_ip2host(IPADDR *ip, char *host) @@ -491,8 +502,6 @@ int net_ip2host(IPADDR *ip, char *host) int net_host2ip(const char *host, IPADDR *ip) { - unsigned long addr; - if (strchr(host, ':') != NULL) { /* IPv6 */ ip->family = AF_INET6; @@ -501,16 +510,8 @@ int net_host2ip(const char *host, IPADDR *ip) } else { /* IPv4 */ ip->family = AF_INET; -#ifdef HAVE_INET_ATON - if (inet_aton(host, &ip->ip.s_addr) == 0) + if (inet_pton(AF_INET, host, &ip->ip) == 0) return -1; -#else - addr = inet_addr(host); - if (addr == INADDR_NONE) - return -1; - - memcpy(&ip->ip, &addr, 4); -#endif } return 0; @@ -529,29 +530,6 @@ int net_geterror(GIOChannel *handle) return data; } -/* get error of net_gethostname() */ -const char *net_gethosterror(int error) -{ - g_return_val_if_fail(error != 0, NULL); - - if (error == EAI_SYSTEM) { - return strerror(errno); - } else { - return gai_strerror(error); - } -} - -/* return TRUE if host lookup failed because it didn't exist (ie. not - some error with name server) */ -int net_hosterror_notfound(int error) -{ -#ifdef EAI_NODATA /* NODATA is deprecated */ - return error != 1 && (error == EAI_NONAME || error == EAI_NODATA); -#else - return error != 1 && (error == EAI_NONAME); -#endif -} - /* Get name of TCP service */ char *net_getservbyport(int port) { diff --git a/src/core/network.h b/src/core/network.h index 0747f018..78092375 100644 --- a/src/core/network.h +++ b/src/core/network.h @@ -1,15 +1,12 @@ #ifndef IRSSI_CORE_NETWORK_H #define IRSSI_CORE_NETWORK_H -#ifdef HAVE_SOCKS_H -#include -#endif - #include -# include -# include -# include -# include +#include +#include +#include +#include +#include #ifndef AF_INET6 # ifdef PF_INET6 @@ -19,11 +16,31 @@ # endif #endif +#if GLIB_CHECK_VERSION(2, 59, 0) +/* nothing */ +#else +/* compatibility code for old GLib */ + +typedef enum { + G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT = 0, + G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY = 1 << 0, + G_RESOLVER_NAME_LOOKUP_FLAGS_IPV6_ONLY = 1 << 1, +} GResolverNameLookupFlags; + +#endif + struct _IPADDR { unsigned short family; struct in6_addr ip; }; +typedef struct { + int refcount; + /* GList */ + GList *ailist; /* needs to be freed */ + GError *error; /* needs to be freed */ +} RESOLVED_IP_REC; + /* maxmimum string length of IP address */ #define MAX_IP_LEN INET6_ADDRSTRLEN @@ -33,9 +50,7 @@ extern IPADDR ip4_any; GIOChannel *i_io_channel_new(int handle); -/* Returns 1 if IPADDRs are the same. */ -/* Deprecated since it is unused. It will be deleted in a later release. */ -int net_ip_compare(IPADDR *ip1, IPADDR *ip2) G_GNUC_DEPRECATED; +/* OTR */ int i_io_channel_write_block(GIOChannel *channel, void *data, int len); int i_io_channel_read_block(GIOChannel *channel, void *data, int len); @@ -64,18 +79,9 @@ int net_receive(GIOChannel *handle, char *buf, int len); /* Transmit data, return number of bytes sent, -1 = error */ int net_transmit(GIOChannel *handle, const char *data, int len); -/* Get IP addresses for host, both IPv4 and IPv6 if possible. - If ip->family is 0, the address wasn't found. - Returns 0 = ok, others = error code for net_gethosterror() */ -int net_gethostbyname(const char *addr, IPADDR *ip4, IPADDR *ip6); -/* Get name for host, *name should be g_free()'d unless it's NULL. - Return values are the same as with net_gethostbyname() */ -int net_gethostbyaddr(IPADDR *ip, char **name); -/* get error of net_gethostname() */ -const char *net_gethosterror(int error); -/* return TRUE if host lookup failed because it didn't exist (ie. not - some error with name server) */ -int net_hosterror_notfound(int error); +/* Get the first IP address for host, both IPv4 and IPv6 if possible. */ +int net_gethostbyname_first_ips(const char *addr, GResolverNameLookupFlags flags, IPADDR *ip4, + IPADDR *ip6); /* Get socket address/port */ int net_getsockname(GIOChannel *handle, IPADDR *addr, int *port); @@ -94,4 +100,7 @@ char *net_getservbyport(int port); int is_ipv4_address(const char *host); int is_ipv6_address(const char *host); +void resolved_ip_ref(RESOLVED_IP_REC *iprec); +int resolved_ip_unref(RESOLVED_IP_REC *iprec); + #endif diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h index 2f68bd04..de1f06df 100644 --- a/src/core/server-connect-rec.h +++ b/src/core/server-connect-rec.h @@ -12,6 +12,7 @@ char *proxy_string, *proxy_string_after, *proxy_password; unsigned short family; /* 0 = don't care, AF_INET or AF_INET6 */ unsigned short chosen_family; /* family actually chosen during name resolution */ +char *ipaddr; char *tag; /* try to keep this tag when connected to server */ char *address; int port; @@ -44,6 +45,8 @@ unsigned int unix_socket:1; /* Connect using named unix socket */ unsigned int use_tls:1; /* this connection uses TLS */ unsigned int tls_verify:1; unsigned int no_connect:1; /* don't connect() at all, it's done by plugin */ -unsigned short last_failed_family; /* #641: if we failed to connect to ipv6, try ipv4 and vice versa */ +int last_connected; +int last_failed; +RESOLVED_IP_REC *resolved_host; char *channels; char *away_reason; diff --git a/src/core/server-rec.h b/src/core/server-rec.h index 6c7c63e3..e43245a7 100644 --- a/src/core/server-rec.h +++ b/src/core/server-rec.h @@ -21,10 +21,8 @@ unsigned int no_reconnect:1; /* Don't reconnect to server */ NET_SENDBUF_REC *handle; int readtag; /* input tag */ -/* for net_gethostbyname_return() */ -GIOChannel *connect_pipe[2]; +GCancellable *connect_cancellable; int connect_tag; -int connect_pid; RAWLOG_REC *rawlog; GHashTable *module_data; diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c index a9d9422b..64af6287 100644 --- a/src/core/servers-reconnect.c +++ b/src/core/servers-reconnect.c @@ -120,6 +120,10 @@ static int server_reconnect_timeout(void) if (server->connect_tag != -1) { g_source_remove(server->connect_tag); server->connect_tag = -1; + } else if (server->connect_cancellable != NULL) { + g_cancellable_cancel(server->connect_cancellable); + g_object_unref(server->connect_cancellable); + server->connect_cancellable = NULL; } server->connection_lost = TRUE; server_connect_failed(server, "Timeout"); @@ -168,7 +172,8 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info) server_connect_ref(dest); dest->type = module_get_uniq_id("SERVER CONNECT", 0); dest->reconnection = src->reconnection; - dest->last_failed_family = src->last_failed_family; + dest->last_connected = src->last_connected; + dest->last_failed = src->last_failed; dest->proxy = g_strdup(src->proxy); dest->proxy_port = src->proxy_port; dest->proxy_string = g_strdup(src->proxy_string); @@ -207,6 +212,10 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info) dest->own_ip6 = g_new(IPADDR, 1); memcpy(dest->own_ip6, src->own_ip6, sizeof(IPADDR)); } + dest->resolved_host = src->resolved_host; + if (dest->resolved_host != NULL) { + resolved_ip_ref(dest->resolved_host); + } dest->channels = g_strdup(src->channels); dest->away_reason = g_strdup(src->away_reason); diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c index 82e5f6be..8747eea3 100644 --- a/src/core/servers-setup.c +++ b/src/core/servers-setup.c @@ -58,7 +58,8 @@ static void save_ips(IPADDR *ip4, IPADDR *ip6, static void get_source_host_ip(void) { const char *hostname; - IPADDR ip4, ip6; + IPADDR ip4 = { 0 }; + IPADDR ip6 = { 0 }; if (source_host_ok) return; @@ -66,25 +67,28 @@ static void get_source_host_ip(void) /* FIXME: This will block! */ hostname = settings_get_str("hostname"); source_host_ok = *hostname != '\0' && - net_gethostbyname(hostname, &ip4, &ip6) == 0; + net_gethostbyname_first_ips(hostname, G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT, + &ip4, &ip6) == 0; - if (source_host_ok) + if (source_host_ok) { save_ips(&ip4, &ip6, &source_host_ip4, &source_host_ip6); - else { - g_free_and_null(source_host_ip4); - g_free_and_null(source_host_ip6); + } else { + g_free_and_null(source_host_ip4); + g_free_and_null(source_host_ip6); } } static void conn_set_ip(SERVER_CONNECT_REC *conn, const char *own_host, IPADDR **own_ip4, IPADDR **own_ip6) { - IPADDR ip4, ip6; + IPADDR ip4 = { 0 }; + IPADDR ip6 = { 0 }; if (*own_ip4 == NULL && *own_ip6 == NULL) { /* resolve the IP */ - if (net_gethostbyname(own_host, &ip4, &ip6) == 0) - save_ips(&ip4, &ip6, own_ip4, own_ip6); + if (net_gethostbyname_first_ips(own_host, G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT, + &ip4, &ip6) == 0) + save_ips(&ip4, &ip6, own_ip4, own_ip6); } server_connect_own_ip_save(conn, *own_ip4, *own_ip6); @@ -305,6 +309,13 @@ static SERVER_CONNECT_REC *create_addr_conn(int chat_type, const char *address, proto = chat_type >= 0 ? chat_protocol_find_id(chat_type) : chat_protocol_get_default(); + if (proto == NULL) { + signal_stop(); + return NULL; + } + + g_return_val_if_fail(proto != NULL, NULL); + conn = proto->create_server_connect(); server_connect_ref(conn); @@ -446,6 +457,7 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node) { SERVER_SETUP_REC *rec; CHATNET_REC *chatnetrec; + CHAT_PROTOCOL_REC *proto; char *server, *chatnet, *family; int port; char *value = NULL; @@ -466,23 +478,40 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node) rec = NULL; - chatnetrec = chatnet == NULL ? NULL : chatnet_find(chatnet); - if (chatnetrec == NULL && chatnet != NULL) { - /* chat network not found, create it. */ - chatnetrec = chat_protocol_get_default()->create_chatnet(); - chatnetrec->chat_type = chat_protocol_get_default()->id; - chatnetrec->name = g_strdup(chatnet); - chatnet_create(chatnetrec); + if (chatnet != NULL) { + chatnetrec = chatnet_find(chatnet); + if (chatnetrec != NULL) { + proto = CHAT_PROTOCOL(chatnetrec); + } else { + /* chat network not found, create it. */ + if (chatnet_find_unavailable(chatnet)) { + /* no protocols loaded, skip loading servers */ + return NULL; + } + proto = chat_protocol_get_default(); + chatnetrec = proto->create_chatnet(); + chatnetrec->chat_type = chat_protocol_get_default()->id; + chatnetrec->name = g_strdup(chatnet); + chatnet_create(chatnetrec); + } + } else { + chatnetrec = NULL; + proto = chat_protocol_get_default(); + if (proto == NULL) { + /* no protocols loaded, skip loading servers */ + return NULL; + } } family = config_node_get_str(node, "family", ""); - rec = CHAT_PROTOCOL(chatnetrec)->create_server_setup(); + rec = proto->create_server_setup(); rec->type = module_get_uniq_id("SERVER SETUP", 0); - rec->chat_type = CHAT_PROTOCOL(chatnetrec)->id; + rec->chat_type = proto->id; rec->chatnet = chatnetrec == NULL ? NULL : g_strdup(chatnetrec->name); - rec->family = g_ascii_strcasecmp(family, "inet6") == 0 ? AF_INET6 : - (g_ascii_strcasecmp(family, "inet") == 0 ? AF_INET : 0); + rec->family = g_ascii_strcasecmp(family, "inet6") == 0 ? + AF_INET6 : + (g_ascii_strcasecmp(family, "inet") == 0 ? AF_INET : 0); rec->address = g_strdup(server); rec->password = g_strdup(config_node_get_str(node, "password", NULL)); @@ -759,8 +788,7 @@ void servers_setup_init(void) read_settings(); signal_add("setup changed", (SIGNAL_FUNC) read_settings); - signal_add("setup reread", (SIGNAL_FUNC) read_servers); - signal_add("irssi init read settings", (SIGNAL_FUNC) read_servers); + signal_add("setup reread servers", (SIGNAL_FUNC) read_servers); } void servers_setup_deinit(void) @@ -773,8 +801,7 @@ void servers_setup_deinit(void) server_setup_destroy(setupservers->data); signal_remove("setup changed", (SIGNAL_FUNC) read_settings); - signal_remove("setup reread", (SIGNAL_FUNC) read_servers); - signal_remove("irssi init read settings", (SIGNAL_FUNC) read_servers); + signal_remove("setup reread servers", (SIGNAL_FUNC) read_servers); module_uniq_destroy("SERVER SETUP"); } diff --git a/src/core/servers.c b/src/core/servers.c index 30fc6844..04852104 100644 --- a/src/core/servers.c +++ b/src/core/servers.c @@ -51,20 +51,16 @@ void server_connect_failed(SERVER_REC *server, const char *msg) g_source_remove(server->connect_tag); server->connect_tag = -1; } + if (server->connect_cancellable != NULL) { + g_cancellable_cancel(server->connect_cancellable); + g_object_unref(server->connect_cancellable); + server->connect_cancellable = NULL; + } if (server->handle != NULL) { net_sendbuffer_destroy(server->handle, TRUE); server->handle = NULL; } - if (server->connect_pipe[0] != NULL) { - g_io_channel_shutdown(server->connect_pipe[0], TRUE, NULL); - g_io_channel_unref(server->connect_pipe[0]); - g_io_channel_shutdown(server->connect_pipe[1], TRUE, NULL); - g_io_channel_unref(server->connect_pipe[1]); - server->connect_pipe[0] = NULL; - server->connect_pipe[1] = NULL; - } - server_unref(server); } @@ -134,8 +130,7 @@ static char *server_create_tag(SERVER_CONNECT_REC *conn) } g_free(tag); - tag = str->str; - g_string_free(str, FALSE); + tag = g_string_free(str, FALSE); return tag; } @@ -157,7 +152,7 @@ static void server_connect_callback_init(SERVER_REC *server, GIOChannel *handle) error = net_geterror(handle); if (error != 0) { server->connection_lost = TRUE; - server->connrec->last_failed_family = server->connrec->chosen_family; + server->connrec->last_failed = server->connrec->last_connected; server_connect_failed(server, g_strerror(error)); return; } @@ -178,7 +173,7 @@ static void server_connect_callback_init_ssl(SERVER_REC *server, GIOChannel *han error = irssi_ssl_handshake(handle); if (error == -1) { server->connection_lost = TRUE; - server->connrec->last_failed_family = server->connrec->chosen_family; + server->connrec->last_failed = server->connrec->last_connected; server_connect_failed(server, NULL); return; } @@ -212,13 +207,18 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip, g_return_if_fail(ip != NULL || unix_socket != NULL); + if (ip != NULL) { + server->connrec->chosen_family = ip->family; + net_ip2host(ip, ipaddr); + server->connrec->ipaddr = g_strdup(ipaddr); + } + signal_emit("server connecting", 2, server, ip); if (server->connrec->no_connect) return; if (ip != NULL) { - server->connrec->chosen_family = ip->family; own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4; port = server->connrec->proxy != NULL ? server->connrec->proxy_port : server->connrec->port; @@ -255,12 +255,12 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip, server->connection_lost = TRUE; if (ip != NULL) { - server->connrec->last_failed_family = ip->family; + server->connrec->last_failed = server->connrec->last_connected; } server_connect_failed(server, errmsg2 ? errmsg2 : errmsg); g_free(errmsg2); } else { - server->connrec->last_failed_family = 0; + server->connrec->last_failed = 0; if (!server->connrec->use_tls) server->handle = net_sendbuffer_create(handle, 0); if (server->connrec->use_tls) @@ -272,48 +272,47 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip, } } -static void server_connect_callback_readpipe(SERVER_REC *server) +static int server_start_connect_resolve(SERVER_REC *server); + +static void server_connect_use_resolved(SERVER_REC *server) { - RESOLVED_IP_REC iprec; - IPADDR *ip; + IPADDR *ip; const char *errormsg; + RESOLVED_IP_REC *iprec = server->connrec->resolved_host; - g_source_remove(server->connect_tag); - server->connect_tag = -1; - - net_gethostbyname_return(server->connect_pipe[0], &iprec); - - g_io_channel_shutdown(server->connect_pipe[0], TRUE, NULL); - g_io_channel_unref(server->connect_pipe[0]); - g_io_channel_shutdown(server->connect_pipe[1], TRUE, NULL); - g_io_channel_unref(server->connect_pipe[1]); - - server->connect_pipe[0] = NULL; - server->connect_pipe[1] = NULL; - - /* figure out if we should use IPv4 or v6 address */ - if (iprec.error != 0) { - /* error */ + if (iprec->error != NULL) { + /* error */ ip = NULL; - } else if (server->connrec->family == AF_INET) { - /* force IPv4 connection */ - ip = iprec.ip4.family == 0 ? NULL : &iprec.ip4; - } else if (server->connrec->family == AF_INET6) { - /* force IPv6 connection */ - ip = iprec.ip6.family == 0 ? NULL : &iprec.ip6; } else { - /* pick the one that was found. if both were found: - 1. disprefer the last one that failed - 2. prefer ipv4 over ipv6 unless resolve_prefer_ipv6 is set - */ - if (iprec.ip4.family == 0 || - (iprec.ip6.family != 0 && - (server->connrec->last_failed_family == AF_INET || - (settings_get_bool("resolve_prefer_ipv6") && - server->connrec->last_failed_family != AF_INET6)))) { - ip = &iprec.ip6; + GList *curr; + int i; + + curr = iprec->ailist; + i = 0; + while (i < server->connrec->last_failed) { + if (curr != NULL) { + curr = curr->next; + i++; + } + /* curr is different now */ + if (curr == NULL) { + resolved_ip_unref(server->connrec->resolved_host); + server->connrec->resolved_host = NULL; + server->connrec->last_failed = 0; + /* retry resolve */ + server_start_connect_resolve(server); + return; + } + } + if (curr != NULL) { + GInetAddress *addr; + addr = curr->data; + server->connrec->last_connected = i + 1; + ip = g_new0(IPADDR, 1); + ip->family = g_inet_address_get_family(addr); + memcpy(&ip->ip, g_inet_address_to_bytes(addr), sizeof(ip->ip)); } else { - ip = &iprec.ip4; + ip = NULL; } } @@ -322,28 +321,69 @@ static void server_connect_callback_readpipe(SERVER_REC *server) server_real_connect(server, ip, NULL); errormsg = NULL; } else { - if (iprec.error == 0 || net_hosterror_notfound(iprec.error)) { + if (iprec->error->code == G_RESOLVER_ERROR_NOT_FOUND) { /* IP wasn't found for the host, don't try to reconnect back to this server */ server->dns_error = TRUE; } - if (iprec.error == 0) { - /* forced IPv4 or IPv6 address but it wasn't found */ - errormsg = server->connrec->family == AF_INET ? - "IPv4 address not found for host" : - "IPv6 address not found for host"; - } else { - /* gethostbyname() failed */ - errormsg = iprec.errorstr != NULL ? iprec.errorstr : - "Host lookup failed"; - } + errormsg = iprec->error->message; + if (errormsg == NULL) + errormsg = "Host lookup failed"; server->connection_lost = TRUE; + /* clear the error in resolved_host */ + server->connrec->resolved_host = NULL; server_connect_failed(server, errormsg); + + resolved_ip_unref(iprec); } - g_free(iprec.errorstr); + g_free(ip); +} + +static void server_connect_callback_resolved(RESOLVED_IP_REC *iprec, SERVER_REC *server) +{ + if (server->connect_cancellable != NULL) { + g_object_unref(server->connect_cancellable); + server->connect_cancellable = NULL; + } + + if (server->connrec->resolved_host != NULL) { + resolved_ip_unref(server->connrec->resolved_host); + } + server->connrec->resolved_host = iprec; + + if (iprec->error == NULL && iprec->ailist == NULL) { + server->connection_lost = TRUE; + server->dns_error = TRUE; + server_connect_failed(server, "Host lookup failed"); + } else { + server_connect_use_resolved(server); + } +} + +static int server_start_connect_resolve(SERVER_REC *server) +{ + const char *connect_address; + GResolverNameLookupFlags net_gethostbyname_flags; + + connect_address = + server->connrec->proxy != NULL ? server->connrec->proxy : server->connrec->address; + net_gethostbyname_flags = G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT; + if (server->connrec->family == AF_INET) { + net_gethostbyname_flags = G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY; + } else if (server->connrec->family == AF_INET6) { + net_gethostbyname_flags = G_RESOLVER_NAME_LOOKUP_FLAGS_IPV6_ONLY; + } + if (server->connrec->resolved_host == NULL) { + server->connect_cancellable = net_gethostbyname_nonblock( + connect_address, net_gethostbyname_flags, + (NetGethostbynameContinuationFunc) server_connect_callback_resolved, server); + return FALSE; + } else { + return TRUE; + } } SERVER_REC *server_connect(SERVER_CONNECT_REC *conn) @@ -395,9 +435,6 @@ void server_connect_init(SERVER_REC *server) /* starts connecting to server */ int server_start_connect(SERVER_REC *server) { - const char *connect_address; - int fd[2]; - g_return_val_if_fail(server != NULL, FALSE); if (!server->connrec->unix_socket && server->connrec->port <= 0) return FALSE; @@ -415,30 +452,17 @@ int server_start_connect(SERVER_REC *server) /* connect with unix socket */ server_real_connect(server, NULL, server->connrec->address); } else { + int already_resolved; /* resolve host name */ - if (pipe(fd) != 0) { - g_warning("server_connect(): pipe() failed."); - g_free(server->tag); - g_free(server->nick); - return FALSE; - } - - server->connect_pipe[0] = i_io_channel_new(fd[0]); - server->connect_pipe[1] = i_io_channel_new(fd[1]); - - connect_address = server->connrec->proxy != NULL ? - server->connrec->proxy : server->connrec->address; - server->connect_pid = - net_gethostbyname_nonblock(connect_address, - server->connect_pipe[1], 0); - server->connect_tag = - i_input_add(server->connect_pipe[0], I_INPUT_READ, - (GInputFunction) server_connect_callback_readpipe, server); + already_resolved = server_start_connect_resolve(server); server->connect_time = time(NULL); lookup_servers = g_slist_append(lookup_servers, server); signal_emit("server looking", 1, server); + if (already_resolved) { + server_connect_use_resolved(server); + } } return TRUE; } @@ -477,8 +501,9 @@ void server_disconnect(SERVER_REC *server) if (server->connect_tag != -1) { /* still connecting to server.. */ - if (server->connect_pid != -1) - net_disconnect_nonblock(server->connect_pid); + server_connect_failed(server, NULL); + return; + } else if (server->connect_cancellable != NULL) { server_connect_failed(server, NULL); return; } @@ -637,6 +662,7 @@ void server_connect_unref(SERVER_CONNECT_REC *conn) g_free_not_null(conn->proxy_string_after); g_free_not_null(conn->proxy_password); + g_free_not_null(conn->ipaddr); g_free_not_null(conn->tag); g_free_not_null(conn->address); g_free_not_null(conn->chatnet); @@ -644,6 +670,10 @@ void server_connect_unref(SERVER_CONNECT_REC *conn) g_free_not_null(conn->own_ip4); g_free_not_null(conn->own_ip6); + if (conn->resolved_host != NULL) { + resolved_ip_unref(conn->resolved_host); + } + g_free_not_null(conn->password); g_free_not_null(conn->nick); g_free_not_null(conn->username); @@ -764,7 +794,6 @@ static void sig_chat_protocol_deinit(CHAT_PROTOCOL_REC *proto) void servers_init(void) { - settings_add_bool("server", "resolve_prefer_ipv6", FALSE); lookup_servers = servers = NULL; signal_add("chat protocol deinit", (SIGNAL_FUNC) sig_chat_protocol_deinit); diff --git a/src/core/servers.h b/src/core/servers.h index d52603eb..5e5a7fd2 100644 --- a/src/core/servers.h +++ b/src/core/servers.h @@ -2,6 +2,7 @@ #define IRSSI_CORE_SERVERS_H #include +#include /* Returns SERVER_REC if it's server, NULL if it isn't. */ #define SERVER(server) \ diff --git a/src/core/settings.c b/src/core/settings.c index 1e7ef2ee..065c8fed 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -673,18 +673,6 @@ GSList *settings_get_sorted(void) return list; } -void sig_term(int n) -{ - /* if we get SIGTERM after this, just die instead of coming back here. */ - signal(SIGTERM, SIG_DFL); - - /* quit from all servers too.. */ - signal_emit("command quit", 1, ""); - - /* and die */ - raise(SIGTERM); -} - /* Yes, this is my own stupid checksum generator, some "real" algorithm would be nice but would just take more space without much real benefit */ static unsigned int file_checksum(const char *fname) @@ -805,8 +793,6 @@ static void init_configfile(void) signal_emit("gui dialog", 2, "error", str); g_free(str); } - - signal(SIGTERM, sig_term); } int settings_reread(const char *fname) diff --git a/src/core/special-vars.c b/src/core/special-vars.c index 802fcb36..8c890645 100644 --- a/src/core/special-vars.c +++ b/src/core/special-vars.c @@ -88,8 +88,7 @@ static char *get_argument(char **cmd, char **arglist) } if (str->len > 0) g_string_truncate(str, str->len-1); - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); return ret; } @@ -412,8 +411,7 @@ char *get_alignment(const char *text, int align, int flags, char pad) } } - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); return ret; } @@ -604,8 +602,7 @@ char *parse_special_string(const char *cmd, SERVER_REC *server, void *item, } g_strfreev(arglist); - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); return ret; } diff --git a/src/fe-common/Makefile.am b/src/fe-common/Makefile.am deleted file mode 100644 index f4b78b34..00000000 --- a/src/fe-common/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = core irc - -EXTRA_DIST = meson.build diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am deleted file mode 100644 index 01e934e0..00000000 --- a/src/fe-common/core/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -noinst_LIBRARIES = libfe_common_core.a - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) \ - -DHELPDIR=\""$(datadir)/irssi/help"\" \ - -DTHEMESDIR=\""$(datadir)/irssi/themes"\" - -libfe_common_core_a_SOURCES = \ - chat-completion.c \ - command-history.c \ - completion.c \ - fe-channels.c \ - fe-common-core.c \ - fe-core-commands.c \ - fe-exec.c \ - fe-expandos.c \ - fe-help.c \ - fe-ignore.c \ - fe-ignore-messages.c \ - fe-log.c \ - fe-messages.c \ - fe-modules.c \ - fe-queries.c \ - fe-server.c \ - fe-settings.c \ - fe-tls.c \ - formats.c \ - hilight-text.c \ - keyboard.c \ - module-formats.c \ - printtext.c \ - fe-recode.c \ - themes.c \ - window-activity.c \ - window-commands.c \ - window-items.c \ - windows-layout.c \ - fe-windows.c - -if HAVE_CAPSICUM -libfe_common_core_a_SOURCES += \ - fe-capsicum.c -endif - -pkginc_fe_common_coredir=$(pkgincludedir)/src/fe-common/core -pkginc_fe_common_core_HEADERS = \ - command-history.h \ - chat-completion.h \ - completion.h \ - fe-capsicum.h \ - fe-channels.h \ - fe-common-core.h \ - fe-core-commands.h \ - fe-exec.h \ - fe-messages.h \ - fe-queries.h \ - fe-settings.h \ - fe-tls.h \ - formats.h \ - hilight-text.h \ - keyboard.h \ - module-formats.h \ - module.h \ - printtext.h \ - fe-recode.h \ - themes.h \ - window-activity.h \ - window-items.h \ - windows-layout.h \ - fe-windows.h - -EXTRA_DIST = meson.build diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c index 43d86354..ccb8bfd9 100644 --- a/src/fe-common/core/command-history.c +++ b/src/fe-common/core/command-history.c @@ -261,7 +261,12 @@ static const char *command_history_prev_int(WINDOW_REC *window, const char *text if (*text != '\0' && (pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) { /* save the old entry to history */ - command_history_add(history, text); + if (pos != NULL && settings_get_bool("command_history_editable")) { + history_entry_destroy(pos->data); + pos->data = history_entry_new(history, text); + } else { + command_history_add(history, text); + } } return history->pos == NULL ? text : ((HISTORY_ENTRY_REC *)history->pos->data)->text; @@ -292,7 +297,12 @@ static const char *command_history_next_int(WINDOW_REC *window, const char *text if (*text != '\0' && (pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) { /* save the old entry to history */ - command_history_add(history, text); + if (pos != NULL && settings_get_bool("command_history_editable")) { + history_entry_destroy(pos->data); + pos->data = history_entry_new(history, text); + } else { + command_history_add(history, text); + } } return history->pos == NULL ? "" : ((HISTORY_ENTRY_REC *)history->pos->data)->text; } @@ -467,6 +477,7 @@ void command_history_init(void) { settings_add_int("history", "max_command_history", 100); settings_add_bool("history", "window_history", FALSE); + settings_add_bool("history", "command_history_editable", FALSE); special_history_func_set(special_history_func); diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c index e2c4d2a9..852eabff 100644 --- a/src/fe-common/core/completion.c +++ b/src/fe-common/core/completion.c @@ -111,8 +111,7 @@ char *auto_word_complete(const char *line, int *pos) *pos = startpos+strlen(replace); g_string_insert(result, startpos, replace); - ret = result->str; - g_string_free(result, FALSE); + ret = g_string_free_and_steal(result); } g_free(word); @@ -290,8 +289,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i g_free_not_null(last_line); last_line = g_strdup(result->str); - ret = result->str; - g_string_free(result, FALSE); + ret = g_string_free_and_steal(result); /* free the data */ g_free(data); diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c index 2d4e9ece..220737b7 100644 --- a/src/fe-common/core/fe-channels.c +++ b/src/fe-common/core/fe-channels.c @@ -646,7 +646,7 @@ void fe_channels_init(void) command_bind("channel modify", NULL, (SIGNAL_FUNC) cmd_channel_modify); command_bind("channel remove", NULL, (SIGNAL_FUNC) cmd_channel_remove); command_bind("channel list", NULL, (SIGNAL_FUNC) cmd_channel_list); - command_bind("names", NULL, (SIGNAL_FUNC) cmd_names); + command_bind_first("names", NULL, (SIGNAL_FUNC) cmd_names); command_bind("cycle", NULL, (SIGNAL_FUNC) cmd_cycle); command_set_options("channel add", "auto noauto -bots -botcmd"); diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index 9724354f..06240d5c 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -166,7 +166,7 @@ void fe_common_core_init(void) settings_add_bool("lookandfeel", "use_msgs_window", FALSE); g_get_charset(&str); settings_add_str("lookandfeel", "term_charset", str); - settings_add_str("lookandfeel", "glib_log_domains", "all"); + settings_add_str("lookandfeel", "glib_log_domains", "all -glib-gio:debug"); themes_init(); theme_register(fecommon_core_formats); @@ -258,13 +258,19 @@ void fe_common_core_deinit(void) g_log_set_default_handler(logger_old, NULL); } -static gboolean glib_domain_wanted(const char *domain) +static gboolean glib_domain_wanted(const char *domain, const char *level) { const char *domains; char *c, *cur; int len = 0; int print_it = 0; /* -1 for exclude, 0 for undecided, 1 for include */ int incl; + char *domainlevel, *alllevel, *starlevel, *domainstar; + + domainlevel = g_strdup_printf("%s:%s", domain, level); + alllevel = g_strdup_printf("all:%s", level); + starlevel = g_strdup_printf("*:%s", level); + domainstar = g_strdup_printf("%s:*", domain); /* Go through each item in glib_log_domains setting to determine whether * or not we want to print message from this domain */ @@ -287,8 +293,10 @@ static gboolean glib_domain_wanted(const char *domain) } /* If we got a valid item, process it */ - if (len > 0 && (!strncmp(domain, c, len) || !strncasecmp("all", c, len) || - !strncmp("*", c, len))) + if (len > 0 && (!strncasecmp(domain, c, len) || !strncasecmp("all", c, len) || + !strncmp("*", c, len) || !strncasecmp(domainstar, c, len) || + !strncasecmp(domainlevel, c, len) || + !strncasecmp(alllevel, c, len) || !strncasecmp(starlevel, c, len))) print_it = incl; /* Go past any spaces towards the next item */ @@ -300,6 +308,11 @@ static gboolean glib_domain_wanted(const char *domain) len = 0; } while (*c != '\0' && print_it != -1); + g_free(domainlevel); + g_free(alllevel); + g_free(starlevel); + g_free(domainstar); + return (print_it == 1); } @@ -333,7 +346,7 @@ static void i_log_func(const char *log_domain, GLogLevelFlags log_level, const c domain = (log_domain ? log_domain : "default"); /* Only print the message if we decided to */ - if (!glib_domain_wanted(domain)) + if (!glib_domain_wanted(domain, reason)) return; if (windows == NULL) diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c index 164036c1..0d29d6c3 100644 --- a/src/fe-common/core/fe-log.c +++ b/src/fe-common/core/fe-log.c @@ -57,6 +57,7 @@ static int skip_next_printtext; static char *log_theme_name; static char **autolog_ignore_targets; +static GTimeZone *utc; static char *log_colorizer_strip(const char *str) { @@ -213,8 +214,7 @@ static char *log_items_get_list(LOG_REC *log) if(rec->servertag != NULL) g_string_append_printf(str, " (%s)", rec->servertag); - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); return ret; } @@ -547,7 +547,7 @@ static void log_line(TEXT_DEST_REC *dest, const char *text) char *val; if ((val = g_hash_table_lookup(dest->meta, "time")) != NULL) { GDateTime *time; - if ((time = g_date_time_new_from_iso8601(val, NULL)) != NULL) { + if ((time = g_date_time_new_from_iso8601(val, utc)) != NULL) { t = g_date_time_to_unix(time); g_date_time_unref(time); } @@ -745,6 +745,7 @@ void fe_log_init(void) { autoremove_tag = g_timeout_add(60000, (GSourceFunc) sig_autoremove, NULL); skip_next_printtext = FALSE; + utc = g_time_zone_new_utc(); settings_add_bool("log", "awaylog_colors", TRUE); settings_add_bool("log", "autolog", FALSE); @@ -812,6 +813,7 @@ void fe_log_deinit(void) if (autolog_ignore_targets != NULL) g_strfreev(autolog_ignore_targets); + g_time_zone_unref(utc); g_free_not_null(autolog_path); g_free_not_null(log_theme_name); } diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c index 355d4fd4..c6e9a838 100644 --- a/src/fe-common/core/fe-messages.c +++ b/src/fe-common/core/fe-messages.c @@ -133,8 +133,7 @@ char *expand_emphasis(WI_ITEM_REC *item, const char *text) } } - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); return ret; } @@ -730,9 +729,8 @@ static void sig_nicklist_new(CHANNEL_REC *channel, NICK_REC *nick) n++; } while (printnick_exists(firstnick, nick, newnick->str)); - g_hash_table_insert(printnicks, nick, newnick->str); - g_string_free(newnick, FALSE); - g_free(nickhost); + g_hash_table_insert(printnicks, nick, g_string_free_and_steal(newnick)); + g_free(nickhost); } static void sig_nicklist_remove(CHANNEL_REC *channel, NICK_REC *nick) diff --git a/src/fe-common/core/fe-modules.c b/src/fe-common/core/fe-modules.c index 955b9a9e..a1714996 100644 --- a/src/fe-common/core/fe-modules.c +++ b/src/fe-common/core/fe-modules.c @@ -29,8 +29,6 @@ #include -#ifdef HAVE_GMODULE - static void sig_module_error(void *number, const char *data, const char *rootmodule, const char *submodule) { @@ -273,22 +271,3 @@ void fe_modules_deinit(void) command_unbind("load", (SIGNAL_FUNC) cmd_load); command_unbind("unload", (SIGNAL_FUNC) cmd_unload); } - -#else /* !HAVE_GMODULE */ - -static void cmd_load(const char *data) -{ - printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, - "Dynamic modules loading not supported"); -} - -void fe_modules_init(void) -{ - command_bind("load", NULL, (SIGNAL_FUNC) cmd_load); -} - -void fe_modules_deinit(void) -{ - command_unbind("load", (SIGNAL_FUNC) cmd_load); -} -#endif diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c index 77f07474..dce53804 100644 --- a/src/fe-common/core/fe-queries.c +++ b/src/fe-common/core/fe-queries.c @@ -355,7 +355,7 @@ static void read_settings(void) void fe_queries_init(void) { - settings_add_level("lookandfeel", "autocreate_query_level", "MSGS DCCMSGS"); + settings_add_level("lookandfeel", "autocreate_query_level", "MSGS DCCMSGS NOTICES"); settings_add_bool("lookandfeel", "autocreate_own_query", TRUE); settings_add_time("lookandfeel", "autoclose_query", "0"); diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c index ab76c363..56acf020 100644 --- a/src/fe-common/core/fe-server.c +++ b/src/fe-common/core/fe-server.c @@ -101,8 +101,14 @@ static SERVER_SETUP_REC *create_server_setup(GHashTable *optlist) } } - server = rec->create_server_setup(); - server->chat_type = rec->id; + if (rec == NULL) { + /* no protocols loaded, bail out */ + signal_emit("chat protocol unknown", 1, "(none)"); + return NULL; + } + + server = rec->create_server_setup(); + server->chat_type = rec->id; server->tls_verify = TRUE; return server; } diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index 0c8b3088..db2148d0 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -142,7 +142,6 @@ static void format_ext_color_unexpand(GString *out, gboolean bg, int base, char g_string_append_c(out, ext_color_al[value % 36]); } -#ifdef TERM_TRUECOLOR void unformat_24bit_color(char **ptr, int off, int *fgcolor, int *bgcolor, int *flags) { unsigned int color; @@ -191,12 +190,10 @@ static void format_24bit_color_unexpand(GString *out, int off, const char **ptr) g_string_append_c(out, rgbx[3] & 0x1 ? 'z' : 'Z'); g_string_append_printf(out, "%06X", color); } -#endif void format_24bit_color(GString *out, int bg, unsigned int color) { unsigned char rgb[] = { color >> 16, color >> 8, color }; -#ifdef TERM_TRUECOLOR unsigned char x = bg ? 0x1 : 0; unsigned int i; g_string_append_c(out, 4); @@ -210,9 +207,6 @@ void format_24bit_color(GString *out, int bg, unsigned int color) } } g_string_append_c(out, 0x20 + x); -#else /* !TERM_TRUECOLOR */ - format_ext_color(out, bg, color_24bit_256(rgb)); -#endif /* TERM_TRUECOLOR */ } int format_expand_styles(GString *out, const char **format, int *flags) @@ -622,8 +616,7 @@ char *format_string_expand(const char *text, int *flags) text++; } - ret = out->str; - g_string_free(out, FALSE); + ret = g_string_free_and_steal(out); return ret; } @@ -668,11 +661,9 @@ char *format_string_unexpand(const char *text, int flags) case FORMAT_COLOR_EXT3_BG: format_ext_color_unexpand(out, TRUE, 0xb0, *++text); break; -#ifdef TERM_TRUECOLOR case FORMAT_COLOR_24: format_24bit_color_unexpand(out, 1, &text); break; -#endif case FORMAT_STYLE_BLINK: format_flag_unexpand(out, 'F'); break; @@ -800,8 +791,7 @@ static char *format_get_text_args(TEXT_DEST_REC *dest, text++; } - ret = out->str; - g_string_free(out, FALSE); + ret = g_string_free_and_steal(out); return ret; } @@ -896,8 +886,7 @@ char *format_add_linestart(const char *text, const char *linestart) text++; } - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); return ret; } @@ -921,18 +910,17 @@ char *format_add_lineend(const char *text, const char *linestart) } g_string_append(str, linestart); - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); return ret; } #define LINE_START_IRSSI_LEVEL \ (MSGLEVEL_CLIENTERROR | MSGLEVEL_CLIENTNOTICE) -#define NOT_LINE_START_LEVEL \ - (MSGLEVEL_NEVER | MSGLEVEL_LASTLOG | MSGLEVEL_CLIENTCRAP | \ - MSGLEVEL_MSGS | MSGLEVEL_PUBLIC | MSGLEVEL_DCC | MSGLEVEL_DCCMSGS | \ - MSGLEVEL_ACTIONS | MSGLEVEL_NOTICES | MSGLEVEL_SNOTES | MSGLEVEL_CTCPS) +#define NOT_LINE_START_LEVEL \ + (MSGLEVEL_NEVER | MSGLEVEL_LASTLOG | MSGLEVEL_CLIENTCRAP | MSGLEVEL_MSGS | \ + MSGLEVEL_PUBLIC | MSGLEVEL_DCC | MSGLEVEL_DCCMSGS | MSGLEVEL_ACTIONS | MSGLEVEL_NOTICES | \ + MSGLEVEL_PUBNOTICES | MSGLEVEL_SNOTES | MSGLEVEL_CTCPS) /* return the "-!- " text at the start of the line */ char *format_get_level_tag(THEME_REC *theme, TEXT_DEST_REC *dest) @@ -1057,13 +1045,6 @@ void format_newline(TEXT_DEST_REC *dest) GINT_TO_POINTER(-1), GINT_TO_POINTER(GUI_PRINT_FLAG_NEWLINE), "", dest); } -#ifndef TERM_TRUECOLOR -inline static int color_24bit_256_int(unsigned int color) -{ - unsigned char rgb[] = { color >> 16, color >> 8, color }; - return color_24bit_256(rgb); -} -#endif /* !TERM_TRUECOLOR */ /* parse ANSI color string */ static const char *get_ansi_color(THEME_REC *theme, const char *str, @@ -1191,7 +1172,7 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str, } if (i == -1) break; -#ifdef TERM_TRUECOLOR + if (num == 38) { flags |= GUI_PRINT_FLAG_COLOR_24_FG; fg = num2; @@ -1199,15 +1180,6 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str, flags |= GUI_PRINT_FLAG_COLOR_24_BG; bg = num2; } -#else /* !TERM_TRUECOLOR */ - if (num == 38) { - flags &= ~GUI_PRINT_FLAG_COLOR_24_FG; - fg = color_24bit_256_int(num2); - } else if (num == 48) { - flags &= ~GUI_PRINT_FLAG_COLOR_24_BG; - bg = color_24bit_256_int(num2); - } -#endif break; case 5: @@ -1332,7 +1304,6 @@ int strip_real_length(const char *str, int len, /* We expect 4 to indicate an internal Irssi color code. However 4 * also means hex color, an alternative to mIRC color codes. We * don't support those. */ -#ifdef TERM_TRUECOLOR if (str[1] == FORMAT_COLOR_24 && str[2] != '\0') { if (str[3] == '\0') str++; else if (str[4] == '\0') str += 2; @@ -1344,9 +1315,7 @@ int strip_real_length(const char *str, int len, *last_color_len = 6; str+=4; } - } else -#endif - if (str[1] < FORMAT_STYLE_SPECIAL && str[2] != '\0') { + } else if (str[1] < FORMAT_STYLE_SPECIAL && str[2] != '\0') { if (last_color_pos != NULL) *last_color_pos = (int) (str-start); if (last_color_len != NULL) @@ -1395,14 +1364,12 @@ char *strip_codes(const char *input) /* irssi color */ if (p[2] != '\0') { -#ifdef TERM_TRUECOLOR if (p[1] == FORMAT_COLOR_24) { if (p[3] == '\0') p += 2; else if (p[4] == '\0') p += 3; else if (p[5] == '\0') p += 4; else p += 5; } else -#endif /* TERM_TRUECOLOR */ p += 2; continue; } @@ -1550,11 +1517,9 @@ void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC bgcolor = 0xb0 + *++ptr - FORMAT_COLOR_NOCHANGE; flags &= ~GUI_PRINT_FLAG_COLOR_24_BG; break; -#ifdef TERM_TRUECOLOR case FORMAT_COLOR_24: unformat_24bit_color(&ptr, 1, &fgcolor, &bgcolor, &flags); break; -#endif default: if (*ptr != FORMAT_COLOR_NOCHANGE) { flags &= ~GUI_PRINT_FLAG_COLOR_24_FG; @@ -1581,9 +1546,13 @@ void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC break; case 15: /* remove all styling */ - fgcolor = theme->default_color; - bgcolor = -1; - flags &= GUI_PRINT_FLAG_INDENT|GUI_PRINT_FLAG_MONOSPACE; + if (!hide_text_style) { + if (!hide_colors) { + fgcolor = theme->default_color; + bgcolor = -1; + } + flags &= GUI_PRINT_FLAG_INDENT | GUI_PRINT_FLAG_MONOSPACE; + } break; case 17: if (!hide_text_style) @@ -1641,13 +1610,11 @@ void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags, (flags & GUI_PRINT_FLAG_COLOR_24_FG) != (*last_flags & GUI_PRINT_FLAG_COLOR_24_FG)) { *last_fg = fg; -#ifdef TERM_TRUECOLOR if (flags & GUI_PRINT_FLAG_COLOR_24_FG) { *last_flags |= GUI_PRINT_FLAG_COLOR_24_FG; format_24bit_color(out, 0, fg); } else { *last_flags &= ~GUI_PRINT_FLAG_COLOR_24_FG; -#endif if (fg < 0) { g_string_append_c(out, 4); g_string_append_c(out, (char) -1); @@ -1655,20 +1622,16 @@ void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags, } else { format_ext_color(out, 0, fg); } -#ifdef TERM_TRUECOLOR } -#endif } if (bg != *last_bg || (flags & GUI_PRINT_FLAG_COLOR_24_BG) != (*last_flags & GUI_PRINT_FLAG_COLOR_24_BG)) { *last_bg = bg; -#ifdef TERM_TRUECOLOR if (flags & GUI_PRINT_FLAG_COLOR_24_BG) { *last_flags |= GUI_PRINT_FLAG_COLOR_24_BG; format_24bit_color(out, 1, bg); } else { *last_flags &= ~GUI_PRINT_FLAG_COLOR_24_BG; -#endif if (bg < 0) { g_string_append_c(out, 4); g_string_append_c(out, FORMAT_COLOR_NOCHANGE); @@ -1676,9 +1639,7 @@ void format_gui_flags(GString *out, int *last_fg, int *last_bg, int *last_flags, } else { format_ext_color(out, 1, bg); } -#ifdef TERM_TRUECOLOR } -#endif } if ((flags & GUI_PRINT_FLAG_UNDERLINE) != (*last_flags & GUI_PRINT_FLAG_UNDERLINE)) { diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h index 5666c73b..79b90ded 100644 --- a/src/fe-common/core/formats.h +++ b/src/fe-common/core/formats.h @@ -158,9 +158,7 @@ void format_send_as_gui_flags(TEXT_DEST_REC *dest, const char *text, SIGNAL_FUNC #define FORMAT_COLOR_EXT1_BG ('0'-5) #define FORMAT_COLOR_EXT2_BG ('0'-9) #define FORMAT_COLOR_EXT3_BG ('0'-10) -#ifdef TERM_TRUECOLOR #define FORMAT_COLOR_24 ('0'-13) -#endif #define FORMAT_STYLE_SPECIAL 0x60 #define FORMAT_STYLE_BLINK (0x01 + FORMAT_STYLE_SPECIAL) diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c index 66e2dfd3..2412a1f8 100644 --- a/src/fe-common/core/hilight-text.c +++ b/src/fe-common/core/hilight-text.c @@ -469,8 +469,7 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text, } g_string_append(str, text + pos); - newstr = str->str; - g_string_free(str, FALSE); + newstr = g_string_free_and_steal(str); format_dest_meta_stash(dest, "hilight-start", tmp = g_strdup_printf("%d", hilight_start)); @@ -626,7 +625,7 @@ static void cmd_hilight_show(void) } /* SYNTAX: HILIGHT [-nick | -word | -line] [-mask | -full | -matchcase | -regexp] - [-color ] [-actcolor ] [-level ] + [-color ] [-actcolor ] [-level ] [-priority ] [-network ] [-channels ] */ static void cmd_hilight(const char *data) { diff --git a/src/fe-common/core/meson.build b/src/fe-common/core/meson.build index 73cb156a..a84f12eb 100644 --- a/src/fe-common/core/meson.build +++ b/src/fe-common/core/meson.build @@ -3,7 +3,7 @@ if have_capsicum fe_common_core_capsicum_source = files('fe-capsicum.c') else - fe_common_core_capsicum_source = [] + fe_common_core_capsicum_source = [ ] endif fe_common_core_sources = [ @@ -43,10 +43,11 @@ fe_common_core_sources = [ + [ default_theme_h, irssi_version_h, - ] + ], ] -libfe_common_core_a = static_library('fe_common_core', +libfe_common_core_a = static_library( + 'fe_common_core', fe_common_core_sources, include_directories : rootinc, implicit_include_directories : false, @@ -54,10 +55,12 @@ libfe_common_core_a = static_library('fe_common_core', def_helpdir, def_themesdir, ], - dependencies : dep) + dependencies : dep, +) if want_fuzzer - libfuzzer_fe_common_core_a = static_library('fuzzer_fe_common_core', + libfuzzer_fe_common_core_a = static_library( + 'fuzzer_fe_common_core', fe_common_core_sources, include_directories : rootinc, implicit_include_directories : false, @@ -66,7 +69,8 @@ if want_fuzzer def_themesdir, def_suppress_printf_fallback, ], - dependencies : dep) + dependencies : dep, + ) endif install_headers( @@ -96,4 +100,5 @@ install_headers( 'window-items.h', 'windows-layout.h', ), - subdir : incdir / 'src' / 'fe-common' / 'core') + subdir : incdir / 'src' / 'fe-common' / 'core', +) diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c index 18652689..9de8d740 100644 --- a/src/fe-common/core/printtext.c +++ b/src/fe-common/core/printtext.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -240,8 +241,7 @@ static char *printtext_get_args(TEXT_DEST_REC *dest, const char *str, } } - ret = out->str; - g_string_free(out, FALSE); + ret = g_string_free_and_steal(out); return ret; } @@ -270,8 +270,7 @@ static char *printtext_expand_formats(const char *str, int *flags) } } - ret = out->str; - g_string_free(out, FALSE); + ret = g_string_free_and_steal(out); return ret; } diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c index 04f00477..58d17b8e 100644 --- a/src/fe-common/core/themes.c +++ b/src/fe-common/core/themes.c @@ -395,9 +395,8 @@ char *theme_format_expand_get(THEME_REC *theme, const char **format) (*format)++; } - ret = str->str; - g_string_free(str, FALSE); - return ret; + ret = g_string_free_and_steal(str); + return ret; } static char *theme_format_expand_data_rec(THEME_REC *theme, const char **format, @@ -496,8 +495,7 @@ static char *theme_format_expand_abstract(THEME_REC *theme, const char **formatp p++; } g_free(ret); - abstract = str->str; - g_string_free(str, FALSE); + abstract = g_string_free_and_steal(str); /* abstract may itself contain abstracts or replaces */ p = abstract; @@ -568,15 +566,14 @@ static char *theme_format_expand_data_rec(THEME_REC *theme, const char **format, } } - /* save the last color */ - if (save_last_fg != NULL) - *save_last_fg = last_fg; - if (save_last_bg != NULL) - *save_last_bg = last_bg; + /* save the last color */ + if (save_last_fg != NULL) + *save_last_fg = last_fg; + if (save_last_bg != NULL) + *save_last_bg = last_bg; - ret = str->str; - g_string_free(str, FALSE); - return ret; + ret = g_string_free_and_steal(str); + return ret; } /* expand the data part in {abstract data} */ @@ -645,9 +642,8 @@ static char *theme_format_compress_colors(THEME_REC *theme, const char *format) } } - ret = str->str; - g_string_free(str, FALSE); - return ret; + ret = g_string_free_and_steal(str); + return ret; } char *theme_format_expand(THEME_REC *theme, const char *format) diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c index 7a2903fd..2884c3eb 100644 --- a/src/fe-common/core/window-activity.c +++ b/src/fe-common/core/window-activity.c @@ -143,7 +143,7 @@ void window_activity_init(void) { settings_add_str("lookandfeel", "activity_hide_targets", ""); settings_add_level("lookandfeel", "activity_hide_level", ""); - settings_add_level("lookandfeel", "activity_msg_level", "PUBLIC"); + settings_add_level("lookandfeel", "activity_msg_level", "PUBLIC NOTICES"); settings_add_level("lookandfeel", "activity_hilight_level", "MSGS DCCMSGS"); signal_window_hilight_check = signal_get_uniq_id("window hilight check"); diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am deleted file mode 100644 index 8a04bee4..00000000 --- a/src/fe-common/irc/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -SUBDIRS = dcc notifylist - -noinst_LIBRARIES = libfe_common_irc.a - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) \ - -DHELPDIR=\""$(datadir)/irssi/help"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" - -real_sources = \ - fe-irc-channels.c \ - fe-irc-commands.c \ - fe-irc-messages.c \ - fe-irc-queries.c \ - fe-irc-server.c \ - fe-ircnet.c \ - fe-ctcp.c \ - fe-events.c \ - fe-events-numeric.c \ - fe-modes.c \ - fe-netjoin.c \ - fe-netsplit.c \ - fe-common-irc.c \ - fe-whois.c \ - fe-sasl.c \ - fe-cap.c \ - irc-completion.c \ - module-formats.c - -libfe_common_irc_a_SOURCES = \ - $(real_sources) \ - irc-modules.c - -pkginc_fe_common_ircdir=$(pkgincludedir)/src/fe-common/irc -pkginc_fe_common_irc_HEADERS = \ - fe-irc-server.h \ - fe-irc-channels.h \ - module.h \ - module-formats.h - -EXTRA_DIST = meson.build diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am deleted file mode 100644 index feee349d..00000000 --- a/src/fe-common/irc/dcc/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -noinst_LIBRARIES = libfe_irc_dcc.a - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) \ - -DHELPDIR=\""$(datadir)/irssi/help"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" - -libfe_irc_dcc_a_SOURCES = \ - fe-dcc.c \ - fe-dcc-chat.c \ - fe-dcc-chat-messages.c \ - fe-dcc-get.c \ - fe-dcc-send.c \ - module-formats.c \ - fe-dcc-server.c - -pkginc_fe_common_irc_dccdir=$(pkgincludedir)/src/fe-common/irc/dcc -pkginc_fe_common_irc_dcc_HEADERS = \ - module.h \ - module-formats.h \ - fe-dcc.h - -EXTRA_DIST = meson.build diff --git a/src/fe-common/irc/dcc/meson.build b/src/fe-common/irc/dcc/meson.build index 296b1d61..b347cd00 100644 --- a/src/fe-common/irc/dcc/meson.build +++ b/src/fe-common/irc/dcc/meson.build @@ -1,6 +1,7 @@ # this file is part of irssi -libfe_irc_dcc_a = static_library('fe_irc_dcc', +libfe_irc_dcc_a = static_library( + 'fe_irc_dcc', files( 'fe-dcc-chat-messages.c', 'fe-dcc-chat.c', @@ -16,7 +17,17 @@ libfe_irc_dcc_a = static_library('fe_irc_dcc', def_helpdir, def_sysconfdir, ], - dependencies : dep) + dependencies : dep, +) +shared_library( + 'fe_irc_dcc', + name_suffix : module_suffix, + install : true, + install_dir : moduledir, + link_with : dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main, + link_whole : libfe_irc_dcc_a, + override_options : [ 'b_lundef=false' ], +) install_headers( files( @@ -24,4 +35,5 @@ install_headers( 'module-formats.h', 'module.h', ), - subdir : incdir / 'src' / 'fe-common' / 'irc' / 'dcc') + subdir : incdir / 'src' / 'fe-common' / 'irc' / 'dcc', +) diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c index a36d3caa..5f097ec2 100644 --- a/src/fe-common/irc/fe-common-irc.c +++ b/src/fe-common/irc/fe-common-irc.c @@ -30,9 +30,6 @@ #include #include -void fe_irc_modules_init(void); -void fe_irc_modules_deinit(void); - void fe_irc_queries_init(void); void fe_irc_queries_deinit(void); @@ -103,14 +100,10 @@ void fe_common_irc_init(void) settings_check(); module_register("irc", "fe-common"); - - fe_irc_modules_init(); } void fe_common_irc_deinit(void) { - fe_irc_modules_deinit(); - fe_irc_channels_deinit(); fe_irc_queries_deinit(); fe_irc_messages_deinit(); diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c index 14893966..cc60ea92 100644 --- a/src/fe-common/irc/fe-ctcp.c +++ b/src/fe-common/irc/fe-ctcp.c @@ -119,11 +119,10 @@ static void ctcp_default_reply(IRC_SERVER_REC *server, const char *data, g_free(ctcp); } -static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data, - const char *nick, const char *addr, - const char *target) +static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data, const char *nick, + const char *addr, const char *target) { - gint64 tv, tv2; + gint64 tv, tv2 = 0; long usecs; g_return_if_fail(data != NULL); @@ -141,8 +140,9 @@ static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data, tv2 += tv * G_TIME_SPAN_SECOND; tv = g_get_real_time(); usecs = tv - tv2; - printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS, - IRCTXT_CTCP_PING_REPLY, nick, usecs / G_TIME_SPAN_SECOND, usecs % G_TIME_SPAN_SECOND); + printformat(server, server_ischannel(SERVER(server), target) ? target : nick, + MSGLEVEL_CTCPS, IRCTXT_CTCP_PING_REPLY, nick, usecs / G_TIME_SPAN_SECOND, + usecs % G_TIME_SPAN_SECOND); } void fe_ctcp_init(void) diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c index 34ba3fe7..8035cebf 100644 --- a/src/fe-common/irc/fe-events-numeric.c +++ b/src/fe-common/irc/fe-events-numeric.c @@ -35,6 +35,7 @@ #include #include #include +#include static void print_event_received(IRC_SERVER_REC *server, const char *data, const char *nick, int target_param); @@ -143,45 +144,74 @@ static void event_ban_list(IRC_SERVER_REC *server, const char *data) IRC_CHANNEL_REC *chanrec; BAN_REC *banrec; const char *channel; - char *params, *ban, *setby, *tims; - long secs; + char *params, *ban, *setby, *tims, *timestr, *ago; g_return_if_fail(data != NULL); params = event_get_params(data, 5, NULL, &channel, &ban, &setby, &tims); - secs = *tims == '\0' ? 0 : - (long) (time(NULL) - atol(tims)); + timestr = my_asctime((time_t) atoll(tims)); + ago = time_ago((time_t) atoll(tims)); chanrec = irc_channel_find(server, channel); banrec = chanrec == NULL ? NULL : banlist_find(chanrec->banlist, ban); channel = get_visible_target(server, channel); printformat(server, channel, MSGLEVEL_CRAP, - *setby == '\0' ? IRCTXT_BANLIST : IRCTXT_BANLIST_LONG, - banrec == NULL ? 0 : g_slist_index(chanrec->banlist, banrec)+1, - channel, ban, setby, secs); + *setby == '\0' ? IRCTXT_BANLIST : IRCTXT_BANLIST_LONG, + banrec == NULL ? 0 : g_slist_index(chanrec->banlist, banrec) + 1, channel, ban, + setby, ago, timestr); + g_free(timestr); g_free(params); } static void event_eban_list(IRC_SERVER_REC *server, const char *data) { const char *channel; - char *params, *ban, *setby, *tims; - long secs; + char *params, *ban, *setby, *tims, *timestr, *ago; g_return_if_fail(data != NULL); params = event_get_params(data, 5, NULL, &channel, &ban, &setby, &tims); - secs = *tims == '\0' ? 0 : - (long) (time(NULL) - atol(tims)); + timestr = my_asctime((time_t) atoll(tims)); + ago = time_ago((time_t) atoll(tims)); channel = get_visible_target(server, channel); printformat(server, channel, MSGLEVEL_CRAP, - *setby == '\0' ? IRCTXT_EBANLIST : IRCTXT_EBANLIST_LONG, - channel, ban, setby, secs); + *setby == '\0' ? IRCTXT_EBANLIST : IRCTXT_EBANLIST_LONG, channel, ban, setby, + timestr, ago); + + g_free(timestr); + g_free(params); +} + +static void do_quiet_list(IRC_SERVER_REC *server, const char *channel, char *ban, char *setby, + char *tims) +{ + char *timestr, *ago; + + timestr = my_asctime((time_t) atoll(tims)); + ago = time_ago((time_t) atoll(tims)); + + channel = get_visible_target(server, channel); + printformat(server, channel, MSGLEVEL_CRAP, + *setby == '\0' ? IRCTXT_QUIETLIST : IRCTXT_QUIETLIST_LONG, channel, ban, setby, + ago, timestr); + + g_free(timestr); +} + +static void event_quiet_list(IRC_SERVER_REC *server, const char *data) +{ + const char *channel; + char *params, *ban, *setby, *tims; + + g_return_if_fail(data != NULL); + + params = event_get_params(data, 6, NULL, &channel, NULL, &ban, &setby, &tims); + do_quiet_list(server, channel, ban, setby, tims); g_free(params); } @@ -214,20 +244,21 @@ static void event_accept_list(IRC_SERVER_REC *server, const char *data) static void event_invite_list(IRC_SERVER_REC *server, const char *data) { const char *channel; - char *params, *invite, *setby, *tims; - long secs; + char *params, *invite, *setby, *tims, *timestr, *ago; g_return_if_fail(data != NULL); params = event_get_params(data, 5, NULL, &channel, &invite, &setby, &tims); - secs = *tims == '\0' ? 0 : - (long) (time(NULL) - atol(tims)); + timestr = my_asctime((time_t) atoll(tims)); + ago = time_ago((time_t) atoll(tims)); channel = get_visible_target(server, channel); printformat(server, channel, MSGLEVEL_CRAP, - *setby == '\0' ? IRCTXT_INVITELIST : IRCTXT_INVITELIST_LONG, - channel, invite, setby, secs); + *setby == '\0' ? IRCTXT_INVITELIST : IRCTXT_INVITELIST_LONG, channel, invite, + setby, timestr, ago); + + g_free(timestr); g_free(params); } @@ -695,6 +726,26 @@ static void event_target_received(IRC_SERVER_REC *server, const char *data, print_event_received(server, data, nick, TRUE); } +static void event_hybrid_quiet_list(IRC_SERVER_REC *server, const char *data) +{ + const char *channel; + char *params, *ban, *setby, *tims; + + g_return_if_fail(data != NULL); + + params = event_get_params(data, 5, NULL, &channel, &ban, &setby, &tims); + + if (*tims == '\0') { + /* probably not a quiet list */ + event_target_received(server, data, NULL); + return; + } + + do_quiet_list(server, channel, ban, setby, tims); + + g_free(params); +} + static void event_motd(IRC_SERVER_REC *server, const char *data, const char *nick, const char *addr) { @@ -727,6 +778,8 @@ void fe_events_numeric_init(void) signal_add("event 281", (SIGNAL_FUNC) event_accept_list); signal_add("event 367", (SIGNAL_FUNC) event_ban_list); signal_add("event 348", (SIGNAL_FUNC) event_eban_list); + signal_add("event 728", (SIGNAL_FUNC) event_quiet_list); + signal_add("event 344", (SIGNAL_FUNC) event_hybrid_quiet_list); /* used by ircd-hybrid */ signal_add("event 346", (SIGNAL_FUNC) event_invite_list); signal_add("event 433", (SIGNAL_FUNC) event_nick_in_use); signal_add("event 332", (SIGNAL_FUNC) event_topic_get); @@ -785,8 +838,7 @@ void fe_events_numeric_init(void) signal_add("event 470", (SIGNAL_FUNC) event_received); signal_add("event 479", (SIGNAL_FUNC) event_received); - signal_add("event 344", (SIGNAL_FUNC) event_target_received); /* reop list */ - signal_add("event 345", (SIGNAL_FUNC) event_target_received); /* end of reop list */ + signal_add("event 345", (SIGNAL_FUNC) event_target_received); /* end of reop list/hybrid quiet list */ signal_add("event 347", (SIGNAL_FUNC) event_target_received); /* end of invite exception list */ signal_add("event 349", (SIGNAL_FUNC) event_target_received); /* end of ban exception list */ signal_add("event 368", (SIGNAL_FUNC) event_target_received); /* end of ban list */ @@ -804,7 +856,6 @@ void fe_events_numeric_init(void) signal_add("event 506", (SIGNAL_FUNC) event_target_received); /* cannot send (+R) */ signal_add("event 716", (SIGNAL_FUNC) event_target_received); /* cannot /msg (+g) */ signal_add("event 717", (SIGNAL_FUNC) event_target_received); /* +g notified */ - signal_add("event 728", (SIGNAL_FUNC) event_target_received); /* quiet (or other) list */ signal_add("event 729", (SIGNAL_FUNC) event_target_received); /* end of quiet (or other) list */ /* clang-format on */ } @@ -825,6 +876,8 @@ void fe_events_numeric_deinit(void) signal_remove("event 281", (SIGNAL_FUNC) event_accept_list); signal_remove("event 367", (SIGNAL_FUNC) event_ban_list); signal_remove("event 348", (SIGNAL_FUNC) event_eban_list); + signal_remove("event 728", (SIGNAL_FUNC) event_quiet_list); + signal_remove("event 344", (SIGNAL_FUNC) event_hybrid_quiet_list); signal_remove("event 346", (SIGNAL_FUNC) event_invite_list); signal_remove("event 433", (SIGNAL_FUNC) event_nick_in_use); signal_remove("event 332", (SIGNAL_FUNC) event_topic_get); @@ -879,7 +932,6 @@ void fe_events_numeric_deinit(void) signal_remove("event 470", (SIGNAL_FUNC) event_received); signal_remove("event 479", (SIGNAL_FUNC) event_received); - signal_remove("event 344", (SIGNAL_FUNC) event_target_received); signal_remove("event 345", (SIGNAL_FUNC) event_target_received); signal_remove("event 347", (SIGNAL_FUNC) event_target_received); signal_remove("event 349", (SIGNAL_FUNC) event_target_received); @@ -898,6 +950,5 @@ void fe_events_numeric_deinit(void) signal_remove("event 506", (SIGNAL_FUNC) event_target_received); signal_remove("event 716", (SIGNAL_FUNC) event_target_received); signal_remove("event 717", (SIGNAL_FUNC) event_target_received); - signal_remove("event 728", (SIGNAL_FUNC) event_target_received); signal_remove("event 729", (SIGNAL_FUNC) event_target_received); } diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c index 93ff3603..39752984 100644 --- a/src/fe-common/irc/fe-irc-channels.c +++ b/src/fe-common/irc/fe-irc-channels.c @@ -73,6 +73,38 @@ const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target) return target; } +/* Get time elapsed since an event */ +char *time_ago(time_t seconds) +{ + static char ret[128]; + long unsigned years, weeks, days, hours, minutes; + + seconds = time(NULL) - seconds; + + years = seconds / (86400 * 365); + seconds %= (86400 * 365); + weeks = seconds / 604800; + days = (seconds / 86400) % 7; + hours = (seconds / 3600) % 24; + minutes = (seconds / 60) % 60; + seconds %= 60; + + if (years) + snprintf(ret, sizeof(ret), "%luy %luw %lud", years, weeks, days); + else if (weeks) + snprintf(ret, sizeof(ret), "%luw %lud %luh", weeks, days, hours); + else if (days) + snprintf(ret, sizeof(ret), "%lud %luh %lum", days, hours, minutes); + else if (hours) + snprintf(ret, sizeof(ret), "%luh %lum", hours, minutes); + else if (minutes) + snprintf(ret, sizeof(ret), "%lum %lus", minutes, (long unsigned) seconds); + else + snprintf(ret, sizeof(ret), "%lus", (long unsigned) seconds); + + return ret; +} + static void sig_channel_rejoin(SERVER_REC *server, REJOIN_REC *rec) { g_return_if_fail(rec != NULL); diff --git a/src/fe-common/irc/fe-irc-channels.h b/src/fe-common/irc/fe-irc-channels.h index a5770107..080cd484 100644 --- a/src/fe-common/irc/fe-irc-channels.h +++ b/src/fe-common/irc/fe-irc-channels.h @@ -3,6 +3,7 @@ int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target); const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target); +char *time_ago(time_t seconds); void fe_irc_channels_init(void); void fe_irc_channels_deinit(void); diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c index 40ad36e0..368a3fa6 100644 --- a/src/fe-common/irc/fe-irc-commands.c +++ b/src/fe-common/irc/fe-irc-commands.c @@ -39,6 +39,7 @@ #include #include #include +#include /* SYNTAX: ME */ static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item) @@ -224,15 +225,16 @@ static void bans_show_channel(IRC_CHANNEL_REC *channel, IRC_SERVER_REC *server) /* show bans.. */ counter = 1; for (tmp = channel->banlist; tmp != NULL; tmp = tmp->next) { + char *timestr, *ago; BAN_REC *rec = tmp->data; + timestr = my_asctime(rec->time); + ago = time_ago(rec->time); printformat(server, channel->visible_name, MSGLEVEL_CRAP, - (rec->setby == NULL || *rec->setby == '\0') ? - IRCTXT_BANLIST : IRCTXT_BANLIST_LONG, - counter, channel->visible_name, - rec->ban, rec->setby, - (int) (time(NULL)-rec->time)); - counter++; + (rec->setby == NULL || *rec->setby == '\0') ? IRCTXT_BANLIST : + IRCTXT_BANLIST_LONG, + counter, channel->visible_name, rec->ban, rec->setby, ago, timestr); + counter++; } } diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c index 5d820bbf..89346648 100644 --- a/src/fe-common/irc/fe-irc-messages.c +++ b/src/fe-common/irc/fe-irc-messages.c @@ -269,13 +269,22 @@ static char *notice_channel_context(SERVER_REC *server, const char *msg) static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg, const char *target) { - char *channel; + gboolean is_public; + const char *cleantarget; + char *context_channel; + + cleantarget = fe_channel_skip_prefix(server, target); + is_public = server_ischannel(SERVER(server), cleantarget); /* check if this is a cnotice */ - channel = notice_channel_context((SERVER_REC *) server, msg); - printformat(server, channel != NULL ? channel : fe_channel_skip_prefix(server, target), - MSGLEVEL_NOTICES | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT, IRCTXT_OWN_NOTICE, - target, msg); - g_free(channel); + context_channel = is_public ? NULL : notice_channel_context((SERVER_REC *) server, msg); + + printformat( + server, context_channel != NULL ? context_channel : cleantarget, + (is_public || context_channel != NULL ? MSGLEVEL_PUBNOTICES : MSGLEVEL_NOTICES) | + MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT, + IRCTXT_OWN_NOTICE, target, msg); + + g_free(context_channel); } static void sig_message_irc_notice(SERVER_REC *server, const char *msg, @@ -283,7 +292,9 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg, const char *target) { const char *oldtarget; - int level = MSGLEVEL_NOTICES; + char *context_channel; + int level; + gboolean is_public; oldtarget = target; target = fe_channel_skip_prefix(IRC_SERVER(server), target); @@ -299,29 +310,32 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg, return; } - if (ignore_check_plus(server, nick, address, - server_ischannel(SERVER(server), target) ? target : NULL, - msg, &level, TRUE)) + is_public = server_ischannel(SERVER(server), target); + /* check if this is a cnotice */ + context_channel = is_public ? NULL : notice_channel_context(server, msg); + level = (is_public || context_channel != NULL) ? MSGLEVEL_PUBNOTICES : MSGLEVEL_NOTICES; + + if (ignore_check_plus(server, nick, address, is_public ? target : context_channel, msg, + &level, TRUE)) { + g_free(context_channel); return; + } - if (server_ischannel(SERVER(server), target)) { + if (is_public) { /* notice in some channel */ - printformat(server, target, level, - IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg); + char *nickmode; + nickmode = channel_get_nickmode(channel_find(server, target), nick); + printformat(server, target, level, IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg, + nickmode); } else { - char *channel; - /* check if this is a cnotice */ - channel = notice_channel_context(server, msg); - - if (channel == NULL) { + if (context_channel == NULL) { /* private notice */ privmsg_get_query(SERVER(server), nick, FALSE, MSGLEVEL_NOTICES); } - printformat(server, channel == NULL ? nick : channel, level, IRCTXT_NOTICE_PRIVATE, - nick, address, msg); - - g_free(channel); + printformat(server, context_channel == NULL ? nick : context_channel, level, + IRCTXT_NOTICE_PRIVATE, nick, address, msg); } + g_free(context_channel); } static void sig_message_own_ctcp(IRC_SERVER_REC *server, const char *cmd, diff --git a/src/fe-common/irc/fe-irc-queries.c b/src/fe-common/irc/fe-irc-queries.c index 7a13542a..22aaa145 100644 --- a/src/fe-common/irc/fe-irc-queries.c +++ b/src/fe-common/irc/fe-irc-queries.c @@ -24,6 +24,11 @@ #include #include #include +#include +#include +#include + +int query_type; static QUERY_REC *query_find_address(SERVER_REC *server, const char *address) { @@ -88,14 +93,42 @@ static void event_privmsg(SERVER_REC *server, const char *data, } } +static void sig_window_bound_query(SERVER_REC *server) +{ + GSList *wtmp, *btmp, *bounds; + + if (!IS_IRC_SERVER(server)) + return; + + for (wtmp = windows; wtmp != NULL; wtmp = wtmp->next) { + WINDOW_REC *win = wtmp->data; + bounds = g_slist_copy(win->bound_items); + + for (btmp = bounds; btmp != NULL; btmp = btmp->next) { + WINDOW_BIND_REC *bound = btmp->data; + + if (bound->type == query_type && + g_strcmp0(server->tag, bound->servertag) == 0) { + irc_query_create(bound->servertag, bound->name, TRUE); + } + } + + g_slist_free(bounds); + } +} + void fe_irc_queries_init(void) { - settings_add_bool("lookandfeel", "query_track_nick_changes", TRUE); + query_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "QUERY"); + settings_add_bool("lookandfeel", "query_track_nick_changes", TRUE); + + signal_add("server connected", sig_window_bound_query); signal_add_first("event privmsg", (SIGNAL_FUNC) event_privmsg); } void fe_irc_queries_deinit(void) { + signal_remove("server connected", sig_window_bound_query); signal_remove("event privmsg", (SIGNAL_FUNC) event_privmsg); } diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c index b76d4ce7..990c4fe2 100644 --- a/src/fe-common/irc/fe-netsplit.c +++ b/src/fe-common/irc/fe-netsplit.c @@ -137,7 +137,7 @@ static void get_server_splits(void *key, NETSPLIT_REC *split, g_string_append_printf(chanrec->nicks, "%s, ", split->nick); if (chanrec->nick_count == netsplit_max_nicks) - chanrec->maxnickpos = chanrec->nicks->len; + chanrec->maxnickpos = chanrec->nicks->len - 2; } } } diff --git a/src/fe-common/irc/irc-modules.c b/src/fe-common/irc/irc-modules.c deleted file mode 100644 index 3bf1f327..00000000 --- a/src/fe-common/irc/irc-modules.c +++ /dev/null @@ -1,4 +0,0 @@ -void fe_irc_dcc_init(void);void fe_irc_notifylist_init(void); -void fe_irc_notifylist_deinit(void);void fe_irc_dcc_deinit(void); -void fe_irc_modules_init(void) { fe_irc_dcc_init(); fe_irc_notifylist_init(); } -void fe_irc_modules_deinit(void) { fe_irc_notifylist_deinit(); fe_irc_dcc_deinit(); } diff --git a/src/fe-common/irc/meson.build b/src/fe-common/irc/meson.build index 1789133c..b4d78032 100644 --- a/src/fe-common/irc/meson.build +++ b/src/fe-common/irc/meson.build @@ -1,6 +1,7 @@ # this file is part of irssi -libfe_common_irc_a = static_library('fe_common_irc', +libfe_common_irc_a = static_library( + 'fe_common_irc', files( 'fe-cap.c', 'fe-common-irc.c', @@ -20,8 +21,6 @@ libfe_common_irc_a = static_library('fe_common_irc', 'fe-whois.c', 'irc-completion.c', 'module-formats.c', - - 'irc-modules.c', ), include_directories : rootinc, implicit_include_directories : false, @@ -29,7 +28,17 @@ libfe_common_irc_a = static_library('fe_common_irc', def_helpdir, def_themesdir, ], - dependencies : dep) + dependencies : dep, +) +shared_library( + 'fe_common_irc', + name_suffix : module_suffix, + install : true, + install_dir : moduledir, + link_with : dl_cross_irc_core + dl_cross_irssi_main, + link_whole : libfe_common_irc_a, + override_options : [ 'b_lundef=false' ], +) install_headers( files( @@ -38,7 +47,8 @@ install_headers( 'module-formats.h', 'module.h', ), - subdir : incdir / 'src' / 'fe-common' / 'irc') + subdir : incdir / 'src' / 'fe-common' / 'irc', +) subdir('dcc') subdir('notifylist') diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c index 0adb2680..86310157 100644 --- a/src/fe-common/irc/module-formats.c +++ b/src/fe-common/irc/module-formats.c @@ -81,12 +81,14 @@ FORMAT_REC fecommon_irc_formats[] = { { "bantype", "Ban type changed to {channel $0}", 1, { 0 } }, { "no_bans", "No bans in channel {channel $0}", 1, { 0 } }, { "banlist", "$0 - {channel $1}: ban {ban $2}", 3, { 1, 0, 0 } }, - { "banlist_long", "$0 - {channel $1}: ban {ban $2} {comment by {nick $3}, $4 secs ago}", 5, { 1, 0, 0, 0, 1 } }, + { "banlist_long", "$0 - {channel $1}: ban {ban $2} {comment by {nick $3}, on $5 ($4 ago)}", 6, { 1, 0, 0, 0, 0, 0 } }, + { "quietlist", "{channel $0}: quiet {ban $1}", 2, { 0, 0 } }, + { "quietlist_long", "{channel $0}: quiet {ban $1} {comment by {nick $2}, on $4 ($3 ago)}", 5, { 0, 0, 0, 0, 0 } }, { "ebanlist", "{channel $0}: ban exception {ban $1}", 2, { 0, 0 } }, - { "ebanlist_long", "{channel $0}: ban exception {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } }, + { "ebanlist_long", "{channel $0}: ban exception {ban $1} {comment by {nick $2}, on $4 ($3 ago)}", 5, { 0, 0, 0, 0, 0 } }, { "no_invitelist", "Invite list is empty in channel {channel $0}", 1, { 0 } }, { "invitelist", "{channel $0}: invite {ban $1}", 2, { 0, 0 } }, - { "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } }, + { "invitelist_long", "{channel $0}: invite {ban $1} {comment by {nick $2}, on $3 ($4 ago)}", 5, { 0, 0, 0, 0, 0 } }, { "no_such_channel", "{channel $0}: No such channel", 1, { 0 } }, { "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } }, { "server_help_start", "$1", 2, { 0, 0 } }, @@ -140,8 +142,8 @@ FORMAT_REC fecommon_irc_formats[] = { { NULL, "Received messages", 0 }, { "notice_server", "{servernotice $0}$1", 2, { 0, 0 } }, - { "notice_public", "{notice $0{pubnotice_channel $1}}$2", 3, { 0, 0, 0 } }, - { "notice_private", "{notice $0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } }, + { "notice_public", "{pubnotice $3 $0}$2", 4, { 0, 0, 0, 0 } }, + { "notice_private", "{notice $0}$2", 3, { 0, 0, 0 } }, { "action_private", "{pvtaction $0}$2", 3, { 0, 0, 0 } }, { "action_private_query", "{pvtaction_query $0}$2", 3, { 0, 0, 0 } }, { "action_public", "{pubaction $0}$1", 2, { 0, 0 } }, diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h index a9d29cb0..722f8d40 100644 --- a/src/fe-common/irc/module-formats.h +++ b/src/fe-common/irc/module-formats.h @@ -59,6 +59,8 @@ enum { IRCTXT_NO_BANS, IRCTXT_BANLIST, IRCTXT_BANLIST_LONG, + IRCTXT_QUIETLIST, + IRCTXT_QUIETLIST_LONG, IRCTXT_EBANLIST, IRCTXT_EBANLIST_LONG, IRCTXT_NO_INVITELIST, diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am deleted file mode 100644 index 5eecb5fb..00000000 --- a/src/fe-common/irc/notifylist/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -noinst_LIBRARIES = libfe_irc_notifylist.a - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) \ - -DHELPDIR=\""$(datadir)/irssi/help"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" - -libfe_irc_notifylist_a_SOURCES = \ - fe-notifylist.c \ - module-formats.c - -pkginc_fe_common_irc_notifylistdir=$(pkgincludedir)/src/fe-common/irc/notifylist -pkginc_fe_common_irc_notifylist_HEADERS = \ - module.h \ - module-formats.h - -EXTRA_DIST = meson.build diff --git a/src/fe-common/irc/notifylist/meson.build b/src/fe-common/irc/notifylist/meson.build index 2e66c786..894c1d89 100644 --- a/src/fe-common/irc/notifylist/meson.build +++ b/src/fe-common/irc/notifylist/meson.build @@ -1,6 +1,7 @@ # this file is part of irssi -libfe_irc_notifylist_a = static_library('fe_irc_notifylist', +libfe_irc_notifylist_a = static_library( + 'fe_irc_notifylist', files( 'fe-notifylist.c', 'module-formats.c', @@ -11,11 +12,22 @@ libfe_irc_notifylist_a = static_library('fe_irc_notifylist', def_helpdir, def_sysconfdir, ], - dependencies : dep) + dependencies : dep, +) +shared_library( + 'fe_irc_notifylist', + name_suffix : module_suffix, + install : true, + install_dir : moduledir, + link_with : dl_cross_irc_notifylist + dl_cross_irssi_main, + link_whole : libfe_irc_notifylist_a, + override_options : [ 'b_lundef=false' ], +) install_headers( files( 'module-formats.h', 'module.h', ), - subdir : incdir / 'src' / 'fe-common' / 'irc' / 'notifylist') + subdir : incdir / 'src' / 'fe-common' / 'irc' / 'notifylist', +) diff --git a/src/fe-common/meson.build b/src/fe-common/meson.build index 05ab38a1..91a46324 100644 --- a/src/fe-common/meson.build +++ b/src/fe-common/meson.build @@ -1,6 +1,4 @@ # this file is part of irssi -subdir('core') -foreach s : chat_modules - subdir(s) -endforeach +# intentionally empty + diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am deleted file mode 100644 index 3efa83b6..00000000 --- a/src/fe-fuzz/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -SUBDIRS = irc fe-common - -bin_PROGRAMS = irssi-fuzz server-fuzz - -# Force link with CXX for libfuzzer support -CCLD=$(CXX) $(CXXFLAGS) - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -irssi_fuzz_DEPENDENCIES = @COMMON_LIBS@ - -irssi_fuzz_LDADD = \ - @COMMON_LIBS@ \ - @PROG_LIBS@ \ - $(FUZZER_LIBS) - -irssi_fuzz_SOURCES = \ - irssi.c \ - null-logger.c \ - ../fe-text/module-formats.c - -server_fuzz_DEPENDENCIES = @COMMON_LIBS@ - -server_fuzz_LDADD = \ - @COMMON_LIBS@ \ - @PROG_LIBS@ \ - $(FUZZER_LIBS) - -server_fuzz_SOURCES = \ - server.c \ - null-logger.c \ - ../fe-text/module-formats.c - -noinst_HEADERS = \ - null-logger.h \ - ../fe-text/module-formats.h - -EXTRA_DIST = meson.build diff --git a/src/fe-fuzz/fe-common/Makefile.am b/src/fe-fuzz/fe-common/Makefile.am deleted file mode 100644 index 74f13119..00000000 --- a/src/fe-fuzz/fe-common/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = core - -EXTRA_DIST = meson.build diff --git a/src/fe-fuzz/fe-common/core/Makefile.am b/src/fe-fuzz/fe-common/core/Makefile.am deleted file mode 100644 index 8f6ae477..00000000 --- a/src/fe-fuzz/fe-common/core/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -bin_PROGRAMS = theme-load-fuzz - -# Force link with CXX for libfuzzer support -CCLD=$(CXX) $(CXXFLAGS) - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -LDADD = \ - ../../../irc/libirc.a \ - ../../../irc/core/libirc_core.a \ - ../../../irc/dcc/libirc_dcc.a \ - ../../../irc/flood/libirc_flood.a \ - ../../../irc/notifylist/libirc_notifylist.a \ - ../../../fe-common/core/libfe_common_core.a \ - ../../../fe-common/irc/libfe_common_irc.a \ - ../../../fe-common/irc/dcc/libfe_irc_dcc.a \ - ../../../fe-common/irc/notifylist/libfe_irc_notifylist.a \ - ../../../core/libcore.a \ - ../../../lib-config/libirssi_config.a \ - @PROG_LIBS@ \ - $(FUZZER_LIBS) - -theme_load_fuzz_SOURCES = \ - ../../null-logger.c \ - theme-load.c \ - $(top_srcdir)/src/fe-text/module-formats.c - -noinst_HEADERS = \ - $(top_srcdir)/src/fe-text/module-formats.h - -EXTRA_DIST = meson.build diff --git a/src/fe-fuzz/fe-common/core/meson.build b/src/fe-fuzz/fe-common/core/meson.build index 893f5937..af9dea6e 100644 --- a/src/fe-fuzz/fe-common/core/meson.build +++ b/src/fe-fuzz/fe-common/core/meson.build @@ -1,5 +1,6 @@ # this file is part of irssi -executable('theme-load-fuzz', +executable( + 'theme-load-fuzz', files( '../../null-logger.c', 'theme-load.c', @@ -10,12 +11,12 @@ executable('theme-load-fuzz', libcore_a, libfuzzer_fe_common_core_a, ], - link_args : [fuzzer_lib], + link_args : [ fuzzer_lib ], link_language : fuzzer_link_language, include_directories : rootinc, implicit_include_directories : false, install : true, - dependencies : dep + dependencies : dep, ) # noinst_headers = files( diff --git a/src/fe-fuzz/irc/Makefile.am b/src/fe-fuzz/irc/Makefile.am deleted file mode 100644 index 74f13119..00000000 --- a/src/fe-fuzz/irc/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = core - -EXTRA_DIST = meson.build diff --git a/src/fe-fuzz/irc/core/Makefile.am b/src/fe-fuzz/irc/core/Makefile.am deleted file mode 100644 index 9221e29e..00000000 --- a/src/fe-fuzz/irc/core/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -bin_PROGRAMS = event-get-params-fuzz - -# Force link with CXX for libfuzzer support -CCLD=$(CXX) $(CXXFLAGS) - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -LDADD = \ - ../../../irc/libirc.a \ - ../../../irc/core/libirc_core.a \ - ../../../irc/dcc/libirc_dcc.a \ - ../../../irc/flood/libirc_flood.a \ - ../../../irc/notifylist/libirc_notifylist.a \ - ../../../fe-common/core/libfe_common_core.a \ - ../../../fe-common/irc/libfe_common_irc.a \ - ../../../fe-common/irc/dcc/libfe_irc_dcc.a \ - ../../../fe-common/irc/notifylist/libfe_irc_notifylist.a \ - ../../../core/libcore.a \ - ../../../lib-config/libirssi_config.a \ - @PROG_LIBS@ \ - $(FUZZER_LIBS) - -event_get_params_fuzz_SOURCES = \ - ../../null-logger.c \ - event-get-params.c \ - $(top_srcdir)/src/fe-text/module-formats.c - -noinst_HEADERS = \ - $(top_srcdir)/src/fe-text/module-formats.h - -EXTRA_DIST = meson.build diff --git a/src/fe-fuzz/irc/core/meson.build b/src/fe-fuzz/irc/core/meson.build index 6a47e07d..65d316d3 100644 --- a/src/fe-fuzz/irc/core/meson.build +++ b/src/fe-fuzz/irc/core/meson.build @@ -1,6 +1,7 @@ # this file is part of irssi -executable('event-get-params-fuzz', +executable( + 'event-get-params-fuzz', files( '../../null-logger.c', 'event-get-params.c', @@ -9,15 +10,15 @@ executable('event-get-params-fuzz', link_with : [ libconfig_a, libcore_a, - libirc_a, + libirc_core_a, libfuzzer_fe_common_core_a, ], - link_args : [fuzzer_lib], + link_args : [ fuzzer_lib ], link_language : fuzzer_link_language, include_directories : rootinc, implicit_include_directories : false, install : true, - dependencies : dep + dependencies : dep, ) # noinst_headers = files( diff --git a/src/fe-fuzz/meson.build b/src/fe-fuzz/meson.build index 7fac025d..55071a30 100644 --- a/src/fe-fuzz/meson.build +++ b/src/fe-fuzz/meson.build @@ -3,7 +3,8 @@ subdir('irc') subdir('fe-common') -executable('irssi-fuzz', +executable( + 'irssi-fuzz', files( 'null-logger.c', 'irssi.c', @@ -14,15 +15,16 @@ executable('irssi-fuzz', libcore_a, libfuzzer_fe_common_core_a, ], - link_args : [fuzzer_lib], + link_args : [ fuzzer_lib ], link_language : fuzzer_link_language, include_directories : rootinc, implicit_include_directories : false, install : true, - dependencies : dep + dependencies : dep, ) -executable('server-fuzz', +executable( + 'server-fuzz', files( 'null-logger.c', 'server.c', @@ -32,17 +34,17 @@ executable('server-fuzz', libconfig_a, libcore_a, libfuzzer_fe_common_core_a, - libirc_a, + libirc_core_a, libfe_common_irc_a, libfe_irc_dcc_a, libfe_irc_notifylist_a, ], - link_args : [fuzzer_lib], + link_args : [ fuzzer_lib ], link_language : fuzzer_link_language, include_directories : rootinc, implicit_include_directories : false, install : true, - dependencies : dep + dependencies : dep, ) # noinst_headers = files( diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c index b74a29b9..25579c8c 100644 --- a/src/fe-fuzz/server.c +++ b/src/fe-fuzz/server.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -43,9 +44,9 @@ #include #include -/* irc.c */ -void irc_init(void); -void irc_deinit(void); +/* irc-core.c */ +void irc_core_init(void); +void irc_core_deinit(void); /* irc-session.c */ void irc_session_init(void); @@ -153,7 +154,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) { core_preinit((*argv)[0]); core_init(); irssi_ssl_init(); - irc_init(); + irc_core_init(); fe_common_core_init(); fe_common_irc_init(); signal_add("event 001", (SIGNAL_FUNC) event_connected); diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am deleted file mode 100644 index bbcd63f8..00000000 --- a/src/fe-none/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -bin_PROGRAMS = botti - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -botti_DEPENDENCIES = @COMMON_NOUI_LIBS@ - -botti_LDADD = \ - @COMMON_NOUI_LIBS@ \ - @PERL_LINK_LIBS@ \ - @PERL_LINK_FLAGS@ \ - @PROG_LIBS@ - -botti_SOURCES = \ - irssi.c - -noinst_HEADERS = \ - module.h - -EXTRA_DIST = meson.build diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c index 6a02ff6a..c442bd7f 100644 --- a/src/fe-none/irssi.c +++ b/src/fe-none/irssi.c @@ -23,23 +23,17 @@ #include #include #include +#include #include -#ifdef HAVE_STATIC_PERL -void perl_core_init(void); -void perl_core_deinit(void); -#endif - -void irc_init(void); -void irc_deinit(void); - static GMainLoop *main_loop; static char *autoload_module; static int reload; +static int quitting; static void sig_exit(void) { - g_main_loop_quit(main_loop); + quitting = TRUE; } static void sig_reload(void) @@ -47,35 +41,44 @@ static void sig_reload(void) reload = TRUE; } +static void autoload_modules(void) +{ + char **list, **module; + list = g_strsplit_set(settings_get_str("autoload_modules"), " ,", -1); + for (module = list; *module != NULL; module++) { + char *tmp; + if ((tmp = strchr(*module, ':')) != NULL) { + *tmp = '\0'; + tmp++; + module_load_sub(*module, tmp, NULL); + } else { + module_load(*module, NULL); + } + } + g_strfreev(list); +} + void noui_init(void) { srand(time(NULL)); irssi_gui = IRSSI_GUI_NONE; core_init(); - irc_init(); module_register("core", "fe-none"); signal_add("reload", (SIGNAL_FUNC) sig_reload); signal_add("gui exit", (SIGNAL_FUNC) sig_exit); -#ifdef HAVE_STATIC_PERL - perl_core_init(); -#endif + autoload_modules(); signal_emit("irssi init finished", 0); } void noui_deinit(void) { -#ifdef HAVE_STATIC_PERL - perl_core_deinit(); -#endif - signal_remove("reload", (SIGNAL_FUNC) sig_reload); signal_remove("gui exit", (SIGNAL_FUNC) sig_exit); - irc_deinit(); core_deinit(); } @@ -92,9 +95,6 @@ int main(int argc, char **argv) args_execute(argc, argv); core_preinit(argv[0]); -#ifdef HAVE_SOCKS - SOCKSinit(argv[0]); -#endif noui_init(); if (autoload_module == NULL) @@ -104,7 +104,14 @@ int main(int argc, char **argv) reload = FALSE; module_load(autoload_module, NULL); main_loop = g_main_loop_new(NULL, TRUE); - g_main_loop_run(main_loop); + while (!quitting && !reload) { + if (sigterm_received) { + sigterm_received = FALSE; + signal_emit("gui exit", 0); + } + + g_main_context_iteration(NULL, TRUE); + } g_main_loop_unref(main_loop); } while (reload); diff --git a/src/fe-none/meson.build b/src/fe-none/meson.build index 58df15f6..b6b91b57 100644 --- a/src/fe-none/meson.build +++ b/src/fe-none/meson.build @@ -1,20 +1,24 @@ # this file is part of irssi -executable('botti', +fe_none_irssi = executable( + 'botti', files( 'irssi.c', ), include_directories : rootinc, implicit_include_directories : false, export_dynamic : true, + implib : true, link_with : [ libconfig_a, libcore_a, - libirc_a, ], install : true, - dependencies : dep + dependencies : dep, ) +if need_dl_cross_link_main + dl_cross_irssi_main = [ fe_none_irssi ] +endif # noinst_headers = files( # 'module.h', diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am deleted file mode 100644 index d97cbfa5..00000000 --- a/src/fe-text/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -bin_PROGRAMS = irssi - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -irssi_DEPENDENCIES = \ - @COMMON_LIBS@ \ - @PERL_LINK_LIBS@ \ - @PERL_FE_LINK_LIBS@ \ - @OTR_LINK_LIBS@ - -irssi_LDFLAGS = -export-dynamic - -irssi_LDADD = \ - @COMMON_LIBS@ \ - @PERL_LINK_LIBS@ \ - @PERL_FE_LINK_LIBS@ \ - @OTR_LINK_LIBS@ \ - @OTR_LINK_FLAGS@ \ - @PERL_LINK_FLAGS@ \ - @PROG_LIBS@ \ - @TEXTUI_LIBS@ - -terminfo_sources = \ - term-terminfo.c \ - terminfo-core.c - -use_term_sources = $(terminfo_sources) - -irssi_SOURCES = \ - gui-entry.c \ - gui-expandos.c \ - gui-printtext.c \ - gui-readline.c \ - gui-windows.c \ - lastlog.c \ - mainwindows.c \ - mainwindow-activity.c \ - mainwindows-layout.c \ - statusbar.c \ - statusbar-config.c \ - statusbar-items.c \ - term.c \ - $(use_term_sources) \ - textbuffer.c \ - textbuffer-commands.c \ - textbuffer-view.c \ - textbuffer-formats.c \ - irssi.c \ - module-formats.c - -pkginc_fe_textdir=$(pkgincludedir)/src/fe-text -pkginc_fe_text_HEADERS = \ - gui-printtext.h \ - gui-windows.h \ - mainwindows.h \ - statusbar.h \ - statusbar-item.h \ - term.h \ - textbuffer.h \ - textbuffer-view.h \ - textbuffer-formats.h - -noinst_HEADERS = \ - gui-entry.h \ - gui-readline.h \ - statusbar-config.h \ - terminfo-core.h \ - module.h \ - module-formats.h - -EXTRA_DIST = \ - $(terminfo_sources) \ - meson.build diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c index 5050c800..ad362f20 100644 --- a/src/fe-text/gui-entry.c +++ b/src/fe-text/gui-entry.c @@ -300,7 +300,6 @@ static char *text_effects_only(const char *p) /* irssi color */ if (p[2] != '\0') { -#ifdef TERM_TRUECOLOR if (p[1] == FORMAT_COLOR_24) { if (p[3] == '\0') p += 2; else if (p[4] == '\0') p += 3; @@ -310,12 +309,9 @@ static char *text_effects_only(const char *p) p += 5; } } else { -#endif /* TERM_TRUECOLOR */ g_string_append_len(str, p, 3); p += 2; -#ifdef TERM_TRUECOLOR } -#endif /* TERM_TRUECOLOR */ continue; } } diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c index d317456b..7482d470 100644 --- a/src/fe-text/gui-printtext.c +++ b/src/fe-text/gui-printtext.c @@ -245,9 +245,7 @@ void gui_printtext_get_colors(int *flags, int *fg, int *bg, int *attr) if (*flags & GUI_PRINT_FLAG_MIRC_COLOR) { /* mirc colors - extended colours proposal */ gboolean use_24_map = FALSE; -#ifdef TERM_TRUECOLOR use_24_map = settings_get_bool("colors_ansi_24bit"); -#endif if (*bg >= 0) { if (use_24_map && mirc_colors24[*bg % 100] != -1) { *bg = mirc_colors24[*bg % 100]; @@ -407,7 +405,7 @@ void gui_printtext_init(void) indent_functions = g_hash_table_new((GHashFunc) g_str_hash, (GCompareFunc) g_str_equal); - settings_add_int("history", "scrollback_lines", 500); + settings_add_int("history", "scrollback_lines", 5000); settings_add_time("history", "scrollback_time", "1day"); settings_add_time("history", "scrollback_max_age", "0"); settings_add_int("history", "scrollback_burst_remove", 10); diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c index fbaa303a..9952f748 100644 --- a/src/fe-text/irssi.c +++ b/src/fe-text/irssi.c @@ -46,25 +46,6 @@ #include #include -#ifdef HAVE_STATIC_PERL -void perl_core_init(void); -void perl_core_deinit(void); - -void fe_perl_init(void); -void fe_perl_deinit(void); -#endif - -#ifdef HAVE_STATIC_OTR -void otr_core_init(void); -void otr_core_deinit(void); -#endif - -void irc_init(void); -void irc_deinit(void); - -void fe_common_irc_init(void); -void fe_common_irc_deinit(void); - void gui_expandos_init(void); void gui_expandos_deinit(void); @@ -168,9 +149,7 @@ static void textui_init(void) irssi_gui = IRSSI_GUI_TEXT; core_init(); - irc_init(); fe_common_core_init(); - fe_common_irc_init(); theme_register(gui_text_formats); signal_add("settings userinfo changed", (SIGNAL_FUNC) sig_settings_userinfo_changed); @@ -216,15 +195,6 @@ static void textui_finish_init(void) module_register("core", "fe-text"); -#ifdef HAVE_STATIC_PERL - perl_core_init(); - fe_perl_init(); -#endif - -#ifdef HAVE_STATIC_OTR - otr_core_init(); -#endif - dirty_check(); /* Temporarily raise the fatal level to abort on config errors. */ @@ -267,15 +237,6 @@ static void textui_deinit(void) while (modules != NULL) module_unload(modules->data); -#ifdef HAVE_STATIC_PERL - perl_core_deinit(); - fe_perl_deinit(); -#endif - -#ifdef HAVE_STATIC_OTR - otr_core_deinit(); -#endif - dirty_check(); /* one last time to print any quit messages */ signal_remove("settings userinfo changed", (SIGNAL_FUNC) sig_settings_userinfo_changed); signal_remove("module autoload", (SIGNAL_FUNC) sig_autoload_modules); @@ -301,9 +262,7 @@ static void textui_deinit(void) theme_unregister(); - fe_common_irc_deinit(); fe_common_core_deinit(); - irc_deinit(); core_deinit(); } @@ -344,10 +303,6 @@ int main(int argc, char **argv) check_files(); -#ifdef HAVE_SOCKS - SOCKSinit(argv[0]); -#endif - /* setlocale() must be called at the beginning before any calls that affect it, especially regexps seem to break if they're generated before this call. @@ -376,6 +331,11 @@ int main(int argc, char **argv) /* Does the same as g_main_run(main_loop), except we can call our dirty-checker after each iteration */ while (!quitting) { + if (sigterm_received) { + sigterm_received = FALSE; + signal_emit("gui exit", 0); + } + if (sighup_received) { sighup_received = FALSE; diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c index 26b94248..b9f77c0a 100644 --- a/src/fe-text/mainwindows.c +++ b/src/fe-text/mainwindows.c @@ -233,8 +233,10 @@ MAIN_WINDOW_REC *mainwindow_create(int right) if (MAIN_WINDOW_TEXT_HEIGHT(parent) < WINDOW_MIN_SIZE+NEW_WINDOW_SIZE) parent = find_window_with_room(); - if (parent == NULL) + if (parent == NULL) { + g_free(rec); return NULL; /* not enough space */ + } space = parent->height / 2; rec->first_line = parent->first_line; @@ -255,8 +257,10 @@ MAIN_WINDOW_REC *mainwindow_create(int right) if (MAIN_WINDOW_TEXT_WIDTH(parent) < 2 * NEW_WINDOW_WIDTH) { parent = find_window_with_room_right(); } - if (parent == NULL) + if (parent == NULL) { + g_free(rec); return NULL; /* not enough space */ + } space = parent->width / 2; rec->first_line = parent->first_line; diff --git a/src/fe-text/meson.build b/src/fe-text/meson.build index 3ceeda12..6165b461 100644 --- a/src/fe-text/meson.build +++ b/src/fe-text/meson.build @@ -1,6 +1,7 @@ # this file is part of irssi -executable('irssi', +fe_text_irssi = executable( + 'irssi', files( #### terminfo_sources #### 'term-terminfo.c', @@ -27,23 +28,26 @@ executable('irssi', 'textbuffer-view.c', 'textbuffer.c', ) - + [ irssi_version_h ], + + [ + irssi_version_h, + default_config_h, + default_theme_h, + ], include_directories : rootinc, implicit_include_directories : false, export_dynamic : true, + implib : true, link_with : [ libconfig_a, libcore_a, libfe_common_core_a, - libirc_a, - libfe_common_irc_a, - libfe_irc_dcc_a, - libfe_irc_notifylist_a, - ], + ], install : true, - dependencies : dep - + textui_dep + dependencies : dep + textui_dep, ) +if need_dl_cross_link_main + dl_cross_irssi_main = [ fe_text_irssi ] +endif install_headers( files( @@ -57,7 +61,8 @@ install_headers( 'textbuffer-view.h', 'textbuffer.h', ), - subdir : incdir / 'src' / 'fe-text') + subdir : incdir / 'src' / 'fe-text', +) # noinst_headers = files( # 'gui-entry.h', diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c index 9902bc03..9bcdd5a0 100644 --- a/src/fe-text/term-terminfo.c +++ b/src/fe-text/term-terminfo.c @@ -31,6 +31,9 @@ #include #ifdef HAVE_TERM_H +#ifdef NEED_CURSES_H +#include +#endif #include #else /* TODO: This needs arguments, starting with C2X. */ @@ -40,14 +43,13 @@ int tputs(); /* returns number of characters in the beginning of the buffer being a a single character, or -1 if more input is needed. The character will be saved in result */ -typedef int (*TERM_INPUT_FUNC)(const unsigned char *buffer, int size, - unichar *result); +typedef int (*TERM_INPUT_FUNC)(const unsigned char *buffer, int size, unichar *result); struct _TERM_WINDOW { - /* Terminal to use for window */ + /* Terminal to use for window */ TERM_REC *term; - /* Area for window in terminal */ + /* Area for window in terminal */ int x, y; int width, height; }; @@ -316,7 +318,12 @@ void term_window_scroll(TERM_WINDOW *window, int count) term_lines_empty[window->y+y] = FALSE; } -inline static int term_putchar(int c) +#ifdef TPUTS_SVR4 +#define putc_arg_t char +#else +#define putc_arg_t int +#endif +inline static int term_putchar(putc_arg_t c) { return fputc(c, current_term->out); } @@ -343,40 +350,32 @@ static int termctl_set_color_24bit(int bg, unsigned int lc) #define COLOR_BLACK24 COLOR_RESET - 1 /* Change active color */ -#ifdef TERM_TRUECOLOR void term_set_color2(TERM_WINDOW *window, int col, unsigned int fgcol24, unsigned int bgcol24) -#else -void term_set_color(TERM_WINDOW *window, int col) -#endif { int set_normal; unsigned int fg, bg; -#ifdef TERM_TRUECOLOR if (col & ATTR_FGCOLOR24) { if (fgcol24) fg = fgcol24 << 8; else fg = COLOR_BLACK24; } else -#endif fg = (col & FG_MASK); -#ifdef TERM_TRUECOLOR if (col & ATTR_BGCOLOR24) { if (bgcol24) bg = bgcol24 << 8; else bg = COLOR_BLACK24; } else -#endif bg = ((col & BG_MASK) >> BG_SHIFT); if (!term_use_colors && bg > 0) col |= ATTR_REVERSE; - set_normal = ((col & ATTR_RESETFG) && last_fg != COLOR_RESET) || - ((col & ATTR_RESETBG) && last_bg != COLOR_RESET); + set_normal = ((col & ATTR_RESETFG) && last_fg != COLOR_RESET) || + ((col & ATTR_RESETBG) && last_bg != COLOR_RESET); if (((last_attrs & ATTR_BOLD) && (col & ATTR_BOLD) == 0) || ((last_attrs & ATTR_REVERSE) && (col & ATTR_REVERSE) == 0) || ((last_attrs & ATTR_BLINK) && (col & ATTR_BLINK) == 0)) { @@ -387,19 +386,17 @@ void term_set_color(TERM_WINDOW *window, int col) if (set_normal) { last_fg = last_bg = COLOR_RESET; - last_attrs = 0; + last_attrs = 0; terminfo_set_normal(); } /* set foreground color */ - if (fg != last_fg && - (fg != 0 || (col & ATTR_RESETFG) == 0)) { - if (term_use_colors) { + if (fg != last_fg && (fg != 0 || (col & ATTR_RESETFG) == 0)) { + if (term_use_colors) { last_fg = fg; if (fg >> 8) - termctl_set_color_24bit(0, - last_fg == COLOR_BLACK24 ? 0 - : last_fg >> 8); + termctl_set_color_24bit(0, last_fg == COLOR_BLACK24 ? 0 : + last_fg >> 8); else terminfo_set_fg(last_fg); } @@ -407,19 +404,17 @@ void term_set_color(TERM_WINDOW *window, int col) /* set background color */ if (window && window->term->TI_colors && - (term_color256map[bg&0xff]&8) == window->term->TI_colors) + (term_color256map[bg & 0xff] & 8) == window->term->TI_colors) col |= ATTR_BLINK; if (col & ATTR_BLINK) - current_term->set_blink(current_term); + current_term->tr_set_blink(current_term); - if (bg != last_bg && - (bg != 0 || (col & ATTR_RESETBG) == 0)) { - if (term_use_colors) { + if (bg != last_bg && (bg != 0 || (col & ATTR_RESETBG) == 0)) { + if (term_use_colors) { last_bg = bg; if (bg >> 8) - termctl_set_color_24bit(1, - last_bg == COLOR_BLACK24 ? 0 - : last_bg >> 8); + termctl_set_color_24bit(1, last_bg == COLOR_BLACK24 ? 0 : + last_bg >> 8); else terminfo_set_bg(last_bg); } @@ -431,7 +426,7 @@ void term_set_color(TERM_WINDOW *window, int col) /* bold */ if (window && window->term->TI_colors && - (term_color256map[fg&0xff]&8) == window->term->TI_colors) + (term_color256map[fg & 0xff] & 8) == window->term->TI_colors) col |= ATTR_BOLD; if (col & ATTR_BOLD) terminfo_set_bold(); @@ -451,7 +446,7 @@ void term_set_color(TERM_WINDOW *window, int col) terminfo_set_italic(FALSE); /* update the new attribute settings whilst ignoring color values. */ - last_attrs = col & ~( BG_MASK | FG_MASK ); + last_attrs = col & ~(BG_MASK | FG_MASK); } void term_move(TERM_WINDOW *window, int x, int y) diff --git a/src/fe-text/term.c b/src/fe-text/term.c index 1d5c2bef..5587fe20 100644 --- a/src/fe-text/term.c +++ b/src/fe-text/term.c @@ -150,12 +150,8 @@ static void read_settings(void) term_use_colors = settings_get_bool("colors") && (force_colors || term_has_colors()); -#ifdef TERM_TRUECOLOR term_use_colors24 = settings_get_bool("colors_ansi_24bit") && (force_colors || term_has_colors()); -#else - term_use_colors24 = FALSE; -#endif if (term_use_colors != old_colors || term_use_colors24 != old_colors24) irssi_redraw(); @@ -173,12 +169,8 @@ void term_common_init(void) force_colors = FALSE; term_use_colors = term_has_colors() && settings_get_bool("colors"); -#ifdef TERM_TRUECOLOR settings_add_bool("lookandfeel", "colors_ansi_24bit", FALSE); term_use_colors24 = term_has_colors() && settings_get_bool("colors_ansi_24bit"); -#else - term_use_colors24 = FALSE; -#endif read_settings(); if (g_get_charset(&dummy)) { diff --git a/src/fe-text/term.h b/src/fe-text/term.h index 7758fea3..601b12c6 100644 --- a/src/fe-text/term.h +++ b/src/fe-text/term.h @@ -72,13 +72,8 @@ void term_window_clear(TERM_WINDOW *window); /* Scroll window up/down */ void term_window_scroll(TERM_WINDOW *window, int count); -#ifdef TERM_TRUECOLOR #define term_set_color(window, col) term_set_color2(window, (col) &~(ATTR_FGCOLOR24|ATTR_BGCOLOR24), UINT_MAX, UINT_MAX) void term_set_color2(TERM_WINDOW *window, int col, unsigned int fgcol24, unsigned int bgcol24); -#else -#define term_set_color2(window, col, unused1, unused2) term_set_color(window, col) -void term_set_color(TERM_WINDOW *window, int col); -#endif void term_move(TERM_WINDOW *window, int x, int y); void term_addch(TERM_WINDOW *window, char chr); diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c index 7c21d509..0aa329f4 100644 --- a/src/fe-text/terminfo-core.c +++ b/src/fe-text/terminfo-core.c @@ -1,18 +1,27 @@ #include "module.h" #include +#include #include #ifndef _POSIX_VDISABLE # define _POSIX_VDISABLE 0 #endif +#ifdef TPUTS_SVR4 +#define putc_arg_t char +#else +#define putc_arg_t int +#endif #define tput(s) tputs(s, 0, term_putchar) -inline static int term_putchar(int c) +inline static int term_putchar(putc_arg_t c) { return fputc(c, current_term->out); } #ifdef HAVE_TERM_H +#ifdef NEED_CURSES_H +#include +#endif #include #else /* Don't bother including curses.h because of these - @@ -35,8 +44,8 @@ int tigetflag(); #define CAP_TYPE_STR 2 typedef struct { - const char *ti_name; /* terminfo name */ - const char *tc_name; /* termcap name */ + char *ti_name; /* terminfo name */ + char *tc_name; /* termcap name */ int type; unsigned int offset; } TERMINFO_REC; @@ -169,20 +178,20 @@ static void _set_cursor_visible(TERM_REC *term, int set) /* Scroll (change_scroll_region+parm_rindex+parm_index / csr+rin+indn) */ static void _scroll_region(TERM_REC *term, int y1, int y2, int count) { - /* setup the scrolling region to wanted area */ - scroll_region_setup(term, y1, y2); + /* setup the scrolling region to wanted area */ + scroll_region_setup(term, y1, y2); - term->move(term, 0, y1); + term->tr_move(term, 0, y1); if (count > 0) { - term->move(term, 0, y2); + term->tr_move(term, 0, y2); tput(tparm(term->TI_indn, count, count, 0, 0, 0, 0, 0, 0, 0)); } else if (count < 0) { - term->move(term, 0, y1); + term->tr_move(term, 0, y1); tput(tparm(term->TI_rin, -count, -count, 0, 0, 0, 0, 0, 0, 0)); } - /* reset the scrolling region to full screen */ - scroll_region_setup(term, 0, term->height-1); + /* reset the scrolling region to full screen */ + scroll_region_setup(term, 0, term->height - 1); } /* Scroll (change_scroll_region+scroll_reverse+scroll_forward / csr+ri+ind) */ @@ -190,21 +199,21 @@ static void _scroll_region_1(TERM_REC *term, int y1, int y2, int count) { int i; - /* setup the scrolling region to wanted area */ - scroll_region_setup(term, y1, y2); + /* setup the scrolling region to wanted area */ + scroll_region_setup(term, y1, y2); if (count > 0) { - term->move(term, 0, y2); + term->tr_move(term, 0, y2); for (i = 0; i < count; i++) tput(tparm(term->TI_ind, 0, 0, 0, 0, 0, 0, 0, 0, 0)); } else if (count < 0) { - term->move(term, 0, y1); + term->tr_move(term, 0, y1); for (i = count; i < 0; i++) tput(tparm(term->TI_ri, 0, 0, 0, 0, 0, 0, 0, 0, 0)); } - /* reset the scrolling region to full screen */ - scroll_region_setup(term, 0, term->height-1); + /* reset the scrolling region to full screen */ + scroll_region_setup(term, 0, term->height - 1); } /* Scroll (parm_insert_line+parm_delete_line / il+dl) */ @@ -213,22 +222,22 @@ static void _scroll_line(TERM_REC *term, int y1, int y2, int count) /* setup the scrolling region to wanted area - this might not necessarily work with il/dl, but at least it looks better if it does */ - scroll_region_setup(term, y1, y2); + scroll_region_setup(term, y1, y2); if (count > 0) { - term->move(term, 0, y1); + term->tr_move(term, 0, y1); tput(tparm(term->TI_dl, count, count, 0, 0, 0, 0, 0, 0, 0)); - term->move(term, 0, y2-count+1); + term->tr_move(term, 0, y2 - count + 1); tput(tparm(term->TI_il, count, count, 0, 0, 0, 0, 0, 0, 0)); } else if (count < 0) { - term->move(term, 0, y2+count+1); + term->tr_move(term, 0, y2 + count + 1); tput(tparm(term->TI_dl, -count, -count, 0, 0, 0, 0, 0, 0, 0)); - term->move(term, 0, y1); + term->tr_move(term, 0, y1); tput(tparm(term->TI_il, -count, -count, 0, 0, 0, 0, 0, 0, 0)); } - /* reset the scrolling region to full screen */ - scroll_region_setup(term, 0, term->height-1); + /* reset the scrolling region to full screen */ + scroll_region_setup(term, 0, term->height - 1); } /* Scroll (insert_line+delete_line / il1+dl1) */ @@ -237,17 +246,17 @@ static void _scroll_line_1(TERM_REC *term, int y1, int y2, int count) int i; if (count > 0) { - term->move(term, 0, y1); - for (i = 0; i < count; i++) + term->tr_move(term, 0, y1); + for (i = 0; i < count; i++) tput(tparm(term->TI_dl1, 0, 0, 0, 0, 0, 0, 0, 0, 0)); - term->move(term, 0, y2-count+1); - for (i = 0; i < count; i++) + term->tr_move(term, 0, y2 - count + 1); + for (i = 0; i < count; i++) tput(tparm(term->TI_il1, 0, 0, 0, 0, 0, 0, 0, 0, 0)); } else if (count < 0) { - term->move(term, 0, y2+count+1); + term->tr_move(term, 0, y2 + count + 1); for (i = count; i < 0; i++) tput(tparm(term->TI_dl1, 0, 0, 0, 0, 0, 0, 0, 0, 0)); - term->move(term, 0, y1); + term->tr_move(term, 0, y1); for (i = count; i < 0; i++) tput(tparm(term->TI_il1, 0, 0, 0, 0, 0, 0, 0, 0, 0)); } @@ -262,14 +271,14 @@ static void _clear_screen(TERM_REC *term) /* Clear screen (clr_eos / ed) */ static void _clear_eos(TERM_REC *term) { - term->move(term, 0, 0); + term->tr_move(term, 0, 0); tput(tparm(term->TI_ed, 0, 0, 0, 0, 0, 0, 0, 0, 0)); } /* Clear screen (parm_delete_line / dl) */ static void _clear_del(TERM_REC *term) { - term->move(term, 0, 0); + term->tr_move(term, 0, 0); tput(tparm(term->TI_dl, term->height, term->height, 0, 0, 0, 0, 0, 0, 0)); } @@ -278,8 +287,8 @@ static void _clear_del_1(TERM_REC *term) { int i; - term->move(term, 0, 0); - for (i = 0; i < term->height; i++) + term->tr_move(term, 0, 0); + for (i = 0; i < term->height; i++) tput(tparm(term->TI_dl1, 0, 0, 0, 0, 0, 0, 0, 0, 0)); } @@ -452,10 +461,7 @@ static void terminfo_colors_deinit(TERM_REC *term) terminal capabilities don't contain color codes */ void terminfo_setup_colors(TERM_REC *term, int force) { - static const char ansitab[16] = { - 0, 4, 2, 6, 1, 5, 3, 7, - 8, 12, 10, 14, 9, 13, 11, 15 - }; + static const char ansitab[16] = { 0, 4, 2, 6, 1, 5, 3, 7, 8, 12, 10, 14, 9, 13, 11, 15 }; unsigned int i, color; terminfo_colors_deinit(term); @@ -463,16 +469,15 @@ void terminfo_setup_colors(TERM_REC *term, int force) if (force && term->TI_setf == NULL && term->TI_setaf == NULL) term->TI_colors = 8; - if ((term->TI_setf || term->TI_setaf || force) && - term->TI_colors > 0) { + if ((term->TI_setf || term->TI_setaf || force) && term->TI_colors > 0) { term->TI_fg = g_new0(char *, term->TI_colors); term->TI_bg = g_new0(char *, term->TI_colors); - term->set_fg = _set_fg; - term->set_bg = _set_bg; + term->tr_set_fg = _set_fg; + term->tr_set_bg = _set_bg; } else { /* no colors */ term->TI_colors = 0; - term->set_fg = term->set_bg = _ignore_parm; + term->tr_set_fg = term->tr_set_bg = _ignore_parm; } if (term->TI_setaf) { @@ -486,7 +491,7 @@ void terminfo_setup_colors(TERM_REC *term, int force) term->TI_fg[i] = g_strdup(tparm(term->TI_setf, i, 0, 0, 0, 0, 0, 0, 0, 0)); } else if (force) { for (i = 0; i < 8; i++) - term->TI_fg[i] = g_strdup_printf("\033[%dm", 30+ansitab[i]); + term->TI_fg[i] = g_strdup_printf("\033[%dm", 30 + ansitab[i]); } if (term->TI_setab) { @@ -500,7 +505,7 @@ void terminfo_setup_colors(TERM_REC *term, int force) term->TI_bg[i] = g_strdup(tparm(term->TI_setb, i, 0, 0, 0, 0, 0, 0, 0, 0)); } else if (force) { for (i = 0; i < 8; i++) - term->TI_bg[i] = g_strdup_printf("\033[%dm", 40+ansitab[i]); + term->TI_bg[i] = g_strdup_printf("\033[%dm", 40 + ansitab[i]); } } @@ -578,12 +583,12 @@ static int term_setup(TERM_REC *term) { GString *str; int err; - char *term_env; + char *term_env; term_env = getenv("TERM"); if (term_env == NULL) { fprintf(stderr, "TERM environment not set\n"); - return 0; + return 0; } if (setupterm(term_env, 1, &err) != 0) { @@ -591,98 +596,98 @@ static int term_setup(TERM_REC *term) return 0; } - term_fill_capabilities(term); + term_fill_capabilities(term); /* Cursor movement */ if (term->TI_cup) - term->move = _move_cup; + term->tr_move = _move_cup; else if (term->TI_hpa && term->TI_vpa) - term->move = _move_pa; + term->tr_move = _move_pa; else { - fprintf(stderr, "Terminal doesn't support cursor movement\n"); + fprintf(stderr, "Terminal doesn't support cursor movement\n"); return 0; } - term->move_relative = _move_relative; - term->set_cursor_visible = term->TI_civis && term->TI_cnorm ? - _set_cursor_visible : _ignore_parm; + term->tr_move_relative = _move_relative; + term->tr_set_cursor_visible = + term->TI_civis && term->TI_cnorm ? _set_cursor_visible : _ignore_parm; - /* Scrolling */ + /* Scrolling */ if ((term->TI_csr || term->TI_wind) && term->TI_rin && term->TI_indn) - term->scroll = _scroll_region; + term->tr_scroll = _scroll_region; else if (term->TI_il && term->TI_dl) - term->scroll = _scroll_line; + term->tr_scroll = _scroll_line; else if ((term->TI_csr || term->TI_wind) && term->TI_ri && term->TI_ind) - term->scroll = _scroll_region_1; - else if (term->scroll == NULL && (term->TI_il1 && term->TI_dl1)) - term->scroll = _scroll_line_1; - else if (term->scroll == NULL) { - fprintf(stderr, "Terminal doesn't support scrolling\n"); + term->tr_scroll = _scroll_region_1; + else if (term->tr_scroll == NULL && (term->TI_il1 && term->TI_dl1)) + term->tr_scroll = _scroll_line_1; + else if (term->tr_scroll == NULL) { + fprintf(stderr, "Terminal doesn't support scrolling\n"); return 0; } /* Clearing screen */ if (term->TI_clear) - term->clear = _clear_screen; + term->tr_clear = _clear_screen; else if (term->TI_ed) - term->clear = _clear_eos; + term->tr_clear = _clear_eos; else if (term->TI_dl) - term->clear = _clear_del; + term->tr_clear = _clear_del; else if (term->TI_dl1) - term->clear = _clear_del_1; + term->tr_clear = _clear_del_1; else { /* we could do this by line inserts as well, but don't bother - if some terminal has insert line it most probably has delete line as well, if not a regular clear screen */ - fprintf(stderr, "Terminal doesn't support clearing screen\n"); + fprintf(stderr, "Terminal doesn't support clearing screen\n"); return 0; } /* Clearing to end of line */ if (term->TI_el) - term->clrtoeol = _clrtoeol; + term->tr_clrtoeol = _clrtoeol; else { - fprintf(stderr, "Terminal doesn't support clearing to end of line\n"); + fprintf(stderr, "Terminal doesn't support clearing to end of line\n"); return 0; } /* Repeating character */ if (term->TI_rep) - term->repeat = _repeat; + term->tr_repeat = _repeat; else - term->repeat = _repeat_manual; + term->tr_repeat = _repeat_manual; /* Bold, underline, standout, reverse, italics */ - term->set_blink = term->TI_blink ? _set_blink : _ignore; - term->set_bold = term->TI_bold ? _set_bold : _ignore; - term->set_reverse = term->TI_rev ? _set_reverse : - term->TI_smso ? _set_standout_on : _ignore; - term->set_uline = term->TI_smul && term->TI_rmul ? - _set_uline : _ignore_parm; - term->set_standout = term->TI_smso && term->TI_rmso ? - _set_standout : _ignore_parm; - term->set_italic = term->TI_sitm && term->TI_ritm ? - _set_italic : _ignore_parm; + term->tr_set_blink = term->TI_blink ? _set_blink : _ignore; + term->tr_set_bold = term->TI_bold ? _set_bold : _ignore; + term->tr_set_reverse = term->TI_rev ? _set_reverse : + term->TI_smso ? _set_standout_on : + _ignore; + term->tr_set_uline = term->TI_smul && term->TI_rmul ? _set_uline : _ignore_parm; + term->tr_set_standout = term->TI_smso && term->TI_rmso ? _set_standout : _ignore_parm; + term->tr_set_italic = term->TI_sitm && term->TI_ritm ? _set_italic : _ignore_parm; - /* Create a string to set all attributes off */ - str = g_string_new(NULL); + /* Create a string to set all attributes off */ + str = g_string_new(NULL); if (term->TI_sgr0) g_string_append(str, term->TI_sgr0); - if (term->TI_rmul && (term->TI_sgr0 == NULL || g_strcmp0(term->TI_rmul, term->TI_sgr0) != 0)) + if (term->TI_rmul && + (term->TI_sgr0 == NULL || g_strcmp0(term->TI_rmul, term->TI_sgr0) != 0)) g_string_append(str, term->TI_rmul); - if (term->TI_rmso && (term->TI_sgr0 == NULL || g_strcmp0(term->TI_rmso, term->TI_sgr0) != 0)) + if (term->TI_rmso && + (term->TI_sgr0 == NULL || g_strcmp0(term->TI_rmso, term->TI_sgr0) != 0)) g_string_append(str, term->TI_rmso); - if (term->TI_ritm && (term->TI_sgr0 == NULL || g_strcmp0(term->TI_ritm, term->TI_sgr0) != 0)) + if (term->TI_ritm && + (term->TI_sgr0 == NULL || g_strcmp0(term->TI_ritm, term->TI_sgr0) != 0)) g_string_append(str, term->TI_ritm); - term->TI_normal = str->str; - g_string_free(str, FALSE); - term->set_normal = _set_normal; + term->TI_normal = g_string_free_and_steal(str); + term->tr_set_normal = _set_normal; - term->beep = term->TI_bel ? _beep : _ignore; + term->tr_beep = term->TI_bel ? _beep : _ignore; terminfo_setup_colors(term, FALSE); terminfo_input_init0(term); - terminfo_cont(term); - return 1; + terminfo_cont(term); + return 1; } void term_set_appkey_mode(int enable) @@ -727,14 +732,14 @@ void terminfo_core_deinit(TERM_REC *term) TERM_REC *old_term; old_term = current_term; - current_term = term; - term->set_normal(term); - current_term = old_term; + current_term = term; + term->tr_set_normal(term); + current_term = old_term; - terminfo_stop(term); + terminfo_stop(term); g_free(term->TI_normal); terminfo_colors_deinit(term); - g_free(term); + g_free(term); } diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h index a077d0bf..cb0e41e2 100644 --- a/src/fe-text/terminfo-core.h +++ b/src/fe-text/terminfo-core.h @@ -3,48 +3,49 @@ #include -#define terminfo_move(x, y) current_term->move(current_term, x, y) -#define terminfo_move_relative(oldx, oldy, x, y) current_term->move_relative(current_term, oldx, oldy, x, y) -#define terminfo_set_cursor_visible(set) current_term->set_cursor_visible(current_term, set) -#define terminfo_scroll(y1, y2, count) current_term->scroll(current_term, y1, y2, count) -#define terminfo_clear() current_term->clear(current_term) -#define terminfo_clrtoeol() current_term->clrtoeol(current_term) -#define terminfo_repeat(chr, count) current_term->repeat(current_term, chr, count) -#define terminfo_set_fg(color) current_term->set_fg(current_term, color) -#define terminfo_set_bg(color) current_term->set_bg(current_term, color) -#define terminfo_set_normal() current_term->set_normal(current_term) -#define terminfo_set_bold() current_term->set_bold(current_term) -#define terminfo_set_uline(set) current_term->set_uline(current_term, set) -#define terminfo_set_standout(set) current_term->set_standout(current_term, set) -#define terminfo_set_reverse() current_term->set_reverse(current_term) -#define terminfo_set_italic(set) current_term->set_italic(current_term, set) +#define terminfo_move(x, y) current_term->tr_move(current_term, x, y) +#define terminfo_move_relative(oldx, oldy, x, y) \ + current_term->tr_move_relative(current_term, oldx, oldy, x, y) +#define terminfo_set_cursor_visible(set) current_term->tr_set_cursor_visible(current_term, set) +#define terminfo_scroll(y1, y2, count) current_term->tr_scroll(current_term, y1, y2, count) +#define terminfo_clear() current_term->tr_clear(current_term) +#define terminfo_clrtoeol() current_term->tr_clrtoeol(current_term) +#define terminfo_repeat(chr, count) current_term->tr_repeat(current_term, chr, count) +#define terminfo_set_fg(color) current_term->tr_set_fg(current_term, color) +#define terminfo_set_bg(color) current_term->tr_set_bg(current_term, color) +#define terminfo_set_normal() current_term->tr_set_normal(current_term) +#define terminfo_set_bold() current_term->tr_set_bold(current_term) +#define terminfo_set_uline(set) current_term->tr_set_uline(current_term, set) +#define terminfo_set_standout(set) current_term->tr_set_standout(current_term, set) +#define terminfo_set_reverse() current_term->tr_set_reverse(current_term) +#define terminfo_set_italic(set) current_term->tr_set_italic(current_term, set) #define terminfo_is_colors_set(term) (term->TI_fg != NULL) -#define terminfo_beep(term) current_term->beep(current_term) +#define terminfo_beep(term) current_term->tr_beep(current_term) typedef struct _TERM_REC TERM_REC; struct _TERM_REC { - /* Functions */ - void (*move)(TERM_REC *term, int x, int y); - void (*move_relative)(TERM_REC *term, int oldx, int oldy, int x, int y); - void (*set_cursor_visible)(TERM_REC *term, int set); - void (*scroll)(TERM_REC *term, int y1, int y2, int count); + /* Functions */ + void (*tr_move)(TERM_REC *term, int x, int y); + void (*tr_move_relative)(TERM_REC *term, int oldx, int oldy, int x, int y); + void (*tr_set_cursor_visible)(TERM_REC *term, int set); + void (*tr_scroll)(TERM_REC *term, int y1, int y2, int count); - void (*clear)(TERM_REC *term); - void (*clrtoeol)(TERM_REC *term); - void (*repeat)(TERM_REC *term, char chr, int count); + void (*tr_clear)(TERM_REC *term); + void (*tr_clrtoeol)(TERM_REC *term); + void (*tr_repeat)(TERM_REC *term, char chr, int count); - void (*set_fg)(TERM_REC *term, int color); - void (*set_bg)(TERM_REC *term, int color); - void (*set_normal)(TERM_REC *term); - void (*set_blink)(TERM_REC *term); - void (*set_bold)(TERM_REC *term); - void (*set_reverse)(TERM_REC *term); - void (*set_uline)(TERM_REC *term, int set); - void (*set_standout)(TERM_REC *term, int set); - void (*set_italic)(TERM_REC *term, int set); + void (*tr_set_fg)(TERM_REC *term, int color); + void (*tr_set_bg)(TERM_REC *term, int color); + void (*tr_set_normal)(TERM_REC *term); + void (*tr_set_blink)(TERM_REC *term); + void (*tr_set_bold)(TERM_REC *term); + void (*tr_set_reverse)(TERM_REC *term); + void (*tr_set_uline)(TERM_REC *term, int set); + void (*tr_set_standout)(TERM_REC *term, int set); + void (*tr_set_italic)(TERM_REC *term, int set); - void (*beep)(TERM_REC *term); + void (*tr_beep)(TERM_REC *term); #ifndef HAVE_TERMINFO char buffer1[1024], buffer2[1024]; @@ -52,46 +53,46 @@ struct _TERM_REC { FILE *in, *out; struct termios tio, old_tio; - /* Terminal size */ - int width, height; + /* Terminal size */ + int width, height; - /* Cursor movement */ - const char *TI_smcup, *TI_rmcup, *TI_cup; - const char *TI_hpa, *TI_vpa, *TI_cub1, *TI_cuf1; - const char *TI_civis, *TI_cnorm; + /* Cursor movement */ + char *TI_smcup, *TI_rmcup, *TI_cup; + char *TI_hpa, *TI_vpa, *TI_cub1, *TI_cuf1; + char *TI_civis, *TI_cnorm; /* Scrolling */ - const char *TI_csr, *TI_wind; - const char *TI_ri, *TI_rin, *TI_ind, *TI_indn; - const char *TI_il, *TI_il1, *TI_dl, *TI_dl1; + char *TI_csr, *TI_wind; + char *TI_ri, *TI_rin, *TI_ind, *TI_indn; + char *TI_il, *TI_il1, *TI_dl, *TI_dl1; /* Clearing screen */ - const char *TI_clear, *TI_ed; /* + *TI_dl, *TI_dl1; */ + char *TI_clear, *TI_ed; /* + *TI_dl, *TI_dl1; */ - /* Clearing to end of line */ - const char *TI_el; + /* Clearing to end of line */ + char *TI_el; /* Repeating character */ - const char *TI_rep; + char *TI_rep; /* Colors */ - int TI_colors; /* numbers of colors in TI_fg[] and TI_bg[] */ - const char *TI_sgr0; /* turn off all attributes */ - const char *TI_smul, *TI_rmul; /* underline on/off */ - const char *TI_smso, *TI_rmso; /* standout on/off */ - const char *TI_sitm, *TI_ritm; /* italic on/off */ - const char *TI_bold, *TI_blink, *TI_rev; - const char *TI_setaf, *TI_setab, *TI_setf, *TI_setb; + int TI_colors; /* numbers of colors in TI_fg[] and TI_bg[] */ + char *TI_sgr0; /* turn off all attributes */ + char *TI_smul, *TI_rmul; /* underline on/off */ + char *TI_smso, *TI_rmso; /* standout on/off */ + char *TI_sitm, *TI_ritm; /* italic on/off */ + char *TI_bold, *TI_blink, *TI_rev; + char *TI_setaf, *TI_setab, *TI_setf, *TI_setb; - /* Colors - generated and dynamically allocated */ + /* Colors - generated and dynamically allocated */ char **TI_fg, **TI_bg, *TI_normal; /* Beep */ - char *TI_bel; + char *TI_bel; /* Keyboard-transmit mode */ - const char *TI_smkx; - const char *TI_rmkx; + char *TI_smkx; + char *TI_rmkx; /* Terminal mode states */ int appkey_enabled; diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c index ce104c2d..bbf9f229 100644 --- a/src/fe-text/textbuffer-formats.c +++ b/src/fe-text/textbuffer-formats.c @@ -18,6 +18,7 @@ TEXT_BUFFER_REC *color_buf; gboolean scrollback_format; gboolean show_server_time; int signal_gui_render_line_text; +GTimeZone *utc; static void collector_free(GSList **collector) { @@ -125,7 +126,7 @@ static LINE_INFO_META_REC *line_meta_create(GHashTable *meta_hash) while (g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer *) &val)) { if (g_strcmp0("time", key) == 0) { GDateTime *time; - if ((time = g_date_time_new_from_iso8601(val, NULL)) != NULL) { + if ((time = g_date_time_new_from_iso8601(val, utc)) != NULL) { meta->server_time = g_date_time_to_unix(time); g_date_time_unref(time); } @@ -445,6 +446,7 @@ static void read_settings(void) void textbuffer_formats_init(void) { signal_gui_render_line_text = signal_get_uniq_id("gui render line text"); + utc = g_time_zone_new_utc(); settings_add_bool("lookandfeel", "scrollback_format", TRUE); settings_add_bool("lookandfeel", "show_server_time", FALSE); @@ -462,4 +464,6 @@ void textbuffer_formats_deinit(void) signal_remove("print format", (SIGNAL_FUNC) sig_print_format); signal_remove("print noformat", (SIGNAL_FUNC) sig_print_noformat); signal_remove("gui print text finished", (SIGNAL_FUNC) sig_gui_print_text_finished); + + g_time_zone_unref(utc); } diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c index 2cc6ce6d..ee474785 100644 --- a/src/fe-text/textbuffer-view.c +++ b/src/fe-text/textbuffer-view.c @@ -118,7 +118,6 @@ static void textbuffer_cache_unref(TEXT_BUFFER_CACHE_REC *cache) #define FGATTR (ATTR_NOCOLORS | ATTR_RESETFG | FG_MASK | ATTR_FGCOLOR24) #define BGATTR (ATTR_NOCOLORS | ATTR_RESETBG | BG_MASK | ATTR_BGCOLOR24) -#ifdef TERM_TRUECOLOR static void unformat_24bit_line_color(const unsigned char **ptr, int off, int *flags, unsigned int *fg, unsigned int *bg) { unsigned int color; @@ -145,7 +144,6 @@ static void unformat_24bit_line_color(const unsigned char **ptr, int off, int *f *fg = color; } } -#endif static inline unichar read_unichar(const unsigned char *data, const unsigned char **next, int *width) { @@ -215,11 +213,9 @@ static inline void unformat(const unsigned char **ptr, int *color, unsigned int break; #undef SET_COLOR_EXT_BG_BITS #undef SET_COLOR_EXT_FG_BITS -#ifdef TERM_TRUECOLOR case FORMAT_COLOR_24: unformat_24bit_line_color(ptr, 1, color, fg24, bg24); break; -#endif default: if (**ptr != FORMAT_COLOR_NOCHANGE) { if (**ptr == (unsigned char) 0xff) { @@ -289,10 +285,8 @@ view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line) sub->start = ++ptr; sub->color = color; -#ifdef TERM_TRUECOLOR sub->fg24 = fg24; sub->bg24 = bg24; -#endif lines = g_slist_append(lines, sub); linecount++; @@ -360,10 +354,8 @@ view_update_line_cache(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line) sub->indent = xpos; sub->indent_func = indent_func; sub->color = color; -#ifdef TERM_TRUECOLOR sub->fg24 = fg24; sub->bg24 = bg24; -#endif lines = g_slist_append(lines, sub); linecount++; @@ -502,10 +494,8 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line, if (indent_func == NULL || cache->lines[subline-1].continues) xpos = cache->lines[subline-1].indent; color = cache->lines[subline-1].color; -#ifdef TERM_TRUECOLOR fg24 = cache->lines[subline-1].fg24; bg24 = cache->lines[subline-1].bg24; -#endif } else { indent_func = NULL; } diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h index 4e5ed82f..cdd3cbe5 100644 --- a/src/fe-text/textbuffer-view.h +++ b/src/fe-text/textbuffer-view.h @@ -15,9 +15,7 @@ typedef struct { int indent; INDENT_FUNC indent_func; int color; -#ifdef TERM_TRUECOLOR unsigned int fg24, bg24; -#endif /* first word in line belong to the end of the last word in previous line */ diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am deleted file mode 100644 index a271a891..00000000 --- a/src/irc/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -if BUILD_IRSSIPROXY -PROXY=proxy -endif - -SUBDIRS = core dcc flood notifylist $(PROXY) - -noinst_LIBRARIES = libirc.a - -libirc_a_SOURCES = irc.c - -EXTRA_DIST = meson.build diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am deleted file mode 100644 index 5881481b..00000000 --- a/src/irc/core/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -noinst_LIBRARIES = libirc_core.a - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - $(GLIB_CFLAGS) - -libirc_core_a_SOURCES = \ - bans.c \ - ctcp.c \ - channels-query.c \ - channel-events.c \ - channel-rejoin.c \ - irc.c \ - irc-core.c \ - irc-channels.c \ - irc-channels-setup.c \ - irc-chatnets.c \ - irc-commands.c \ - irc-expandos.c \ - irc-masks.c \ - irc-nicklist.c \ - irc-queries.c \ - irc-servers.c \ - irc-servers-reconnect.c \ - irc-servers-setup.c \ - irc-session.c \ - irc-cap.c \ - sasl.c \ - lag.c \ - massjoin.c \ - modes.c \ - mode-lists.c \ - netsplit.c \ - servers-idle.c \ - servers-redirect.c - -pkginc_irc_coredir=$(pkgincludedir)/src/irc/core -pkginc_irc_core_HEADERS = \ - bans.h \ - ctcp.h \ - channel-events.h \ - channel-rejoin.h \ - irc.h \ - irc-channels.h \ - irc-chatnets.h \ - irc-commands.h \ - irc-masks.h \ - irc-nicklist.h \ - irc-queries.h \ - irc-servers.h \ - irc-servers-setup.h \ - irc-cap.h \ - sasl.h \ - modes.h \ - mode-lists.h \ - module.h \ - netsplit.h \ - servers-idle.h \ - servers-redirect.h - -EXTRA_DIST = meson.build diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c index 8a43d398..5281ac95 100644 --- a/src/irc/core/bans.c +++ b/src/irc/core/bans.c @@ -106,9 +106,8 @@ char *ban_get_masks(IRC_CHANNEL_REC *channel, const char *nicks, int ban_type) if (str->len > 0) g_string_truncate(str, str->len-1); - ret = str->str; - g_string_free(str, FALSE); - return ret; + ret = g_string_free_and_steal(str); + return ret; } void ban_set(IRC_CHANNEL_REC *channel, const char *bans, int ban_type) diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c index ce7e1616..2c2df7f9 100644 --- a/src/irc/core/irc-cap.c +++ b/src/irc/core/irc-cap.c @@ -234,7 +234,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add } } else if (!g_ascii_strcasecmp(evt, "ACK")) { - int got_sasl = FALSE; + int got_sasl = (i_slist_find_string(server->cap_active, "sasl") != NULL); /* Emit a signal for every ack'd cap */ for (i = 0; i < caps_length; i++) { diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c index d1a0f72e..136bff85 100644 --- a/src/irc/core/irc-core.c +++ b/src/irc/core/irc-core.c @@ -77,6 +77,10 @@ static void destroy_server_connect(SERVER_CONNECT_REC *conn) g_free_not_null(ircconn->alternate_nick); g_free_not_null(ircconn->sasl_username); g_free_not_null(ircconn->sasl_password); + + if (ircconn->scram_session != NULL) { + scram_session_free(ircconn->scram_session); + } } void irc_core_init(void) @@ -106,9 +110,6 @@ void irc_core_init(void) (QUERY_REC *(*) (const char *, const char *, int)) irc_query_create; - chat_protocol_register(rec); - g_free(rec); - irc_session_init(); irc_chatnets_init(); irc_servers_init(); @@ -125,6 +126,10 @@ void irc_core_init(void) sasl_init(); settings_check(); + + chat_protocol_register(rec); + g_free(rec); + module_register("irc", "core"); } diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c index c1603a48..2d94a48b 100644 --- a/src/irc/core/irc-servers-setup.c +++ b/src/irc/core/irc-servers-setup.c @@ -128,12 +128,31 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn, conn->sasl_password = g_strdup(ircnet->sasl_password); } else g_warning("The fields sasl_username and sasl_password are either missing or empty"); - } - else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "external")) { + } else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-1") || + !g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-256") || + !g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-512")) { + /* The SCRAM-SHA-* methods need both the username and the password */ + if (ircnet->sasl_username != NULL && *ircnet->sasl_username && + ircnet->sasl_password != NULL && *ircnet->sasl_password) { + if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-1")) + conn->sasl_mechanism = SASL_MECHANISM_SCRAM_SHA_1; + if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-256")) + conn->sasl_mechanism = SASL_MECHANISM_SCRAM_SHA_256; + if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "SCRAM-SHA-512")) + conn->sasl_mechanism = SASL_MECHANISM_SCRAM_SHA_512; + + conn->sasl_username = g_strdup(ircnet->sasl_username); + conn->sasl_password = g_strdup(ircnet->sasl_password); + } else + g_warning("The fields sasl_username and sasl_password are either " + "missing or empty"); + } else if (!g_ascii_strcasecmp(ircnet->sasl_mechanism, "external")) { conn->sasl_mechanism = SASL_MECHANISM_EXTERNAL; + } else { + g_warning("Unsupported SASL mechanism \"%s\" selected", + ircnet->sasl_mechanism); + conn->sasl_mechanism = SASL_MECHANISM_MAX; } - else - g_warning("Unsupported SASL mechanism \"%s\" selected", ircnet->sasl_mechanism); } } diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h index 7b11a2fe..ce5f0868 100644 --- a/src/irc/core/irc-servers-setup.h +++ b/src/irc/core/irc-servers-setup.h @@ -25,7 +25,7 @@ typedef struct { int cmd_queue_speed; int max_query_chans; int starttls; - int no_cap : 1; + unsigned int no_cap : 1; } IRC_SERVER_SETUP_REC; void irc_servers_setup_init(void); diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c index 29f63c21..7e8fdb5a 100644 --- a/src/irc/core/irc-servers.c +++ b/src/irc/core/irc-servers.c @@ -475,6 +475,7 @@ SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn) server->send_message = send_message; server->query_find_func = (QUERY_REC * (*) (SERVER_REC *, const char *) ) irc_query_find; server->nick_comp_func = irc_nickcmp_rfc1459; + server->sasl_success = FALSE; server_connect_init((SERVER_REC *) server); return (SERVER_REC *) server; @@ -873,8 +874,7 @@ char *irc_server_get_channels(IRC_SERVER_REC *server, int rejoin_channels_mode) if (use_keys) g_string_append_printf(chans, " %s", keys->str); } - ret = chans->str; - g_string_free(chans, FALSE); + ret = g_string_free_and_steal(chans); g_string_free(keys, TRUE); return ret; diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h index 6e78c4da..53ff1436 100644 --- a/src/irc/core/irc-servers.h +++ b/src/irc/core/irc-servers.h @@ -4,6 +4,7 @@ #include #include #include +#include /* * 63 is the maximum hostname length defined by the protocol. 10 is a common @@ -42,7 +43,6 @@ #define IS_IRC_SERVER_CONNECT(conn) \ (IRC_SERVER_CONNECT(conn) ? TRUE : FALSE) -/* clang-format off */ /* all strings should be either NULL or dynamically allocated */ /* address and nick are mandatory, rest are optional */ struct _IRC_SERVER_CONNECT_REC { @@ -54,17 +54,17 @@ struct _IRC_SERVER_CONNECT_REC { int sasl_mechanism; char *sasl_username; char *sasl_password; + SCRAM_SESSION_REC *scram_session; int max_cmds_at_once; int cmd_queue_speed; int max_query_chans; int max_kicks, max_msgs, max_modes, max_whois; - int disallow_starttls:1; - int starttls:1; - int no_cap:1; + unsigned int disallow_starttls : 1; + unsigned int starttls : 1; + unsigned int no_cap : 1; }; -/* clang-format on */ #define STRUCT_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC struct _IRC_SERVER_REC { diff --git a/src/irc/core/meson.build b/src/irc/core/meson.build index e6cc89c7..d1b7db78 100644 --- a/src/irc/core/meson.build +++ b/src/irc/core/meson.build @@ -1,6 +1,7 @@ # this file is part of irssi -libirc_core_a = static_library('irc_core', +libirc_core_a = static_library( + 'irc_core', files( 'bans.c', 'channel-events.c', @@ -28,6 +29,7 @@ libirc_core_a = static_library('irc_core', 'modes.c', 'netsplit.c', 'sasl.c', + 'scram.c', 'servers-idle.c', 'servers-redirect.c', ), @@ -37,7 +39,22 @@ libirc_core_a = static_library('irc_core', def_moduledir, def_sysconfdir, ], - dependencies : dep) + dependencies : dep, +) +libirc_core_sm = shared_library( + 'irc_core', + name_suffix : module_suffix, + install : true, + install_dir : moduledir, + link_whole : libirc_core_a, + link_with : dl_cross_irssi_main, + override_options : [ 'b_lundef=false' ], +) + +dl_cross_irc_core = [ ] +if need_dl_cross_link + dl_cross_irc_core += libirc_core_sm +endif install_headers( files( @@ -60,7 +77,9 @@ install_headers( 'module.h', 'netsplit.h', 'sasl.h', + 'scram.h', 'servers-idle.h', 'servers-redirect.h', ), - subdir : incdir / 'src' / 'irc' / 'core') + subdir : incdir / 'src' / 'irc' / 'core', +) diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c index b0de2f18..ff37a1e1 100644 --- a/src/irc/core/modes.c +++ b/src/irc/core/modes.c @@ -21,6 +21,7 @@ #include "module.h" #include #include +#include #include #include @@ -443,8 +444,7 @@ char *modes_join(IRC_SERVER_REC *server, const char *old, } g_free(dup); - modestr = newmode->str; - g_string_free(newmode, FALSE); + modestr = g_string_free_and_steal(newmode); return modestr; } @@ -755,8 +755,7 @@ static char *get_nicks(IRC_SERVER_REC *server, WI_ITEM_REC *item, } if (str->len > 0) g_string_truncate(str, str->len-1); - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); g_strfreev(matches); cmd_params_free(free_arg); diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c index 9bc40ff2..89ca4a9e 100644 --- a/src/irc/core/sasl.c +++ b/src/irc/core/sasl.c @@ -80,6 +80,24 @@ static void sasl_start(IRC_SERVER_REC *server, const char *data, const char *fro case SASL_MECHANISM_EXTERNAL: irc_send_cmd_now(server, "AUTHENTICATE EXTERNAL"); break; + + case SASL_MECHANISM_SCRAM_SHA_1: + irc_send_cmd_now(server, "AUTHENTICATE SCRAM-SHA-1"); + break; + + case SASL_MECHANISM_SCRAM_SHA_256: + irc_send_cmd_now(server, "AUTHENTICATE SCRAM-SHA-256"); + break; + + case SASL_MECHANISM_SCRAM_SHA_512: + irc_send_cmd_now(server, "AUTHENTICATE SCRAM-SHA-512"); + break; + + case SASL_MECHANISM_MAX: + signal_emit("server sasl failure", 2, server, + "Irssi: Unsupported SASL mechanism"); + irc_cap_finish_negotiation(server); + return; } server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server); } @@ -223,6 +241,54 @@ void sasl_send_response(IRC_SERVER_REC *server, GString *response) g_free(enc); } +/* + * Sends AUTHENTICATE messages to log in via SCRAM. + */ +static void scram_authenticate(IRC_SERVER_REC *server, const char *data, const char *digest) +{ + char *output; + int ret; + size_t output_len; + IRC_SERVER_CONNECT_REC *conn = server->connrec; + + if (conn->scram_session == NULL) { + conn->scram_session = + scram_session_create(digest, conn->sasl_username, conn->sasl_password); + + if (conn->scram_session == NULL) { + g_critical("Could not create SCRAM session with digest %s", digest); + irc_send_cmd_now(server, "AUTHENTICATE *"); + return; + } + } + + ret = scram_process(conn->scram_session, data, &output, &output_len); + + if (ret == SCRAM_IN_PROGRESS) { + // Authentication is still in progress + GString *resp = g_string_new_len(output, output_len); + sasl_send_response(server, resp); + g_string_free(resp, TRUE); + g_free(output); + } else if (ret == SCRAM_SUCCESS) { + // Authentication succeeded + sasl_send_response(server, NULL); + scram_session_free(conn->scram_session); + conn->scram_session = NULL; + } else if (ret == SCRAM_ERROR) { + // Authentication failed + irc_send_cmd_now(server, "AUTHENTICATE *"); + + if (conn->scram_session->error != NULL) { + g_warning("SASL SCRAM authentication failed: %s", + conn->scram_session->error); + } + + scram_session_free(conn->scram_session); + conn->scram_session = NULL; + } +} + /* * Called when the incoming SASL request is completely received. */ @@ -258,6 +324,18 @@ static void sasl_step_complete(IRC_SERVER_REC *server, GString *data) /* Empty response */ sasl_send_response(server, NULL); break; + + case SASL_MECHANISM_SCRAM_SHA_1: + scram_authenticate(server, data->str, "SHA1"); + break; + + case SASL_MECHANISM_SCRAM_SHA_256: + scram_authenticate(server, data->str, "SHA256"); + break; + + case SASL_MECHANISM_SCRAM_SHA_512: + scram_authenticate(server, data->str, "SHA512"); + break; } } diff --git a/src/irc/core/sasl.h b/src/irc/core/sasl.h index 04d0cd9d..67c8567b 100644 --- a/src/irc/core/sasl.h +++ b/src/irc/core/sasl.h @@ -25,6 +25,9 @@ enum { SASL_MECHANISM_NONE = 0, SASL_MECHANISM_PLAIN, SASL_MECHANISM_EXTERNAL, + SASL_MECHANISM_SCRAM_SHA_1, + SASL_MECHANISM_SCRAM_SHA_256, + SASL_MECHANISM_SCRAM_SHA_512, SASL_MECHANISM_MAX }; diff --git a/src/irc/core/scram.c b/src/irc/core/scram.c new file mode 100644 index 00000000..4c950140 --- /dev/null +++ b/src/irc/core/scram.c @@ -0,0 +1,304 @@ +/* + scram.c : irssi + + Copyright (C) 2023 Patrick Okraku + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include "module.h" +#include +#include +#include + +#define NONCE_LENGTH 18 +#define CLIENT_KEY "Client Key" +#define SERVER_KEY "Server Key" + +// EVP_MD_CTX_create() and EVP_MD_CTX_destroy() were renamed in OpenSSL 1.1.0 +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) +#define EVP_MD_CTX_new(ctx) EVP_MD_CTX_create(ctx) +#define EVP_MD_CTX_free(ctx) EVP_MD_CTX_destroy(ctx) +#endif + +SCRAM_SESSION_REC *scram_session_create(const char *digest, const char *username, + const char *password) +{ + SCRAM_SESSION_REC *session; + const EVP_MD *md; +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) + OpenSSL_add_all_algorithms(); +#endif + md = EVP_get_digestbyname(digest); + + if (md == NULL) { + // Unknown message digest + return NULL; + } + + session = g_new0(SCRAM_SESSION_REC, 1); + session->digest = md; + session->digest_size = EVP_MD_size(md); + session->username = g_strdup(username); + session->password = g_strdup(password); + return session; +} + +void scram_session_free(SCRAM_SESSION_REC *session) +{ + if (session == NULL) { + return; + } + + g_free(session->username); + g_free(session->password); + g_free(session->client_nonce_b64); + g_free(session->client_first_message_bare); + g_free(session->salted_password); + g_free(session->auth_message); + g_free(session->error); + + g_free(session); +} + +static int create_nonce(void *buffer, size_t length) +{ + return RAND_bytes(buffer, length); +} + +static int create_SHA(SCRAM_SESSION_REC *session, const unsigned char *input, size_t input_len, + unsigned char *output, unsigned int *output_len) +{ + EVP_MD_CTX *md_ctx = EVP_MD_CTX_new(); + + if (!EVP_DigestInit_ex(md_ctx, session->digest, NULL)) { + session->error = g_strdup("Message digest initialization failed"); + EVP_MD_CTX_free(md_ctx); + return SCRAM_ERROR; + } + + if (!EVP_DigestUpdate(md_ctx, input, input_len)) { + session->error = g_strdup("Message digest update failed"); + EVP_MD_CTX_free(md_ctx); + return SCRAM_ERROR; + } + + if (!EVP_DigestFinal_ex(md_ctx, output, output_len)) { + session->error = g_strdup("Message digest finalization failed"); + EVP_MD_CTX_free(md_ctx); + return SCRAM_ERROR; + } + + EVP_MD_CTX_free(md_ctx); + return SCRAM_IN_PROGRESS; +} + +static scram_status process_client_first(SCRAM_SESSION_REC *session, char **output, + size_t *output_len) +{ + char nonce[NONCE_LENGTH]; + + if (!create_nonce(nonce, NONCE_LENGTH)) { + session->error = g_strdup("Could not create client nonce"); + return SCRAM_ERROR; + } + + session->client_nonce_b64 = g_base64_encode((guchar *) nonce, NONCE_LENGTH); + *output = g_strdup_printf("n,,n=%s,r=%s", session->username, session->client_nonce_b64); + *output_len = strlen(*output); + session->client_first_message_bare = g_strdup(*output + 3); + session->step++; + return SCRAM_IN_PROGRESS; +} + +static scram_status process_server_first(SCRAM_SESSION_REC *session, const char *data, + char **output, size_t *output_len) +{ + char **params, *client_final_message_without_proof, *salt, *server_nonce_b64, + *client_proof_b64; + unsigned char *client_key, stored_key[EVP_MAX_MD_SIZE], *client_signature, *client_proof; + unsigned int i, param_count, iteration_count, client_key_len, stored_key_len; + gsize salt_len = 0; + size_t client_nonce_len; + + params = g_strsplit(data, ",", -1); + param_count = g_strv_length(params); + + if (param_count < 3) { + /* Invalid server-first-message */ + session->error = g_strdup_printf("%s", data); + g_strfreev(params); + return SCRAM_ERROR; + } + + server_nonce_b64 = NULL; + salt = NULL; + iteration_count = 0; + + for (i = 0; i < param_count; i++) { + if (!strncmp(params[i], "r=", 2)) { + g_free(server_nonce_b64); + server_nonce_b64 = g_strdup(params[i] + 2); + } else if (!strncmp(params[i], "s=", 2)) { + g_free(salt); + salt = g_strdup(params[i] + 2); + } else if (!strncmp(params[i], "i=", 2)) { + iteration_count = strtoul(params[i] + 2, NULL, 10); + } + } + + g_strfreev(params); + + if (server_nonce_b64 == NULL || *server_nonce_b64 == '\0' || salt == NULL || + *salt == '\0' || iteration_count == 0) { + session->error = g_strdup_printf("Invalid server-first-message: %s", data); + g_free(server_nonce_b64); + g_free(salt); + return SCRAM_ERROR; + } + + client_nonce_len = strlen(session->client_nonce_b64); + + // The server can append his nonce to the client's nonce + if (strlen(server_nonce_b64) < client_nonce_len || + strncmp(server_nonce_b64, session->client_nonce_b64, client_nonce_len)) { + session->error = g_strdup_printf("Invalid server nonce: %s", server_nonce_b64); + return SCRAM_ERROR; + } + + g_base64_decode_inplace((gchar *) salt, &salt_len); + + // SaltedPassword := Hi(Normalize(password), salt, i) + session->salted_password = g_malloc(session->digest_size); + + PKCS5_PBKDF2_HMAC(session->password, strlen(session->password), (unsigned char *) salt, + salt_len, iteration_count, session->digest, session->digest_size, + session->salted_password); + + // AuthMessage := client-first-message-bare + "," + + // server-first-message + "," + + // client-final-message-without-proof + client_final_message_without_proof = g_strdup_printf("c=biws,r=%s", server_nonce_b64); + + session->auth_message = g_strdup_printf("%s,%s,%s", session->client_first_message_bare, + data, client_final_message_without_proof); + + // ClientKey := HMAC(SaltedPassword, "Client Key") + client_key = g_malloc0(session->digest_size); + + HMAC(session->digest, session->salted_password, session->digest_size, + (unsigned char *) CLIENT_KEY, strlen(CLIENT_KEY), client_key, &client_key_len); + + // StoredKey := H(ClientKey) + if (!create_SHA(session, client_key, session->digest_size, stored_key, &stored_key_len)) { + g_free(client_final_message_without_proof); + g_free(server_nonce_b64); + g_free(salt); + g_free(client_key); + return SCRAM_ERROR; + } + + // ClientSignature := HMAC(StoredKey, AuthMessage) + client_signature = g_malloc0(session->digest_size); + HMAC(session->digest, stored_key, stored_key_len, (unsigned char *) session->auth_message, + strlen((char *) session->auth_message), client_signature, NULL); + + // ClientProof := ClientKey XOR ClientSignature + client_proof = g_malloc0(client_key_len); + + for (i = 0; i < client_key_len; i++) { + client_proof[i] = client_key[i] ^ client_signature[i]; + } + + client_proof_b64 = g_base64_encode((guchar *) client_proof, client_key_len); + + *output = g_strdup_printf("%s,p=%s", client_final_message_without_proof, client_proof_b64); + *output_len = strlen(*output); + + g_free(server_nonce_b64); + g_free(salt); + g_free(client_final_message_without_proof); + g_free(client_key); + g_free(client_signature); + g_free(client_proof); + g_free(client_proof_b64); + + session->step++; + return SCRAM_IN_PROGRESS; +} + +static scram_status process_server_final(SCRAM_SESSION_REC *session, const char *data) +{ + char *verifier; + unsigned char *server_key, *server_signature; + unsigned int server_key_len = 0, server_signature_len = 0; + gsize verifier_len = 0; + + if (strlen(data) < 3 || (data[0] != 'v' && data[1] != '=')) { + return SCRAM_ERROR; + } + + verifier = g_strdup(data + 2); + g_base64_decode_inplace(verifier, &verifier_len); + + // ServerKey := HMAC(SaltedPassword, "Server Key") + server_key = g_malloc0(session->digest_size); + HMAC(session->digest, session->salted_password, session->digest_size, + (unsigned char *) SERVER_KEY, strlen(SERVER_KEY), server_key, &server_key_len); + + // ServerSignature := HMAC(ServerKey, AuthMessage) + server_signature = g_malloc0(session->digest_size); + HMAC(session->digest, server_key, session->digest_size, + (unsigned char *) session->auth_message, strlen((char *) session->auth_message), + server_signature, &server_signature_len); + + if (verifier_len == server_signature_len && + memcmp(verifier, server_signature, verifier_len) == 0) { + g_free(verifier); + g_free(server_key); + g_free(server_signature); + return SCRAM_SUCCESS; + } else { + g_free(verifier); + g_free(server_key); + g_free(server_signature); + return SCRAM_ERROR; + } +} + +scram_status scram_process(SCRAM_SESSION_REC *session, const char *input, char **output, + size_t *output_len) +{ + scram_status status; + + switch (session->step) { + case 0: + status = process_client_first(session, output, output_len); + break; + case 1: + status = process_server_first(session, input, output, output_len); + break; + case 2: + status = process_server_final(session, input); + break; + default: + *output = NULL; + *output_len = 0; + status = SCRAM_ERROR; + break; + } + + return status; +} diff --git a/src/irc/core/scram.h b/src/irc/core/scram.h new file mode 100644 index 00000000..14068e48 --- /dev/null +++ b/src/irc/core/scram.h @@ -0,0 +1,27 @@ +#ifndef IRSSI_IRC_CORE_SCRAM_H +#define IRSSI_IRC_CORE_SCRAM_H + +#include + +typedef struct { + const EVP_MD *digest; + size_t digest_size; + char *username; + char *password; + char *client_nonce_b64; + char *client_first_message_bare; + unsigned char *salted_password; + char *auth_message; + char *error; + int step; +} SCRAM_SESSION_REC; + +typedef enum { SCRAM_ERROR = 0, SCRAM_IN_PROGRESS, SCRAM_SUCCESS } scram_status; + +SCRAM_SESSION_REC *scram_session_create(const char *digset, const char *username, + const char *password); +void scram_session_free(SCRAM_SESSION_REC *session); +scram_status scram_process(SCRAM_SESSION_REC *session, const char *input, char **output, + size_t *output_len); + +#endif diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am deleted file mode 100644 index c5592f7f..00000000 --- a/src/irc/dcc/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -noinst_LIBRARIES = libirc_dcc.a - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -libirc_dcc_a_SOURCES = \ - dcc.c \ - dcc-chat.c \ - dcc-get.c \ - dcc-send.c \ - dcc-resume.c \ - dcc-autoget.c \ - dcc-queue.c \ - dcc-server.c - -pkginc_irc_dccdir=$(pkgincludedir)/src/irc/dcc -pkginc_irc_dcc_HEADERS = \ - dcc-rec.h \ - dcc-file-rec.h \ - dcc.h \ - dcc-file.h \ - dcc-chat.h \ - dcc-get.h \ - dcc-send.h \ - dcc-queue.h \ - module.h \ - dcc-server.h - -EXTRA_DIST = meson.build diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c index 0214387b..cc1c9e43 100644 --- a/src/irc/dcc/dcc-get.c +++ b/src/irc/dcc/dcc-get.c @@ -88,8 +88,7 @@ static char *dcc_get_rename_file(const char *fname) num++; } while (stat(newname->str, &statbuf) == 0); - ret = newname->str; - g_string_free(newname, FALSE); + ret = g_string_free_and_steal(newname); return ret; } @@ -416,8 +415,7 @@ char *get_file_name(char **params, int fileparams) out = g_string_append(out, params[pos]); } - ret = out->str; - g_string_free(out, FALSE); + ret = g_string_free_and_steal(out); return ret; } diff --git a/src/irc/dcc/dcc-queue.h b/src/irc/dcc/dcc-queue.h index 1ab4ecbf..08dcee38 100644 --- a/src/irc/dcc/dcc-queue.h +++ b/src/irc/dcc/dcc-queue.h @@ -1,5 +1,5 @@ -#ifndef IRSSI_IRC_DCC_DCC_QUEUE_H_ -#define IRSSI_IRC_DCC_DCC_QUEUE_H_ +#ifndef IRSSI_IRC_DCC_DCC_QUEUE_H +#define IRSSI_IRC_DCC_DCC_QUEUE_H #include diff --git a/src/irc/dcc/meson.build b/src/irc/dcc/meson.build index 0c3d706a..c09f07b2 100644 --- a/src/irc/dcc/meson.build +++ b/src/irc/dcc/meson.build @@ -1,6 +1,7 @@ # this file is part of irssi -libirc_dcc_a = static_library('irc_dcc', +libirc_dcc_sm = shared_library( + 'irc_dcc', files( 'dcc-autoget.c', 'dcc-chat.c', @@ -13,7 +14,18 @@ libirc_dcc_a = static_library('irc_dcc', ), include_directories : rootinc, implicit_include_directories : false, - dependencies : dep) + name_suffix : module_suffix, + install : true, + install_dir : moduledir, + link_with : dl_cross_irc_core + dl_cross_irssi_main, + dependencies : dep, + override_options : [ 'b_lundef=false' ], +) + +dl_cross_irc_dcc = [ ] +if need_dl_cross_link + dl_cross_irc_dcc += libirc_dcc_sm +endif install_headers( files( @@ -28,4 +40,5 @@ install_headers( 'dcc.h', 'module.h', ), - subdir : incdir / 'src' / 'irc' / 'dcc') + subdir : incdir / 'src' / 'irc' / 'dcc', +) diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am deleted file mode 100644 index 4b37cede..00000000 --- a/src/irc/flood/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -noinst_LIBRARIES = libirc_flood.a - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -libirc_flood_a_SOURCES = \ - autoignore.c \ - flood.c - -pkginc_irc_flooddir=$(pkgincludedir)/src/irc/flood -pkginc_irc_flood_HEADERS = \ - module.h - -EXTRA_DIST = meson.build diff --git a/src/irc/flood/meson.build b/src/irc/flood/meson.build index 75107db1..9df0ef84 100644 --- a/src/irc/flood/meson.build +++ b/src/irc/flood/meson.build @@ -1,14 +1,26 @@ # this file is part of irssi -libirc_flood_a = static_library('irc_flood', +libirc_flood_a = static_library( + 'irc_flood', files( 'autoignore.c', 'flood.c', ), include_directories : rootinc, implicit_include_directories : false, - dependencies : dep) + dependencies : dep, +) +shared_library( + 'irc_flood', + name_suffix : module_suffix, + install : true, + install_dir : moduledir, + link_with : dl_cross_irc_core + dl_cross_irssi_main, + link_whole : libirc_flood_a, + override_options : [ 'b_lundef=false' ], +) install_headers( files('module.h'), - subdir : incdir / 'src' / 'irc' / 'flood') + subdir : incdir / 'src' / 'irc' / 'flood', +) diff --git a/src/irc/irc.c b/src/irc/irc.c deleted file mode 100644 index 250a6fb4..00000000 --- a/src/irc/irc.c +++ /dev/null @@ -1,5 +0,0 @@ -void irc_core_init(void); void irc_core_deinit(void); -void irc_dcc_init(void);void irc_flood_init(void);void irc_notifylist_init(void); -void irc_notifylist_deinit(void);void irc_flood_deinit(void);void irc_dcc_deinit(void); -void irc_init(void) { irc_core_init(); irc_dcc_init(); irc_flood_init(); irc_notifylist_init(); } -void irc_deinit(void) { irc_notifylist_deinit(); irc_flood_deinit(); irc_dcc_deinit(); irc_core_deinit(); } diff --git a/src/irc/meson.build b/src/irc/meson.build index 72abc3ce..13bfc493 100644 --- a/src/irc/meson.build +++ b/src/irc/meson.build @@ -5,20 +5,6 @@ subdir('dcc') subdir('flood') subdir('notifylist') -libirc_a = static_library('irc', - files( - 'irc.c', - ), - link_with : [ - libirc_core_a, - libirc_dcc_a, - libirc_flood_a, - libirc_notifylist_a, - ], - include_directories : rootinc, - implicit_include_directories : false, -) - if want_proxy subdir('proxy') endif diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am deleted file mode 100644 index 3f913d58..00000000 --- a/src/irc/notifylist/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -noinst_LIBRARIES = libirc_notifylist.a - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -libirc_notifylist_a_SOURCES = \ - notifylist.c \ - notify-commands.c \ - notify-ison.c \ - notify-setup.c \ - notify-whois.c - -pkginc_irc_notifylistdir=$(pkgincludedir)/src/irc/notifylist -pkginc_irc_notifylist_HEADERS = \ - notifylist.h \ - notify-setup.h \ - module.h - -EXTRA_DIST = meson.build diff --git a/src/irc/notifylist/meson.build b/src/irc/notifylist/meson.build index f00ea321..75f92810 100644 --- a/src/irc/notifylist/meson.build +++ b/src/irc/notifylist/meson.build @@ -1,6 +1,7 @@ # this file is part of irssi -libirc_notifylist_a = static_library('irc_notifylist', +libirc_notifylist_sm = shared_library( + 'irc_notifylist', files( 'notify-commands.c', 'notify-ison.c', @@ -10,7 +11,18 @@ libirc_notifylist_a = static_library('irc_notifylist', ), include_directories : rootinc, implicit_include_directories : false, - dependencies : dep) + name_suffix : module_suffix, + install : true, + install_dir : moduledir, + link_with : dl_cross_irc_core + dl_cross_irssi_main, + dependencies : dep, + override_options : [ 'b_lundef=false' ], +) + +dl_cross_irc_notifylist = [ ] +if need_dl_cross_link + dl_cross_irc_notifylist += libirc_notifylist_sm +endif install_headers( files( @@ -18,4 +30,5 @@ install_headers( 'notify-setup.h', 'notifylist.h', ), - subdir : incdir / 'src' / 'irc' / 'notifylist') + subdir : incdir / 'src' / 'irc' / 'notifylist', +) diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am deleted file mode 100644 index 437a6dc0..00000000 --- a/src/irc/proxy/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -moduledir = $(libdir)/irssi/modules -module_LTLIBRARIES = libirc_proxy.la - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -libirc_proxy.a: - rm -f libirc_proxy.a - $(LN_S) .libs/libirc_proxy.a libirc_proxy.a - -libirc_proxy_la_LDFLAGS = -module -avoid-version - -libirc_proxy_la_DEPENDENCIES = libirc_proxy.a - -libirc_proxy_la_SOURCES = \ - proxy.c \ - dump.c \ - listen.c - -noinst_HEADERS = \ - module.h \ - proxy.h - -clean-generic: - rm -f libirc_proxy.a - -EXTRA_DIST = meson.build diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c index 19aba87d..1fed639e 100644 --- a/src/irc/proxy/listen.c +++ b/src/irc/proxy/listen.c @@ -711,16 +711,19 @@ static void add_listen(const char *ircnet, int port, const char *port_or_path) /* bind to specific host/ip? */ my_ip = NULL; if (*settings_get_str("irssiproxy_bind") != '\0') { - if (net_gethostbyname(settings_get_str("irssiproxy_bind"), - &ip4, &ip6) != 0) { + if (net_gethostbyname_first_ips(settings_get_str("irssiproxy_bind"), + G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT, &ip4, + &ip6) != 0) { printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "Proxy: can not resolve '%s' - aborting", settings_get_str("irssiproxy_bind")); return; } - my_ip = ip6.family == 0 ? &ip4 : ip4.family == 0 || - settings_get_bool("resolve_prefer_ipv6") ? &ip6 : &ip4; + my_ip = ip6.family == 0 ? &ip4 : + ip4.family == 0 || settings_get_bool("irssiproxy_prefer_ipv6") ? + &ip6 : + &ip4; } handle = net_listen(my_ip, &port); } diff --git a/src/irc/proxy/meson.build b/src/irc/proxy/meson.build index 30ac90a4..4d5ed554 100644 --- a/src/irc/proxy/meson.build +++ b/src/irc/proxy/meson.build @@ -1,6 +1,7 @@ # this file is part of irssi -shared_module('irc_proxy', +shared_library( + 'irc_proxy', files( 'dump.c', 'listen.c', @@ -13,6 +14,7 @@ shared_module('irc_proxy', install : true, install_dir : moduledir, dependencies : dep, + override_options : [ 'b_lundef=false' ], ) # noinst_headers = files( diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c index d32b6009..240df971 100644 --- a/src/irc/proxy/proxy.c +++ b/src/irc/proxy/proxy.c @@ -74,6 +74,7 @@ static void irc_proxy_setup_changed(void) void irc_proxy_init(void) { + settings_add_bool("irssiproxy", "irssiproxy_prefer_ipv6", TRUE); settings_add_str("irssiproxy", "irssiproxy_ports", ""); settings_add_str("irssiproxy", "irssiproxy_password", ""); settings_add_str("irssiproxy", "irssiproxy_bind", ""); diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am deleted file mode 100644 index cd319edb..00000000 --- a/src/lib-config/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -noinst_LIBRARIES = libirssi_config.a - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -libirssi_config_a_SOURCES = \ - get.c \ - set.c \ - parse.c \ - write.c - -pkginc_lib_configdir=$(pkgincludedir)/src/lib-config -pkginc_lib_config_HEADERS = \ - iconfig.h \ - module.h - -EXTRA_DIST = meson.build diff --git a/src/lib-config/iconfig.h b/src/lib-config/iconfig.h index 92662d8d..bb1e7f47 100644 --- a/src/lib-config/iconfig.h +++ b/src/lib-config/iconfig.h @@ -62,6 +62,8 @@ struct _CONFIG_REC { GIOChannel *handle; int tmp_indent_level; /* indentation position */ int tmp_last_lf; /* last character was a line feed */ + + int list_of_lists : 1; /* list of lists allowed */ }; /* Open configuration. The file is created if it doesn't exist, unless diff --git a/src/lib-config/meson.build b/src/lib-config/meson.build index 2bc094dd..c4818dcd 100644 --- a/src/lib-config/meson.build +++ b/src/lib-config/meson.build @@ -1,6 +1,7 @@ # this file is part of irssi -libconfig_a = static_library('irssi_config', +libconfig_a = static_library( + 'irssi_config', files( 'get.c', 'parse.c', @@ -9,11 +10,13 @@ libconfig_a = static_library('irssi_config', ), include_directories : rootinc, implicit_include_directories : false, - dependencies : dep) + dependencies : dep, +) install_headers( files( 'iconfig.h', 'module.h', ), - subdir : incdir / 'src' / 'lib-config') + subdir : incdir / 'src' / 'lib-config', +) diff --git a/src/lib-config/parse.c b/src/lib-config/parse.c index e4ff1abb..91a78781 100644 --- a/src/lib-config/parse.c +++ b/src/lib-config/parse.c @@ -170,8 +170,10 @@ static GTokenType config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node) case '{': /* block */ - if (key == NULL && node->type != NODE_TYPE_LIST) + if (key == NULL && node->type != NODE_TYPE_LIST) { + g_scanner_error(rec->scanner, "Missing key"); return G_TOKEN_ERROR; + } newnode = config_node_section(rec, node, key, NODE_TYPE_BLOCK); config_parse_loop(rec, newnode, (GTokenType) '}'); @@ -186,8 +188,11 @@ static GTokenType config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node) case '(': /* list */ - if (key == NULL) + if (key == NULL && !rec->list_of_lists) { + g_scanner_error(rec->scanner, "List of lists not allowed"); return G_TOKEN_ERROR; + } + newnode = config_node_section(rec, node, key, NODE_TYPE_LIST); config_parse_loop(rec, newnode, (GTokenType) ')'); g_free_not_null(key); diff --git a/src/lib-config/write.c b/src/lib-config/write.c index b7c6edb5..168b4e40 100644 --- a/src/lib-config/write.c +++ b/src/lib-config/write.c @@ -26,6 +26,15 @@ #define CONFIG_INDENT_SIZE 2 static const char *indent_block = " "; /* needs to be the same size as CONFIG_INDENT_SIZE! */ +#if GLIB_CHECK_VERSION(2, 76, 0) +/* nothing */ +#else +static gchar *g_string_free_and_steal(GString *string) +{ + return g_string_free(string, FALSE); +} +#endif + /* write needed amount of indentation to the start of the line */ static int config_write_indent(CONFIG_REC *rec) { @@ -108,8 +117,7 @@ static char *config_escape_string(const char *text) g_string_append_c(str, '"'); - ret = str->str; - g_string_free(str, FALSE); + ret = g_string_free_and_steal(str); return ret; } diff --git a/src/meson.build b/src/meson.build index dee8dc3c..b1663d18 100644 --- a/src/meson.build +++ b/src/meson.build @@ -2,28 +2,28 @@ subdir('lib-config') subdir('core') -foreach s : chat_modules - subdir(s) -endforeach -subdir('fe-common') -if have_perl - subdir('perl') -endif -if have_otr - subdir('otr') -endif +subdir('fe-common' / 'core') if want_bot subdir('fe-none') endif if want_textui subdir('fe-text') endif +foreach s : chat_modules + subdir(s) + subdir('fe-common' / s) +endforeach +if have_perl + subdir('perl') +endif +if have_otr + subdir('otr') +endif if want_fuzzer subdir('fe-fuzz') endif install_headers( - files( - 'common.h' - ), - subdir : incdir / 'src') + files('common.h'), + subdir : incdir / 'src', +) diff --git a/src/otr/Makefile.am b/src/otr/Makefile.am deleted file mode 100644 index b9b82d9a..00000000 --- a/src/otr/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -moduledir = $(libdir)/irssi/modules - -module_LTLIBRARIES = $(otr_module_lib) -noinst_LTLIBRARIES = $(otr_static_lib) - -EXTRA_LTLIBRARIES = \ - libotr_core.la \ - libotr_core_static.la - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) \ - $(OTR_CFLAGS) - -libotr_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir) -libotr_core_la_LIBADD = $(OTR_LDFLAGS) - -otr_sources = \ - key.c \ - otr-module.c \ - otr-formats.c \ - otr-ops.c \ - otr-fe.c \ - otr.c - -libotr_core_la_SOURCES = \ - $(otr_sources) - -libotr_core_static_la_SOURCES = \ - $(otr_sources) - -noinst_HEADERS = \ - irssi-otr.h \ - key.h \ - module.h \ - otr-formats.h \ - otr-fe.h \ - otr.h - -EXTRA_DIST = meson.build diff --git a/src/otr/meson.build b/src/otr/meson.build index 5b7d256f..9611b428 100644 --- a/src/otr/meson.build +++ b/src/otr/meson.build @@ -1,6 +1,7 @@ # this file is part of irssi -shared_module('otr_core', +shared_library( + 'otr_core', files( 'key.c', 'otr-fe.c', @@ -15,6 +16,7 @@ shared_module('otr_core', install : true, install_dir : moduledir, dependencies : dep, + override_options : [ 'b_lundef=false' ], ) # noinst_headers = files( diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am deleted file mode 100644 index ca81d3c6..00000000 --- a/src/perl/Makefile.am +++ /dev/null @@ -1,170 +0,0 @@ -moduledir = $(libdir)/irssi/modules - -perl_dirs = common irc ui textui - -module_LTLIBRARIES = $(perl_module_lib) $(perl_module_fe_lib) -noinst_LTLIBRARIES = $(perl_static_lib) $(perl_static_fe_lib) -EXTRA_LTLIBRARIES = \ - libperl_core.la libfe_perl.la \ - libperl_core_static.la libfe_perl_static.la - -libperl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir) -libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir) - -perl-core.lo: irssi-core.pl.h -perl-signals.lo: perl-signals-list.h - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(builddir) \ - $(GLIB_CFLAGS) \ - -DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" \ - -DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \ - -DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \ - $(PERL_CFLAGS) - -perl_sources = \ - perl-core.c \ - perl-common.c \ - perl-signals.c \ - perl-sources.c - -perl_fe_sources = \ - module-formats.c \ - perl-fe.c - -noinst_HEADERS = \ - module.h \ - module-fe.h \ - module-formats.h \ - perl-core.h \ - perl-common.h \ - perl-signals.h \ - perl-sources.h - -libperl_core_la_SOURCES = \ - $(perl_sources) - -libperl_core_static_la_SOURCES = \ - $(perl_sources) - -libfe_perl_la_SOURCES = \ - $(perl_fe_sources) - -libfe_perl_static_la_SOURCES = \ - $(perl_fe_sources) - -perl-signals-list.h: $(top_srcdir)/docs/signals.txt $(srcdir)/get-signals.pl - cat $(top_srcdir)/docs/signals.txt | $(perlpath) $(srcdir)/get-signals.pl > perl-signals-list.h - -irssi-core.pl.h: irssi-core.pl - $(top_srcdir)/utils/file2header.sh $(srcdir)/irssi-core.pl irssi_core_code > irssi-core.pl.h - -common_sources = \ - common/Irssi.xs \ - common/Irssi.pm \ - common/Channel.xs \ - common/Core.xs \ - common/Expando.xs \ - common/Ignore.xs \ - common/Log.xs \ - common/Masks.xs \ - common/Query.xs \ - common/Rawlog.xs \ - common/Server.xs \ - common/Settings.xs \ - common/Makefile.PL.in \ - common/typemap \ - common/module.h - -irc_sources = \ - irc/Irc.xs \ - irc/Irc.pm \ - irc/Dcc.xs \ - irc/Channel.xs \ - irc/Ctcp.xs \ - irc/Query.xs \ - irc/Server.xs \ - irc/Modes.xs \ - irc/Netsplit.xs \ - irc/Notifylist.xs \ - irc/Client.xs \ - irc/Makefile.PL.in \ - irc/typemap \ - irc/module.h - -ui_sources = \ - ui/UI.xs \ - ui/UI.pm \ - ui/Formats.xs \ - ui/Themes.xs \ - ui/Window.xs \ - ui/Makefile.PL.in \ - ui/typemap \ - ui/module.h - -textui_sources = \ - textui/TextUI.xs \ - textui/TextUI.pm \ - textui/TextBuffer.xs \ - textui/TextBufferView.xs \ - textui/Statusbar.xs \ - textui/Makefile.PL.in \ - textui/wrapper_buffer_line.h \ - textui/typemap \ - textui/module.h - -EXTRA_DIST = \ - get-signals.pl \ - irssi-core.pl \ - Makefile_silent.pm \ - $(common_sources) \ - $(irc_sources) \ - $(ui_sources) \ - $(textui_sources) \ - meson.build \ - common/meson.build \ - irc/meson.build \ - ui/meson.build \ - textui/meson.build - -am_v_pl__show_gen = $(am__v_pl__show_gen_$(V)) -am_v_pl__hide_gen = $(am__v_pl__hide_gen_$(V)) -am__v_pl__show_gen_ = $(am__v_pl__show_gen_$(AM_DEFAULT_VERBOSITY)) -am__v_pl__hide_gen_ = $(am__v_pl__hide_gen_$(AM_DEFAULT_VERBOSITY)) -am__v_pl__show_gen_0 = echo " GEN " $$dir ; -am__v_pl__hide_gen_0 = > /dev/null -am__v_pl__show_gen_1 = -am__v_pl__hide_gen_1 = - -all-local: - $(AM_V_GEN)for dir in $(perl_dirs); do \ - cd $$dir && \ - if [ ! -f Makefile ]; then \ - $(am_v_pl__show_gen)$(perlpath) Makefile.PL $(PERL_MM_PARAMS) $(am_v_pl__hide_gen); \ - fi && \ - ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \ - $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \ - cd ..; \ - done - -install-exec-local: - for dir in $(perl_dirs); do \ - cd $$dir && $(MAKE) install && cd ..; \ - done - -clean-generic: - for dir in $(perl_dirs); do \ - cd $$dir; \ - $(MAKE) clean; \ - cd ..; \ - done - -distclean-generic: - for dir in $(perl_dirs); do \ - cd $$dir; \ - $(MAKE) realclean; rm -f Makefile.PL Makefile; \ - cd ..; \ - done - -libperl_core_la_LIBADD = $(PERL_LDFLAGS) diff --git a/src/perl/Makefile_silent.pm b/src/perl/Makefile_silent.pm deleted file mode 100644 index b5d71d66..00000000 --- a/src/perl/Makefile_silent.pm +++ /dev/null @@ -1,76 +0,0 @@ -push @ExtUtils::MakeMaker::Overridable, qw(pm_to_blib); -my $verb = $AM_DEFAULT_VERBOSITY; -{ package MY; - sub _center { - my $z = shift; - (length $z == 2 ? " $z " : length $z == 4 ? " $z " : " $z ").' ' - } - sub _silent_cmd { - my $z = shift; - $z =~ s{\t(?:- ?)?\K(?=\$\((?|(CC)CMD|(XS)UBPPRUN|(LD|MV|CHMOD)|(RM)_R?F|(CP)_NONEMPTY|FULL_(AR)\)))}{\$(PL_AM_V_$1)}g; - $z - } - sub c_o { _silent_cmd(shift->SUPER::c_o(@_)) } - sub xs_c { _silent_cmd(shift->SUPER::xs_c(@_)) } - sub xs_o { _silent_cmd(shift->SUPER::xs_o(@_)) } - sub dynamic_lib { _silent_cmd(shift->SUPER::dynamic_lib(@_)) } - sub static_lib { _silent_cmd(shift->SUPER::static_lib(@_)) } - sub dynamic_bs { - my $ret = shift->SUPER::dynamic_bs(@_); - $ret =~ s{Running Mkbootstrap for}{\$(PL_AM_V_BS_Text)}g; - _silent_cmd($ret) - } - sub pm_to_blib { - my $ret = shift->SUPER::pm_to_blib(@_); - $ret =~ s{^(\t(?:- ?)?)(?:\$\(NOECHO\) ?)?(.*-e ['"]pm_to_blib(.*\\\n)*.*)$}{$1\$(PL_AM_V_BLIB)$2\$(PL_AM_V_BLIB_Hide)}mg; - $ret - } - sub post_constants { - my $ret = shift->SUPER::post_constants(@_); - my @terse = qw(cc xs ld chmod cp ar blib); - my @silent = qw(mv rm); - my @special = qw(BLIB_Hide); - - #default verbosity from command line parameter - $ret .= " -AM_DEFAULT_VERBOSITY = @{[$verb ? 1 : 0]} -"; - #default options forward - $ret .= " -PL_AM_V_${_} = \$(pl_am__v_${_}_\$(V)) -pl_am__v_${_}_ = \$(pl_am__v_${_}_\$(AM_DEFAULT_VERBOSITY)) -" for @special, map uc, @terse, @silent; - - #quoted plain text needs extra quotes - $ret .= " -PL_AM_V_BS_Text = \"\$(pl_am__v_BS_Text_\$(V))\" -pl_am__v_BS_Text_ = \$(pl_am__v_BS_Text_\$(AM_DEFAULT_VERBOSITY)) -" - #hide pm_to_blib output -. " -pl_am__v_BLIB_Hide_0 = \$(DEV_NULL) -pl_am__v_BLIB_Hide_1 = -" - #text for Mkbootstrap -. " -pl_am__v_BS_Text_0 = \"@{[_center('BS')]}\" -pl_am__v_BS_Text_1 = \"Running Mkbootstrap for\" -"; - #"terse" output - $ret .= " -pl_am__v_${_}_0 = \$(NOECHO)echo \"@{[_center($_)]}\" \$\@; -" for map uc, @terse; - - #no output - $ret .= " -pl_am__v_${_}_0 = \$(NOECHO) -" for map uc, @silent; - - #in verbose mode the "terse" echo expands to nothing - $ret .= " -pl_am__v_${_}_1 = -" for map uc, @terse, @silent; - $ret - } -} -1; diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs index 9e582a70..94a8398a 100644 --- a/src/perl/common/Core.xs +++ b/src/perl/common/Core.xs @@ -322,6 +322,13 @@ CODE: OUTPUT: RETVAL +int +MSGLEVEL_PUBNOTICES() +CODE: + RETVAL = MSGLEVEL_PUBNOTICES; +OUTPUT: + RETVAL + int MSGLEVEL_SNOTES() CODE: diff --git a/src/perl/common/Makefile.PL.in b/src/perl/common/Makefile.PL.in deleted file mode 100644 index 2b087d08..00000000 --- a/src/perl/common/Makefile.PL.in +++ /dev/null @@ -1,7 +0,0 @@ -use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm"; - -WriteMakefile('NAME' => 'Irssi', - 'LIBS' => '', - 'OBJECT' => '$(O_FILES)', - 'INC' => '-I../../.. @GLIB_CFLAGS@', - 'VERSION_FROM' => '@srcdir@/Irssi.pm'); diff --git a/src/perl/common/meson.build b/src/perl/common/meson.build index 4162756b..1d0ba953 100644 --- a/src/perl/common/meson.build +++ b/src/perl/common/meson.build @@ -1,20 +1,22 @@ - -libperl_Irssi_a = shared_module('Irssi', - [ xsubpp.process( - files( - 'Channel.xs', - 'Core.xs', - 'Expando.xs', - 'Ignore.xs', - 'Irssi.xs', - 'Log.xs', - 'Masks.xs', - 'Query.xs', - 'Rawlog.xs', - 'Server.xs', - 'Settings.xs', - ) - ) ] +shared_library( + 'Irssi', + [ + xsubpp.process( + files( + 'Channel.xs', + 'Core.xs', + 'Expando.xs', + 'Ignore.xs', + 'Irssi.xs', + 'Log.xs', + 'Masks.xs', + 'Query.xs', + 'Rawlog.xs', + 'Server.xs', + 'Settings.xs', + ) + ), + ] + files( 'module.h', ) @@ -26,7 +28,8 @@ libperl_Irssi_a = shared_module('Irssi', include_directories : rootinc, implicit_include_directories : true, dependencies : dep + [ perl_dep ], - link_with : dl_cross_perl_core, + link_with : dl_cross_perl_core + dl_cross_irssi_main, + override_options : [ 'b_lundef=false' ], ) install_headers( @@ -35,6 +38,6 @@ install_headers( ), install_dir : perlmoddir, ) - + # 'Makefile.PL.in', # 'typemap', diff --git a/src/perl/irc/Dcc.xs b/src/perl/irc/Dcc.xs index c078a1b5..a6d2c473 100644 --- a/src/perl/irc/Dcc.xs +++ b/src/perl/irc/Dcc.xs @@ -1,7 +1,74 @@ #define PERL_NO_GET_CONTEXT #include "module.h" +static int initialized = FALSE; + +static void perl_dcc_fill_hash(HV *hv, DCC_REC *dcc) +{ + (void) hv_store(hv, "type", 4, new_pv(dcc_type2str(dcc->type)), 0); + (void) hv_store(hv, "orig_type", 9, new_pv(dcc_type2str(dcc->orig_type)), 0); + (void) hv_store(hv, "created", 7, newSViv(dcc->created), 0); + + (void) hv_store(hv, "server", 6, iobject_bless(dcc->server), 0); + (void) hv_store(hv, "servertag", 9, new_pv(dcc->servertag), 0); + (void) hv_store(hv, "mynick", 6, new_pv(dcc->mynick), 0); + (void) hv_store(hv, "nick", 4, new_pv(dcc->nick), 0); + + (void) hv_store(hv, "chat", 4, simple_iobject_bless(dcc->chat), 0); + (void) hv_store(hv, "target", 6, new_pv(dcc->target), 0); + (void) hv_store(hv, "arg", 3, new_pv(dcc->arg), 0); + + (void) hv_store(hv, "addr", 4, new_pv(dcc->addrstr), 0); + (void) hv_store(hv, "port", 4, newSViv(dcc->port), 0); + + (void) hv_store(hv, "starttime", 9, newSViv(dcc->starttime), 0); + (void) hv_store(hv, "transfd", 7, newSViv(dcc->transfd), 0); +} + +static void perl_dcc_chat_fill_hash(HV *hv, CHAT_DCC_REC *dcc) +{ + perl_dcc_fill_hash(hv, (DCC_REC *) dcc); + + (void) hv_store(hv, "id", 2, new_pv(dcc->id), 0); + (void) hv_store(hv, "mirc_ctcp", 9, newSViv(dcc->mirc_ctcp), 0); + (void) hv_store(hv, "connection_lost", 15, newSViv(dcc->connection_lost), 0); +} + +static void perl_dcc_file_fill_hash(HV *hv, FILE_DCC_REC *dcc) +{ + perl_dcc_fill_hash(hv, (DCC_REC *) dcc); + + (void) hv_store(hv, "size", 4, newSViv(dcc->size), 0); + (void) hv_store(hv, "skipped", 7, newSViv(dcc->skipped), 0); +} + +static void perl_dcc_get_fill_hash(HV *hv, GET_DCC_REC *dcc) +{ + perl_dcc_file_fill_hash(hv, (FILE_DCC_REC *) dcc); + + (void) hv_store(hv, "get_type", 8, newSViv(dcc->get_type), 0); + (void) hv_store(hv, "file", 4, new_pv(dcc->file), 0); + (void) hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0); +} + +static void perl_dcc_send_fill_hash(HV *hv, SEND_DCC_REC *dcc) +{ + perl_dcc_file_fill_hash(hv, (FILE_DCC_REC *) dcc); + + (void) hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0); + (void) hv_store(hv, "waitforend", 10, newSViv(dcc->waitforend), 0); + (void) hv_store(hv, "gotalldata", 10, newSViv(dcc->gotalldata), 0); +} + +static PLAIN_OBJECT_INIT_REC irc_dcc_plains[] = { { "Irssi::Irc::Dcc", + (PERL_OBJECT_FUNC) perl_dcc_fill_hash }, + + { NULL, NULL } }; + +/********************************/ + MODULE = Irssi::Irc::Dcc PACKAGE = Irssi::Irc + PROTOTYPES: ENABLE void @@ -101,3 +168,38 @@ MODULE = Irssi::Irc::Dcc PACKAGE = Irssi::Windowitem PREFIX = item_ Irssi::Irc::Dcc::Chat item_get_dcc(item) Irssi::Windowitem item + +#******************************* +MODULE = Irssi::Irc::Dcc PACKAGE = Irssi::Irc::Dcc +#******************************* + +void +init() +CODE: + if (initialized) + return; + perl_api_version_check("Irssi::Irc::Dcc"); + initialized = TRUE; + + irssi_add_object(module_get_uniq_id_str("DCC", "CHAT"), 0, "Irssi::Irc::Dcc::Chat", + (PERL_OBJECT_FUNC) perl_dcc_chat_fill_hash); + irssi_add_object(module_get_uniq_id_str("DCC", "GET"), 0, "Irssi::Irc::Dcc::Get", + (PERL_OBJECT_FUNC) perl_dcc_get_fill_hash); + irssi_add_object(module_get_uniq_id_str("DCC", "SEND"), 0, "Irssi::Irc::Dcc::Send", + (PERL_OBJECT_FUNC) perl_dcc_send_fill_hash); + irssi_add_object(module_get_uniq_id_str("DCC", "SERVER"), 0, "Irssi::Irc::Dcc::Server", + (PERL_OBJECT_FUNC) perl_dcc_send_fill_hash); + irssi_add_plains(irc_dcc_plains); + perl_eval_pv("@Irssi::Irc::Dcc::Chat::ISA = qw(Irssi::Irc::Dcc);\n" + "@Irssi::Irc::Dcc::Get::ISA = qw(Irssi::Irc::Dcc);\n" + "@Irssi::Irc::Dcc::Send::ISA = qw(Irssi::Irc::Dcc);\n" + "@Irssi::Irc::Dcc::Server::ISA = qw(Irssi::Irc::Dcc);\n", + TRUE); + +void +deinit() +CODE: + initialized = FALSE; + +BOOT: + /* nothing */ diff --git a/src/perl/irc/Irc.pm b/src/perl/irc/Irc.pm index 1d95462d..b5ace267 100644 --- a/src/perl/irc/Irc.pm +++ b/src/perl/irc/Irc.pm @@ -22,5 +22,11 @@ Irssi::Irc::init(); Irssi::EXPORT_ALL(); +eval { + local $@; + require Irssi::Irc::Dcc; + 1; +}; + 1; diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs index 33be93d5..80033fba 100644 --- a/src/perl/irc/Irc.xs +++ b/src/perl/irc/Irc.xs @@ -69,63 +69,6 @@ static void perl_ban_fill_hash(HV *hv, BAN_REC *ban) (void) hv_store(hv, "time", 4, newSViv(ban->time), 0); } -static void perl_dcc_fill_hash(HV *hv, DCC_REC *dcc) -{ - (void) hv_store(hv, "type", 4, new_pv(dcc_type2str(dcc->type)), 0); - (void) hv_store(hv, "orig_type", 9, new_pv(dcc_type2str(dcc->orig_type)), 0); - (void) hv_store(hv, "created", 7, newSViv(dcc->created), 0); - - (void) hv_store(hv, "server", 6, iobject_bless(dcc->server), 0); - (void) hv_store(hv, "servertag", 9, new_pv(dcc->servertag), 0); - (void) hv_store(hv, "mynick", 6, new_pv(dcc->mynick), 0); - (void) hv_store(hv, "nick", 4, new_pv(dcc->nick), 0); - - (void) hv_store(hv, "chat", 4, simple_iobject_bless(dcc->chat), 0); - (void) hv_store(hv, "target", 6, new_pv(dcc->target), 0); - (void) hv_store(hv, "arg", 3, new_pv(dcc->arg), 0); - - (void) hv_store(hv, "addr", 4, new_pv(dcc->addrstr), 0); - (void) hv_store(hv, "port", 4, newSViv(dcc->port), 0); - - (void) hv_store(hv, "starttime", 9, newSViv(dcc->starttime), 0); - (void) hv_store(hv, "transfd", 7, newSViv(dcc->transfd), 0); -} - -static void perl_dcc_chat_fill_hash(HV *hv, CHAT_DCC_REC *dcc) -{ - perl_dcc_fill_hash(hv, (DCC_REC *) dcc); - - (void) hv_store(hv, "id", 2, new_pv(dcc->id), 0); - (void) hv_store(hv, "mirc_ctcp", 9, newSViv(dcc->mirc_ctcp), 0); - (void) hv_store(hv, "connection_lost", 15, newSViv(dcc->connection_lost), 0); -} - -static void perl_dcc_file_fill_hash(HV *hv, FILE_DCC_REC *dcc) -{ - perl_dcc_fill_hash(hv, (DCC_REC *) dcc); - - (void) hv_store(hv, "size", 4, newSViv(dcc->size), 0); - (void) hv_store(hv, "skipped", 7, newSViv(dcc->skipped), 0); -} - -static void perl_dcc_get_fill_hash(HV *hv, GET_DCC_REC *dcc) -{ - perl_dcc_file_fill_hash(hv, (FILE_DCC_REC *) dcc); - - (void) hv_store(hv, "get_type", 8, newSViv(dcc->get_type), 0); - (void) hv_store(hv, "file", 4, new_pv(dcc->file), 0); - (void) hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0); -} - -static void perl_dcc_send_fill_hash(HV *hv, SEND_DCC_REC *dcc) -{ - perl_dcc_file_fill_hash(hv, (FILE_DCC_REC *) dcc); - - (void) hv_store(hv, "file_quoted", 11, newSViv(dcc->file_quoted), 0); - (void) hv_store(hv, "waitforend", 10, newSViv(dcc->waitforend), 0); - (void) hv_store(hv, "gotalldata", 10, newSViv(dcc->gotalldata), 0); -} - static void perl_netsplit_fill_hash(HV *hv, NETSPLIT_REC *netsplit) { AV *av; @@ -195,7 +138,6 @@ static void perl_client_fill_hash(HV *hv, CLIENT_REC *client) static PLAIN_OBJECT_INIT_REC irc_plains[] = { { "Irssi::Irc::Ban", (PERL_OBJECT_FUNC) perl_ban_fill_hash }, - { "Irssi::Irc::Dcc", (PERL_OBJECT_FUNC) perl_dcc_fill_hash }, { "Irssi::Irc::Netsplit", (PERL_OBJECT_FUNC) perl_netsplit_fill_hash }, { "Irssi::Irc::Netsplitserver", (PERL_OBJECT_FUNC) perl_netsplit_server_fill_hash }, { "Irssi::Irc::Netsplitchannel", (PERL_OBJECT_FUNC) perl_netsplit_channel_fill_hash }, @@ -244,27 +186,9 @@ CODE: irssi_add_object(module_get_uniq_id("SERVER CONNECT", 0), chat_type, "Irssi::Irc::Connect", (PERL_OBJECT_FUNC) perl_irc_connect_fill_hash); - irssi_add_object(module_get_uniq_id("SERVER", 0), - chat_type, "Irssi::Irc::Server", - (PERL_OBJECT_FUNC) perl_irc_server_fill_hash); - irssi_add_object(module_get_uniq_id_str("DCC", "CHAT"), - 0, "Irssi::Irc::Dcc::Chat", - (PERL_OBJECT_FUNC) perl_dcc_chat_fill_hash); - irssi_add_object(module_get_uniq_id_str("DCC", "GET"), - 0, "Irssi::Irc::Dcc::Get", - (PERL_OBJECT_FUNC) perl_dcc_get_fill_hash); - irssi_add_object(module_get_uniq_id_str("DCC", "SEND"), - 0, "Irssi::Irc::Dcc::Send", - (PERL_OBJECT_FUNC) perl_dcc_send_fill_hash); - irssi_add_object(module_get_uniq_id_str("DCC", "SERVER"), - 0, "Irssi::Irc::Dcc::Server", - (PERL_OBJECT_FUNC) perl_dcc_send_fill_hash); - irssi_add_plains(irc_plains); - perl_eval_pv("@Irssi::Irc::Dcc::Chat::ISA = qw(Irssi::Irc::Dcc);\n" - "@Irssi::Irc::Dcc::Get::ISA = qw(Irssi::Irc::Dcc);\n" - "@Irssi::Irc::Dcc::Send::ISA = qw(Irssi::Irc::Dcc);\n" - "@Irssi::Irc::Dcc::Server::ISA = qw(Irssi::Irc::Dcc);\n", - TRUE); + irssi_add_object(module_get_uniq_id("SERVER", 0), chat_type, "Irssi::Irc::Server", + (PERL_OBJECT_FUNC) perl_irc_server_fill_hash); + irssi_add_plains(irc_plains); void deinit() @@ -274,7 +198,6 @@ CODE: BOOT: irssi_boot(Irc__Channel); irssi_boot(Irc__Ctcp); - irssi_boot(Irc__Dcc); irssi_boot(Irc__Modes); irssi_boot(Irc__Netsplit); irssi_boot(Irc__Notifylist); diff --git a/src/perl/irc/Irc/Dcc.pm b/src/perl/irc/Irc/Dcc.pm new file mode 100644 index 00000000..65a30c44 --- /dev/null +++ b/src/perl/irc/Irc/Dcc.pm @@ -0,0 +1,26 @@ +# +# Perl interface to irssi functions. +# + +package Irssi::Irc::Dcc; + +use strict; +use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); + +$VERSION = "0.9"; + +require Exporter; +require DynaLoader; + +@ISA = qw(Exporter DynaLoader); +@EXPORT = qw(); +@EXPORT_OK = qw(); + +bootstrap Irssi::Irc::Dcc $VERSION if (!Irssi::Core::is_static()); + +Irssi::Irc::Dcc::init(); + +Irssi::EXPORT_ALL(); + +1; + diff --git a/src/perl/irc/Makefile.PL.in b/src/perl/irc/Makefile.PL.in deleted file mode 100644 index 561308c7..00000000 --- a/src/perl/irc/Makefile.PL.in +++ /dev/null @@ -1,8 +0,0 @@ -use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm"; - -WriteMakefile('NAME' => 'Irssi::Irc', - 'LIBS' => '', - 'OBJECT' => '$(O_FILES)', - 'TYPEMAPS' => ['../common/typemap'], - 'INC' => '-I../../.. @GLIB_CFLAGS@', - 'VERSION_FROM' => '@srcdir@/Irc.pm'); diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build index c83d4b49..4dd0f5e1 100644 --- a/src/perl/irc/meson.build +++ b/src/perl/irc/meson.build @@ -1,22 +1,23 @@ -libperl_Irssi_Irc_a = shared_module('Irc', - [ xsubpp.process( - files( - 'Channel.xs', - 'Client.xs', - 'Ctcp.xs', - 'Dcc.xs', - 'Irc.xs', - 'Modes.xs', - 'Netsplit.xs', - 'Notifylist.xs', - 'Query.xs', - 'Server.xs', +shared_library( + 'Irc', + [ + xsubpp.process( + files( + 'Channel.xs', + 'Client.xs', + 'Ctcp.xs', + 'Irc.xs', + 'Modes.xs', + 'Netsplit.xs', + 'Notifylist.xs', + 'Query.xs', + 'Server.xs', + ), + extra_args : [ + '-typemap', '../common/typemap', + ], ), - extra_args : [ - '-typemap', - '../common/typemap', - ], - ) ] + ] + files( 'module.h', ), @@ -27,7 +28,8 @@ libperl_Irssi_Irc_a = shared_module('Irc', include_directories : rootinc, implicit_include_directories : true, dependencies : dep + [ perl_dep ], - link_with : dl_cross_perl_core, + link_with : dl_cross_perl_core + dl_cross_irc_notifylist + dl_cross_irc_core + dl_cross_irssi_main, + override_options : [ 'b_lundef=false' ], ) install_headers( @@ -36,6 +38,39 @@ install_headers( ), install_dir : perlmoddir / 'Irssi', ) - + +shared_library( + 'Dcc', + [ + xsubpp.process( + files( + 'Dcc.xs', + ), + extra_args : [ + '-typemap', '../common/typemap', + ], + ), + ] + + files( + 'module.h', + ), + name_prefix : '', + name_suffix : perl_module_suffix, + install : true, + install_dir : perlmoddir / 'auto' / 'Irssi' / 'Irc' / 'Dcc', + include_directories : rootinc, + implicit_include_directories : true, + dependencies : dep + [ perl_dep ], + link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main, + override_options : [ 'b_lundef=false' ], +) + +install_headers( + files( + 'Irc/Dcc.pm', + ), + install_dir : perlmoddir / 'Irssi' / 'Irc', +) + # 'Makefile.PL.in', # 'typemap', diff --git a/src/perl/irssi-core.pl b/src/perl/irssi-core.pl index 0999de9e..cf987b31 100644 --- a/src/perl/irssi-core.pl +++ b/src/perl/irssi-core.pl @@ -1,9 +1,7 @@ # NOTE: this is printed through printf()-like function, # so no extra percent characters. -# %%d : must be first - 1 if perl libraries are to be linked -# statically with irssi binary, 0 if not -# %%s : must be second - use Irssi; use Irssi::Irc; etc.. +# %%s : use Irssi; use Irssi::Irc; etc.. package Irssi::Core; use Symbol; @@ -15,7 +13,7 @@ $SIG{__WARN__} = sub { }; sub is_static { - return %d; + return 0; } sub destroy { @@ -52,10 +50,3 @@ sub eval_file { die "cap_sasl has been unloaded from Irssi ".Irssi::version()." because it conflicts with the built-in SASL support. See /help network for configuring SASL or read the ChangeLog for more information."; } } - -if ( $] >= 5.037005 && $] <= 5.038000 ) { - # https://github.com/Perl/perl5/issues/21366 - print STDERR "\e7 \e[A Irssi: applying locale workaround for Perl 5.38.0 \e8"; - require POSIX; - POSIX::setlocale(&POSIX::LC_ALL, ""); -} diff --git a/src/perl/meson.build b/src/perl/meson.build index 0ae1ec26..9e85ca06 100644 --- a/src/perl/meson.build +++ b/src/perl/meson.build @@ -1,36 +1,39 @@ - -perl_signals_list_h = custom_target('perl-signals-list.h', +perl_signals_list_h = custom_target( + 'perl-signals-list.h', input : files('../../docs/signals.txt'), output : 'perl-signals-list.h', capture : true, depend_files : files('get-signals.pl'), - command : [build_perl, files('get-signals.pl'), '@INPUT@'], + command : [ build_perl, files('get-signals.pl'), '@INPUT@' ], ) -irssi_core_pl_h = custom_target('irssi-core.pl.h', +irssi_core_pl_h = custom_target( + 'irssi-core.pl.h', input : files('irssi-core.pl'), output : 'irssi-core.pl.h', capture : true, - command : [file2header, '@INPUT@', 'irssi_core_code'], + command : [ file2header, '@INPUT@', 'irssi_core_code' ], ) # required as of Meson 0.58.0 generated_files_inc = include_directories('.') -libperl_core_a = shared_module('perl_core', +libperl_core_sm = shared_library( + 'perl_core', files( 'perl-common.c', 'perl-core.c', 'perl-signals.c', 'perl-sources.c', - ) + [ + ) + + [ irssi_core_pl_h, perl_signals_list_h, - ] + built_src, + ] + + built_src, c_args : [ def_scriptdir, def_perl_use_lib, - '-D' + 'PERL_STATIC_LIBS' + '=' + 0.to_string(), ], include_directories : [ rootinc ] + [ generated_files_inc ], implicit_include_directories : false, @@ -40,15 +43,17 @@ libperl_core_a = shared_module('perl_core', install_rpath : perl_rpath, build_rpath : perl_rpath, dependencies : dep_cflagsonly + [ perl_dep ] + dl_cross_dep, - override_options : ['b_asneeded=false'], + override_options : [ 'b_asneeded=false', 'b_lundef=false' ], + link_with : dl_cross_irssi_main, ) -dl_cross_perl_core = [] +dl_cross_perl_core = [ ] if need_dl_cross_link - dl_cross_perl_core += libperl_core_a + dl_cross_perl_core += libperl_core_sm endif -libfe_perl_a = shared_module('fe_perl', +shared_library( + 'fe_perl', files( 'module-formats.c', 'perl-fe.c', @@ -62,7 +67,8 @@ libfe_perl_a = shared_module('fe_perl', install : true, install_dir : moduledir, dependencies : dep, - link_with : dl_cross_perl_core, + link_with : dl_cross_perl_core + dl_cross_irssi_main, + override_options : [ 'b_lundef=false' ], ) subdir('common') diff --git a/src/perl/module.h b/src/perl/module.h index 0a4d78f6..398eb1c7 100644 --- a/src/perl/module.h +++ b/src/perl/module.h @@ -17,4 +17,4 @@ extern PerlInterpreter *my_perl; /* must be called my_perl or some perl implemen /* Change this every time when some API changes between irssi's perl module (or irssi itself) and irssi's perl libraries. */ -#define IRSSI_PERL_API_VERSION (20011214 + IRSSI_ABI_VERSION) +#define IRSSI_PERL_API_VERSION (20160124 + IRSSI_ABI_VERSION) diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c index 7eaab8eb..58b56bb8 100644 --- a/src/perl/perl-common.c +++ b/src/perl/perl-common.c @@ -239,9 +239,8 @@ char *perl_get_use_list(void) for (tmp = use_protocols; tmp != NULL; tmp = tmp->next) g_string_append_printf(str, "use Irssi::%s;", (char *) tmp->data); - ret = str->str; - g_string_free(str, FALSE); - return ret; + ret = g_string_free_and_steal(str); + return ret; } void irssi_callXS(void (*subaddr)(pTHX_ CV* cv), CV *cv, SV **mark) @@ -287,6 +286,8 @@ void perl_connect_fill_hash(HV *hv, SERVER_CONNECT_REC *conn) (void) hv_store(hv, "type", 4, new_pv(type), 0); (void) hv_store(hv, "chat_type", 9, new_pv(chat_type), 0); + (void) hv_store(hv, "chosen_family", 13, newSViv(conn->chosen_family), 0); + (void) hv_store(hv, "ipaddr", 6, new_pv(conn->ipaddr), 0); (void) hv_store(hv, "tag", 3, new_pv(conn->tag), 0); (void) hv_store(hv, "address", 7, new_pv(conn->address), 0); (void) hv_store(hv, "port", 4, newSViv(conn->port), 0); @@ -583,6 +584,10 @@ static void perl_register_protocol(CHAT_PROTOCOL_REC *rec) SV *sv; chat_type = chat_protocol_lookup(rec->name); + if (chat_type == CHAT_PROTOCOL_NOT_INITIALIZED) { + return; + } + g_return_if_fail(chat_type >= 0); name = g_ascii_strdown(rec->name,-1); diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c index 24f0218c..fe2d2f62 100644 --- a/src/perl/perl-core.c +++ b/src/perl/perl-core.c @@ -18,6 +18,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include + #define NEED_PERL_H #define PERL_NO_GET_CONTEXT #include "module.h" @@ -77,31 +82,10 @@ static void perl_script_destroy(PERL_SCRIPT_REC *script) extern void boot_DynaLoader(pTHX_ CV* cv); -#if PERL_STATIC_LIBS == 1 -extern void boot_Irssi(pTHX_ CV *cv); - -XS(boot_Irssi_Core) -{ - dXSARGS; - PERL_UNUSED_VAR(items); - - irssi_callXS(boot_Irssi, cv, mark); - irssi_boot(Irc); - irssi_boot(UI); - irssi_boot(TextUI); - /* Make sure to keep this in line with perl_scripts_deinit below. */ - XSRETURN_YES; -} -#endif - static void xs_init(pTHX) { dXSUB_SYS; -#if PERL_STATIC_LIBS == 1 - newXS("Irssi::Core::boot_Irssi_Core", boot_Irssi_Core, __FILE__); -#endif - /* boot the dynaloader too, if we want to use some other dynamic modules.. */ newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, __FILE__); @@ -111,27 +95,41 @@ static void xs_init(pTHX) void perl_scripts_init(void) { char *code, *use_code; + int broken_perl; perl_scripts = NULL; perl_sources_start(); perl_signals_start(); my_perl = perl_alloc(); + broken_perl = wcwidth(160); perl_construct(my_perl); + broken_perl = broken_perl != wcwidth(160); - perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args)-1, perl_args, NULL); -#if PERL_STATIC_LIBS == 1 - perl_eval_pv("Irssi::Core::->boot_Irssi_Core(0.9);", TRUE); -#endif + perl_parse(my_perl, xs_init, G_N_ELEMENTS(perl_args) - 1, perl_args, NULL); - perl_common_start(); + perl_common_start(); use_code = perl_get_use_list(); - code = g_strdup_printf(irssi_core_code, PERL_STATIC_LIBS, use_code); + code = g_strdup_printf(irssi_core_code, use_code); perl_eval_pv(code, TRUE); + if (broken_perl) { + g_warning("applying locale workaround for Perl %d.%d, see " + "https://github.com/Perl/perl5/issues/21366", + PERL_REVISION, PERL_VERSION); + perl_eval_pv("package Irssi::Core;" + /* https://github.com/Perl/perl5/issues/21746 */ + "if ( $] == $] )" + "{" + "require POSIX;" + "POSIX::setlocale(&POSIX::LC_ALL, \"\");" + "}" + "1;", + TRUE); + } g_free(code); - g_free(use_code); + g_free(use_code); } /* Destroy all perl scripts and deinitialize perl interpreter */ @@ -153,17 +151,6 @@ void perl_scripts_deinit(void) /* Unload all perl libraries loaded with dynaloader */ perl_eval_pv("foreach my $lib (@DynaLoader::dl_modules) { if ($lib =~ /^Irssi\\b/) { $lib .= '::deinit();'; eval $lib; } }", TRUE); -#if PERL_STATIC_LIBS == 1 - /* If perl is statically built we should manually deinit the modules - which are booted in boot_Irssi_Core above */ - perl_eval_pv("foreach my $lib (qw(" - "Irssi" " " - "Irssi::Irc" " " - "Irssi::UI" " " - "Irssi::TextUI" - ")) { eval $lib . '::deinit();'; }", TRUE); -#endif - /* We could unload all libraries .. but this crashes with some libraries, probably because we don't call some deinit function.. Anyway, this would free some memory with /SCRIPT RESET, but it @@ -215,9 +202,8 @@ static char *script_data_get_name(void) n++; } while (perl_script_find(name->str) != NULL); - ret = name->str; - g_string_free(name, FALSE); - return ret; + ret = g_string_free_and_steal(name); + return ret; } static int perl_script_eval(PERL_SCRIPT_REC *script) @@ -476,7 +462,7 @@ void perl_core_init(void) char **argv = perl_args; PERL_SYS_INIT3(&argc, &argv, &environ); - print_script_errors = 1; + print_script_errors = 1; settings_add_str("perl", "perl_use_lib", PERL_USE_LIB); /*PL_perl_destruct_level = 1; - this crashes with some people.. */ diff --git a/src/perl/textui/Makefile.PL.in b/src/perl/textui/Makefile.PL.in deleted file mode 100644 index 2b0a148a..00000000 --- a/src/perl/textui/Makefile.PL.in +++ /dev/null @@ -1,8 +0,0 @@ -use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm"; - -WriteMakefile('NAME' => 'Irssi::TextUI', - 'LIBS' => '', - 'OBJECT' => '$(O_FILES)', - 'TYPEMAPS' => ['../common/typemap', '../ui/typemap'], - 'INC' => '-I../../.. @GLIB_CFLAGS@', - 'VERSION_FROM' => '@srcdir@/TextUI.pm'); diff --git a/src/perl/textui/meson.build b/src/perl/textui/meson.build index 429e988e..9a5b08cf 100644 --- a/src/perl/textui/meson.build +++ b/src/perl/textui/meson.build @@ -1,18 +1,19 @@ -libperl_Irssi_TextUI_a = shared_module('TextUI', - [ xsubpp.process( - files( - 'Statusbar.xs', - 'TextBufferView.xs', - 'TextBuffer.xs', - 'TextUI.xs', +shared_library( + 'TextUI', + [ + xsubpp.process( + files( + 'Statusbar.xs', + 'TextBufferView.xs', + 'TextBuffer.xs', + 'TextUI.xs', + ), + extra_args : [ + '-typemap', '../common/typemap', + '-typemap', '../ui/typemap', + ], ), - extra_args : [ - '-typemap', - '../common/typemap', - '-typemap', - '../ui/typemap', - ], - ) ] + ] + files( 'module.h', ), @@ -23,7 +24,8 @@ libperl_Irssi_TextUI_a = shared_module('TextUI', include_directories : rootinc, implicit_include_directories : true, dependencies : dep + [ perl_dep ], - link_with : dl_cross_perl_core, + link_with : dl_cross_perl_core + dl_cross_irssi_main, + override_options : [ 'b_lundef=false' ], ) install_headers( @@ -32,6 +34,6 @@ install_headers( ), install_dir : perlmoddir / 'Irssi', ) - + # 'Makefile.PL.in', # 'typemap', diff --git a/src/perl/ui/Makefile.PL.in b/src/perl/ui/Makefile.PL.in deleted file mode 100644 index 9507e74d..00000000 --- a/src/perl/ui/Makefile.PL.in +++ /dev/null @@ -1,8 +0,0 @@ -use ExtUtils::MakeMaker;our $AM_DEFAULT_VERBOSITY='@AM_DEFAULT_VERBOSITY@';require "@top_srcdir@/src/perl/Makefile_silent.pm"; - -WriteMakefile('NAME' => 'Irssi::UI', - 'LIBS' => '', - 'OBJECT' => '$(O_FILES)', - 'TYPEMAPS' => ['../common/typemap'], - 'INC' => '-I../../.. @GLIB_CFLAGS@', - 'VERSION_FROM' => '@srcdir@/UI.pm'); diff --git a/src/perl/ui/meson.build b/src/perl/ui/meson.build index 26ef42eb..5a24d5d6 100644 --- a/src/perl/ui/meson.build +++ b/src/perl/ui/meson.build @@ -1,16 +1,18 @@ -libperl_Irssi_UI_a = shared_module('UI', - [ xsubpp.process( - files( - 'Formats.xs', - 'Themes.xs', - 'UI.xs', - 'Window.xs', +shared_library( + 'UI', + [ + xsubpp.process( + files( + 'Formats.xs', + 'Themes.xs', + 'UI.xs', + 'Window.xs', + ), + extra_args : [ + '-typemap', '../common/typemap', + ], ), - extra_args : [ - '-typemap', - '../common/typemap', - ], - ) ] + ] + files( 'module.h', ), @@ -21,7 +23,8 @@ libperl_Irssi_UI_a = shared_module('UI', include_directories : rootinc, implicit_include_directories : true, dependencies : dep + [ perl_dep ], - link_with : dl_cross_perl_core, + link_with : dl_cross_perl_core + dl_cross_irssi_main, + override_options : [ 'b_lundef=false' ], ) install_headers( @@ -30,6 +33,6 @@ install_headers( ), install_dir : perlmoddir / 'Irssi', ) - + # 'Makefile.PL.in', # 'typemap', diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap index 5cb40b0e..e6c649fc 100644 --- a/subprojects/glib.wrap +++ b/subprojects/glib.wrap @@ -1,6 +1,6 @@ [wrap-file] # make sure to update the glib_internal_version in meson.build -directory = glib-2.58.3 -source_url = https://download.gnome.org/sources/glib/2.58/glib-2.58.3.tar.xz -source_filename = glib-2.58.3.tar.xz -source_hash = 8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481 +directory = glib-2.74.7 +source_url = https://download.gnome.org/sources/glib/2.74/glib-2.74.7.tar.xz +source_filename = glib-2.74.7.tar.xz +source_hash = 196ab86c27127a61b7a70c3ba6af7b97bdc01c07cd3b21abd5e778b955eccb1b diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 0799ee3f..00000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -if BUILD_TEXTUI -TEXTUI=fe-text -endif - -SUBDIRS = fe-common irc $(TEXTUI) - -EXTRA_DIST = meson.build diff --git a/tests/fe-common/Makefile.am b/tests/fe-common/Makefile.am deleted file mode 100644 index 74f13119..00000000 --- a/tests/fe-common/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = core - -EXTRA_DIST = meson.build diff --git a/tests/fe-common/core/Makefile.am b/tests/fe-common/core/Makefile.am deleted file mode 100644 index 15287601..00000000 --- a/tests/fe-common/core/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -include $(top_srcdir)/utils/glib-tap.mk - -PACKAGE_STRING=fe-common/core - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -test_programs = test-formats - -test_formats_CPPFLAGS = \ - $(AM_CPPFLAGS) - -test_formats_DEPENDENCIES = \ - ../../../src/core/libcore.a \ - ../../../src/lib-config/libirssi_config.a - -test_formats_LDADD = \ - ../../../src/fe-common/core/libfe_common_core.a \ - ../../../src/core/libcore.a \ - ../../../src/lib-config/libirssi_config.a \ - @PROG_LIBS@ - -test_formats_SOURCES = \ - test-formats.c - -EXTRA_DIST += meson.build diff --git a/tests/fe-common/core/meson.build b/tests/fe-common/core/meson.build index 44b11222..a3181f7b 100644 --- a/tests/fe-common/core/meson.build +++ b/tests/fe-common/core/meson.build @@ -1,4 +1,5 @@ -test_test_formats = executable('test-formats', +test_test_formats = executable( + 'test-formats', files( 'test-formats.c', ), @@ -12,8 +13,11 @@ test_test_formats = executable('test-formats', ], include_directories : rootinc, implicit_include_directories : false, - dependencies : dep + dependencies : dep, +) +test( + 'test-formats test', + test_test_formats, + args : [ '--tap' ], + protocol : 'tap', ) -test('test-formats test', test_test_formats, - args : ['--tap'], - protocol : 'tap') diff --git a/tests/fe-text/Makefile.am b/tests/fe-text/Makefile.am deleted file mode 100644 index a0e1d0f5..00000000 --- a/tests/fe-text/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -include $(top_srcdir)/utils/glib-tap.mk - -PACKAGE_STRING=fe-text - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) - -test_programs = test-paste-join-multiline - -test_paste_join_multiline_CPPFLAGS = \ - $(AM_CPPFLAGS) - -# test_paste_join_multiline_DEPENDENCIES = - -test_paste_join_multiline_LDADD = \ - ../../src/fe-common/core/libfe_common_core.a \ - ../../src/core/libcore.a \ - ../../src/lib-config/libirssi_config.a \ - @PROG_LIBS@ \ - @TEXTUI_LIBS@ - - -test_paste_join_multiline_SOURCES = \ - ../../src/fe-text/gui-entry.c \ - ../../src/fe-text/mainwindows.c \ - ../../src/fe-text/term-terminfo.c \ - ../../src/fe-text/terminfo-core.c \ - ../../src/fe-text/term.c \ - ../../src/fe-text/textbuffer-formats.c \ - ../../src/fe-text/textbuffer-view.c \ - ../../src/fe-text/textbuffer.c \ - ../../src/fe-text/gui-windows.c \ - ../../src/fe-text/gui-printtext.c \ - mock-irssi.c \ - test-paste-join-multiline.c - -EXTRA_DIST += meson.build diff --git a/tests/fe-text/meson.build b/tests/fe-text/meson.build index 397bd39f..68def5f8 100644 --- a/tests/fe-text/meson.build +++ b/tests/fe-text/meson.build @@ -1,4 +1,5 @@ -test_test_paste_join_multiline = executable('test-paste-join-multiline', +test_test_paste_join_multiline = executable( + 'test-paste-join-multiline', files( '../../src/fe-text/gui-entry.c', '../../src/fe-text/gui-printtext.c', @@ -25,7 +26,9 @@ test_test_paste_join_multiline = executable('test-paste-join-multiline', implicit_include_directories : false, dependencies : dep + textui_dep, ) -test('test-paste-join-multiline test', test_test_paste_join_multiline, - args : ['--tap'], - protocol : 'tap') - +test( + 'test-paste-join-multiline test', + test_test_paste_join_multiline, + args : [ '--tap' ], + protocol : 'tap', +) diff --git a/tests/irc/Makefile.am b/tests/irc/Makefile.am deleted file mode 100644 index 88adb5b9..00000000 --- a/tests/irc/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS = \ - core \ - flood - -EXTRA_DIST = meson.build diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am deleted file mode 100644 index 503989a9..00000000 --- a/tests/irc/core/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -include $(top_srcdir)/utils/glib-tap.mk - -PACKAGE_STRING=irc/core - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - $(GLIB_CFLAGS) - -test_programs = test-channel-events test-irc - -CPPFLAGS = \ - $(AM_CPPFLAGS) - -DEPENDENCIES = \ - ../../../src/core/libcore.a \ - ../../../src/lib-config/libirssi_config.a - -LDADD = \ - ../../../src/irc/core/libirc_core.a \ - ../../../src/core/libcore.a \ - ../../../src/lib-config/libirssi_config.a \ - @PROG_LIBS@ - -test_channel_events_SOURCES = \ - test-channel-events.c - -test_irc_SOURCES = \ - test-irc.c - -EXTRA_DIST += meson.build diff --git a/tests/irc/core/meson.build b/tests/irc/core/meson.build index f63f4fa8..d59b645d 100644 --- a/tests/irc/core/meson.build +++ b/tests/irc/core/meson.build @@ -1,4 +1,5 @@ -test_test_irc = executable('test-irc', +test_test_irc = executable( + 'test-irc', files( 'test-irc.c', ), @@ -13,15 +14,19 @@ test_test_irc = executable('test-irc', ], include_directories : rootinc, implicit_include_directories : false, - dependencies : dep + dependencies : dep, ) -test('test-irc test', test_test_irc, +test( + 'test-irc test', + test_test_irc, args : [ '--tap', ], - protocol : 'tap') + protocol : 'tap', +) -test_test_channel_events = executable('test-channel-events', +test_test_channel_events = executable( + 'test-channel-events', files( 'test-channel-events.c', ), @@ -36,10 +41,13 @@ test_test_channel_events = executable('test-channel-events', ], include_directories : rootinc, implicit_include_directories : false, - dependencies : dep + dependencies : dep, ) -test('test-channel-events test', test_test_channel_events, +test( + 'test-channel-events test', + test_test_channel_events, args : [ '--tap', ], - protocol : 'tap') + protocol : 'tap', +) diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am deleted file mode 100644 index 6c4eec84..00000000 --- a/tests/irc/flood/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -include $(top_srcdir)/utils/glib-tap.mk - -PACKAGE_STRING=irc/flood - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - $(GLIB_CFLAGS) - -test_programs = \ - test-796 - -test_796_CPPFLAGS = \ - $(AM_CPPFLAGS) - -test_796_DEPENDENCIES = \ - ../../../src/core/libcore.a \ - ../../../src/lib-config/libirssi_config.a - -test_796_LDADD = \ - ../../../src/irc/libirc.a \ - ../../../src/fe-common/irc/libfe_common_irc.a \ - ../../../src/fe-common/irc/dcc/libfe_irc_dcc.a \ - ../../../src/fe-common/irc/notifylist/libfe_irc_notifylist.a \ - ../../../src/irc/dcc/libirc_dcc.a \ - ../../../src/irc/notifylist/libirc_notifylist.a \ - ../../../src/irc/flood/libirc_flood.a \ - ../../../src/irc/core/libirc_core.a \ - ../../../src/fe-common/core/libfe_common_core.a \ - ../../../src/core/libcore.a \ - ../../../src/lib-config/libirssi_config.a \ - @PROG_LIBS@ - -test_796_SOURCES = \ - test-796.c - -EXTRA_DIST += meson.build diff --git a/tests/irc/flood/meson.build b/tests/irc/flood/meson.build index e9d0a2bc..9da3dda5 100644 --- a/tests/irc/flood/meson.build +++ b/tests/irc/flood/meson.build @@ -1,4 +1,5 @@ -test_test_796 = executable('test-796', +test_test_796 = executable( + 'test-796', files( 'test-796.c', ), @@ -6,7 +7,8 @@ test_test_796 = executable('test-796', libconfig_a, libcore_a, libfe_common_core_a, - libirc_a, + libirc_core_a, + libirc_flood_a, libfe_common_irc_a, libfe_irc_dcc_a, libfe_irc_notifylist_a, @@ -16,10 +18,13 @@ test_test_796 = executable('test-796', ], include_directories : rootinc, implicit_include_directories : false, - dependencies : dep + dependencies : dep, ) -test('test-796 test', test_test_796, +test( + 'test-796 test', + test_test_796, args : [ '--tap', ], - protocol : 'tap') + protocol : 'tap', +) diff --git a/themes/Makefile.am b/themes/Makefile.am deleted file mode 100644 index c8814532..00000000 --- a/themes/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -themedir = $(datadir)/irssi/themes -theme_DATA = default.theme colorless.theme - -EXTRA_DIST = \ - $(theme_DATA) \ - meson.build diff --git a/themes/default.theme b/themes/default.theme index 79b1af55..a08caefa 100644 --- a/themes/default.theme +++ b/themes/default.theme @@ -202,6 +202,7 @@ abstracts = { # notices ownnotice = "[%r$0%K(%R$1-%K)]%n "; notice = "%K-%M$*%K-%n "; + pubnotice = "%K-%M$0$1-%K-%n %|"; pubnotice_channel = "%K:%m$*"; pvtnotice_host = "%K(%m$*%K)"; servernotice = "%g!$*%n "; diff --git a/themes/meson.build b/themes/meson.build index d58dddf4..bdf2519e 100644 --- a/themes/meson.build +++ b/themes/meson.build @@ -3,4 +3,5 @@ install_data( 'default.theme', 'colorless.theme', ), - install_dir : themedir) + install_dir : themedir, +) diff --git a/utils/Makefile.am b/utils/Makefile.am deleted file mode 100644 index 8af5c8f7..00000000 --- a/utils/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = \ - file2header.sh \ - irssi-version.sh \ - syntax.pl \ - tap-driver.sh \ - tap-test diff --git a/utils/check-perl-hash.sh b/utils/check-perl-hash.sh new file mode 100755 index 00000000..208257e9 --- /dev/null +++ b/utils/check-perl-hash.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# make sure perl hashes have correct length +find src/perl \( -name '*.c' -o -name '*.xs' \) -exec grep -n hv_store {} + | perl -l -ne 'if (/"(\w+)",\s*(\d+)/ && $2 != length $1) { $X=1; print "Incorrect key length in $_" } END { exit $X }' diff --git a/utils/clang-format-xs/clang-format-xs b/utils/clang-format-xs/clang-format-xs index 3216210b..39493c53 100755 --- a/utils/clang-format-xs/clang-format-xs +++ b/utils/clang-format-xs/clang-format-xs @@ -6,14 +6,22 @@ srcdir=$(dirname "$(readlink -f "$0")") test -z "$srcdir" && srcdir=. CLANG_FORMAT=${CLANG_FORMAT:-clang-format} +if [[ "$CLANG_FORMAT" = *-xs\ * ]]; then + CLANG_FORMAT=${CLANG_FORMAT/-xs / } +elif [[ "$CLANG_FORMAT" = *-xs ]]; then + CLANG_FORMAT=${CLANG_FORMAT%-xs} +fi + +clang_format_version=$($CLANG_FORMAT --version 2>/dev/null | perl -ne '/(\d+)/ && print $1 or print 0') + options=() files=() lines=() -inplace=0;xml=0; +inplace=0;xml=0;list_ignored=0; filename=tmp.1.c offsets= off_opts=() -opts=$(getopt -n clang-format-xs -s bash -a -o in -l Werror,assume-filename:,cursor:,dry-run,dump-config,fallback-style:,ferror-limit:,help,length:,lines:,offset:,output-replacement-xmls,sort-includes,style:,verbose,version -- "$@") +opts=$(getopt -n clang-format-xs -s bash -a -o in -l Werror,assume-filename:,cursor:,dry-run,dump-config,fallback-style:,ferror-limit:,help,length:,lines:,offset:,output-replacement-xmls,sort-includes,list-ignored,style:,verbose,version -- "$@") if [ $? -ne 0 ]; then exit 1; fi eval set -- "$opts"; unset opts while :; do @@ -47,6 +55,11 @@ while :; do shift continue ;; + --list-ignored) + list_ignored=1 + shift + continue + ;; -i) inplace=1 shift @@ -75,6 +88,10 @@ fi if [[ $xml = 1 ]]; then options_o=("-output-replacements-xml" "${options[@]}") fi +if [[ $list_ignored = 1 ]]; then + options_o=("-list-ignored" "${options[@]}") +fi + options_o+=("${off_opts[@]}") do_xs() { @@ -92,7 +109,13 @@ do_xs() { rm "$1".1.c } -if [[ ${#files[@]} -eq 0 ]]; then +if [[ $list_ignored = 1 ]]; then + if [[ $clang_format_version -lt 19 ]]; then + : # true + else + $CLANG_FORMAT "${options_o[@]}" -- "${files[@]}" + fi +elif [[ ${#files[@]} -eq 0 ]]; then case "$filename" in *.xs) cat > "$filename".1.xs diff --git a/utils/clang-format-xs/format-xs-1.pl b/utils/clang-format-xs/format-xs-1.pl index 1d15316e..fab1e90a 100644 --- a/utils/clang-format-xs/format-xs-1.pl +++ b/utils/clang-format-xs/format-xs-1.pl @@ -30,7 +30,7 @@ while (<>) { $prot = 2; $in_code = 0; } - elsif (/^((PP)?CODE|PREINIT):/) { + elsif (/^((PP)?CODE|PREINIT|BOOT):/) { $prot = 1; $in_code = 3; } diff --git a/utils/file2header.sh b/utils/file2header.sh index f25ae13b..174d3d13 100755 --- a/utils/file2header.sh +++ b/utils/file2header.sh @@ -1,5 +1,5 @@ #!/bin/sh echo "const char *$2 =" -cat $1|sed 's/\\/\\\\/g'|sed 's/"/\\"/g'|sed 's/^/\"/'|sed 's/$/\\n\"/' +sed 's/\\/\\\\/g;s/"/\\"/g;s/^/\"/;s/$/\\n\"/' "$1" echo ";" diff --git a/utils/glib-tap.mk b/utils/glib-tap.mk deleted file mode 100644 index 582f6d29..00000000 --- a/utils/glib-tap.mk +++ /dev/null @@ -1,134 +0,0 @@ -# GLIB - Library of useful C routines - -TESTS_ENVIRONMENT= \ - G_TEST_SRCDIR="$(abs_srcdir)" \ - G_TEST_BUILDDIR="$(abs_builddir)" \ - G_DEBUG=gc-friendly \ - MALLOC_CHECK_=2 \ - MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/utils/tap-driver.sh -LOG_COMPILER = $(top_srcdir)/utils/tap-test - -NULL = - -# initialize variables for unconditional += appending -BUILT_SOURCES = -BUILT_EXTRA_DIST = -CLEANFILES = *.log *.trs -DISTCLEANFILES = -MAINTAINERCLEANFILES = -EXTRA_DIST = -TESTS = - -installed_test_LTLIBRARIES = -installed_test_PROGRAMS = -installed_test_SCRIPTS = -nobase_installed_test_DATA = - -noinst_LTLIBRARIES = -noinst_PROGRAMS = -noinst_SCRIPTS = -noinst_DATA = - -check_LTLIBRARIES = -check_PROGRAMS = -check_SCRIPTS = -check_DATA = - -# We support a fairly large range of possible variables. It is expected that all types of files in a test suite -# will belong in exactly one of the following variables. -# -# First, we support the usual automake suffixes, but in lowercase, with the customary meaning: -# -# test_programs, test_scripts, test_data, test_ltlibraries -# -# The above are used to list files that are involved in both uninstalled and installed testing. The -# test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite. -# Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is -# installed in the same way as it appears in the package layout. -# -# In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled', -# like so: -# -# installed_test_programs, uninstalled_test_programs -# installed_test_scripts, uninstalled_test_scripts -# installed_test_data, uninstalled_test_data -# installed_test_ltlibraries, uninstalled_test_ltlibraries -# -# Additionally, we support 'extra' infixes for programs and scripts. This is used for support programs/scripts -# that should not themselves be run as testcases (but exist to be used from other testcases): -# -# test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs -# test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts -# -# Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data -# file automatically end up in the tarball. -# -# dist_test_scripts, dist_test_data, dist_test_extra_scripts -# dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts -# dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts -# -# Note that no file is automatically disted unless it appears in one of the dist_ variables. This follows the -# standard automake convention of not disting programs scripts or data by default. -# -# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted -# variants) will be run as part of the in-tree 'make check'. These are all assumed to be runnable under -# gtester. That's a bit strange for scripts, but it's possible. - -TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \ - $(dist_test_scripts) $(dist_uninstalled_test_scripts) - -# Note: build even the installed-only targets during 'make check' to ensure that they still work. -# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to -# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were -# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'. -all_test_programs = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \ - $(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs) -all_test_scripts = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \ - $(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts) -all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \ - $(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts) -all_test_scripts += $(all_dist_test_scripts) -EXTRA_DIST += $(all_dist_test_scripts) -all_test_data = $(test_data) $(uninstalled_test_data) $(installed_test_data) -all_dist_test_data = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data) -all_test_data += $(all_dist_test_data) -EXTRA_DIST += $(all_dist_test_data) -all_test_ltlibs = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries) - -if ENABLE_ALWAYS_BUILD_TESTS -noinst_LTLIBRARIES += $(all_test_ltlibs) -noinst_PROGRAMS += $(all_test_programs) -noinst_SCRIPTS += $(all_test_scripts) -noinst_DATA += $(all_test_data) -else -check_LTLIBRARIES += $(all_test_ltlibs) -check_PROGRAMS += $(all_test_programs) -check_SCRIPTS += $(all_test_scripts) -check_DATA += $(all_test_data) -endif - -if ENABLE_INSTALLED_TESTS -installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \ - $(test_extra_programs) $(installed_test_extra_programs) -installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \ - $(test_extra_scripts) $(test_installed_extra_scripts) -installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \ - $(dist_installed_test_scripts) $(dist_installed_test_extra_scripts) -nobase_installed_test_DATA += $(test_data) $(installed_test_data) -nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data) -installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries) -installed_testcases = $(test_programs) $(installed_test_programs) \ - $(test_scripts) $(installed_test_scripts) \ - $(dist_test_scripts) $(dist_installed_test_scripts) - -installed_test_meta_DATA = $(installed_testcases:=.test) - -%.test: %$(EXEEXT) Makefile - $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ - echo 'Type=session' >> $@.tmp; \ - echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \ - mv $@.tmp $@) - -CLEANFILES += $(installed_test_meta_DATA) -endif diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh index 0d82147f..afb05546 100755 --- a/utils/irssi-version.sh +++ b/utils/irssi-version.sh @@ -1,6 +1,6 @@ #!/bin/sh -DATE=`grep '^v' $1/NEWS | head -1` +DATE=`grep '^v' "$1"/NEWS | head -1` VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -` case $VERSION_DATE in *xx) @@ -20,7 +20,7 @@ if echo "${VERSION}" | grep -q -- -head; then VERSION_DATE=`date +%Y%m%d` fi - git_version=$(GIT_DIR=$1/.git git describe --dirty --long --tags --match '[0-9]*.[0-9]*' 2>/dev/null) + git_version=`GIT_DIR=$1/.git git describe --dirty --long --tags --match '[0-9]*.[0-9]*' 2>/dev/null` if [ $? = 0 ]; then echo "#undef PACKAGE_VERSION" echo "#define PACKAGE_VERSION \"${git_version}\"" diff --git a/utils/make-dist.sh b/utils/make-dist.sh new file mode 100755 index 00000000..2e26701c --- /dev/null +++ b/utils/make-dist.sh @@ -0,0 +1,96 @@ +#!/bin/sh +# Run this to create a distribution tarball from a git checkout + +set -e + +PKG_NAME="Irssi" + +repo_root="$(git rev-parse --show-toplevel)" +dist_tmp="$repo_root/${PKG_NAME}-Dist" + +if [ -z "$repo_root" ]; then + echo "**Error**: ${PKG_NAME} make-dist.sh must be run in a git clone, cannot proceed." + exit 1 +fi + +if [ ! -f "$repo_root"/irssi.conf ]; then + echo -n "**Error**: Directory \`$repo_root' does not look like the" + echo " top-level $PKG_NAME directory" + exit 1 +fi + +cd "$repo_root" +./utils/check-perl-hash.sh + +if [ -f pyproject.toml ] || [ -f setup.cfg ]; then + echo "**Error**: ${PKG_NAME} make-dist.sh cannot be run in Dist directory, cannot proceed." + exit 1 +fi + + +rm -fr "$dist_tmp" +echo "Cloning to \`$dist_tmp'..." +git clone --quiet --no-local "$repo_root" "$dist_tmp" +cd "$dist_tmp" +if [ ! -f meson.build ]; then + echo "**Error**: ${PKG_NAME} make-dist.sh could not find meson.build, cannot proceed." + exit 1 +fi + +name=$(perl -0777 -n -e "m{project\\(\\s*'(.*?)'}s and print \$1 and exit" meson.build) +version=$(perl -0777 -n -e "m{project\\(.*?,\\s*version\\s*:\\s*'(.*?)'}s and print \$1 and exit" meson.build) +if [ -z "$name" ] || [ -z "$version" ]; then + echo "**Error**: ${PKG_NAME} make-dist.sh could not find either name or version, cannot proceed." + exit 1 +fi +version=$(echo "$version"|perl -p -e 's/-head/.dev0/') + +git log > ChangeLog + +cat <pyproject.toml +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta" + +PYPROJECT_TOML + +cat <setup.cfg +[metadata] +name = $name +version = $version +url = https://irssi.org/ +maintainer = The Irssi team +maintainer_email = @ +license = GNU General Public License v2 or later (GPLv2+) + +[check-manifest] +ignore = + pyproject.toml +$(perl -a -l -n -e '$F[0] eq "#" and $F[1] eq "ignore" and print " @F[2..$#F]"' MANIFEST.in) + +SETUP_CFG + +if command -v check-manifest >/dev/null; then + echo "Checking MANIFEST.in..." + check-manifest --ignore ChangeLog +else + echo "**Warning**: check-manifest not found, did not check MANIFEST.in" +fi + +echo "Creating sdist..." +python3 -W ignore -c 'from setuptools import *;setup()' --quiet sdist --formats=tar + +tar --delete --file "dist/$name-$version.tar" \ + $(tar tf "dist/$name-$version.tar" | grep -F \ + "$name-$version/setup.cfg +$name-$version/pyproject.toml +$name-$version/$name.egg-info +$name-$version/PKG-INFO") + +echo "Zipping..." +xz -k "dist/$name-$version.tar" +gzip -k "dist/$name-$version.tar" + +mv -v dist/*.tar.* "$repo_root" +cd "$repo_root" +# rm -fr "$dist_tmp" diff --git a/utils/syncdocs.sh b/utils/syncdocs.sh index fb88393b..73c69c03 100755 --- a/utils/syncdocs.sh +++ b/utils/syncdocs.sh @@ -1,25 +1,28 @@ #!/bin/sh -e -# Run this to download FAQ and startup-HOWTO from irssi.org +# Run this to download QNA and New-users from irssi.org PKG_NAME="Irssi" +export LC_ALL=en_IE.utf8 site=https://irssi.org -faq=$site/documentation/faq/ -howto=$site/documentation/startup/ -design=$site/documentation/design/ +qna=$site/documentation/qna/ +howto=$site/New-users/ +#design=$site/documentation/design/ # remove everything until H1 and optionally 2 DIVs before the # FOOTER. May need to be adjusted as the source pages change pageclean_regex='s{.*(?=)?\s*(\s*){0,3})}{\1\2}g;' +s{(\s*)?\s*((\r?\n)*\s*\s*)?(\s*){0,3})}{\1\2}g; +s{}{}g; +s{(.*?)}{\1}g;' srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. srcdir="$srcdir"/.. -if test ! -f "$srcdir"/configure.ac; then +if test ! -f "$srcdir"/irssi.conf; then echo -n "**Error**: Directory \`$srcdir' does not look like the" echo " top-level $PKG_NAME directory" exit 1 @@ -45,6 +48,7 @@ else any=false fi +addheadermark="perl -p -e s{\\K}{(q:#:x\$1).q: :}ge;s{(?=)}{q: :.(q:#:x\$1)}ge" if type w3m >/dev/null 2>&1 ; then converter="w3m -o display_link_number=1 -dump -T text/html" any=true @@ -83,25 +87,33 @@ download_it() { mv "$3".tmp "$3" } -download_it "FAQ" "$faq" "$srcdir"/docs/faq.html -download_it "Startup How-To" "$howto" "$srcdir"/docs/startup-HOWTO.html -download_it "Design" "$design" "$srcdir"/docs/design.html +download_it_nested() { + name=$1; shift + src=$1; shift + dest=$1; shift + download_it "$name" "$src" "$dest".nest + echo > "$dest" + eval $(perl -n -0777 -e 'print qq{download_it "\$name ($2)" "\${src}$1/" "\${dest}.$1"; +cat "\${dest}.$1" >> "\${dest}.tmp"; +rm "\${dest}.$1";\n} + while(m{(.*?)}g)' "$dest".nest) + rm "$dest".nest + perl -i -0777 -p -e 's{}{}g;s{\A}{\n}' "$dest".tmp + mv "$dest".tmp "$dest" +} + +download_it_nested "QNA" "$qna" "$srcdir"/docs/qna.html +download_it "New users guide" "$howto" "$srcdir"/docs/New-users.html +#download_it "Design" "$design" "$srcdir"/docs/design.html # .html -> .txt with lynx or elinks -echo "Documentation: html -> txt..." +echo "Documentation: html -> txt... [converter: $converter]" -cat "$srcdir"/docs/faq.html \ - | LC_ALL=en_IE.utf8 $converter \ - | perl -pe ' - s/^ *//; - if ($_ eq "\n" && $state eq "Q") { $_ = ""; } - elsif (/^([QA]):/) { $state = $1 } - elsif ($_ ne "\n") { $_ = " $_"; }; -' > "$srcdir"/docs/faq.txt +cat "$srcdir"/docs/qna.html \ + | $addheadermark | $converter > "$srcdir"/docs/qna.txt -cat "$srcdir"/docs/startup-HOWTO.html \ - | perl -pe "s/\\bhref=([\"\'])#.*?\\1//" \ - | LC_ALL=en_IE.utf8 $converter > "$srcdir"/docs/startup-HOWTO.txt +cat "$srcdir"/docs/New-users.html \ + | $addheadermark | $converter > "$srcdir"/docs/New-users.txt -cat "$srcdir"/docs/design.html \ - | LC_ALL=en_IE.utf8 $converter > "$srcdir"/docs/design.txt +#cat "$srcdir"/docs/design.html \ +# | $addheadermark | $converter > "$srcdir"/docs/design.txt diff --git a/utils/syncscripts.sh b/utils/syncscripts.sh index 533b77cc..5df1d036 100755 --- a/utils/syncscripts.sh +++ b/utils/syncscripts.sh @@ -9,7 +9,7 @@ srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. srcdir="$srcdir"/.. -if test ! -f "$srcdir"/configure.ac; then +if test ! -f "$srcdir"/irssi.conf; then echo -n "**Error**: Directory \`$srcdir' does not look like the" echo " top-level $PKG_NAME directory" exit 1 diff --git a/utils/tap-driver.sh b/utils/tap-driver.sh deleted file mode 100755 index 19aa531d..00000000 --- a/utils/tap-driver.sh +++ /dev/null @@ -1,652 +0,0 @@ -#! /bin/sh -# Copyright (C) 2011-2013 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -scriptversion=2011-12-27.17; # UTC - -# Make unconditional expansion of undefined variables an error. This -# helps a lot in preventing typo-related bugs. -set -u - -me=tap-driver.sh - -fatal () -{ - echo "$me: fatal: $*" >&2 - exit 1 -} - -usage_error () -{ - echo "$me: $*" >&2 - print_usage >&2 - exit 2 -} - -print_usage () -{ - cat < - # - trap : 1 3 2 13 15 - if test $merge -gt 0; then - exec 2>&1 - else - exec 2>&3 - fi - "$@" - echo $? - ) | LC_ALL=C ${AM_TAP_AWK-awk} \ - -v me="$me" \ - -v test_script_name="$test_name" \ - -v log_file="$log_file" \ - -v trs_file="$trs_file" \ - -v expect_failure="$expect_failure" \ - -v merge="$merge" \ - -v ignore_exit="$ignore_exit" \ - -v comments="$comments" \ - -v diag_string="$diag_string" \ -' -# FIXME: the usages of "cat >&3" below could be optimized when using -# FIXME: GNU awk, and/on on systems that supports /dev/fd/. - -# Implementation note: in what follows, `result_obj` will be an -# associative array that (partly) simulates a TAP result object -# from the `TAP::Parser` perl module. - -## ----------- ## -## FUNCTIONS ## -## ----------- ## - -function fatal(msg) -{ - print me ": " msg | "cat >&2" - exit 1 -} - -function abort(where) -{ - fatal("internal error " where) -} - -# Convert a boolean to a "yes"/"no" string. -function yn(bool) -{ - return bool ? "yes" : "no"; -} - -function add_test_result(result) -{ - if (!test_results_index) - test_results_index = 0 - test_results_list[test_results_index] = result - test_results_index += 1 - test_results_seen[result] = 1; -} - -# Whether the test script should be re-run by "make recheck". -function must_recheck() -{ - for (k in test_results_seen) - if (k != "XFAIL" && k != "PASS" && k != "SKIP") - return 1 - return 0 -} - -# Whether the content of the log file associated to this test should -# be copied into the "global" test-suite.log. -function copy_in_global_log() -{ - for (k in test_results_seen) - if (k != "PASS") - return 1 - return 0 -} - -# FIXME: this can certainly be improved ... -function get_global_test_result() -{ - if ("ERROR" in test_results_seen) - return "ERROR" - if ("FAIL" in test_results_seen || "XPASS" in test_results_seen) - return "FAIL" - all_skipped = 1 - for (k in test_results_seen) - if (k != "SKIP") - all_skipped = 0 - if (all_skipped) - return "SKIP" - return "PASS"; -} - -function stringify_result_obj(result_obj) -{ - if (result_obj["is_unplanned"] || result_obj["number"] != testno) - return "ERROR" - - if (plan_seen == LATE_PLAN) - return "ERROR" - - if (result_obj["directive"] == "TODO") - return result_obj["is_ok"] ? "XPASS" : "XFAIL" - - if (result_obj["directive"] == "SKIP") - return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL; - - if (length(result_obj["directive"])) - abort("in function stringify_result_obj()") - - return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL -} - -function decorate_result(result) -{ - color_name = color_for_result[result] - if (color_name) - return color_map[color_name] "" result "" color_map["std"] - # If we are not using colorized output, or if we do not know how - # to colorize the given result, we should return it unchanged. - return result -} - -function report(result, details) -{ - if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/) - { - msg = ": " test_script_name - add_test_result(result) - } - else if (result == "#") - { - msg = " " test_script_name ":" - } - else - { - abort("in function report()") - } - if (length(details)) - msg = msg " " details - # Output on console might be colorized. - print decorate_result(result) msg - # Log the result in the log file too, to help debugging (this is - # especially true when said result is a TAP error or "Bail out!"). - print result msg | "cat >&3"; -} - -function testsuite_error(error_message) -{ - report("ERROR", "- " error_message) -} - -function handle_tap_result() -{ - details = result_obj["number"]; - if (length(result_obj["description"])) - details = details " " result_obj["description"] - - if (plan_seen == LATE_PLAN) - { - details = details " # AFTER LATE PLAN"; - } - else if (result_obj["is_unplanned"]) - { - details = details " # UNPLANNED"; - } - else if (result_obj["number"] != testno) - { - details = sprintf("%s # OUT-OF-ORDER (expecting %d)", - details, testno); - } - else if (result_obj["directive"]) - { - details = details " # " result_obj["directive"]; - if (length(result_obj["explanation"])) - details = details " " result_obj["explanation"] - } - - report(stringify_result_obj(result_obj), details) -} - -# `skip_reason` should be empty whenever planned > 0. -function handle_tap_plan(planned, skip_reason) -{ - planned += 0 # Avoid getting confused if, say, `planned` is "00" - if (length(skip_reason) && planned > 0) - abort("in function handle_tap_plan()") - if (plan_seen) - { - # Error, only one plan per stream is acceptable. - testsuite_error("multiple test plans") - return; - } - planned_tests = planned - # The TAP plan can come before or after *all* the TAP results; we speak - # respectively of an "early" or a "late" plan. If we see the plan line - # after at least one TAP result has been seen, assume we have a late - # plan; in this case, any further test result seen after the plan will - # be flagged as an error. - plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN) - # If testno > 0, we have an error ("too many tests run") that will be - # automatically dealt with later, so do not worry about it here. If - # $plan_seen is true, we have an error due to a repeated plan, and that - # has already been dealt with above. Otherwise, we have a valid "plan - # with SKIP" specification, and should report it as a particular kind - # of SKIP result. - if (planned == 0 && testno == 0) - { - if (length(skip_reason)) - skip_reason = "- " skip_reason; - report("SKIP", skip_reason); - } -} - -function extract_tap_comment(line) -{ - if (index(line, diag_string) == 1) - { - # Strip leading `diag_string` from `line`. - line = substr(line, length(diag_string) + 1) - # And strip any leading and trailing whitespace left. - sub("^[ \t]*", "", line) - sub("[ \t]*$", "", line) - # Return what is left (if any). - return line; - } - return ""; -} - -# When this function is called, we know that line is a TAP result line, -# so that it matches the (perl) RE "^(not )?ok\b". -function setup_result_obj(line) -{ - # Get the result, and remove it from the line. - result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0) - sub("^(not )?ok[ \t]*", "", line) - - # If the result has an explicit number, get it and strip it; otherwise, - # automatically assing the next progresive number to it. - if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/) - { - match(line, "^[0-9]+") - # The final `+ 0` is to normalize numbers with leading zeros. - result_obj["number"] = substr(line, 1, RLENGTH) + 0 - line = substr(line, RLENGTH + 1) - } - else - { - result_obj["number"] = testno - } - - if (plan_seen == LATE_PLAN) - # No further test results are acceptable after a "late" TAP plan - # has been seen. - result_obj["is_unplanned"] = 1 - else if (plan_seen && testno > planned_tests) - result_obj["is_unplanned"] = 1 - else - result_obj["is_unplanned"] = 0 - - # Strip trailing and leading whitespace. - sub("^[ \t]*", "", line) - sub("[ \t]*$", "", line) - - # This will have to be corrected if we have a "TODO"/"SKIP" directive. - result_obj["description"] = line - result_obj["directive"] = "" - result_obj["explanation"] = "" - - if (index(line, "#") == 0) - return # No possible directive, nothing more to do. - - # Directives are case-insensitive. - rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*" - - # See whether we have the directive, and if yes, where. - pos = match(line, rx "$") - if (!pos) - pos = match(line, rx "[^a-zA-Z0-9_]") - - # If there was no TAP directive, we have nothing more to do. - if (!pos) - return - - # Let`s now see if the TAP directive has been escaped. For example: - # escaped: ok \# SKIP - # not escaped: ok \\# SKIP - # escaped: ok \\\\\# SKIP - # not escaped: ok \ # SKIP - if (substr(line, pos, 1) == "#") - { - bslash_count = 0 - for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--) - bslash_count += 1 - if (bslash_count % 2) - return # Directive was escaped. - } - - # Strip the directive and its explanation (if any) from the test - # description. - result_obj["description"] = substr(line, 1, pos - 1) - # Now remove the test description from the line, that has been dealt - # with already. - line = substr(line, pos) - # Strip the directive, and save its value (normalized to upper case). - sub("^[ \t]*#[ \t]*", "", line) - result_obj["directive"] = toupper(substr(line, 1, 4)) - line = substr(line, 5) - # Now get the explanation for the directive (if any), with leading - # and trailing whitespace removed. - sub("^[ \t]*", "", line) - sub("[ \t]*$", "", line) - result_obj["explanation"] = line -} - -function get_test_exit_message(status) -{ - if (status == 0) - return "" - if (status !~ /^[1-9][0-9]*$/) - abort("getting exit status") - if (status < 127) - exit_details = "" - else if (status == 127) - exit_details = " (command not found?)" - else if (status >= 128 && status <= 255) - exit_details = sprintf(" (terminated by signal %d?)", status - 128) - else if (status > 256 && status <= 384) - # We used to report an "abnormal termination" here, but some Korn - # shells, when a child process die due to signal number n, can leave - # in $? an exit status of 256+n instead of the more standard 128+n. - # Apparently, both behaviours are allowed by POSIX (2008), so be - # prepared to handle them both. See also Austing Group report ID - # 0000051 - exit_details = sprintf(" (terminated by signal %d?)", status - 256) - else - # Never seen in practice. - exit_details = " (abnormal termination)" - return sprintf("exited with status %d%s", status, exit_details) -} - -function write_test_results() -{ - print ":global-test-result: " get_global_test_result() > trs_file - print ":recheck: " yn(must_recheck()) > trs_file - print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file - for (i = 0; i < test_results_index; i += 1) - print ":test-result: " test_results_list[i] > trs_file - close(trs_file); -} - -BEGIN { - -## ------- ## -## SETUP ## -## ------- ## - -'"$init_colors"' - -# Properly initialized once the TAP plan is seen. -planned_tests = 0 - -COOKED_PASS = expect_failure ? "XPASS": "PASS"; -COOKED_FAIL = expect_failure ? "XFAIL": "FAIL"; - -# Enumeration-like constants to remember which kind of plan (if any) -# has been seen. It is important that NO_PLAN evaluates "false" as -# a boolean. -NO_PLAN = 0 -EARLY_PLAN = 1 -LATE_PLAN = 2 - -testno = 0 # Number of test results seen so far. -bailed_out = 0 # Whether a "Bail out!" directive has been seen. - -# Whether the TAP plan has been seen or not, and if yes, which kind -# it is ("early" is seen before any test result, "late" otherwise). -plan_seen = NO_PLAN - -## --------- ## -## PARSING ## -## --------- ## - -is_first_read = 1 - -while (1) - { - # Involutions required so that we are able to read the exit status - # from the last input line. - st = getline - if (st < 0) # I/O error. - fatal("I/O error while reading from input stream") - else if (st == 0) # End-of-input - { - if (is_first_read) - abort("in input loop: only one input line") - break - } - if (is_first_read) - { - is_first_read = 0 - nextline = $0 - continue - } - else - { - curline = nextline - nextline = $0 - $0 = curline - } - # Copy any input line verbatim into the log file. - print | "cat >&3" - # Parsing of TAP input should stop after a "Bail out!" directive. - if (bailed_out) - continue - - # TAP test result. - if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/) - { - testno += 1 - setup_result_obj($0) - handle_tap_result() - } - # TAP plan (normal or "SKIP" without explanation). - else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/) - { - # The next two lines will put the number of planned tests in $0. - sub("^1\\.\\.", "") - sub("[^0-9]*$", "") - handle_tap_plan($0, "") - continue - } - # TAP "SKIP" plan, with an explanation. - else if ($0 ~ /^1\.\.0+[ \t]*#/) - { - # The next lines will put the skip explanation in $0, stripping - # any leading and trailing whitespace. This is a little more - # tricky in truth, since we want to also strip a potential leading - # "SKIP" string from the message. - sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "") - sub("[ \t]*$", ""); - handle_tap_plan(0, $0) - } - # "Bail out!" magic. - # Older versions of prove and TAP::Harness (e.g., 3.17) did not - # recognize a "Bail out!" directive when preceded by leading - # whitespace, but more modern versions (e.g., 3.23) do. So we - # emulate the latter, "more modern" behaviour. - else if ($0 ~ /^[ \t]*Bail out!/) - { - bailed_out = 1 - # Get the bailout message (if any), with leading and trailing - # whitespace stripped. The message remains stored in `$0`. - sub("^[ \t]*Bail out![ \t]*", ""); - sub("[ \t]*$", ""); - # Format the error message for the - bailout_message = "Bail out!" - if (length($0)) - bailout_message = bailout_message " " $0 - testsuite_error(bailout_message) - } - # Maybe we have too look for dianogtic comments too. - else if (comments != 0) - { - comment = extract_tap_comment($0); - if (length(comment)) - report("#", comment); - } - } - -## -------- ## -## FINISH ## -## -------- ## - -# A "Bail out!" directive should cause us to ignore any following TAP -# error, as well as a non-zero exit status from the TAP producer. -if (!bailed_out) - { - if (!plan_seen) - { - testsuite_error("missing test plan") - } - else if (planned_tests != testno) - { - bad_amount = testno > planned_tests ? "many" : "few" - testsuite_error(sprintf("too %s tests run (expected %d, got %d)", - bad_amount, planned_tests, testno)) - } - if (!ignore_exit) - { - # Fetch exit status from the last line. - exit_message = get_test_exit_message(nextline) - if (exit_message) - testsuite_error(exit_message) - } - } - -write_test_results() - -exit 0 - -} # End of "BEGIN" block. -' - -# TODO: document that we consume the file descriptor 3 :-( -} 3>"$log_file" - -test $? -eq 0 || fatal "I/O or internal error" - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/utils/tap-test b/utils/tap-test deleted file mode 100755 index b3ef8b04..00000000 --- a/utils/tap-test +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/sh - -# run a GTest in tap mode. The test binary is passed as $1 - -t="$1"; shift -if ${PKG_CONFIG:-pkg-config} --atleast-version 2.40 glib-2.0; then -exec "$t" -k --tap "$@" -else # GTest does not support tap yet - (((("$t" "$@"; echo $? >&3) | ${AM_TAP_AWK:-awk} ' -{ - if (/: /) { - i++ - ok = /: OK/ - sub(/:/, " #") - print (ok ? "ok " : "not ok ") i " " $0 - } else { - print "# " $0 - } -} END { - print 1 ".." i -} -' >&4) 3>&1) | (read xs; exit $xs)) 4>&1 -fi