Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package unibilium for openSUSE:Factory checked in at 2025-03-31 11:43:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unibilium (Old) and /work/SRC/openSUSE:Factory/.unibilium.new.2696 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unibilium" Mon Mar 31 11:43:25 2025 rev:5 rq:1265525 version:2.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/unibilium/unibilium.changes 2021-07-03 20:51:00.384696010 +0200 +++ /work/SRC/openSUSE:Factory/.unibilium.new.2696/unibilium.changes 2025-03-31 11:44:49.868269846 +0200 @@ -1,0 +2,10 @@ +Wed Mar 26 21:03:07 UTC 2025 - Richard Rahl <rra...@opensuse.org> + +- update to 2.1.2: + * build: Add a minimal configure.ac + * build: bump minimum required cmake + * build(cmake): allow user to set TERMINFO_DIRS + * Do not stop searching on EPERM +- use newer macros (autosetup, ldconfig_scriptlets, make) + +------------------------------------------------------------------- Old: ---- unibilium-2.1.1.tar.gz New: ---- unibilium-2.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unibilium.spec ++++++ --- /var/tmp/diff_new_pack.0BQePv/_old 2025-03-31 11:44:50.320288602 +0200 +++ /var/tmp/diff_new_pack.0BQePv/_new 2025-03-31 11:44:50.320288602 +0200 @@ -1,7 +1,7 @@ # # spec file for package unibilium # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,15 @@ %define sover 4 Name: unibilium -Version: 2.1.1 +Version: 2.1.2 Release: 0 Summary: A terminfo parsing library License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ URL: https://github.com/neovim/neovim/wiki/Deps#forks Source: https://github.com/neovim/unibilium/archive/v%{version}/unibilium-%{version}.tar.gz +BuildRequires: autoconf +BuildRequires: automake BuildRequires: libtool BuildRequires: pkgconfig @@ -57,18 +59,15 @@ This package holds the development files. %prep -%setup -q +%autosetup %build -make CFLAGS="%{optflags}" \ - PREFIX="%{_prefix}" \ - LIBDIR="%{_libdir}" \ - %{?_smp_mflags} +autoreconf -vfi +%configure +%make_build %install -%make_install CFLAGS="%{optflags}" \ - PREFIX="%{_prefix}" \ - LIBDIR="%{_libdir}" +%make_install # Remove libtool files. find %{buildroot} -type f -name "*.la" -delete -print @@ -76,8 +75,7 @@ # Remove static library file. rm -vf %{buildroot}%{_libdir}/lib%{name}.a -%post -n lib%{name}%{sover} -p /sbin/ldconfig -%postun -n lib%{name}%{sover} -p /sbin/ldconfig +%ldconfig_scriptlets -n lib%{name}%{sover} %files -n lib%{name}%{sover} %license LICENSE @@ -85,8 +83,10 @@ %{_libdir}/lib%{name}.so.* %files devel +%license LICENSE +%doc Changes GPLv3 LGPLv3 README.md %{_includedir}/%{name}.h %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%{_mandir}/man3/unibi*.3* +%{_mandir}/man?/unibi*.?%{?ext_man} ++++++ unibilium-2.1.1.tar.gz -> unibilium-2.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unibilium-2.1.1/.gitignore new/unibilium-2.1.2/.gitignore --- old/unibilium-2.1.1/.gitignore 2021-04-04 13:47:20.000000000 +0200 +++ new/unibilium-2.1.2/.gitignore 2024-09-13 11:47:46.000000000 +0200 @@ -8,3 +8,24 @@ .*.swp /.maint /tags + +# autoreconf +aclocal.m4 +autom4te.cache/ +config.guess +config.sub +configure +ltmain.sh + +# configure +Makefile +config.log +config.status +libtool + +# Tools +compile_commands.json + +# Build/deps dir +/build/ +/.cache/clangd/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unibilium-2.1.1/CMakeLists.txt new/unibilium-2.1.2/CMakeLists.txt --- old/unibilium-2.1.1/CMakeLists.txt 2021-04-04 13:47:20.000000000 +0200 +++ new/unibilium-2.1.2/CMakeLists.txt 2024-09-13 11:47:46.000000000 +0200 @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 2.8.12) -project(unibilium LANGUAGES C) +cmake_minimum_required(VERSION 3.10) +project(unibilium LANGUAGES C VERSION 2.1.2) file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/*.c) add_library(unibilium ${SRC_FILES}) @@ -12,12 +12,13 @@ ncursesw5-config --terminfo-dirs 2>/dev/null || \ ncurses5-config --terminfo-dirs 2>/dev/null || \ echo '/etc/terminfo:/lib/terminfo:/usr/share/terminfo:/usr/lib/terminfo:/usr/local/share/terminfo:/usr/local/lib/terminfo'" - OUTPUT_VARIABLE TERMINFO_DIRS) + OUTPUT_VARIABLE TERMINFO_DIRS_DEFAULT) # Remove trailing newline - string(STRIP "${TERMINFO_DIRS}" TERMINFO_DIRS) + string(STRIP "${TERMINFO_DIRS_DEFAULT}" TERMINFO_DIRS_DEFAULT) else() - set(TERMINFO_DIRS "") + set(TERMINFO_DIRS_DEFAULT "") endif() +set(TERMINFO_DIRS "${TERMINFO_DIRS_DEFAULT}" CACHE STRING "Colon-separated list of directories where unibilium should look for compiled terminfo files at runtime") target_compile_definitions(unibilium PUBLIC "TERMINFO_DIRS=\"${TERMINFO_DIRS}\"") include(GNUInstallDirs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unibilium-2.1.1/Changes new/unibilium-2.1.2/Changes --- old/unibilium-2.1.1/Changes 2021-04-04 13:47:20.000000000 +0200 +++ new/unibilium-2.1.2/Changes 2024-09-13 11:47:46.000000000 +0200 @@ -1,3 +1,11 @@ +2.1.2 2024-07-11 + - Add build and deps directories to gitignore + - build(cmake): allow user to set `TERMINFO_DIRS` (#25) + - Do not stop searching on access denied. + - build: bump minimum required version (#22) + - build: Add a minimal configure.ac + - doc: update issue tracker URL #20 + 2.1.1 2021-04-04 - Makefile: fix undefined references with static builds (#19) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unibilium-2.1.1/Makefile new/unibilium-2.1.2/Makefile --- old/unibilium-2.1.1/Makefile 2021-04-04 13:47:20.000000000 +0200 +++ new/unibilium-2.1.2/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,142 +0,0 @@ -ifneq ($(wildcard .maint),) - include maint.mk -endif - -ifeq ($(shell uname),Darwin) - LIBTOOL?=glibtool -else - LIBTOOL?=libtool -endif - -CFLAGS?=-O2 - -CFLAGS_DEBUG= - -PACKAGE=unibilium - -PKG_MAJOR=2 -PKG_MINOR=1 -PKG_REVISION=1 - -PKG_VERSION=$(PKG_MAJOR).$(PKG_MINOR).$(PKG_REVISION) - -# I am implementation $LT_REVISION of binary interface $LT_CURRENT, which is -# a superset of all interfaces back to $LT_CURRENT - $LT_AGE. -LT_REVISION=1 -LT_CURRENT=4 -LT_AGE=0 - -PREFIX=/usr/local -LIBDIR=$(PREFIX)/lib -INCDIR=$(PREFIX)/include -MANDIR=$(PREFIX)/share/man -MAN3DIR=$(MANDIR)/man3 - -ifneq ($(OS),Windows_NT) - TERMINFO_DIRS="$(shell ncursesw6-config --terminfo-dirs 2>/dev/null || \ - ncurses6-config --terminfo-dirs 2>/dev/null || \ - ncursesw5-config --terminfo-dirs 2>/dev/null || \ - ncurses5-config --terminfo-dirs 2>/dev/null || \ - echo "/etc/terminfo:/lib/terminfo:/usr/share/terminfo:/usr/lib/terminfo:/usr/local/share/terminfo:/usr/local/lib/terminfo")" -else - TERMINFO_DIRS="" -endif - -POD2MAN=pod2man -POD2MAN_OPTS=-c "$(PACKAGE)" -s3 -r "$(PACKAGE)-$(PKG_VERSION)" - -PROVE=prove -PROVEFLAGS=-f `perl -we 'print $$ENV{MAKEFLAGS} =~ /-j *(\d+)?/ ? "-j" . ($$1 || 2) : ""'` - -ifeq ($(DEBUG),1) - CFLAGS_DEBUG=-ggdb -DDEBUG -Og -endif - -OBJECTS=unibilium.lo uninames.lo uniutil.lo -LIBRARY=libunibilium.la - -PODS=$(wildcard doc/*.pod) -MANPAGES=$(addprefix man/,$(notdir $(PODS:.pod=.3.gz))) - -TOOLS=$(wildcard tools/*.c) - -TESTS=$(wildcard t/*.c) - -.PHONY: all -all: $(LIBRARY) build-man build-tools build-test - -%.lo: %.c unibilium.h - $(LIBTOOL) --mode=compile --tag=CC $(CC) -I. -Wall -std=c99 $(CFLAGS) $(CFLAGS_DEBUG) -o $@ -c $< - -uniutil.lo: uniutil.c unibilium.h - $(LIBTOOL) --mode=compile --tag=CC $(CC) -I. -DTERMINFO_DIRS='$(TERMINFO_DIRS)' -Wall -std=c99 $(CFLAGS) $(CFLAGS_DEBUG) -o $@ -c $< - -$(LIBRARY): $(OBJECTS) - $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -rpath '$(LIBDIR)' -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -o $@ $^ - -tools/%: $(LIBRARY) $(OBJECTS) tools/%.lo - $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ - -%.t: $(LIBRARY) $(OBJECTS) %.lo - $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ - -.PHONY: build-tools -build-tools: $(TOOLS:.c=) - -.PHONY: build-test -build-test: $(TESTS:.c=.t) - -.PHONY: test -test: build-test - @echo $(PROVE) $(PROVEFLAGS) - @$(PROVE) $(PROVEFLAGS) - -.PHONY: clean -clean: - $(LIBTOOL) --mode=clean rm -f $(OBJECTS) $(LIBRARY) $(MANPAGES) - $(LIBTOOL) --mode=clean rm -f tools/.libs/* t/.libs/* # XXX there has to be a better way - $(LIBTOOL) --mode=clean rm -f $(TOOLS:.c=) $(TOOLS:.c=.o) $(TESTS:.c=.t) $(TESTS:.c=.o) - -.PHONY: install -install: install-inc install-lib install-man - $(LIBTOOL) --mode=finish '$(DESTDIR)$(LIBDIR)' - -.PHONY: install-inc -install-inc: - mkdir -p '$(DESTDIR)$(INCDIR)' - install -m644 unibilium.h '$(DESTDIR)$(INCDIR)' - mkdir -p '$(DESTDIR)$(LIBDIR)/pkgconfig' - perl -wpe 'BEGIN { @V{"VERSION", "LIBDIR", "INCDIR"} = splice @ARGV } s/\@(VERSION|LIBDIR|INCDIR)\@/$$V{$$1}/g' '$(PKG_VERSION)' '$(LIBDIR)' '$(INCDIR)' <unibilium.pc.in >'$(DESTDIR)$(LIBDIR)/pkgconfig/unibilium.pc' - -.PHONY: install-lib -install-lib: - mkdir -p '$(DESTDIR)$(LIBDIR)' - $(LIBTOOL) --mode=install cp $(LIBRARY) '$(DESTDIR)$(LIBDIR)/$(LIBRARY)' - -.PHONY: install-man -install-man: build-man - mkdir -p '$(DESTDIR)$(MAN3DIR)' - install -m644 $(MANPAGES) '$(DESTDIR)$(MAN3DIR)' - -.PHONY: build-man -build-man: $(MANPAGES) - -man/%.3.gz: doc/%.pod - $(POD2MAN) $(POD2MAN_OPTS) $< | gzip > $@ - - -# Regenerate static test files, based on existing terminfo entries. -# Typical usage (to not use files from ~/.terminfo etc): -# TERMINFO=/usr/share/terminfo make regenerate-tests -STATIC_TEST_FILES:= \ - t/static_screen-256color.c \ - t/static_screen.c \ - t/static_tmux.c \ - t/static_xterm-256color.c -.PHONY: regenerate-tests -regenerate-tests: - $(RM) $(STATIC_TEST_FILES) - $(MAKE) $(STATIC_TEST_FILES) - -t/static_%.c: | tools/gen-static-test - $< $(patsubst t/static_%.c,%,$@) > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unibilium-2.1.1/Makefile.in new/unibilium-2.1.2/Makefile.in --- old/unibilium-2.1.1/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/unibilium-2.1.2/Makefile.in 2024-09-13 11:47:46.000000000 +0200 @@ -0,0 +1,145 @@ +ifneq ($(wildcard .maint),) + include maint.mk +endif + +CC=@CC@ +LIBTOOL=@LIBTOOL@ + +CFLAGS=@CFLAGS@ +LDFLAGS=@LDFLAGS@ + +CFLAGS_DEBUG= + +PACKAGE=@PACKAGE_NAME@ + +PKG_MAJOR=@MAJOR@ +PKG_MINOR=@MINOR@ +PKG_REVISION=@PATCH@ + +PKG_VERSION=$(PKG_MAJOR).$(PKG_MINOR).$(PKG_REVISION) + +# I am implementation $LT_REVISION of binary interface $LT_CURRENT, which is +# a superset of all interfaces back to $LT_CURRENT - $LT_AGE. +LT_REVISION=1 +LT_CURRENT=4 +LT_AGE=0 + +top_builddir=@top_builddir@ + +prefix=@prefix@ +exec_prefix=@prefix@ +datarootdir=@datarootdir@ + +LIBDIR=@libdir@ +INCDIR=@includedir@ +MANDIR=@mandir@ +MAN3DIR=$(MANDIR)/man3 + +ifneq ($(OS),Windows_NT) + TERMINFO_DIRS="$(shell ncursesw6-config --terminfo-dirs 2>/dev/null || \ + ncurses6-config --terminfo-dirs 2>/dev/null || \ + ncursesw5-config --terminfo-dirs 2>/dev/null || \ + ncurses5-config --terminfo-dirs 2>/dev/null || \ + echo "/etc/terminfo:/lib/terminfo:/usr/share/terminfo:/usr/lib/terminfo:/usr/local/share/terminfo:/usr/local/lib/terminfo")" +else + TERMINFO_DIRS="" +endif + +POD2MAN=pod2man +POD2MAN_OPTS=-c "$(PACKAGE)" -s3 -r "$(PACKAGE)-$(PKG_VERSION)" + +PROVE=prove +PROVEFLAGS=-f `perl -we 'print $$ENV{MAKEFLAGS} =~ /-j *(\d+)?/ ? "-j" . ($$1 || 2) : ""'` + +ifeq ($(DEBUG),1) + CFLAGS_DEBUG=-ggdb -DDEBUG -Og +endif + +OBJECTS=unibilium.lo uninames.lo uniutil.lo +LIBRARY=libunibilium.la + +PODS=$(wildcard doc/*.pod) +MANPAGES=$(addprefix man/,$(notdir $(PODS:.pod=.3.gz))) + +TOOLS=$(wildcard tools/*.c) + +TESTS=$(wildcard t/*.c) + +.PHONY: all +all: $(LIBRARY) build-man build-tools build-test + +%.lo: %.c unibilium.h + $(LIBTOOL) --mode=compile --tag=CC $(CC) -I. -Wall -std=c99 $(CFLAGS) $(CFLAGS_DEBUG) -o $@ -c $< + +uniutil.lo: uniutil.c unibilium.h + $(LIBTOOL) --mode=compile --tag=CC $(CC) -I. -DTERMINFO_DIRS='$(TERMINFO_DIRS)' -Wall -std=c99 $(CFLAGS) $(CFLAGS_DEBUG) -o $@ -c $< + +$(LIBRARY): $(OBJECTS) + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -rpath '$(LIBDIR)' -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -o $@ $^ + +tools/%: $(LIBRARY) $(OBJECTS) tools/%.lo + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ + +%.t: $(LIBRARY) $(OBJECTS) %.lo + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ + +.PHONY: build-tools +build-tools: $(TOOLS:.c=) + +.PHONY: build-test +build-test: $(TESTS:.c=.t) + +.PHONY: test +test: build-test + @echo $(PROVE) $(PROVEFLAGS) + @$(PROVE) $(PROVEFLAGS) + +.PHONY: clean +clean: + $(LIBTOOL) --mode=clean rm -f $(OBJECTS) $(LIBRARY) $(MANPAGES) + $(LIBTOOL) --mode=clean rm -f tools/.libs/* t/.libs/* # XXX there has to be a better way + $(LIBTOOL) --mode=clean rm -f $(TOOLS:.c=) $(TOOLS:.c=.o) $(TESTS:.c=.t) $(TESTS:.c=.o) + +.PHONY: install +install: install-inc install-lib install-man + $(LIBTOOL) --mode=finish '$(DESTDIR)$(LIBDIR)' + +.PHONY: install-inc +install-inc: + mkdir -p '$(DESTDIR)$(INCDIR)' + install -m644 unibilium.h '$(DESTDIR)$(INCDIR)' + mkdir -p '$(DESTDIR)$(LIBDIR)/pkgconfig' + perl -wpe 'BEGIN { @V{"VERSION", "LIBDIR", "INCDIR"} = splice @ARGV } s/\@(VERSION|LIBDIR|INCDIR)\@/$$V{$$1}/g' '$(PKG_VERSION)' '$(LIBDIR)' '$(INCDIR)' <unibilium.pc.in >'$(DESTDIR)$(LIBDIR)/pkgconfig/unibilium.pc' + +.PHONY: install-lib +install-lib: + mkdir -p '$(DESTDIR)$(LIBDIR)' + $(LIBTOOL) --mode=install cp $(LIBRARY) '$(DESTDIR)$(LIBDIR)/$(LIBRARY)' + +.PHONY: install-man +install-man: build-man + mkdir -p '$(DESTDIR)$(MAN3DIR)' + install -m644 $(MANPAGES) '$(DESTDIR)$(MAN3DIR)' + +.PHONY: build-man +build-man: $(MANPAGES) + +man/%.3.gz: doc/%.pod + $(POD2MAN) $(POD2MAN_OPTS) $< | gzip > $@ + + +# Regenerate static test files, based on existing terminfo entries. +# Typical usage (to not use files from ~/.terminfo etc): +# TERMINFO=/usr/share/terminfo make regenerate-tests +STATIC_TEST_FILES:= \ + t/static_screen-256color.c \ + t/static_screen.c \ + t/static_tmux.c \ + t/static_xterm-256color.c +.PHONY: regenerate-tests +regenerate-tests: + $(RM) $(STATIC_TEST_FILES) + $(MAKE) $(STATIC_TEST_FILES) + +t/static_%.c: | tools/gen-static-test + $< $(patsubst t/static_%.c,%,$@) > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unibilium-2.1.1/README.md new/unibilium-2.1.2/README.md --- old/unibilium-2.1.1/README.md 2021-04-04 13:47:20.000000000 +0200 +++ new/unibilium-2.1.2/README.md 2024-09-13 11:47:46.000000000 +0200 @@ -23,19 +23,33 @@ running the test suite) - gzip (for compressing the man pages) +Configure +--------- + +To generate the `configure` script run: + + autoreconf -fi + +To list the `configure` options run: + + ./configure --help + +To generate the `Makefile` run: + + ./configure --prefix=... + Building -------- -There is no configure step. Compile `unibilium.c`, `uninames.c`, and -`uniutil.c` into a library. +Compile `unibilium.c`, `uninames.c`, and `uniutil.c` into a library. -The included `Makefile` does this for you: +The generated `Makefile` does this for you: - make PREFIX=/usr/local + make or - make all PREFIX=/usr/local + make all creates the library files, generates the man pages, and compiles the test suite. @@ -77,14 +91,14 @@ make test to run the included test suite. If that fails, please report it at -https://github.com/mauke/unibilium/issues. +https://github.com/neovim/unibilium/issues. Installing ---------- Run - make install PREFIX=... + make install to install the library, header files, man pages, and pkg-config file. Take care to specify the same `PREFIX`, `LIBDIR`, `INCDIR`, and `MANDIR` settings @@ -94,7 +108,7 @@ - `DESTDIR`: Acts as an additional prefix for the final installation step. For example, if you do - `make PREFIX=/usr && make install PREFIX=/usr DESTDIR=/tmp`, then the + `./configure --prefix=/usr && make && make install DESTDIR=/tmp`, then the library will be configured for installation under `/usr`, but the actual files will be copied to `/tmp/usr`. Defaults to empty. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unibilium-2.1.1/configure.ac new/unibilium-2.1.2/configure.ac --- old/unibilium-2.1.1/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/unibilium-2.1.2/configure.ac 2024-09-13 11:47:46.000000000 +0200 @@ -0,0 +1,16 @@ +m4_define([MAJOR], [2]) +m4_define([MINOR], [1]) +m4_define([PATCH], [2]) + +AC_INIT([unibilium], [MAJOR.MINOR.PATCH]) +AC_CONFIG_FILES([Makefile]) + +LT_INIT + +AC_SUBST([top_builddir], [$abs_builddir]) + +AC_SUBST([MAJOR], [MAJOR]) +AC_SUBST([MINOR], [MINOR]) +AC_SUBST([PATCH], [PATCH]) + +AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unibilium-2.1.1/uniutil.c new/unibilium-2.1.2/uniutil.c --- old/unibilium-2.1.1/uniutil.c 2021-04-04 13:47:20.000000000 +0200 +++ new/unibilium-2.1.2/uniutil.c 2024-09-13 11:47:46.000000000 +0200 @@ -162,10 +162,14 @@ z = strchr(a, ':'); ut = from_dir(a, z, NULL, term); - if (ut || errno != ENOENT) { + if (ut) { return ut; } + if (errno != ENOENT && errno != EPERM && errno != EACCES) { + return NULL; + } + if (!z) { break; } @@ -196,9 +200,14 @@ if ((env = getenv("HOME"))) { ut = from_dir(env, NULL, ".terminfo", term); - if (ut || errno != ENOENT) { + + if (ut) { return ut; } + + if (errno != ENOENT && errno != EPERM && errno != EACCES) { + return NULL; + } } if ((env = getenv("TERMINFO_DIRS"))) {
