From bae5051ec6219be508b46bab785cddf1f04904f0 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 13 Jan 2018 02:35:24 +0100 Subject: libdpkg: Include for makedev() The glibc implementation provides this macro in and optionally the BSD variants in , although the latter are being deprecated and emit a warning with newer glibc. Conditionally include to prepare for the future removal from glibc. --- lib/dpkg/tarfn.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c index 27952f926..3ad531555 100644 --- a/lib/dpkg/tarfn.c +++ b/lib/dpkg/tarfn.c @@ -22,6 +22,9 @@ #include #include +#if HAVE_SYS_SYSMACROS_H +#include +#endif #include #include -- cgit v1.2.3 From 1e892d4e03cc396bd84e7f478d9cba77bfa40c70 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 24 Mar 2018 19:58:47 +0100 Subject: libcompat: Add md5 module to the libcompat-test library We have slightly modified the source and might continue to do so in the future, we should thus test that it builds correctly, even if we are not needing it on the current build. --- debian/changelog | 3 +++ lib/compat/Makefile.am | 1 + 2 files changed, 4 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index a85f2f464..d23a352c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo + * Portability: + - Add libcompat md5 module to the libcompat-test library, so that we + always make sure it builds, even when we use an external implementation. * Perl modules: - Check that $tarname is defined before use in Dpkg::Source::Package::V1. Thanks to Christoph Biedl . diff --git a/lib/compat/Makefile.am b/lib/compat/Makefile.am index 1d5840a25..19ddcef86 100644 --- a/lib/compat/Makefile.am +++ b/lib/compat/Makefile.am @@ -10,6 +10,7 @@ noinst_LTLIBRARIES = libcompat-test.la libcompat.la libcompat_test_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_LIBCOMPAT=1 libcompat_test_la_SOURCES = \ compat.h \ + md5.c md5.h \ strnlen.c \ strndup.c \ strsignal.c \ -- cgit v1.2.3 From 0d9c18d163ca37ef4c0c2127f8ec901f721d1473 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 24 Mar 2018 19:37:51 +0100 Subject: libcompat: Convert md5 module to use C99 int types In commit 1f4d0354fc4a8c80c6463b9aaebd93822247341b we opted to map the BSD int types to the C99 to avoid modifying the imported code. But we had to modify it anyway, those types are legacy and we require the C99 ones for the rest of the codebase. So let's just switch to them, and get rid of the type compatibility mapping. --- configure.ac | 1 - debian/changelog | 2 ++ lib/compat/md5.c | 20 ++++++++++---------- lib/compat/md5.h | 14 ++++++++------ m4/dpkg-types.m4 | 20 -------------------- 5 files changed, 20 insertions(+), 37 deletions(-) (limited to 'lib') diff --git a/configure.ac b/configure.ac index f6dff9f5e..2e09c63e1 100644 --- a/configure.ac +++ b/configure.ac @@ -124,7 +124,6 @@ AC_C_VOLATILE AC_TYPE_MODE_T AC_TYPE_PID_T AC_TYPE_SIZE_T -DPKG_TYPES_U_INT_T DPKG_TYPE_PTRDIFF_T AC_CHECK_SIZEOF([unsigned int]) AC_CHECK_SIZEOF([unsigned long]) diff --git a/debian/changelog b/debian/changelog index d23a352c7..15e135548 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium * Portability: - Add libcompat md5 module to the libcompat-test library, so that we always make sure it builds, even when we use an external implementation. + - Convert libcompat md5 module to use C99 int types, instead of mapping + them from the BSD types at configure time. * Perl modules: - Check that $tarname is defined before use in Dpkg::Source::Package::V1. Thanks to Christoph Biedl . diff --git a/lib/compat/md5.c b/lib/compat/md5.c index 3da18c98e..7da974635 100644 --- a/lib/compat/md5.c +++ b/lib/compat/md5.c @@ -41,7 +41,7 @@ (cp)[1] = (value) >> 8; \ (cp)[0] = (value); } while (0) -static u_int8_t PADDING[MD5_BLOCK_LENGTH] = { +static uint8_t PADDING[MD5_BLOCK_LENGTH] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 @@ -75,7 +75,7 @@ MD5Update(MD5_CTX *ctx, const unsigned char *input, size_t len) need = MD5_BLOCK_LENGTH - have; /* Update bitcount */ - ctx->count += (u_int64_t)len << 3; + ctx->count += (uint64_t)len << 3; if (len >= need) { if (have != 0) { @@ -106,7 +106,7 @@ MD5Update(MD5_CTX *ctx, const unsigned char *input, size_t len) void MD5Pad(MD5_CTX *ctx) { - u_int8_t count[8]; + uint8_t count[8]; size_t padlen; /* Convert count to 8 bytes in little endian order. */ @@ -156,19 +156,19 @@ MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], MD5_CTX *ctx) * the data and converts bytes into longwords for this routine. */ void -MD5Transform(u_int32_t state[4], const u_int8_t block[MD5_BLOCK_LENGTH]) +MD5Transform(uint32_t state[4], const uint8_t block[MD5_BLOCK_LENGTH]) { - u_int32_t a, b, c, d, in[MD5_BLOCK_LENGTH / 4]; + uint32_t a, b, c, d, in[MD5_BLOCK_LENGTH / 4]; #ifndef WORDS_BIGENDIAN memcpy(in, block, sizeof(in)); #else for (a = 0; a < MD5_BLOCK_LENGTH / 4; a++) { - in[a] = (u_int32_t)( - (u_int32_t)(block[a * 4 + 0]) | - (u_int32_t)(block[a * 4 + 1]) << 8 | - (u_int32_t)(block[a * 4 + 2]) << 16 | - (u_int32_t)(block[a * 4 + 3]) << 24); + in[a] = (uint32_t)( + (uint32_t)(block[a * 4 + 0]) | + (uint32_t)(block[a * 4 + 1]) << 8 | + (uint32_t)(block[a * 4 + 2]) << 16 | + (uint32_t)(block[a * 4 + 3]) << 24); } #endif diff --git a/lib/compat/md5.h b/lib/compat/md5.h index f6243603d..b5247d527 100644 --- a/lib/compat/md5.h +++ b/lib/compat/md5.h @@ -15,20 +15,22 @@ #ifndef _MD5_H_ #define _MD5_H_ +#include + #define MD5_BLOCK_LENGTH 64 #define MD5_DIGEST_LENGTH 16 #define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1) typedef struct MD5Context { - u_int32_t state[4]; /* state */ - u_int64_t count; /* number of bits, mod 2^64 */ - u_int8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ + uint32_t state[4]; /* state */ + uint64_t count; /* number of bits, mod 2^64 */ + uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ } MD5_CTX; void MD5Init(MD5_CTX *); -void MD5Update(MD5_CTX *, const u_int8_t *, size_t); +void MD5Update(MD5_CTX *, const uint8_t *, size_t); void MD5Pad(MD5_CTX *); -void MD5Final(u_int8_t [MD5_DIGEST_LENGTH], MD5_CTX *); -void MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH]); +void MD5Final(uint8_t [MD5_DIGEST_LENGTH], MD5_CTX *); +void MD5Transform(uint32_t [4], const uint8_t [MD5_BLOCK_LENGTH]); #endif /* _MD5_H_ */ diff --git a/m4/dpkg-types.m4 b/m4/dpkg-types.m4 index 7fbbd2a0a..5355f5a93 100644 --- a/m4/dpkg-types.m4 +++ b/m4/dpkg-types.m4 @@ -11,26 +11,6 @@ AC_DEFUN([DPKG_TYPE_PTRDIFF_T], [ ]) ])# DPKG_TYPE_PTRDIFF_T -# DPKG_TYPE_U_INT_T(N) -# -------------------- -# Check for u_intN_t BSD type, defining to C99 type if not. -AC_DEFUN([DPKG_TYPE_U_INT_T], [ - AC_CHECK_TYPE([u_int$1_t], [], [ - AC_DEFINE_UNQUOTED([u_int$1_t], [uint$1_t], - [Define to 'uint$1_t' if not defined.]) - ]) -]) - -# DPKG_TYPES_U_INT_T -# ------------------ -# Check for u_int(8|16|32|64)_t BSD types, defining to C99 types if not. -AC_DEFUN([DPKG_TYPES_U_INT_T], [ - DPKG_TYPE_U_INT_T([8]) - DPKG_TYPE_U_INT_T([16]) - DPKG_TYPE_U_INT_T([32]) - DPKG_TYPE_U_INT_T([64]) -]) - # DPKG_DECL_SYS_SIGLIST # --------------------- # Check for the sys_siglist variable in either signal.h or unistd.h -- cgit v1.2.3 From ac3134292ecb5ea5f203c3fa1376cbc093d35518 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 16 Mar 2018 04:17:16 +0100 Subject: libdpkg: Add new str_concat() function --- lib/dpkg/libdpkg.map | 1 + lib/dpkg/string.c | 19 +++++++++++++++++++ lib/dpkg/string.h | 1 + lib/dpkg/t/t-string.c | 34 +++++++++++++++++++++++++++++++++- 4 files changed, 54 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 5e685c948..85b8a1fa6 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -90,6 +90,7 @@ LIBDPKG_PRIVATE { str_match_end; str_fnv_hash; + str_concat; str_fmt; str_escape_fmt; str_strip_quotes; diff --git a/lib/dpkg/string.c b/lib/dpkg/string.c index 220e2789f..ff97159f9 100644 --- a/lib/dpkg/string.c +++ b/lib/dpkg/string.c @@ -28,6 +28,25 @@ #include #include +char * +str_concat(char *dst, ...) +{ + va_list args; + const char *src; + size_t len; + + va_start(args, dst); + while ((src = va_arg(args, const char *))) { + len = strlen(src); + memcpy(dst, src, len); + dst += len; + } + va_end(args); + *dst = '\0'; + + return dst; +} + /** * Match the end of a string. * diff --git a/lib/dpkg/string.h b/lib/dpkg/string.h index 927aeaee4..d0f6bd7ad 100644 --- a/lib/dpkg/string.h +++ b/lib/dpkg/string.h @@ -56,6 +56,7 @@ bool str_match_end(const char *str, const char *end); unsigned int str_fnv_hash(const char *str); +char *str_concat(char *dst, ...) DPKG_ATTR_SENTINEL; char *str_fmt(const char *fmt, ...) DPKG_ATTR_PRINTF(1); char *str_escape_fmt(char *dest, const char *src, size_t n); char *str_quote_meta(const char *src); diff --git a/lib/dpkg/t/t-string.c b/lib/dpkg/t/t-string.c index 038de84b0..1f5ee4cbe 100644 --- a/lib/dpkg/t/t-string.c +++ b/lib/dpkg/t/t-string.c @@ -76,6 +76,37 @@ test_str_fnv_hash(void) test_pass(str_fnv_hash("Rest-string") == 0x20464b9fUL); } +static void +test_str_concat(void) +{ + char buf[1024], *str; + + memset(buf, 0, sizeof(buf)); + str = str_concat(buf, NULL); + test_pass(str == buf); + test_str(buf, ==, ""); + + memset(buf, 0, sizeof(buf)); + str = str_concat(buf, "aaa", NULL); + test_str(buf, ==, "aaa"); + test_pass(str == buf + 3); + + memset(buf, 0, sizeof(buf)); + str = str_concat(buf, "zzzz", "yy", "xxxx", NULL); + test_str(buf, ==, "zzzzyyxxxx"); + test_pass(str == buf + 10); + + memset(buf, 0, sizeof(buf)); + str = str_concat(buf, "1234", "", "5678", NULL); + test_str(buf, ==, "12345678"); + test_pass(str == buf + 8); + + memset(buf, ' ', sizeof(buf)); + str = str_concat(buf, "eol", NULL, "bom", NULL); + test_str(buf, ==, "eol"); + test_pass(str == buf + 3); +} + static void test_str_fmt(void) { @@ -197,11 +228,12 @@ test_str_strip_quotes(void) TEST_ENTRY(test) { - test_plan(50); + test_plan(60); test_str_is_set(); test_str_match_end(); test_str_fnv_hash(); + test_str_concat(); test_str_fmt(); test_str_escape_fmt(); test_str_quote_meta(); -- cgit v1.2.3 From cd96cca4b2cf83f46d6e289418ed06e3c2ef7066 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 16 Mar 2018 04:33:31 +0100 Subject: libdpkg: Make pkg_name() and pkgbin_name() get const structs Modifying the struct pkginfo and struct pkgbin complicates how the code is used, and when the function can be called. Let's just initialize the pkgname_archqual variable at parse time, so that we can use it at any time, simplifying the overall code. --- lib/dpkg/dpkg-db.h | 7 +++---- lib/dpkg/dump.c | 10 ++-------- lib/dpkg/parse.c | 10 ++++++++++ lib/dpkg/pkg-show.c | 17 ++--------------- 4 files changed, 17 insertions(+), 27 deletions(-) (limited to 'lib') diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index bffd317ab..56b4b5c39 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -110,8 +110,7 @@ struct pkgbin { bool essential; enum pkgmultiarch multiarch; const struct dpkg_arch *arch; - /** The following is the "pkgname:archqual" cached string, if this was a - * C++ class this member would be mutable. */ + /** The fully qualified package name, i.e. "pkgname:archqual". */ const char *pkgname_archqual; const char *description; const char *maintainer; @@ -377,9 +376,9 @@ enum pkg_name_arch_when { void varbuf_add_pkgbin_name(struct varbuf *vb, const struct pkginfo *pkg, const struct pkgbin *pkgbin, enum pkg_name_arch_when pnaw); -const char *pkgbin_name(struct pkginfo *pkg, struct pkgbin *pkgbin, +const char *pkgbin_name(const struct pkginfo *pkg, const struct pkgbin *pkgbin, enum pkg_name_arch_when pnaw); -const char *pkg_name(struct pkginfo *pkg, enum pkg_name_arch_when pnaw); +const char *pkg_name(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw); void pkg_source_version(struct dpkg_version *version, diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c index b13eb6e79..a04f673d9 100644 --- a/lib/dpkg/dump.c +++ b/lib/dpkg/dump.c @@ -461,16 +461,10 @@ writerecord(FILE *file, const char *filename, varbufrecord(&vb, pkg, pkgbin); varbuf_end_str(&vb); - if (fputs(vb.buf,file) < 0) { - struct varbuf pkgname = VARBUF_INIT; - int errno_saved = errno; - varbuf_add_pkgbin_name(&pkgname, pkg, pkgbin, pnaw_nonambig); - - errno = errno_saved; + if (fputs(vb.buf, file) < 0) ohshite(_("failed to write details of '%.50s' to '%.250s'"), - pkgname.buf, filename); - } + pkgbin_name(pkg, pkgbin, pnaw_nonambig), filename); varbuf_destroy(&vb); } diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index 1b3bf13d8..d75c54458 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -219,6 +219,16 @@ pkg_parse_verify(struct parsedb_state *ps, parse_error(ps, _("package has field '%s' but is architecture all"), "Multi-Arch: same"); + /* Generate the fully qualified package name representation. */ + if (pkgbin->arch->type != DPKG_ARCH_NONE && + pkgbin->arch->type != DPKG_ARCH_EMPTY) { + char *pkgname = nfmalloc(strlen(pkg->set->name) + 1 + + strlen(pkgbin->arch->name) + 1); + + str_concat(pkgname, pkg->set->name, ":", pkgbin->arch->name, NULL); + pkgbin->pkgname_archqual = pkgname; + } + /* Initialize deps to be arch-specific unless stated otherwise. */ for (dep = pkgbin->depends; dep; dep = dep->next) for (dop = dep->list; dop; dop = dop->next) diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c index 6af658c42..4818675bb 100644 --- a/lib/dpkg/pkg-show.c +++ b/lib/dpkg/pkg-show.c @@ -93,25 +93,12 @@ varbuf_add_pkgbin_name(struct varbuf *vb, * @return The string representation. */ const char * -pkgbin_name(struct pkginfo *pkg, struct pkgbin *pkgbin, +pkgbin_name(const struct pkginfo *pkg, const struct pkgbin *pkgbin, enum pkg_name_arch_when pnaw) { if (!pkgbin_name_needs_arch(pkgbin, pnaw)) return pkg->set->name; - /* Cache the package name representation, for later reuse. */ - if (pkgbin->pkgname_archqual == NULL) { - struct varbuf vb = VARBUF_INIT; - - varbuf_add_str(&vb, pkg->set->name); - varbuf_add_archqual(&vb, pkgbin->arch); - varbuf_end_str(&vb); - - pkgbin->pkgname_archqual = nfstrsave(vb.buf); - - varbuf_destroy(&vb); - } - return pkgbin->pkgname_archqual; } @@ -126,7 +113,7 @@ pkgbin_name(struct pkginfo *pkg, struct pkgbin *pkgbin, * @return The string representation. */ const char * -pkg_name(struct pkginfo *pkg, enum pkg_name_arch_when pnaw) +pkg_name(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw) { return pkgbin_name(pkg, &pkg->installed, pnaw); } -- cgit v1.2.3 From 9f7e58acdf28043bce2dfaf24ba27bb878418658 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Mar 2017 13:33:09 +0100 Subject: Use internerr() or BUG() instead of assert() The problem with assert() is that it does not print the contents of the variables. It also can be disabled on NDEBUG. But we always want these consistency checks no matter what, and they are not performance sensitive anyway. Enable -Wno-nonnull-compare so that we can keep doing run-time non-NULL checks in functions, instead of just compile-time checks. --- TODO | 1 - debian/changelog | 3 +++ debian/rules | 7 ++++- debian/usertags | 3 ++- dpkg-split/join.c | 5 ++-- dselect/baselist.cc | 6 +++-- dselect/main.cc | 1 - dselect/methlist.cc | 11 +++++--- dselect/method.cc | 7 ++--- dselect/methparse.cc | 5 ++-- dselect/pkgdepcon.cc | 4 +-- dselect/pkglist.cc | 23 +++++++++++----- dselect/pkgsublist.cc | 9 ++++--- dselect/pkgtop.cc | 5 ++-- lib/dpkg/arch.c | 4 +-- lib/dpkg/dbmodify.c | 18 +++++++++---- lib/dpkg/dump.c | 68 +++++++++++++++++++++++++++++++---------------- lib/dpkg/file.c | 4 +-- lib/dpkg/parse.c | 6 +++-- lib/dpkg/path-remove.c | 4 +-- lib/dpkg/pkg-array.c | 5 ++-- lib/dpkg/pkg-db.c | 7 ++--- lib/dpkg/pkg.c | 6 +++-- lib/dpkg/triglib.c | 15 ++++++++--- m4/dpkg-compiler.m4 | 1 + src/archives.c | 19 +++++++++---- src/configure.c | 5 ++-- src/depcon.c | 13 +++++---- src/enquiry.c | 5 ++-- src/filesdb.c | 10 ++++--- src/packages.c | 23 +++++++++++----- src/script.c | 6 +++-- src/trigproc.c | 15 +++++++---- src/unpack.c | 18 +++++++++---- utils/start-stop-daemon.c | 8 +++--- 35 files changed, 235 insertions(+), 115 deletions(-) (limited to 'lib') diff --git a/TODO b/TODO index bc2dee0a9..a4f485da4 100644 --- a/TODO +++ b/TODO @@ -28,7 +28,6 @@ TODO - Do more unused header include removal. - Add needed includes to all header files. - Get rid of useless "unsigned" modifiers. - - Use internerr instead of assert, and print more meaningful messages. - Use enums for currently hardcoded literals (replacingfilesandsaid, filetriggers_edited, etc). - Do not use nfmalloc (and friends) for non in-core db memory. diff --git a/debian/changelog b/debian/changelog index 0574fb529..3d59b4278 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium initialized, instead of non-zero. * Switch a fatal() call in start-stop-daemon into the new BUG() macro, because it is really an internal error. + * Switch all assert() calls (except in update-alternatives) into internerr() + or BUG() calls, to get way better reporting with variable contents and + descriptions, and to make them always present independent of NDEBUG. * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo diff --git a/debian/rules b/debian/rules index 27a2499ef..d5e13c67f 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,12 @@ # Copyright © 2004 Scott James Remnant # Copyright © 2006-2012 Guillem Jover -WFLAGS := -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers +WFLAGS := \ + -Wall -Wextra \ + -Wno-missing-field-initializers \ + -Wno-nonnull-compare \ + -Wno-unused-parameter \ + $(nil) # Use the in-tree dpkg-buildflags dpkg_buildflags = \ diff --git a/debian/usertags b/debian/usertags index 5ef5a449a..97a6d8d44 100644 --- a/debian/usertags +++ b/debian/usertags @@ -15,7 +15,8 @@ Generic tags usertag description ------- ----------- -assert Errors caused by assert(). +assert Errors caused by assert() (obsoleted by internerr() + usage). segfault Errors that cause segmentation faults. conffile Issues with configuration file handling. symlink Issues related to symlink handling. diff --git a/dpkg-split/join.c b/dpkg-split/join.c index 0a61bc921..b5e14712e 100644 --- a/dpkg-split/join.c +++ b/dpkg-split/join.c @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -120,7 +119,9 @@ do_join(const char *const *argv) refi= NULL; for (pq= queue; pq; pq= pq->nextinqueue) if (!refi || pq->info.thispartn < refi->thispartn) refi= &pq->info; - assert(refi); + if (refi == NULL) + internerr("empty deb part queue"); + partlist= nfmalloc(sizeof(struct partinfo*)*refi->maxpartn); for (i = 0; i < refi->maxpartn; i++) partlist[i] = NULL; diff --git a/dselect/baselist.cc b/dselect/baselist.cc index d74ed439d..80fee6935 100644 --- a/dselect/baselist.cc +++ b/dselect/baselist.cc @@ -25,7 +25,6 @@ #include -#include #include #include #include @@ -155,7 +154,10 @@ baselist::draw_column_item(column &col, int y, const char *item) void baselist::setheights() { int y= ymax - (title_height + colheads_height + thisstate_height); - assert(y>=1); + + if (y < 1) + internerr("widget y=%d < 1", y); + if (showinfo==2 && y>=7) { list_height= 5; whatinfo_height= 1; diff --git a/dselect/main.cc b/dselect/main.cc index 55ced3351..e634e7447 100644 --- a/dselect/main.cc +++ b/dselect/main.cc @@ -26,7 +26,6 @@ #include #include -#include #include #include #if HAVE_LOCALE_H diff --git a/dselect/methlist.cc b/dselect/methlist.cc index 331bf0562..6cc280cf4 100644 --- a/dselect/methlist.cc +++ b/dselect/methlist.cc @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -129,10 +128,16 @@ methodlist::methodlist() : baselist(&methodlistbindings) { struct dselect_option *opt, **ip; for (opt=options, ip=table, nitems=0; opt; opt=opt->next, nitems++) { - if (opt == coption) { assert(newcursor==-1); newcursor= nitems; } + if (opt == coption) { + if (newcursor != -1) + internerr("multiple methods with same index"); + newcursor = nitems; + } *ip++= opt; } - assert(nitems==noptions); + if (nitems != noptions) + internerr("inconsistent number of items: ntimes=%d != noptions=%d", + nitems, noptions); if (newcursor==-1) newcursor= 0; setcursor(newcursor); diff --git a/dselect/method.cc b/dselect/method.cc index 74ac9842c..76863bc34 100644 --- a/dselect/method.cc +++ b/dselect/method.cc @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -71,8 +70,10 @@ sthfailed(const char * reasoning) static void cu_unlockmethod(int, void**) { struct flock fl; - assert(methodlockfile); - assert(methlockfd >= 0); + if (methodlockfile == NULL) + internerr("method lock file is NULL"); + if (methlockfd < 0) + internerr("method lock fd is %d < 0", methlockfd); fl.l_type=F_UNLCK; fl.l_whence= SEEK_SET; fl.l_start=fl.l_len=0; if (fcntl(methlockfd,F_SETLK,&fl) == -1) sthfailed(_("cannot unlock access method area")); diff --git a/dselect/methparse.cc b/dselect/methparse.cc index 131e79fbf..a1ab31a8b 100644 --- a/dselect/methparse.cc +++ b/dselect/methparse.cc @@ -26,7 +26,6 @@ #include #include -#include #include #include #include @@ -292,7 +291,9 @@ void getcurrentopt() { void writecurrentopt() { struct atomic_file *file; - assert(methoptfile); + if (methoptfile == NULL) + internerr("method options filename is NULL"); + file = atomic_file_new(methoptfile, (enum atomic_file_flags)0); atomic_file_open(file); if (fprintf(file->fp, "%s %s\n", coption->meth->name, coption->name) == EOF) diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc index 87886ffb6..2104d2c8c 100644 --- a/dselect/pkgdepcon.cc +++ b/dselect/pkgdepcon.cc @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -401,7 +400,8 @@ packagelist::deppossatisfied(deppossi *possi, perpackagestate **fixbyupgrade) // been specified, in which case we don't need to look at the rest // anyway. if (useavailable(&possi->ed->pkg)) { - assert(want == PKG_WANT_INSTALL); + if (want != PKG_WANT_INSTALL) + internerr("depossi package is not want-install, is %d", want); return versionsatisfied(&possi->ed->pkg.available, possi); } else { if (versionsatisfied(&possi->ed->pkg.installed, possi)) diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc index 105f3c1aa..cb144e773 100644 --- a/dselect/pkglist.cc +++ b/dselect/pkglist.cc @@ -23,7 +23,6 @@ #include #include -#include #include #include #include @@ -113,7 +112,10 @@ void packagelist::addheading(enum ssavailval ssavail, pkgpriority priority, const char *otherpriority, const char *section) { - assert(nitems <= nallocated); + if (nitems > nallocated) + internerr("inconsistent state: ntimes=%d > nallocated=%d", + nitems, nallocated); + if (nitems == nallocated) { nallocated += nallocated+50; struct perpackagestate **newtable= new struct perpackagestate*[nallocated]; @@ -266,7 +268,9 @@ void packagelist::sortmakeheads() { discardheadings(); ensurestatsortinfo(); sortinplace(); - assert(nitems); + + if (nitems == 0) + internerr("cannot sort 0 items"); debug(dbg_general, "packagelist[%p]::sortmakeheads() sortorder=%d statsortorder=%d", @@ -275,7 +279,9 @@ void packagelist::sortmakeheads() { int nrealitems= nitems; addheading(ssa_none, sss_none, PKG_PRIO_UNSET, nullptr, nullptr); - assert(sortorder != so_unsorted); + if (sortorder == so_unsorted) + internerr("cannot sort unsorted order"); + if (sortorder == so_alpha && statsortorder == sso_unsorted) { sortinplace(); return; } // Important: do not save pointers into table in this function, because @@ -287,7 +293,8 @@ void packagelist::sortmakeheads() { int a; for (a=0; apkg; - assert(thispkg->set->name); + if (thispkg->set->name == NULL) + internerr("package set has no name at table index %d", a); int ssdiff= 0; ssavailval ssavail= ssa_none; ssstateval ssstate= sss_none; @@ -456,11 +463,13 @@ perpackagestate::free(bool recursive) if (pkg->set->name) { if (modstatdb_get_status() == msdbrw_write) { if (uprec) { - assert(recursive); + if (!recursive) + internerr("unexpected non-recursive free requested"); uprec->selected= selected; pkg->clientdata= uprec; } else { - assert(!recursive); + if (recursive) + internerr("unexpected recursive free requested"); if (pkg->want != selected && !(pkg->want == PKG_WANT_UNKNOWN && selected == PKG_WANT_PURGE)) { pkg->want= selected; diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc index 30b202f7d..d25334f4b 100644 --- a/dselect/pkgsublist.cc +++ b/dselect/pkgsublist.cc @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -102,8 +101,12 @@ void packagelist::addunavailable(deppossi *possi) { if (!recursive) return; if (alreadydone(&unavdone,possi)) return; - assert(possi->up->up->clientdata); - assert(possi->up->up->clientdata->uprec); + if (possi->up->up->clientdata == nullptr) + internerr("deppossi from package %s has nullptr clientdata", + pkg_name(possi->up->up, pnaw_always)); + if (possi->up->up->clientdata->uprec == nullptr) + internerr("deppossi from package %s has nullptr clientdata's uprec", + pkg_name(possi->up->up, pnaw_always)); varbuf& vb= possi->up->up->clientdata->relations; vb(possi->ed->name); diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc index 0da1f109d..6e233a1f9 100644 --- a/dselect/pkgtop.cc +++ b/dselect/pkgtop.cc @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -42,7 +41,9 @@ pkgprioritystring(const struct pkginfo *pkg) } else if (pkg->priority == PKG_PRIO_OTHER) { return pkg->otherpriority; } else { - assert(pkg->priority <= PKG_PRIO_UNKNOWN); + if (pkg->priority > PKG_PRIO_UNKNOWN) + internerr("package %s has out-of-range priority %d", + pkg_name(pkg, pnaw_always), pkg->priority); return gettext(prioritystrings[pkg->priority]); } } diff --git a/lib/dpkg/arch.c b/lib/dpkg/arch.c index 099957170..36b482972 100644 --- a/lib/dpkg/arch.c +++ b/lib/dpkg/arch.c @@ -23,7 +23,6 @@ #include #include -#include #include #include #include @@ -59,7 +58,8 @@ dpkg_arch_name_is_illegal(const char *name) static char buf[150]; const char *p = name; - assert(name); + if (name == NULL) + internerr("arch name argument is NULL"); if (!*p) return _("may not be empty string"); if (!c_isalnum(*p)) diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c index ec1102107..9baa58373 100644 --- a/lib/dpkg/dbmodify.c +++ b/lib/dpkg/dbmodify.c @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -307,13 +306,19 @@ modstatdb_get_status(void) void modstatdb_checkpoint(void) { int i; - assert(cstatus >= msdbrw_write); + if (cstatus < msdbrw_write) + internerr("modstatdb status '%d' is not writtable", cstatus); + writedb(statusfile, wdb_must_sync); for (i=0; i IMPORTANTMAXLEN) + internerr("modstatdb update entry name '%s' longer than %d", + updatefnrest, IMPORTANTMAXLEN); + if (unlink(updatefnbuf)) ohshite(_("failed to remove my own update file %.255s"),updatefnbuf); } @@ -349,7 +354,8 @@ void modstatdb_shutdown(void) { static void modstatdb_note_core(struct pkginfo *pkg) { - assert(cstatus >= msdbrw_write); + if (cstatus < msdbrw_write) + internerr("modstatdb status '%d' is not writtable", cstatus); varbuf_reset(&uvb); varbufrecord(&uvb, pkg, &pkg->installed); @@ -377,7 +383,9 @@ modstatdb_note_core(struct pkginfo *pkg) dir_sync_path(updatesdir); /* Have we made a real mess? */ - assert(strlen(updatefnrest) <= IMPORTANTMAXLEN); + if (strlen(updatefnrest) > IMPORTANTMAXLEN) + internerr("modstatdb update entry name '%s' longer than %d", + updatefnrest, IMPORTANTMAXLEN); nextupdate++; diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c index a04f673d9..8086cf77f 100644 --- a/lib/dpkg/dump.c +++ b/lib/dpkg/dump.c @@ -30,7 +30,6 @@ #include #include -#include #include #include #include @@ -57,7 +56,9 @@ w_name(struct varbuf *vb, const struct pkginfo *pkg, const struct pkgbin *pkgbin, enum fwriteflags flags, const struct fieldinfo *fip) { - assert(pkg->set->name); + if (pkg->set->name == NULL) + internerr("pkgset has no name"); + if (flags&fw_printheader) varbuf_add_str(vb, "Package: "); varbuf_add_str(vb, pkg->set->name); @@ -230,7 +231,11 @@ w_priority(struct varbuf *vb, { if (pkg->priority == PKG_PRIO_UNKNOWN) return; - assert(pkg->priority <= PKG_PRIO_UNKNOWN); + + if (pkg->priority > PKG_PRIO_UNKNOWN) + internerr("package %s has out-of-range priority %d", + pkgbin_name(pkg, pkgbin, pnaw_always), pkg->priority); + if (flags&fw_printheader) varbuf_add_str(vb, "Priority: "); varbuf_add_str(vb, pkg_priority_name(pkg)); @@ -245,38 +250,46 @@ w_status(struct varbuf *vb, { if (pkgbin != &pkg->installed) return; - assert(pkg->want <= PKG_WANT_PURGE); - assert(pkg->eflag <= PKG_EFLAG_REINSTREQ); -#define PEND pkg->trigpend_head -#define AW pkg->trigaw.head + if (pkg->want > PKG_WANT_PURGE) + internerr("package %s has unknown want state %d", + pkgbin_name(pkg, pkgbin, pnaw_always), pkg->want); + if (pkg->eflag > PKG_EFLAG_REINSTREQ) + internerr("package %s has unknown error state %d", + pkgbin_name(pkg, pkgbin, pnaw_always), pkg->eflag); + switch (pkg->status) { case PKG_STAT_NOTINSTALLED: case PKG_STAT_CONFIGFILES: - assert(!PEND); - assert(!AW); + if (pkg->trigpend_head || pkg->trigaw.head) + internerr("package %s in state %s, has awaited or pending triggers", + pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_HALFINSTALLED: case PKG_STAT_UNPACKED: case PKG_STAT_HALFCONFIGURED: - assert(!PEND); + if (pkg->trigpend_head) + internerr("package %s in state %s, has pending triggers", + pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_TRIGGERSAWAITED: - assert(AW); + if (pkg->trigaw.head == NULL) + internerr("package %s in state %s, has no awaited triggers", + pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_TRIGGERSPENDING: - assert(PEND); - assert(!AW); + if (pkg->trigpend_head == NULL || pkg->trigaw.head) + internerr("package %s in stata %s, has awaited or no pending triggers", + pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_INSTALLED: - assert(!PEND); - assert(!AW); + if (pkg->trigpend_head || pkg->trigaw.head) + internerr("package %s in state %s, has awaited or pending triggers", + pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; default: internerr("unknown package status '%d'", pkg->status); } -#undef PEND -#undef AW if (flags&fw_printheader) varbuf_add_str(vb, "Status: "); @@ -295,7 +308,9 @@ void varbufdependency(struct varbuf *vb, struct dependency *dep) { possdel= ""; for (dop= dep->list; dop; dop= dop->next) { - assert(dop->up == dep); + if (dop->up != dep) + internerr("dependency and deppossi not linked properly"); + varbuf_add_str(vb, possdel); possdel = " | "; varbuf_add_str(vb, dop->ed->name); @@ -339,7 +354,10 @@ w_dependency(struct varbuf *vb, for (dyp = pkgbin->depends; dyp; dyp = dyp->next) { if (dyp->type != fip->integer) continue; - assert(dyp->up == pkg); + + if (dyp->up != pkg) + internerr("dependency and package %s not linked properly", + pkgbin_name(pkg, pkgbin, pnaw_always)); if (dep_found) { varbuf_add_str(vb, ", "); @@ -389,8 +407,10 @@ w_trigpend(struct varbuf *vb, if (pkgbin == &pkg->available || !pkg->trigpend_head) return; - assert(pkg->status >= PKG_STAT_TRIGGERSAWAITED && - pkg->status <= PKG_STAT_TRIGGERSPENDING); + if (pkg->status < PKG_STAT_TRIGGERSAWAITED || + pkg->status > PKG_STAT_TRIGGERSPENDING) + internerr("package %s in non-trigger state %s, has pending triggers", + pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); if (flags & fw_printheader) varbuf_add_str(vb, "Triggers-Pending:"); @@ -412,8 +432,10 @@ w_trigaw(struct varbuf *vb, if (pkgbin == &pkg->available || !pkg->trigaw.head) return; - assert(pkg->status > PKG_STAT_CONFIGFILES && - pkg->status <= PKG_STAT_TRIGGERSAWAITED); + if (pkg->status <= PKG_STAT_CONFIGFILES || + pkg->status > PKG_STAT_TRIGGERSAWAITED) + internerr("package %s in state %s, has awaited triggers", + pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); if (flags & fw_printheader) varbuf_add_str(vb, "Triggers-Awaited:"); diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index f8afdeb8a..cd261222c 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -25,7 +25,6 @@ #include #include -#include #include #include #include @@ -79,7 +78,8 @@ file_unlock(int lockfd, const char *lock_desc) { struct flock fl; - assert(lockfd >= 0); + if (lockfd < 0) + internerr("lock fd is %d < 0", lockfd); file_lock_setup(&fl, F_UNLCK); diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index d75c54458..221067881 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -28,7 +28,6 @@ #include #endif -#include #include #include #include @@ -493,7 +492,10 @@ pkg_parse_copy(struct parsedb_state *ps, dst_pkg->trigpend_head = src_pkg->trigpend_head; dst_pkg->trigaw = src_pkg->trigaw; for (ta = dst_pkg->trigaw.head; ta; ta = ta->sameaw.next) { - assert(ta->aw == src_pkg); + if (ta->aw != src_pkg) + internerr("trigger awaited package %s and origin package %s not linked properly", + pkg_name(ta->aw, pnaw_always), + pkgbin_name(src_pkg, src_pkgbin, pnaw_always)); ta->aw = dst_pkg; /* ->othertrigaw_head is updated by trig_note_aw in *(pkg_db_find()) * rather than in dst_pkg. */ diff --git a/lib/dpkg/path-remove.c b/lib/dpkg/path-remove.c index ab26b4a8d..ef9cde7b5 100644 --- a/lib/dpkg/path-remove.c +++ b/lib/dpkg/path-remove.c @@ -24,7 +24,6 @@ #include -#include #include #include #include @@ -122,7 +121,8 @@ path_remove_tree(const char *pathname) const char *u; u = path_skip_slash_dotslash(pathname); - assert(*u); + if (u[0] == '\0') + internerr("pathname '%s' reduces to nothing", pathname); debug(dbg_eachfile, "%s '%s'", __func__, pathname); if (!rmdir(pathname)) diff --git a/lib/dpkg/pkg-array.c b/lib/dpkg/pkg-array.c index 24c6dc0e2..cf5c34d3f 100644 --- a/lib/dpkg/pkg-array.c +++ b/lib/dpkg/pkg-array.c @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -74,7 +73,9 @@ pkg_array_init_from_db(struct pkg_array *a) a->pkgs[i] = pkg; pkg_db_iter_free(iter); - assert(i == a->n_pkgs); + if (i != a->n_pkgs) + internerr("inconsistent state in pkg array: i=%d != npkgs=%d", + i, a->n_pkgs); } /** diff --git a/lib/dpkg/pkg-db.c b/lib/dpkg/pkg-db.c index 300c1cad8..7135450a3 100644 --- a/lib/dpkg/pkg-db.c +++ b/lib/dpkg/pkg-db.c @@ -24,7 +24,6 @@ #include #include -#include #include #include @@ -171,8 +170,10 @@ pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch) { struct pkginfo *pkg, **pkgp; - assert(arch); - assert(arch->type != DPKG_ARCH_NONE); + if (arch == NULL) + internerr("arch argument is NULL"); + if (arch->type == DPKG_ARCH_NONE) + internerr("arch argument is none"); pkg = &set->pkg; diff --git a/lib/dpkg/pkg.c b/lib/dpkg/pkg.c index 1fc3d0c21..4141fddb2 100644 --- a/lib/dpkg/pkg.c +++ b/lib/dpkg/pkg.c @@ -22,9 +22,9 @@ #include #include -#include #include +#include #include #include #include @@ -42,7 +42,9 @@ pkg_set_status(struct pkginfo *pkg, enum pkgstatus status) else if (status == PKG_STAT_NOTINSTALLED) pkg->set->installed_instances--; - assert(pkg->set->installed_instances >= 0); + if (pkg->set->installed_instances < 0) + internerr("pkgset %s went into negative installed instances %d", + pkg->set->name, pkg->set->installed_instances); pkg->status = status; } diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c index 57bd2a66b..a067d1450 100644 --- a/lib/dpkg/triglib.c +++ b/lib/dpkg/triglib.c @@ -26,7 +26,6 @@ #include #include -#include #include #include #include @@ -104,7 +103,9 @@ trig_clear_awaiters(struct pkginfo *notpend) struct trigaw *ta; struct pkginfo *aw; - assert(!notpend->trigpend_head); + if (notpend->trigpend_head) + internerr("package %s has pending triggers", + pkg_name(notpend, pnaw_always)); ta = notpend->othertrigaw_head; notpend->othertrigaw_head = NULL; @@ -400,7 +401,10 @@ trk_file_interest_change(const char *trig, struct pkginfo *pkg, fnn = trigh.namenode_find(trig, signum <= 0); if (!fnn) { - assert(signum < 0); + if (signum >= 0) + internerr("lost filename node '%s' for package %s " + "triggered to add", trig, + pkgbin_name(pkg, pkgbin, pnaw_always)); return; } @@ -627,7 +631,10 @@ trig_cicb_interest_change(const char *trig, struct pkginfo *pkg, { const struct trigkindinfo *tki = trig_classify_byname(trig); - assert(filetriggers_edited >= 0); + if (filetriggers_edited < 0) + internerr("trigger control file for package %s not read", + pkgbin_name(pkg, pkgbin, pnaw_always)); + tki->interest_change(trig, pkg, pkgbin, signum, opts); } diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4 index a2e68e372..a6192f63a 100644 --- a/m4/dpkg-compiler.m4 +++ b/m4/dpkg-compiler.m4 @@ -56,6 +56,7 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [ DPKG_CHECK_COMPILER_FLAG([-Wmissing-declarations]) DPKG_CHECK_COMPILER_FLAG([-Wmissing-format-attribute]) DPKG_CHECK_COMPILER_FLAG([-Wno-missing-field-initializers]) + DPKG_CHECK_COMPILER_FLAG([-Wno-nonnull-compare]) DPKG_CHECK_COMPILER_FLAG([-Wno-tautological-constant-out-of-range-compare]) DPKG_CHECK_COMPILER_FLAG([-Wno-unused-parameter]) DPKG_CHECK_COMPILER_FLAG([-Wnull-dereference]) diff --git a/src/archives.c b/src/archives.c index b82ee4f56..113b76c3d 100644 --- a/src/archives.c +++ b/src/archives.c @@ -29,7 +29,6 @@ #include #include -#include #include #include #include @@ -631,7 +630,8 @@ linktosameexistingdir(const struct tar_entry *ti, const char *fname, varbuf_add_str(symlinkfn, instdir); } else { lastslash= strrchr(fname, '/'); - assert(lastslash); + if (lastslash == NULL) + internerr("tar entry filename '%s' does not contain '/'", fname); varbuf_add_buf(symlinkfn, fname, (lastslash - fname) + 1); } varbuf_add_str(symlinkfn, ti->linkname); @@ -1267,7 +1267,11 @@ void check_breaks(struct dependency *dep, struct pkginfo *pkg, char action[512]; ensure_package_clientdata(fixbydeconf); - assert(fixbydeconf->clientdata->istobe == PKG_ISTOBE_NORMAL); + + if (fixbydeconf->clientdata->istobe != PKG_ISTOBE_NORMAL) + internerr("package %s being fixed by deconf is not to be normal, " + "is to be %d", + pkg_name(pkg, pnaw_always), fixbydeconf->clientdata->istobe); sprintf(action, _("installation of %.250s"), pkgbin_name(pkg, &pkg->available, pnaw_nonambig)); @@ -1329,8 +1333,13 @@ void check_conflict(struct dependency *dep, struct pkginfo *pkg, fixbyrm->want != PKG_WANT_HOLD) || does_replace(pkg, &pkg->available, fixbyrm, &fixbyrm->installed)) && (!fixbyrm->installed.essential || fc_removeessential)))) { - assert(fixbyrm->clientdata->istobe == PKG_ISTOBE_NORMAL || - fixbyrm->clientdata->istobe == PKG_ISTOBE_DECONFIGURE); + + if (fixbyrm->clientdata->istobe != PKG_ISTOBE_NORMAL && + fixbyrm->clientdata->istobe != PKG_ISTOBE_DECONFIGURE) + internerr("package %s to be fixed by removal is not to be normal " + "nor deconfigure, is to be %d", + pkg_name(pkg, pnaw_always), fixbyrm->clientdata->istobe); + fixbyrm->clientdata->istobe = PKG_ISTOBE_REMOVE; notice(_("considering removing %s in favour of %s ..."), pkg_name(fixbyrm, pnaw_nonambig), diff --git a/src/configure.c b/src/configure.c index 815882425..3c565c61d 100644 --- a/src/configure.c +++ b/src/configure.c @@ -29,7 +29,6 @@ #include #include -#include #include #include #include @@ -681,7 +680,9 @@ deferred_configure(struct pkginfo *pkg) pkg_set_status(pkg, PKG_STAT_HALFCONFIGURED); } - assert(pkg->status == PKG_STAT_HALFCONFIGURED); + if (pkg->status != PKG_STAT_HALFCONFIGURED) + internerr("package %s in state %s, instead of half-configured", + pkg_name(pkg, pnaw_always), pkg_status_name(pkg)); modstatdb_note(pkg); diff --git a/src/depcon.c b/src/depcon.c index 924c53ac8..398d06a36 100644 --- a/src/depcon.c +++ b/src/depcon.c @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -314,10 +313,14 @@ depisok(struct dependency *dep, struct varbuf *whynot, * Allow 250x3 for package names, versions, &c, + 250 for ourselves. */ char linebuf[1024]; - assert(dep->type == dep_depends || dep->type == dep_predepends || - dep->type == dep_breaks || dep->type == dep_conflicts || - dep->type == dep_recommends || dep->type == dep_suggests || - dep->type == dep_enhances); + if (dep->type != dep_depends && + dep->type != dep_predepends && + dep->type != dep_breaks && + dep->type != dep_conflicts && + dep->type != dep_recommends && + dep->type != dep_suggests && + dep->type != dep_enhances) + internerr("unknown dependency type %d", dep->type); if (canfixbyremove) *canfixbyremove = NULL; diff --git a/src/enquiry.c b/src/enquiry.c index b299f841b..99349ba7c 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -26,7 +26,6 @@ #include -#include #include #include #include @@ -495,7 +494,9 @@ predeppackage(const char *const *argv) if (!dep) return 1; /* Not found. */ - assert(pkg); + if (pkg == NULL) + internerr("unexpected unfound package"); + startpkg= pkg; pkg->clientdata->istobe = PKG_ISTOBE_PREINSTALL; diff --git a/src/filesdb.c b/src/filesdb.c index 5050144e8..7f157727d 100644 --- a/src/filesdb.c +++ b/src/filesdb.c @@ -32,7 +32,6 @@ #include #include -#include #include #include #include @@ -600,8 +599,13 @@ struct filenamenode *findnamenode(const char *name, enum fnnflags flags) { pointerp = bins + (str_fnv_hash(name) % (BINS)); while (*pointerp) { - /* XXX: Why is the assert needed? It's checking already added entries. */ - assert((*pointerp)->name[0] == '/'); + /* XXX: This should not be needed, but it has been a constant source + * of assertions over the years. Hopefully with the internerr() we will + * get better diagnostics. */ + if ((*pointerp)->name[0] != '/') + internerr("filename node '%s' does not start with '/'", + (*pointerp)->name); + if (strcmp((*pointerp)->name + 1, name) == 0) break; pointerp= &(*pointerp)->next; diff --git a/src/packages.c b/src/packages.c index f68c971ef..ae001757f 100644 --- a/src/packages.c +++ b/src/packages.c @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -232,7 +231,9 @@ void process_queue(void) { * trigger processing, w/o jumping into the next dependtry. */ dependtry++; sincenothing = 0; - assert(dependtry <= 4); + if (dependtry > 4) + internerr("exceeded dependtry %d (sincenothing=%d; queue.length=%d)", + dependtry, sincenothing, queue.length); } else if (sincenothing > queue.length * 2 + 2) { /* XXX: This probably needs moving into a new dependtry instead. */ if (progress_bytrigproc && progress_bytrigproc->trigpend_head) { @@ -242,7 +243,9 @@ void process_queue(void) { } else { dependtry++; sincenothing = 0; - assert(dependtry <= 4); + if (dependtry > 4) + internerr("exceeded dependtry %d (sincenothing=%d, queue.length=%d)", + dependtry, sincenothing, queue.length); } } @@ -250,7 +253,8 @@ void process_queue(void) { pkg_name(pkg, pnaw_always), queue.length, sincenothing, dependtry); if (pkg->status > PKG_STAT_INSTALLED) - internerr("package status (%d) > PKG_STAT_INSTALLED", pkg->status); + internerr("package %s status %d is out-of-bounds", + pkg_name(pkg, pnaw_always), pkg->status); if (setjmp(ejbuf)) { /* Give up on it from the point of view of other packages, i.e. reset @@ -295,7 +299,10 @@ void process_queue(void) { pop_error_context(ehflag_normaltidy); } - assert(!queue.length); + + if (queue.length) + internerr("finished package processing with non-empty queue length %d", + queue.length); } /*** Dependency processing - common to --configure and --remove. ***/ @@ -424,7 +431,11 @@ deppossi_ok_found(struct pkginfo *possdependee, struct pkginfo *requiredby, return FOUND_OK; } if (possdependee->status == PKG_STAT_TRIGGERSAWAITED) { - assert(possdependee->trigaw.head); + if (possdependee->trigaw.head == NULL) + internerr("package %s in state %s, has no awaited triggers", + pkg_name(possdependee, pnaw_always), + pkg_status_name(possdependee)); + if (removing || !(f_triggers || possdependee->clientdata->istobe == PKG_ISTOBE_INSTALLNEW)) { diff --git a/src/script.c b/src/script.c index ac58779d1..ecf4a94a1 100644 --- a/src/script.c +++ b/src/script.c @@ -25,7 +25,6 @@ #include #include -#include #include #include #include @@ -137,7 +136,10 @@ maintscript_pre_exec(struct command *cmd) if (instdirlen == 0 || fc_script_chrootless) return cmd->filename; - assert(strlen(cmd->filename) >= instdirlen); + if (strlen(cmd->filename) < instdirlen) + internerr("maintscript name '%s' length < instdir length %zd", + cmd->filename, instdirlen); + return cmd->filename + instdirlen; } diff --git a/src/trigproc.c b/src/trigproc.c index b9681a273..9c73d4ca6 100644 --- a/src/trigproc.c +++ b/src/trigproc.c @@ -25,7 +25,6 @@ #include -#include #include #include @@ -335,8 +334,11 @@ check_trigger_cycle(struct pkginfo *processing_now) debug(dbg_triggers, "check_triggers_cycle pnow=%s giveup=%s", pkg_name(processing_now, pnaw_always), pkg_name(giveup, pnaw_always)); - assert(giveup->status == PKG_STAT_TRIGGERSAWAITED || - giveup->status == PKG_STAT_TRIGGERSPENDING); + if (giveup->status != PKG_STAT_TRIGGERSAWAITED && + giveup->status != PKG_STAT_TRIGGERSPENDING) + internerr("package %s in non-trigger state %s", + pkg_name(giveup, pnaw_always), + pkg_status_name(giveup)); pkg_set_status(giveup, PKG_STAT_HALFCONFIGURED); modstatdb_note(giveup); print_error_perpackage(_("triggers looping, abandoned"), @@ -367,8 +369,11 @@ trigproc(struct pkginfo *pkg, enum trigproc_type type) if (pkg->trigpend_head) { enum dep_check ok; - assert(pkg->status == PKG_STAT_TRIGGERSPENDING || - pkg->status == PKG_STAT_TRIGGERSAWAITED); + if (pkg->status != PKG_STAT_TRIGGERSPENDING && + pkg->status != PKG_STAT_TRIGGERSAWAITED) + internerr("package %s in non-trigger state %s", + pkg_name(pkg, pnaw_always), + pkg_status_name(pkg)); if (dependtry > 1) { gaveup = check_trigger_cycle(pkg); diff --git a/src/unpack.c b/src/unpack.c index ed2427206..f43c01e45 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -28,7 +28,6 @@ #include #include -#include #include #include #include @@ -859,8 +858,12 @@ pkg_disappear_others(struct pkginfo *pkg) debug(dbg_veryverbose, "process_archive checking disappearance %s", pkg_name(otherpkg, pnaw_always)); - assert(otherpkg->clientdata->istobe == PKG_ISTOBE_NORMAL || - otherpkg->clientdata->istobe == PKG_ISTOBE_DECONFIGURE); + + if (otherpkg->clientdata->istobe != PKG_ISTOBE_NORMAL && + otherpkg->clientdata->istobe != PKG_ISTOBE_DECONFIGURE) + internerr("disappearing package %s is not to be normal or deconfigure, " + "is to be %d", + pkg_name(otherpkg, pnaw_always), otherpkg->clientdata->istobe); for (cfile = otherpkg->clientdata->files; cfile && strcmp(cfile->namenode->name, "/.") == 0; @@ -1226,7 +1229,10 @@ void process_archive(const char *filename) { oldversionstatus= pkg->status; - assert(oldversionstatus <= PKG_STAT_INSTALLED); + if (oldversionstatus > PKG_STAT_INSTALLED) + internerr("package %s state %d is out-of-bounds", + pkg_name(pkg, pnaw_always), oldversionstatus); + debug(dbg_general,"process_archive oldversionstatus=%s", statusstrings[oldversionstatus]); @@ -1516,7 +1522,9 @@ void process_archive(const char *filename) { if (otherpkg->installed.arch != pkg->installed.arch) continue; - assert(otherpkg->status == PKG_STAT_NOTINSTALLED); + if (otherpkg->status != PKG_STAT_NOTINSTALLED) + internerr("other package %s instance in state %s instead of not-installed", + pkg_name(otherpkg, pnaw_always), pkg_status_name(otherpkg)); pkg_blank(otherpkg); } diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index 611340ecc..faea3d176 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -80,7 +80,6 @@ #include #include -#include #include #include #include @@ -959,7 +958,9 @@ parse_schedule(const char *schedule_str) schedule[count].value = repeatat; count++; } - assert(count == schedule_length); + if (count != schedule_length) + BUG("count=%d != schedule_length=%d", + count, schedule_length); } } @@ -2520,7 +2521,8 @@ run_stop_schedule(void) else continue; default: - assert(!"schedule[].type value must be valid"); + BUG("schedule[%d].type value %d is not valid", + position, schedule[position].type); } } -- cgit v1.2.3 From f1cc66e522a475710aa51a6d164a8cc0eda3cae7 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 4 Apr 2018 02:51:51 +0200 Subject: libdpkg: Move filesystem nodename hash implementation into a new module --- lib/dpkg/Makefile.am | 3 + lib/dpkg/fsys-hash.c | 169 +++++++++++++++++++++++++++++++++++++++++ lib/dpkg/fsys-iter.c | 126 +++++++++++++++++++++++++++++++ lib/dpkg/fsys.h | 185 +++++++++++++++++++++++++++++++++++++++++++++ lib/dpkg/libdpkg.map | 18 +++++ po/POTFILES.in | 2 + src/filesdb.c | 209 --------------------------------------------------- src/filesdb.h | 122 +----------------------------- 8 files changed, 504 insertions(+), 330 deletions(-) create mode 100644 lib/dpkg/fsys-hash.c create mode 100644 lib/dpkg/fsys-iter.c create mode 100644 lib/dpkg/fsys.h (limited to 'lib') diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index 215d12ffb..65dd5811c 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -63,6 +63,8 @@ libdpkg_la_SOURCES = \ fdio.c \ file.c \ fields.c \ + fsys-iter.c \ + fsys-hash.c \ glob.c \ i18n.c i18n.h \ log.c \ @@ -121,6 +123,7 @@ pkginclude_HEADERS = \ error.h \ fdio.h \ file.h \ + fsys.h \ glob.h \ macros.h \ namevalue.h \ diff --git a/lib/dpkg/fsys-hash.c b/lib/dpkg/fsys-hash.c new file mode 100644 index 000000000..54d0d57b7 --- /dev/null +++ b/lib/dpkg/fsys-hash.c @@ -0,0 +1,169 @@ +/* + * libdpkg - Debian packaging suite library routines + * fsys-hash.c - filesystem nodes hash table + * + * Copyright © 1995 Ian Jackson + * Copyright © 2000, 2001 Wichert Akkerman + * Copyright © 2008-2014 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include + +#include +#include +#include +#include + +#include "fsys.h" + +/* This must always be a prime for optimal performance. + * This is the closest one to 2^18 (262144). */ +#define BINS 262139 + +static struct filenamenode *bins[BINS]; +static int nfiles = 0; + +void +filesdbinit(void) +{ + struct filenamenode *fnn; + int i; + + for (i = 0; i < BINS; i++) { + for (fnn = bins[i]; fnn; fnn = fnn->next) { + fnn->flags = 0; + fnn->oldhash = NULL; + fnn->newhash = EMPTYHASHFLAG; + fnn->filestat = NULL; + } + } +} + +void +files_db_reset(void) +{ + int i; + + for (i = 0; i < BINS; i++) + bins[i] = NULL; +} + +int +fsys_hash_entries(void) +{ + return nfiles; +} + +struct filenamenode * +findnamenode(const char *name, enum fnnflags flags) +{ + struct filenamenode **pointerp, *newnode; + const char *orig_name = name; + + /* We skip initial slashes and ‘./’ pairs, and add our own single + * leading slash. */ + name = path_skip_slash_dotslash(name); + + pointerp = bins + (str_fnv_hash(name) % (BINS)); + while (*pointerp) { + /* XXX: This should not be needed, but it has been a constant + * source of assertions over the years. Hopefully with the + * internerr() we will get better diagnostics. */ + if ((*pointerp)->name[0] != '/') + internerr("filename node '%s' does not start with '/'", + (*pointerp)->name); + + if (strcmp((*pointerp)->name + 1, name) == 0) + break; + pointerp = &(*pointerp)->next; + } + if (*pointerp) + return *pointerp; + + if (flags & fnn_nonew) + return NULL; + + newnode = nfmalloc(sizeof(struct filenamenode)); + newnode->packages = NULL; + if ((flags & fnn_nocopy) && name > orig_name && name[-1] == '/') { + newnode->name = name - 1; + } else { + char *newname = nfmalloc(strlen(name) + 2); + + newname[0] = '/'; + strcpy(newname + 1, name); + newnode->name = newname; + } + newnode->flags = 0; + newnode->next = NULL; + newnode->divert = NULL; + newnode->statoverride = NULL; + newnode->oldhash = NULL; + newnode->newhash = EMPTYHASHFLAG; + newnode->filestat = NULL; + newnode->trig_interested = NULL; + *pointerp = newnode; + nfiles++; + + return newnode; +} + +/* + * Forward iterator. + */ + +struct fileiterator { + struct filenamenode *namenode; + int nbinn; +}; + +struct fileiterator * +files_db_iter_new(void) +{ + struct fileiterator *iter; + + iter = m_malloc(sizeof(struct fileiterator)); + iter->namenode = NULL; + iter->nbinn = 0; + + return iter; +} + +struct filenamenode * +files_db_iter_next(struct fileiterator *iter) +{ + struct filenamenode *r= NULL; + + while (!iter->namenode) { + if (iter->nbinn >= BINS) + return NULL; + iter->namenode = bins[iter->nbinn++]; + } + r = iter->namenode; + iter->namenode = r->next; + + return r; +} + +void +files_db_iter_free(struct fileiterator *iter) +{ + free(iter); +} diff --git a/lib/dpkg/fsys-iter.c b/lib/dpkg/fsys-iter.c new file mode 100644 index 000000000..aba31aa47 --- /dev/null +++ b/lib/dpkg/fsys-iter.c @@ -0,0 +1,126 @@ +/* + * libdpkg - Debian packaging suite library routines + * fsys-iter.c - filesystem nodes iterators + * + * Copyright © 1995 Ian Jackson + * Copyright © 2000, 2001 Wichert Akkerman + * Copyright © 2008-2014 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include + +#include +#include +#include + +#include "fsys.h" + +/* + * Reverse fileinlist iterator. + */ + +/* + * Initializes an iterator that appears to go through the file list ‘files’ + * in reverse order, returning the namenode from each. What actually happens + * is that we walk the list here, building up a reverse list, and then peel + * it apart one entry at a time. + */ +void +reversefilelist_init(struct reversefilelistiter *iter, + struct fileinlist *files) +{ + struct fileinlist *newent; + + iter->todo = NULL; + while (files) { + newent = m_malloc(sizeof(struct fileinlist)); + newent->namenode = files->namenode; + newent->next = iter->todo; + iter->todo = newent; + files = files->next; + } +} + +struct filenamenode * +reversefilelist_next(struct reversefilelistiter *iter) +{ + struct filenamenode *ret; + struct fileinlist *todo; + + todo = iter->todo; + if (!todo) + return NULL; + ret = todo->namenode; + iter->todo = todo->next; + free(todo); + + return ret; +} + +/* + * Clients must call this function to clean up the reversefilelistiter + * if they wish to break out of the iteration before it is all done. + * Calling this function is not necessary if reversefilelist_next() has + * been called until it returned 0. + */ +void +reversefilelist_abort(struct reversefilelistiter *iter) +{ + while (reversefilelist_next(iter)) + ; +} + +/* + * Iterator for packages owning a file. + */ + +struct filepackages_iterator { + struct pkg_list *pkg_node; +}; + +struct filepackages_iterator * +filepackages_iter_new(struct filenamenode *fnn) +{ + struct filepackages_iterator *iter; + + iter = m_malloc(sizeof(*iter)); + iter->pkg_node = fnn->packages; + + return iter; +} + +struct pkginfo * +filepackages_iter_next(struct filepackages_iterator *iter) +{ + struct pkg_list *pkg_node; + + if (iter->pkg_node == NULL) + return NULL; + + pkg_node = iter->pkg_node; + iter->pkg_node = pkg_node->next; + + return pkg_node->pkg; +} + +void +filepackages_iter_free(struct filepackages_iterator *iter) +{ + free(iter); +} diff --git a/lib/dpkg/fsys.h b/lib/dpkg/fsys.h new file mode 100644 index 000000000..7d63b04e6 --- /dev/null +++ b/lib/dpkg/fsys.h @@ -0,0 +1,185 @@ +/* + * libdpkg - Debian packaging suite library routines + * fsys.h - filesystem nodes hash table + * + * Copyright © 1995 Ian Jackson + * Copyright © 2008-2014 Guillem Jover + * + * This 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 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 . + */ + +#ifndef LIBDPKG_FSYS_H +#define LIBDPKG_FSYS_H + +#include + +/* + * Data structure here is as follows: + * + * For each package we have a ‘struct fileinlist *’, the head of a list + * of files in that package. They are in ‘forwards’ order. Each entry has + * a pointer to the ‘struct filenamenode’. + * + * The struct filenamenodes are in a hash table, indexed by name. + * (This hash table is not visible to callers.) + * + * Each filenamenode has a (possibly empty) list of ‘struct filepackage’, + * giving a list of the packages listing that filename. + * + * When we read files contained info about a particular package we set the + * ‘files’ member of the clientdata struct to the appropriate thing. When + * not yet set the files pointer is made to point to ‘fileslist_uninited’ + * (this is available only internally, within filesdb.c - the published + * interface is ensure_*_available). + */ + +struct pkginfo; + +/** + * Flags to findnamenode(). + */ +enum fnnflags { + /** Do not need to copy filename. */ + fnn_nocopy = DPKG_BIT(0), + /** findnamenode may return NULL. */ + fnn_nonew = DPKG_BIT(1), +}; + +enum filenamenode_flags { + /** In the newconffiles list. */ + fnnf_new_conff = DPKG_BIT(0), + /** In the new filesystem archive. */ + fnnf_new_inarchive = DPKG_BIT(1), + /** In the old package's conffiles list. */ + fnnf_old_conff = DPKG_BIT(2), + /** Obsolete conffile. */ + fnnf_obs_conff = DPKG_BIT(3), + /** Must remove from other packages' lists. */ + fnnf_elide_other_lists = DPKG_BIT(4), + /** >= 1 instance is a dir, cannot rename over. */ + fnnf_no_atomic_overwrite = DPKG_BIT(5), + /** New file has been placed on the disk. */ + fnnf_placed_on_disk = DPKG_BIT(6), + fnnf_deferred_fsync = DPKG_BIT(7), + fnnf_deferred_rename = DPKG_BIT(8), + /** Path being filtered. */ + fnnf_filtered = DPKG_BIT(9), +}; + +struct filenamenode { + struct filenamenode *next; + const char *name; + + struct pkg_list *packages; + struct diversion *divert; + + /** We allow the administrator to override the owner, group and mode + * of a file. If such an override is present we use that instead of + * the stat information stored in the archive. + * + * This functionality used to be in the suidmanager package. */ + struct file_stat *statoverride; + + struct trigfileint *trig_interested; + + /* + * Fields from here on are cleared by filesdbinit(). + */ + + /** Set to zero when a new node is created. */ + enum filenamenode_flags flags; + + /** Valid iff this namenode is in the newconffiles list. */ + const char *oldhash; + /** Valid iff the file was unpacked and hashed on this run. */ + const char *newhash; + + struct stat *filestat; +}; + +/** + * When we deal with an ‘overridden’ file, every package except the + * overriding one is considered to contain the other file instead. Both + * files have entries in the filesdb database, and they refer to each other + * via these diversion structures. + * + * The contested filename's filenamenode has an diversion entry with + * useinstead set to point to the redirected filename's filenamenode; the + * redirected filenamenode has camefrom set to the contested filenamenode. + * Both sides' diversion entries will have pkg set to the package (if any) + * which is allowed to use the contended filename. + * + * Packages that contain either version of the file will all refer to the + * contested filenamenode in their per-file package lists (both in core and + * on disk). References are redirected to the other filenamenode's filename + * where appropriate. + */ +struct diversion { + struct filenamenode *useinstead; + struct filenamenode *camefrom; + struct pkgset *pkgset; + + /** The ‘contested’ halves are in this list for easy cleanup. */ + struct diversion *next; +}; + +struct fileinlist { + struct fileinlist *next; + struct filenamenode *namenode; +}; + +/** + * Queue of filenamenode entries. + */ +struct filenamenode_queue { + struct fileinlist *head, **tail; +}; + +/** + * Forward filesystem node iterator. + */ +struct fileiterator; + +/** + * Reverse filesystem node iterator. + */ +struct reversefilelistiter { + struct fileinlist *todo; +}; + +/** + * Forward filesystem node package owners iterator. + */ +struct filepackages_iterator; + + +void filesdbinit(void); +void files_db_reset(void); +int fsys_hash_entries(void); + +struct filenamenode *findnamenode(const char *filename, enum fnnflags flags); + +struct fileiterator *files_db_iter_new(void); +struct filenamenode *files_db_iter_next(struct fileiterator *iter); +void files_db_iter_free(struct fileiterator *iter); + +void reversefilelist_init(struct reversefilelistiter *iterptr, struct fileinlist *files); +struct filenamenode *reversefilelist_next(struct reversefilelistiter *iterptr); +void reversefilelist_abort(struct reversefilelistiter *iterptr); + +struct filepackages_iterator *filepackages_iter_new(struct filenamenode *fnn); +struct pkginfo *filepackages_iter_next(struct filepackages_iterator *iter); +void filepackages_iter_free(struct filepackages_iterator *iter); + +#endif /* LIBDPKG_FSYS_H */ diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 85b8a1fa6..6f9b53e01 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -381,6 +381,24 @@ LIBDPKG_PRIVATE { modstatdb_shutdown; modstatdb_done; + # Filesystem node hash support + filesdbinit; + files_db_reset; + fsys_hash_entries; + findnamenode; + + files_db_iter_new; + files_db_iter_next; + files_db_iter_free; + + reversefilelist_init; + reversefilelist_next; + reversefilelist_abort; + + filepackages_iter_new; + filepackages_iter_next; + filepackages_iter_free; + # Triggers support trig_name_is_illegal; trigdef_set_methods; diff --git a/po/POTFILES.in b/po/POTFILES.in index 1b890c55e..e4c3815ae 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -21,6 +21,8 @@ lib/dpkg/error.c lib/dpkg/fdio.c lib/dpkg/fields.c lib/dpkg/file.c +lib/dpkg/fsys-iter.c +lib/dpkg/fsys-hash.c lib/dpkg/glob.c lib/dpkg/i18n.c lib/dpkg/log.c diff --git a/src/filesdb.c b/src/filesdb.c index 6e99c36f3..87bca58e3 100644 --- a/src/filesdb.c +++ b/src/filesdb.c @@ -54,47 +54,9 @@ #include "infodb.h" #include "main.h" -/*** filepackages support for tracking packages owning a file. ***/ - -struct filepackages_iterator { - struct pkg_list *pkg_node; -}; - -struct filepackages_iterator * -filepackages_iter_new(struct filenamenode *fnn) -{ - struct filepackages_iterator *iter; - - iter = m_malloc(sizeof(*iter)); - iter->pkg_node = fnn->packages; - - return iter; -} - -struct pkginfo * -filepackages_iter_next(struct filepackages_iterator *iter) -{ - struct pkg_list *pkg_node; - - if (iter->pkg_node == NULL) - return NULL; - - pkg_node = iter->pkg_node; - iter->pkg_node = pkg_node->next; - - return pkg_node->pkg; -} - -void -filepackages_iter_free(struct filepackages_iterator *iter) -{ - free(iter); -} - /*** Generic data structures and routines. ***/ static bool allpackagesdone = false; -static int nfiles= 0; void ensure_package_clientdata(struct pkginfo *pkg) @@ -473,174 +435,3 @@ write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin, note_must_reread_files_inpackage(pkg); } - -/* - * Initializes an iterator that appears to go through the file - * list ‘files’ in reverse order, returning the namenode from - * each. What actually happens is that we walk the list here, - * building up a reverse list, and then peel it apart one - * entry at a time. - */ -void -reversefilelist_init(struct reversefilelistiter *iter, struct fileinlist *files) -{ - struct fileinlist *newent; - - iter->todo = NULL; - while (files) { - newent= m_malloc(sizeof(struct fileinlist)); - newent->namenode= files->namenode; - newent->next = iter->todo; - iter->todo = newent; - files= files->next; - } -} - -struct filenamenode * -reversefilelist_next(struct reversefilelistiter *iter) -{ - struct filenamenode *ret; - struct fileinlist *todo; - - todo = iter->todo; - if (!todo) - return NULL; - ret= todo->namenode; - iter->todo = todo->next; - free(todo); - return ret; -} - -/* - * Clients must call this function to clean up the reversefilelistiter - * if they wish to break out of the iteration before it is all done. - * Calling this function is not necessary if reversefilelist_next has - * been called until it returned 0. - */ -void -reversefilelist_abort(struct reversefilelistiter *iter) -{ - while (reversefilelist_next(iter)); -} - -struct fileiterator { - struct filenamenode *namenode; - int nbinn; -}; - -/* This must always be a prime for optimal performance. - * This is the closest one to 2^18 (262144). */ -#define BINS 262139 - -static struct filenamenode *bins[BINS]; - -struct fileiterator * -files_db_iter_new(void) -{ - struct fileiterator *iter; - - iter = m_malloc(sizeof(struct fileiterator)); - iter->namenode = NULL; - iter->nbinn = 0; - - return iter; -} - -struct filenamenode * -files_db_iter_next(struct fileiterator *iter) -{ - struct filenamenode *r= NULL; - - while (!iter->namenode) { - if (iter->nbinn >= BINS) - return NULL; - iter->namenode = bins[iter->nbinn++]; - } - r = iter->namenode; - iter->namenode = r->next; - - return r; -} - -void -files_db_iter_free(struct fileiterator *iter) -{ - free(iter); -} - -void filesdbinit(void) { - struct filenamenode *fnn; - int i; - - for (i=0; inext) { - fnn->flags= 0; - fnn->oldhash = NULL; - fnn->newhash = EMPTYHASHFLAG; - fnn->filestat = NULL; - } -} - -void -files_db_reset(void) -{ - int i; - - for (i = 0; i < BINS; i++) - bins[i] = NULL; -} - -int -fsys_hash_entries(void) -{ - return nfiles; -} - -struct filenamenode *findnamenode(const char *name, enum fnnflags flags) { - struct filenamenode **pointerp, *newnode; - const char *orig_name = name; - - /* We skip initial slashes and ‘./’ pairs, and add our own single - * leading slash. */ - name = path_skip_slash_dotslash(name); - - pointerp = bins + (str_fnv_hash(name) % (BINS)); - while (*pointerp) { - /* XXX: This should not be needed, but it has been a constant source - * of assertions over the years. Hopefully with the internerr() we will - * get better diagnostics. */ - if ((*pointerp)->name[0] != '/') - internerr("filename node '%s' does not start with '/'", - (*pointerp)->name); - - if (strcmp((*pointerp)->name + 1, name) == 0) - break; - pointerp= &(*pointerp)->next; - } - if (*pointerp) return *pointerp; - - if (flags & fnn_nonew) - return NULL; - - newnode= nfmalloc(sizeof(struct filenamenode)); - newnode->packages = NULL; - if((flags & fnn_nocopy) && name > orig_name && name[-1] == '/') - newnode->name = name - 1; - else { - char *newname= nfmalloc(strlen(name)+2); - newname[0]= '/'; strcpy(newname+1,name); - newnode->name= newname; - } - newnode->flags= 0; - newnode->next = NULL; - newnode->divert = NULL; - newnode->statoverride = NULL; - newnode->oldhash = NULL; - newnode->newhash = EMPTYHASHFLAG; - newnode->filestat = NULL; - newnode->trig_interested = NULL; - *pointerp= newnode; - nfiles++; - - return newnode; -} diff --git a/src/filesdb.h b/src/filesdb.h index 6a7c6afee..4fbe6b0a7 100644 --- a/src/filesdb.h +++ b/src/filesdb.h @@ -23,6 +23,7 @@ #define FILESDB_H #include +#include /* * Data structure here is as follows: @@ -46,120 +47,6 @@ struct pkginfo; -/** - * Flags to findnamenode(). - */ -enum fnnflags { - /** Do not need to copy filename. */ - fnn_nocopy = DPKG_BIT(0), - /** findnamenode may return NULL. */ - fnn_nonew = DPKG_BIT(1), -}; - -enum filenamenode_flags { - /** In the newconffiles list. */ - fnnf_new_conff = DPKG_BIT(0), - /** In the new filesystem archive. */ - fnnf_new_inarchive = DPKG_BIT(1), - /** In the old package's conffiles list. */ - fnnf_old_conff = DPKG_BIT(2), - /** Obsolete conffile. */ - fnnf_obs_conff = DPKG_BIT(3), - /** Must remove from other packages' lists. */ - fnnf_elide_other_lists = DPKG_BIT(4), - /** >= 1 instance is a dir, cannot rename over. */ - fnnf_no_atomic_overwrite = DPKG_BIT(5), - /** New file has been placed on the disk. */ - fnnf_placed_on_disk = DPKG_BIT(6), - fnnf_deferred_fsync = DPKG_BIT(7), - fnnf_deferred_rename = DPKG_BIT(8), - /** Path being filtered. */ - fnnf_filtered = DPKG_BIT(9), -}; - -struct filenamenode { - struct filenamenode *next; - const char *name; - struct pkg_list *packages; - struct diversion *divert; - - /** We allow the administrator to override the owner, group and mode of - * a file. If such an override is present we use that instead of the - * stat information stored in the archive. - * - * This functionality used to be in the suidmanager package. */ - struct file_stat *statoverride; - - /* - * Fields from here on are used by archives.c &c, and cleared by - * filesdbinit. - */ - - /** Set to zero when a new node is created. */ - enum filenamenode_flags flags; - - /** Valid iff this namenode is in the newconffiles list. */ - const char *oldhash; - - /** Valid iff the file was unpacked and hashed on this run. */ - const char *newhash; - - struct stat *filestat; - struct trigfileint *trig_interested; -}; - -struct fileinlist { - struct fileinlist *next; - struct filenamenode *namenode; -}; - -/** - * Queue of filenamenode entries. - */ -struct filenamenode_queue { - struct fileinlist *head, **tail; -}; - -/** - * When we deal with an ‘overridden’ file, every package except the - * overriding one is considered to contain the other file instead. Both - * files have entries in the filesdb database, and they refer to each other - * via these diversion structures. - * - * The contested filename's filenamenode has an diversion entry with - * useinstead set to point to the redirected filename's filenamenode; the - * redirected filenamenode has camefrom set to the contested filenamenode. - * Both sides' diversion entries will have pkg set to the package (if any) - * which is allowed to use the contended filename. - * - * Packages that contain either version of the file will all refer to the - * contested filenamenode in their per-file package lists (both in core and - * on disk). References are redirected to the other filenamenode's filename - * where appropriate. - */ -struct diversion { - struct filenamenode *useinstead; - struct filenamenode *camefrom; - struct pkgset *pkgset; - - /** The ‘contested’ halves are in this list for easy cleanup. */ - struct diversion *next; -}; - -struct filepackages_iterator; -struct filepackages_iterator *filepackages_iter_new(struct filenamenode *fnn); -struct pkginfo *filepackages_iter_next(struct filepackages_iterator *iter); -void filepackages_iter_free(struct filepackages_iterator *iter); - -void filesdbinit(void); -void files_db_reset(void); -int fsys_hash_entries(void); - -struct fileiterator; -struct fileiterator *files_db_iter_new(void); -struct filenamenode *files_db_iter_next(struct fileiterator *iter); -void files_db_iter_free(struct fileiterator *iter); - void ensure_package_clientdata(struct pkginfo *pkg); void ensure_diversions(void); @@ -181,17 +68,10 @@ void ensure_packagefiles_available(struct pkginfo *pkg); void ensure_allinstfiles_available(void); void ensure_allinstfiles_available_quiet(void); void note_must_reread_files_inpackage(struct pkginfo *pkg); -struct filenamenode *findnamenode(const char *filename, enum fnnflags flags); void parse_filehash(struct pkginfo *pkg, struct pkgbin *pkgbin); void write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin, struct fileinlist *list, enum filenamenode_flags mask); void write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin, struct fileinlist *list, enum filenamenode_flags mask); -struct reversefilelistiter { struct fileinlist *todo; }; - -void reversefilelist_init(struct reversefilelistiter *iterptr, struct fileinlist *files); -struct filenamenode *reversefilelist_next(struct reversefilelistiter *iterptr); -void reversefilelist_abort(struct reversefilelistiter *iterptr); - #endif /* FILESDB_H */ -- cgit v1.2.3 From 2d7566140335d5338e5a98278d4df762936f67f4 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 4 Apr 2018 03:06:44 +0200 Subject: libdpkg: Use a single struct filenamenode definition The struct filenamenode hash implementation is lightweight, and once split from the bulk of the on-disk database handling there's no point in reimplementing it, and then redefining the same struct in multiple places, which is rather confusing for the reader, and even for static analyzers. Closes: #746766 --- debian/changelog | 2 ++ lib/dpkg/triglib.c | 32 +------------------------------- lib/dpkg/triglib.h | 3 +++ src/trigcmd.c | 2 ++ src/trigproc.c | 8 +------- 5 files changed, 9 insertions(+), 38 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 123ef6764..afe1d4ab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium behavior, but it will make it possible to do a default switch in 1.20.x. * Warn when using dpkg-divert --add or --remove w/o --rename or --no-rename. * Warn when using dpkg-divert --rename on a file from an Essential package. + * Use a single “struct filenamenode” definition for the entire code base. + Closes: #746766 * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c index a067d1450..395601359 100644 --- a/lib/dpkg/triglib.c +++ b/lib/dpkg/triglib.c @@ -821,42 +821,12 @@ trig_incorporate(enum modstatdb_rw cstatus) /*---------- Default hooks. ----------*/ -struct filenamenode { - struct filenamenode *next; - const char *name; - struct trigfileint *trig_interested; -}; - -static struct filenamenode *trigger_files; - -static struct filenamenode * -th_simple_nn_find(const char *name, bool nonew) -{ - struct filenamenode *search; - - for (search = trigger_files; search; search = search->next) - if (strcmp(search->name, name) == 0) - return search; - - /* Not found. */ - if (nonew) - return NULL; - - search = nfmalloc(sizeof(*search)); - search->name = nfstrsave(name); - search->trig_interested = NULL; - search->next = trigger_files; - trigger_files = search; - - return search; -} - TRIGHOOKS_DEFINE_NAMENODE_ACCESSORS static struct trig_hooks trigh = { .enqueue_deferred = NULL, .transitional_activate = NULL, - .namenode_find = th_simple_nn_find, + .namenode_find = th_nn_find, .namenode_interested = th_nn_interested, .namenode_name = th_nn_name, }; diff --git a/lib/dpkg/triglib.h b/lib/dpkg/triglib.h index 3e63f5cbc..74b33ccb2 100644 --- a/lib/dpkg/triglib.h +++ b/lib/dpkg/triglib.h @@ -25,6 +25,7 @@ #include #include +#include DPKG_BEGIN_DECLS @@ -78,6 +79,8 @@ struct trig_hooks { }; #define TRIGHOOKS_DEFINE_NAMENODE_ACCESSORS \ + static struct filenamenode *th_nn_find(const char *name, bool nonew) \ + { return findnamenode(name, nonew ? fnn_nonew : 0); } \ static struct trigfileint **th_nn_interested(struct filenamenode *fnn) \ { return &fnn->trig_interested; } \ static const char *th_nn_name(struct filenamenode *fnn) \ diff --git a/src/trigcmd.c b/src/trigcmd.c index 312cd8718..bc0d2f9a2 100644 --- a/src/trigcmd.c +++ b/src/trigcmd.c @@ -229,6 +229,8 @@ main(int argc, const char *const *argv) badusage(_("illegal awaited package name '%.250s': %.250s"), bypackage, badname); + filesdbinit(); + activate = argv[0]; badname = trig_name_is_illegal(activate); if (badname) diff --git a/src/trigproc.c b/src/trigproc.c index 9c73d4ca6..7b6537bb4 100644 --- a/src/trigproc.c +++ b/src/trigproc.c @@ -534,18 +534,12 @@ trig_transitional_activate(enum modstatdb_rw cstatus) /*========== Hook setup. ==========*/ -static struct filenamenode * -th_proper_nn_find(const char *name, bool nonew) -{ - return findnamenode(name, nonew ? fnn_nonew : 0); -} - TRIGHOOKS_DEFINE_NAMENODE_ACCESSORS static const struct trig_hooks trig_our_hooks = { .enqueue_deferred = trigproc_enqueue_deferred, .transitional_activate = trig_transitional_activate, - .namenode_find = th_proper_nn_find, + .namenode_find = th_nn_find, .namenode_interested = th_nn_interested, .namenode_name = th_nn_name, }; -- cgit v1.2.3 From 0615492cb4c79d1f552e49f4a10dbfc959f03b9c Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 29 Jan 2017 13:46:09 +0100 Subject: libdpkg: Introduce frontend locking Currently, in order to run dpkg, frontends have to release the database lock before invoking dpkg and re-acquire it afterwards, leaving a short time where the database is unlocked and a different dpkg process or frontend could lock it. Frontend locking addresses the problem by creating a "lock-frontend" file that is acquired by the frontend and not released for dpkg invocations. Thus, multiple frontends cannot race for the database lock. This change extends the frontend lock to dpkg itself, acquiring it whenever the variable DPKG_FRONTEND_LOCKED is not set, so that a user manually running dpkg or a frontend not supporting this protocol cannot interfere with a currently running frontend. [guillem@debian.org: - Add documentation. - Rename frontend lock file. - Fix error strings. ] Signed-off-by: Guillem Jover --- debian/changelog | 4 ++++ doc/frontend.txt | 22 +++++++++++----------- lib/dpkg/dbmodify.c | 21 +++++++++++++++++++++ lib/dpkg/dpkg.h | 1 + man/dpkg.man | 4 ++++ 5 files changed, 41 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index afe1d4ab1..3542c13fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,10 @@ dpkg (1.19.1) UNRELEASED; urgency=medium * Warn when using dpkg-divert --rename on a file from an Essential package. * Use a single “struct filenamenode” definition for the entire code base. Closes: #746766 + * Add support for frontend locking. This makes it possible for frontends + using this new protocol, to safely lock the dpkg database w/o risk of + race conditions with other dpkg instances or frontends supporting the + same protocol. Thanks to Julian Andres Klode . * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo diff --git a/doc/frontend.txt b/doc/frontend.txt index 66280860c..9ea1e20f6 100644 --- a/doc/frontend.txt +++ b/doc/frontend.txt @@ -10,15 +10,15 @@ Database Locking ---------------- Any frontend needing to make sure no write operation is currently happening, -should lock the dpkg database by locking the file «/lock» using -file record locks (i.e. fcntl(2) advisory locking). The whole file should -be locked, as that's the most portable way to perform this operation; this -can be achieved by using start=0, len=0 and whence=SEEK_SET. +and no other frontend is running should first acquire the frontend lock at +«/lock-frontend», and then acquire the dpkg database lock at +«/lock». When the frontend invokes dpkg, it should set the +environment variable DPKG_FRONTEND_LOCKED (to prevent dpkg from acquiring +the frontend lock), and then release the dpkg database lock, which will be +acquired by dpkg itself. This way no other frontend following this protocol +can race to perform operations while another one has one in progress. -Take into account there will be a race condition between the frontend -unlocking the database and the invoked dpkg locking it again, in which -another process could lock it. - -In the future this functionality will be available through a shared libdpkg -library, and all frontends will be expected to switch to that instead, -because this will fix the aforementioned race condition. +These locks must be file record locks (i.e. fcntl(2) advisory locking), and +the whole file should be locked, as that's the most portable way to perform +this operation; this can be achieved by using start=0, len=0 and +whence=SEEK_SET. diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c index 9baa58373..4e1457429 100644 --- a/lib/dpkg/dbmodify.c +++ b/lib/dpkg/dbmodify.c @@ -50,6 +50,7 @@ static bool db_initialized; static enum modstatdb_rw cstatus=-1, cflags=0; static char *lockfile; +static char *frontendlockfile; static char *statusfile, *availablefile; static char *importanttmpfile=NULL; static FILE *importanttmp; @@ -139,6 +140,7 @@ static const struct fni { char **store; } fnis[] = { { LOCKFILE, &lockfile }, + { FRONTENDLOCKFILE, &frontendlockfile }, { STATUSFILE, &statusfile }, { AVAILFILE, &availablefile }, { UPDATESDIR, &updatesdir }, @@ -184,6 +186,7 @@ modstatdb_done(void) } static int dblockfd = -1; +static int frontendlockfd = -1; bool modstatdb_is_locked(void) @@ -215,6 +218,18 @@ modstatdb_can_lock(void) if (dblockfd >= 0) return true; + if (getenv("DPKG_FRONTEND_LOCKED") == NULL) { + frontendlockfd = open(frontendlockfile, O_RDWR | O_CREAT | O_TRUNC, 0660); + if (frontendlockfd == -1) { + if (errno == EACCES || errno == EPERM) + return false; + else + ohshite(_("unable to open/create frontend lockfile")); + } + } else { + frontendlockfd = -1; + } + dblockfd = open(lockfile, O_RDWR | O_CREAT | O_TRUNC, 0660); if (dblockfd == -1) { if (errno == EACCES || errno == EPERM) @@ -232,6 +247,9 @@ modstatdb_lock(void) if (!modstatdb_can_lock()) ohshit(_("you do not have permission to lock the dpkg status database")); + if (frontendlockfd != -1) + file_lock(&frontendlockfd, FILE_LOCK_NOWAIT, frontendlockfile, + _("dpkg frontend")); file_lock(&dblockfd, FILE_LOCK_NOWAIT, lockfile, _("dpkg status database")); } @@ -240,8 +258,11 @@ modstatdb_unlock(void) { /* Unlock. */ pop_cleanup(ehflag_normaltidy); + if (frontendlockfd != -1) + pop_cleanup(ehflag_normaltidy); dblockfd = -1; + frontendlockfd = -1; } enum modstatdb_rw diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h index 19b7914f4..7bc348039 100644 --- a/lib/dpkg/dpkg.h +++ b/lib/dpkg/dpkg.h @@ -78,6 +78,7 @@ DPKG_BEGIN_DECLS #define STATUSFILE "status" #define AVAILFILE "available" #define LOCKFILE "lock" +#define FRONTENDLOCKFILE "lock-frontend" #define DIVERSIONSFILE "diversions" #define STATOVERRIDEFILE "statoverride" #define UPDATESDIR "updates/" diff --git a/man/dpkg.man b/man/dpkg.man index 4f6f14bb9..fdaa87b1c 100644 --- a/man/dpkg.man +++ b/man/dpkg.man @@ -888,6 +888,10 @@ Currently only used by \fB\-\-list\fP. Sets the color mode (since dpkg 1.18.5). The currently accepted values are: \fBauto\fP (default), \fBalways\fP and \fBnever\fP. +.TP +.B DPKG_FRONTEND_LOCKED +Set by a package manager frontend to notify dpkg that it should not acquire +the frontend lock (since dpkg 1.19.1). .SS Internal environment .TP .B DPKG_ROOT -- cgit v1.2.3 From 542885e824d005bc9a8a92e341f71fb323437b90 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 5 Apr 2018 04:58:20 +0200 Subject: libdpkg: Move control database code into db-ctrl modules This continues the work to generalize and make these interfaces available to other users beside dpkg itself. --- lib/dpkg/Makefile.am | 4 + lib/dpkg/db-ctrl-access.c | 120 +++++++++++++++++++++ lib/dpkg/db-ctrl-format.c | 150 +++++++++++++++++++++++++++ lib/dpkg/db-ctrl-upgrade.c | 252 ++++++++++++++++++++++++++++++++++++++++++++ lib/dpkg/db-ctrl.h | 51 +++++++++ po/POTFILES.in | 3 + src/Makefile.am | 9 +- src/archives.c | 2 +- src/depcon.c | 2 +- src/enquiry.c | 2 +- src/filesdb-hash.c | 2 +- src/filesdb.c | 2 +- src/infodb-access.c | 121 ---------------------- src/infodb-format.c | 151 --------------------------- src/infodb-upgrade.c | 253 --------------------------------------------- src/infodb.h | 51 --------- src/packages.c | 2 +- src/querycmd.c | 2 +- src/remove.c | 2 +- src/script.c | 2 +- src/select.c | 2 +- src/trigproc.c | 2 +- src/unpack.c | 2 +- src/verify.c | 2 +- 24 files changed, 594 insertions(+), 597 deletions(-) create mode 100644 lib/dpkg/db-ctrl-access.c create mode 100644 lib/dpkg/db-ctrl-format.c create mode 100644 lib/dpkg/db-ctrl-upgrade.c create mode 100644 lib/dpkg/db-ctrl.h delete mode 100644 src/infodb-access.c delete mode 100644 src/infodb-format.c delete mode 100644 src/infodb-upgrade.c delete mode 100644 src/infodb.h (limited to 'lib') diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index 65dd5811c..22cef8266 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -53,6 +53,9 @@ libdpkg_la_SOURCES = \ compress.c \ dbdir.c \ dbmodify.c \ + db-ctrl-access.c \ + db-ctrl-format.c \ + db-ctrl-upgrade.c \ deb-version.c \ debug.c \ depcon.c \ @@ -114,6 +117,7 @@ pkginclude_HEADERS = \ color.h \ command.h \ compress.h \ + db-ctrl.h \ deb-version.h \ debug.h \ dir.h \ diff --git a/lib/dpkg/db-ctrl-access.c b/lib/dpkg/db-ctrl-access.c new file mode 100644 index 000000000..1c1dc1936 --- /dev/null +++ b/lib/dpkg/db-ctrl-access.c @@ -0,0 +1,120 @@ +/* + * dpkg - main program for package management + * infodb.c - package control information database + * + * Copyright © 1995 Ian Jackson + * Copyright © 2011-2014 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +bool +pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin, + const char *name) +{ + const char *filename; + struct stat stab; + + filename = pkg_infodb_get_file(pkg, pkgbin, name); + if (lstat(filename, &stab) == 0) + return true; + else if (errno == ENOENT) + return false; + else + ohshite(_("unable to check existence of '%.250s'"), filename); +} + +void +pkg_infodb_foreach(struct pkginfo *pkg, struct pkgbin *pkgbin, + pkg_infodb_file_func *func) +{ + DIR *db_dir; + struct dirent *db_de; + struct varbuf_state db_path_state; + struct varbuf db_path = VARBUF_INIT; + const char *pkgname; + enum pkg_infodb_format db_format; + + /* Make sure to always read and verify the format version. */ + db_format = pkg_infodb_get_format(); + + if (pkgbin->multiarch == PKG_MULTIARCH_SAME && + db_format == PKG_INFODB_FORMAT_MULTIARCH) + pkgname = pkgbin_name(pkg, pkgbin, pnaw_always); + else + pkgname = pkgbin_name(pkg, pkgbin, pnaw_never); + + varbuf_add_str(&db_path, pkg_infodb_get_dir()); + varbuf_add_char(&db_path, '/'); + varbuf_end_str(&db_path); + varbuf_snapshot(&db_path, &db_path_state); + + db_dir = opendir(db_path.buf); + if (!db_dir) + ohshite(_("cannot read info directory")); + + push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)db_dir); + while ((db_de = readdir(db_dir)) != NULL) { + const char *filename, *filetype, *dot; + + debug(dbg_veryverbose, "infodb foreach info file '%s'", + db_de->d_name); + + /* Ignore dotfiles, including ‘.’ and ‘..’. */ + if (db_de->d_name[0] == '.') + continue; + + /* Ignore anything odd. */ + dot = strrchr(db_de->d_name, '.'); + if (dot == NULL) + continue; + + /* Ignore files from other packages. */ + if (strlen(pkgname) != (size_t)(dot - db_de->d_name) || + strncmp(db_de->d_name, pkgname, dot - db_de->d_name)) + continue; + + debug(dbg_stupidlyverbose, "infodb foreach file this pkg"); + + /* Skip past the full stop. */ + filetype = dot + 1; + + varbuf_rollback(&db_path, &db_path_state); + varbuf_add_str(&db_path, db_de->d_name); + varbuf_end_str(&db_path); + filename = db_path.buf; + + func(filename, filetype); + } + pop_cleanup(ehflag_normaltidy); /* closedir */ + + varbuf_destroy(&db_path); +} diff --git a/lib/dpkg/db-ctrl-format.c b/lib/dpkg/db-ctrl-format.c new file mode 100644 index 000000000..f124ada61 --- /dev/null +++ b/lib/dpkg/db-ctrl-format.c @@ -0,0 +1,150 @@ +/* + * dpkg - main program for package management + * infodb-format.c - package control information database format + * + * Copyright © 2011-2014 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + +static enum pkg_infodb_format db_format = PKG_INFODB_FORMAT_UNKNOWN; +static bool db_upgrading; + +static enum pkg_infodb_format +pkg_infodb_parse_format(const char *file) +{ + FILE *fp; + int format; + + fp = fopen(file, "r"); + if (fp == NULL) { + /* A missing format file means legacy format (0). */ + if (errno == ENOENT) + return PKG_INFODB_FORMAT_LEGACY; + ohshite(_("error trying to open %.250s"), file); + } + + if (fscanf(fp, "%u", &format) != 1) + ohshit(_("corrupt info database format file '%s'"), file); + + fclose(fp); + + return format; +} + +static enum pkg_infodb_format +pkg_infodb_read_format(void) +{ + struct atomic_file *file; + struct stat st; + char *filename; + + filename = dpkg_db_get_path(INFODIR "/format"); + file = atomic_file_new(filename, 0); + + db_format = pkg_infodb_parse_format(file->name); + + /* Check if a previous upgrade got interrupted. Because we are only + * supposed to upgrade the db layout one format at a time, if the + * new file exists that means the new format is just one ahead, + * we don't try to read it because it contains unreliable data. */ + if (stat(file->name_new, &st) == 0) { + db_format++; + db_upgrading = true; + } + + atomic_file_free(file); + free(filename); + + if (db_format < 0 || db_format >= PKG_INFODB_FORMAT_LAST) + ohshit(_("info database format (%d) is bogus or too new; " + "try getting a newer dpkg"), db_format); + + return db_format; +} + +enum pkg_infodb_format +pkg_infodb_get_format(void) +{ + if (db_format > PKG_INFODB_FORMAT_UNKNOWN) + return db_format; + else + return pkg_infodb_read_format(); +} + +void +pkg_infodb_set_format(enum pkg_infodb_format version) +{ + db_format = version; +} + +bool +pkg_infodb_is_upgrading(void) +{ + if (db_format < 0) + pkg_infodb_read_format(); + + return db_upgrading; +} + +const char * +pkg_infodb_get_dir(void) +{ + static char *infodir; + + if (infodir == NULL) + infodir = dpkg_db_get_path(INFODIR); + + return infodir; +} + +const char * +pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin, + const char *filetype) +{ + static struct varbuf vb; + enum pkg_infodb_format format; + + /* Make sure to always read and verify the format version. */ + format = pkg_infodb_get_format(); + + varbuf_reset(&vb); + varbuf_add_str(&vb, pkg_infodb_get_dir()); + varbuf_add_char(&vb, '/'); + varbuf_add_str(&vb, pkg->set->name); + if (pkgbin->multiarch == PKG_MULTIARCH_SAME && + format == PKG_INFODB_FORMAT_MULTIARCH) + varbuf_add_archqual(&vb, pkgbin->arch); + varbuf_add_char(&vb, '.'); + varbuf_add_str(&vb, filetype); + varbuf_end_str(&vb); + + return vb.buf; +} diff --git a/lib/dpkg/db-ctrl-upgrade.c b/lib/dpkg/db-ctrl-upgrade.c new file mode 100644 index 000000000..67c4ce0fa --- /dev/null +++ b/lib/dpkg/db-ctrl-upgrade.c @@ -0,0 +1,252 @@ +/* + * dpkg - main program for package management + * infodb-upgrade.c - package control information database format upgrade + * + * Copyright © 1995 Ian Jackson + * Copyright © 2011-2014 Guillem Jover + * Copyright © 2011 Linaro Limited + * Copyright © 2011 Raphaël Hertzog + * + * This 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 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 . + */ + +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +struct rename_node { + struct rename_node *next; + char *old; + char *new; +}; + +/* Global variables. */ +static struct rename_node *rename_head = NULL; + +static struct rename_node * +rename_node_new(const char *old, const char *new, struct rename_node *next) +{ + struct rename_node *node; + + node = m_malloc(sizeof(*node)); + node->next = next; + node->old = m_strdup(old); + node->new = m_strdup(new); + + return node; +} + +static void +rename_node_free(struct rename_node *node) +{ + free(node->old); + free(node->new); + free(node); +} + +static void +pkg_infodb_link_multiarch_files(void) +{ + DIR *db_dir; + struct dirent *db_de; + struct varbuf pkgname = VARBUF_INIT; + struct varbuf oldname = VARBUF_INIT; + struct varbuf newname = VARBUF_INIT; + struct varbuf_state db_path_state; + + varbuf_add_str(&oldname, pkg_infodb_get_dir()); + varbuf_add_char(&oldname, '/'); + varbuf_end_str(&oldname); + varbuf_snapshot(&oldname, &db_path_state); + + varbuf_add_buf(&newname, oldname.buf, oldname.used); + varbuf_end_str(&newname); + + db_dir = opendir(oldname.buf); + if (!db_dir) + ohshite(_("cannot read info directory")); + + push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)db_dir); + while ((db_de = readdir(db_dir)) != NULL) { + const char *filetype, *dot; + struct pkginfo *pkg; + struct pkgset *set; + + /* Ignore dotfiles, including ‘.’ and ‘..’. */ + if (db_de->d_name[0] == '.') + continue; + + /* Ignore anything odd. */ + dot = strrchr(db_de->d_name, '.'); + if (dot == NULL) + continue; + + varbuf_reset(&pkgname); + varbuf_add_buf(&pkgname, db_de->d_name, dot - db_de->d_name); + varbuf_end_str(&pkgname); + + /* Skip files already converted. */ + if (strchr(pkgname.buf, ':')) + continue; + + set = pkg_db_find_set(pkgname.buf); + for (pkg = &set->pkg; pkg; pkg = pkg->arch_next) + if (pkg->status != PKG_STAT_NOTINSTALLED) + break; + if (!pkg) { + warning(_("info file %s/%s not associated to any package"), + pkg_infodb_get_dir(), db_de->d_name); + continue; + } + + /* Does it need to be upgraded? */ + if (pkg->installed.multiarch != PKG_MULTIARCH_SAME) + continue; + + /* Skip past the full stop. */ + filetype = dot + 1; + + varbuf_rollback(&oldname, &db_path_state); + varbuf_add_str(&oldname, db_de->d_name); + varbuf_end_str(&oldname); + + varbuf_rollback(&newname, &db_path_state); + varbuf_add_pkgbin_name(&newname, pkg, &pkg->installed, pnaw_always); + varbuf_add_char(&newname, '.'); + varbuf_add_str(&newname, filetype); + varbuf_end_str(&newname); + + if (link(oldname.buf, newname.buf) && errno != EEXIST) + ohshite(_("error creating hard link '%.255s'"), + newname.buf); + rename_head = rename_node_new(oldname.buf, newname.buf, rename_head); + } + pop_cleanup(ehflag_normaltidy); /* closedir */ + + varbuf_destroy(&pkgname); + varbuf_destroy(&newname); + varbuf_destroy(&oldname); +} + +static void +cu_abort_db_upgrade(int argc, void **argv) +{ + struct atomic_file *file = argv[0]; + struct rename_node *next; + + /* Restore the old files if needed and drop the newly created files. */ + while (rename_head) { + next = rename_head->next; + if (link(rename_head->new, rename_head->old) && errno != EEXIST) + ohshite(_("error creating hard link '%.255s'"), + rename_head->old); + if (unlink(rename_head->new)) + ohshite(_("cannot remove '%.250s'"), rename_head->new); + rename_node_free(rename_head); + rename_head = next; + } + if (unlink(file->name_new) && errno != ENOENT) + ohshite(_("cannot remove '%.250s'"), file->name_new); + + atomic_file_free(file); +} + +static void +pkg_infodb_write_format(struct atomic_file *file, int version) +{ + if (fprintf(file->fp, "%d\n", version) < 0) + ohshite(_("error while writing '%s'"), file->name_new); + + atomic_file_sync(file); + atomic_file_close(file); + dir_sync_path_parent(file->name); + + pkg_infodb_set_format(version); +} + +static void +pkg_infodb_unlink_monoarch_files(void) +{ + struct rename_node *next; + + while (rename_head) { + next = rename_head->next; + if (unlink(rename_head->old)) + ohshite(_("cannot remove '%.250s'"), rename_head->old); + rename_node_free(rename_head); + rename_head = next; + } +} + +static void +pkg_infodb_upgrade_to_multiarch(void) +{ + struct atomic_file *db_file; + char *db_format_file; + + db_format_file = dpkg_db_get_path(INFODIR "/format"); + db_file = atomic_file_new(db_format_file, 0); + atomic_file_open(db_file); + + push_cleanup(cu_abort_db_upgrade, ehflag_bombout, NULL, 0, 1, db_file); + + pkg_infodb_link_multiarch_files(); + pkg_infodb_write_format(db_file, 1); + + pkg_infodb_unlink_monoarch_files(); + atomic_file_commit(db_file); + dir_sync_path(pkg_infodb_get_dir()); + + pop_cleanup(ehflag_normaltidy); + + atomic_file_free(db_file); + free(db_format_file); +} + +/** + * Upgrade the infodb if there's the need and possibility. + * + * Currently this implies, that the modstatdb was opened for writing and: + * - previous upgrade has not been completed; or + * - current format is not the latest one. + */ +void +pkg_infodb_upgrade(void) +{ + enum pkg_infodb_format db_format; + + /* Make sure to always read and verify the format version. */ + db_format = pkg_infodb_get_format(); + + if (modstatdb_get_status() < msdbrw_write) + return; + + if (db_format < PKG_INFODB_FORMAT_MULTIARCH || + pkg_infodb_is_upgrading()) + pkg_infodb_upgrade_to_multiarch(); +} diff --git a/lib/dpkg/db-ctrl.h b/lib/dpkg/db-ctrl.h new file mode 100644 index 000000000..93bed39de --- /dev/null +++ b/lib/dpkg/db-ctrl.h @@ -0,0 +1,51 @@ +/* + * libdpkg - Debian packaging suite library routines + * db-ctrl.h - package control information database + * + * Copyright © 2011-2014 Guillem Jover + * + * This 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 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 . + */ + +#ifndef LIBDPKG_DB_CTRL_H +#define LIBDPKG_DB_CTRL_H + +#include + +#include + +enum pkg_infodb_format { + PKG_INFODB_FORMAT_UNKNOWN = -1, + PKG_INFODB_FORMAT_LEGACY = 0, + PKG_INFODB_FORMAT_MULTIARCH = 1, + PKG_INFODB_FORMAT_LAST, +}; + +enum pkg_infodb_format pkg_infodb_get_format(void); +void pkg_infodb_set_format(enum pkg_infodb_format format); +bool pkg_infodb_is_upgrading(void); +void pkg_infodb_upgrade(void); + +const char *pkg_infodb_get_dir(void); +const char *pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin, + const char *filetype); +bool pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin, + const char *name); + +typedef void pkg_infodb_file_func(const char *filename, const char *filetype); + +void pkg_infodb_foreach(struct pkginfo *pkg, struct pkgbin *pkgbin, + pkg_infodb_file_func *func); + +#endif /* LIBDPKG_DB_CTRL_H */ diff --git a/po/POTFILES.in b/po/POTFILES.in index e4c3815ae..d7fb8173f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -11,6 +11,9 @@ lib/dpkg/command.c lib/dpkg/compress.c lib/dpkg/dbdir.c lib/dpkg/dbmodify.c +lib/dpkg/db-ctrl-access.c +lib/dpkg/db-ctrl-format.c +lib/dpkg/db-ctrl-update.c lib/dpkg/deb-version.c lib/dpkg/debug.c lib/dpkg/depcon.c diff --git a/src/Makefile.am b/src/Makefile.am index 2d776dd9a..1e9735acd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ bin_PROGRAMS = \ noinst_HEADERS = \ filesdb.h \ - infodb.h + $(nil) dpkg_SOURCES = \ archives.c archives.h \ @@ -40,9 +40,6 @@ dpkg_SOURCES = \ filesdb-hash.c \ file-match.c file-match.h \ filters.c filters.h \ - infodb-access.c \ - infodb-format.c \ - infodb-upgrade.c \ divertdb.c \ statdb.c \ help.c \ @@ -64,20 +61,16 @@ dpkg_LDADD = \ dpkg_divert_SOURCES = \ filesdb.c \ - infodb-format.c \ divertdb.c \ divertcmd.c dpkg_query_SOURCES = \ filesdb.c \ - infodb-access.c \ - infodb-format.c \ divertdb.c \ querycmd.c dpkg_statoverride_SOURCES = \ filesdb.c \ - infodb-format.c \ selinux.c \ statdb.c \ statcmd.c diff --git a/src/archives.c b/src/archives.c index 113b76c3d..6d73375ab 100644 --- a/src/archives.c +++ b/src/archives.c @@ -55,12 +55,12 @@ #include #include #include +#include #include "filesdb.h" #include "main.h" #include "archives.h" #include "filters.h" -#include "infodb.h" static inline void fd_writeback_init(int fd) diff --git a/src/depcon.c b/src/depcon.c index 398d06a36..560190c1f 100644 --- a/src/depcon.c +++ b/src/depcon.c @@ -34,9 +34,9 @@ #include #include #include +#include #include "filesdb.h" -#include "infodb.h" #include "main.h" struct deppossi_pkg_iterator { diff --git a/src/enquiry.c b/src/enquiry.c index 99349ba7c..6182fce7f 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -42,9 +42,9 @@ #include #include #include +#include #include "filesdb.h" -#include "infodb.h" #include "main.h" struct audit_problem { diff --git a/src/filesdb-hash.c b/src/filesdb-hash.c index 275716009..c04d7a8e6 100644 --- a/src/filesdb-hash.c +++ b/src/filesdb-hash.c @@ -35,9 +35,9 @@ #include #include #include +#include #include "filesdb.h" -#include "infodb.h" /* * If mask is nonzero, will not write any file whose filenamenode diff --git a/src/filesdb.c b/src/filesdb.c index 87bca58e3..8ca613e24 100644 --- a/src/filesdb.c +++ b/src/filesdb.c @@ -49,9 +49,9 @@ #include #include #include +#include #include "filesdb.h" -#include "infodb.h" #include "main.h" /*** Generic data structures and routines. ***/ diff --git a/src/infodb-access.c b/src/infodb-access.c deleted file mode 100644 index c28f46da2..000000000 --- a/src/infodb-access.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * dpkg - main program for package management - * infodb.c - package control information database - * - * Copyright © 1995 Ian Jackson - * Copyright © 2011-2014 Guillem Jover - * - * This 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 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 . - */ - -#include -#include - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include - -#include "filesdb.h" -#include "infodb.h" - -bool -pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin, - const char *name) -{ - const char *filename; - struct stat stab; - - filename = pkg_infodb_get_file(pkg, pkgbin, name); - if (lstat(filename, &stab) == 0) - return true; - else if (errno == ENOENT) - return false; - else - ohshite(_("unable to check existence of '%.250s'"), filename); -} - -void -pkg_infodb_foreach(struct pkginfo *pkg, struct pkgbin *pkgbin, - pkg_infodb_file_func *func) -{ - DIR *db_dir; - struct dirent *db_de; - struct varbuf_state db_path_state; - struct varbuf db_path = VARBUF_INIT; - const char *pkgname; - enum pkg_infodb_format db_format; - - /* Make sure to always read and verify the format version. */ - db_format = pkg_infodb_get_format(); - - if (pkgbin->multiarch == PKG_MULTIARCH_SAME && - db_format == PKG_INFODB_FORMAT_MULTIARCH) - pkgname = pkgbin_name(pkg, pkgbin, pnaw_always); - else - pkgname = pkgbin_name(pkg, pkgbin, pnaw_never); - - varbuf_add_str(&db_path, pkg_infodb_get_dir()); - varbuf_add_char(&db_path, '/'); - varbuf_end_str(&db_path); - varbuf_snapshot(&db_path, &db_path_state); - - db_dir = opendir(db_path.buf); - if (!db_dir) - ohshite(_("cannot read info directory")); - - push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)db_dir); - while ((db_de = readdir(db_dir)) != NULL) { - const char *filename, *filetype, *dot; - - debug(dbg_veryverbose, "infodb foreach info file '%s'", - db_de->d_name); - - /* Ignore dotfiles, including ‘.’ and ‘..’. */ - if (db_de->d_name[0] == '.') - continue; - - /* Ignore anything odd. */ - dot = strrchr(db_de->d_name, '.'); - if (dot == NULL) - continue; - - /* Ignore files from other packages. */ - if (strlen(pkgname) != (size_t)(dot - db_de->d_name) || - strncmp(db_de->d_name, pkgname, dot - db_de->d_name)) - continue; - - debug(dbg_stupidlyverbose, "infodb foreach file this pkg"); - - /* Skip past the full stop. */ - filetype = dot + 1; - - varbuf_rollback(&db_path, &db_path_state); - varbuf_add_str(&db_path, db_de->d_name); - varbuf_end_str(&db_path); - filename = db_path.buf; - - func(filename, filetype); - } - pop_cleanup(ehflag_normaltidy); /* closedir */ - - varbuf_destroy(&db_path); -} diff --git a/src/infodb-format.c b/src/infodb-format.c deleted file mode 100644 index 432930890..000000000 --- a/src/infodb-format.c +++ /dev/null @@ -1,151 +0,0 @@ -/* - * dpkg - main program for package management - * infodb-format.c - package control information database format - * - * Copyright © 2011-2014 Guillem Jover - * - * This 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 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 . - */ - -#include -#include - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include - -#include "infodb.h" - -static enum pkg_infodb_format db_format = PKG_INFODB_FORMAT_UNKNOWN; -static bool db_upgrading; - -static enum pkg_infodb_format -pkg_infodb_parse_format(const char *file) -{ - FILE *fp; - int format; - - fp = fopen(file, "r"); - if (fp == NULL) { - /* A missing format file means legacy format (0). */ - if (errno == ENOENT) - return PKG_INFODB_FORMAT_LEGACY; - ohshite(_("error trying to open %.250s"), file); - } - - if (fscanf(fp, "%u", &format) != 1) - ohshit(_("corrupt info database format file '%s'"), file); - - fclose(fp); - - return format; -} - -static enum pkg_infodb_format -pkg_infodb_read_format(void) -{ - struct atomic_file *file; - struct stat st; - char *filename; - - filename = dpkg_db_get_path(INFODIR "/format"); - file = atomic_file_new(filename, 0); - - db_format = pkg_infodb_parse_format(file->name); - - /* Check if a previous upgrade got interrupted. Because we are only - * supposed to upgrade the db layout one format at a time, if the - * new file exists that means the new format is just one ahead, - * we don't try to read it because it contains unreliable data. */ - if (stat(file->name_new, &st) == 0) { - db_format++; - db_upgrading = true; - } - - atomic_file_free(file); - free(filename); - - if (db_format < 0 || db_format >= PKG_INFODB_FORMAT_LAST) - ohshit(_("info database format (%d) is bogus or too new; " - "try getting a newer dpkg"), db_format); - - return db_format; -} - -enum pkg_infodb_format -pkg_infodb_get_format(void) -{ - if (db_format > PKG_INFODB_FORMAT_UNKNOWN) - return db_format; - else - return pkg_infodb_read_format(); -} - -void -pkg_infodb_set_format(enum pkg_infodb_format version) -{ - db_format = version; -} - -bool -pkg_infodb_is_upgrading(void) -{ - if (db_format < 0) - pkg_infodb_read_format(); - - return db_upgrading; -} - -const char * -pkg_infodb_get_dir(void) -{ - static char *infodir; - - if (infodir == NULL) - infodir = dpkg_db_get_path(INFODIR); - - return infodir; -} - -const char * -pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin, - const char *filetype) -{ - static struct varbuf vb; - enum pkg_infodb_format format; - - /* Make sure to always read and verify the format version. */ - format = pkg_infodb_get_format(); - - varbuf_reset(&vb); - varbuf_add_str(&vb, pkg_infodb_get_dir()); - varbuf_add_char(&vb, '/'); - varbuf_add_str(&vb, pkg->set->name); - if (pkgbin->multiarch == PKG_MULTIARCH_SAME && - format == PKG_INFODB_FORMAT_MULTIARCH) - varbuf_add_archqual(&vb, pkgbin->arch); - varbuf_add_char(&vb, '.'); - varbuf_add_str(&vb, filetype); - varbuf_end_str(&vb); - - return vb.buf; -} diff --git a/src/infodb-upgrade.c b/src/infodb-upgrade.c deleted file mode 100644 index 1a8e144e8..000000000 --- a/src/infodb-upgrade.c +++ /dev/null @@ -1,253 +0,0 @@ -/* - * dpkg - main program for package management - * infodb-upgrade.c - package control information database format upgrade - * - * Copyright © 1995 Ian Jackson - * Copyright © 2011-2014 Guillem Jover - * Copyright © 2011 Linaro Limited - * Copyright © 2011 Raphaël Hertzog - * - * This 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 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 . - */ - -#include -#include - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "filesdb.h" -#include "infodb.h" - -struct rename_node { - struct rename_node *next; - char *old; - char *new; -}; - -/* Global variables. */ -static struct rename_node *rename_head = NULL; - -static struct rename_node * -rename_node_new(const char *old, const char *new, struct rename_node *next) -{ - struct rename_node *node; - - node = m_malloc(sizeof(*node)); - node->next = next; - node->old = m_strdup(old); - node->new = m_strdup(new); - - return node; -} - -static void -rename_node_free(struct rename_node *node) -{ - free(node->old); - free(node->new); - free(node); -} - -static void -pkg_infodb_link_multiarch_files(void) -{ - DIR *db_dir; - struct dirent *db_de; - struct varbuf pkgname = VARBUF_INIT; - struct varbuf oldname = VARBUF_INIT; - struct varbuf newname = VARBUF_INIT; - struct varbuf_state db_path_state; - - varbuf_add_str(&oldname, pkg_infodb_get_dir()); - varbuf_add_char(&oldname, '/'); - varbuf_end_str(&oldname); - varbuf_snapshot(&oldname, &db_path_state); - - varbuf_add_buf(&newname, oldname.buf, oldname.used); - varbuf_end_str(&newname); - - db_dir = opendir(oldname.buf); - if (!db_dir) - ohshite(_("cannot read info directory")); - - push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)db_dir); - while ((db_de = readdir(db_dir)) != NULL) { - const char *filetype, *dot; - struct pkginfo *pkg; - struct pkgset *set; - - /* Ignore dotfiles, including ‘.’ and ‘..’. */ - if (db_de->d_name[0] == '.') - continue; - - /* Ignore anything odd. */ - dot = strrchr(db_de->d_name, '.'); - if (dot == NULL) - continue; - - varbuf_reset(&pkgname); - varbuf_add_buf(&pkgname, db_de->d_name, dot - db_de->d_name); - varbuf_end_str(&pkgname); - - /* Skip files already converted. */ - if (strchr(pkgname.buf, ':')) - continue; - - set = pkg_db_find_set(pkgname.buf); - for (pkg = &set->pkg; pkg; pkg = pkg->arch_next) - if (pkg->status != PKG_STAT_NOTINSTALLED) - break; - if (!pkg) { - warning(_("info file %s/%s not associated to any package"), - pkg_infodb_get_dir(), db_de->d_name); - continue; - } - - /* Does it need to be upgraded? */ - if (pkg->installed.multiarch != PKG_MULTIARCH_SAME) - continue; - - /* Skip past the full stop. */ - filetype = dot + 1; - - varbuf_rollback(&oldname, &db_path_state); - varbuf_add_str(&oldname, db_de->d_name); - varbuf_end_str(&oldname); - - varbuf_rollback(&newname, &db_path_state); - varbuf_add_pkgbin_name(&newname, pkg, &pkg->installed, pnaw_always); - varbuf_add_char(&newname, '.'); - varbuf_add_str(&newname, filetype); - varbuf_end_str(&newname); - - if (link(oldname.buf, newname.buf) && errno != EEXIST) - ohshite(_("error creating hard link '%.255s'"), - newname.buf); - rename_head = rename_node_new(oldname.buf, newname.buf, rename_head); - } - pop_cleanup(ehflag_normaltidy); /* closedir */ - - varbuf_destroy(&pkgname); - varbuf_destroy(&newname); - varbuf_destroy(&oldname); -} - -static void -cu_abort_db_upgrade(int argc, void **argv) -{ - struct atomic_file *file = argv[0]; - struct rename_node *next; - - /* Restore the old files if needed and drop the newly created files. */ - while (rename_head) { - next = rename_head->next; - if (link(rename_head->new, rename_head->old) && errno != EEXIST) - ohshite(_("error creating hard link '%.255s'"), - rename_head->old); - if (unlink(rename_head->new)) - ohshite(_("cannot remove '%.250s'"), rename_head->new); - rename_node_free(rename_head); - rename_head = next; - } - if (unlink(file->name_new) && errno != ENOENT) - ohshite(_("cannot remove '%.250s'"), file->name_new); - - atomic_file_free(file); -} - -static void -pkg_infodb_write_format(struct atomic_file *file, int version) -{ - if (fprintf(file->fp, "%d\n", version) < 0) - ohshite(_("error while writing '%s'"), file->name_new); - - atomic_file_sync(file); - atomic_file_close(file); - dir_sync_path_parent(file->name); - - pkg_infodb_set_format(version); -} - -static void -pkg_infodb_unlink_monoarch_files(void) -{ - struct rename_node *next; - - while (rename_head) { - next = rename_head->next; - if (unlink(rename_head->old)) - ohshite(_("cannot remove '%.250s'"), rename_head->old); - rename_node_free(rename_head); - rename_head = next; - } -} - -static void -pkg_infodb_upgrade_to_multiarch(void) -{ - struct atomic_file *db_file; - char *db_format_file; - - db_format_file = dpkg_db_get_path(INFODIR "/format"); - db_file = atomic_file_new(db_format_file, 0); - atomic_file_open(db_file); - - push_cleanup(cu_abort_db_upgrade, ehflag_bombout, NULL, 0, 1, db_file); - - pkg_infodb_link_multiarch_files(); - pkg_infodb_write_format(db_file, 1); - - pkg_infodb_unlink_monoarch_files(); - atomic_file_commit(db_file); - dir_sync_path(pkg_infodb_get_dir()); - - pop_cleanup(ehflag_normaltidy); - - atomic_file_free(db_file); - free(db_format_file); -} - -/** - * Upgrade the infodb if there's the need and possibility. - * - * Currently this implies, that the modstatdb was opened for writing and: - * - previous upgrade has not been completed; or - * - current format is not the latest one. - */ -void -pkg_infodb_upgrade(void) -{ - enum pkg_infodb_format db_format; - - /* Make sure to always read and verify the format version. */ - db_format = pkg_infodb_get_format(); - - if (modstatdb_get_status() < msdbrw_write) - return; - - if (db_format < PKG_INFODB_FORMAT_MULTIARCH || - pkg_infodb_is_upgrading()) - pkg_infodb_upgrade_to_multiarch(); -} diff --git a/src/infodb.h b/src/infodb.h deleted file mode 100644 index 472011cc3..000000000 --- a/src/infodb.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * dpkg - main program for package management - * infodb.h - package control information database - * - * Copyright © 2011-2014 Guillem Jover - * - * This 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 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 . - */ - -#ifndef DPKG_INFODB_H -#define DPKG_INFODB_H - -#include - -#include - -enum pkg_infodb_format { - PKG_INFODB_FORMAT_UNKNOWN = -1, - PKG_INFODB_FORMAT_LEGACY = 0, - PKG_INFODB_FORMAT_MULTIARCH = 1, - PKG_INFODB_FORMAT_LAST, -}; - -enum pkg_infodb_format pkg_infodb_get_format(void); -void pkg_infodb_set_format(enum pkg_infodb_format format); -bool pkg_infodb_is_upgrading(void); -void pkg_infodb_upgrade(void); - -const char *pkg_infodb_get_dir(void); -const char *pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin, - const char *filetype); -bool pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin, - const char *name); - -typedef void pkg_infodb_file_func(const char *filename, const char *filetype); - -void pkg_infodb_foreach(struct pkginfo *pkg, struct pkgbin *pkgbin, - pkg_infodb_file_func *func); - -#endif /* DPKG_INFODB_H */ diff --git a/src/packages.c b/src/packages.c index ae001757f..da221c093 100644 --- a/src/packages.c +++ b/src/packages.c @@ -41,9 +41,9 @@ #include #include #include +#include #include "filesdb.h" -#include "infodb.h" #include "main.h" static struct pkginfo *progress_bytrigproc; diff --git a/src/querycmd.c b/src/querycmd.c index 127f0c883..67b84b20a 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -54,9 +54,9 @@ #include #include #include +#include #include "filesdb.h" -#include "infodb.h" #include "main.h" static const char *showformat = "${binary:Package}\t${Version}\n"; diff --git a/src/remove.c b/src/remove.c index 9cfd7d044..45c9a9e3e 100644 --- a/src/remove.c +++ b/src/remove.c @@ -42,8 +42,8 @@ #include #include #include +#include -#include "infodb.h" #include "filesdb.h" #include "main.h" diff --git a/src/script.c b/src/script.c index ecf4a94a1..bb5f9825c 100644 --- a/src/script.c +++ b/src/script.c @@ -42,9 +42,9 @@ #include #include #include +#include #include "filesdb.h" -#include "infodb.h" #include "main.h" void diff --git a/src/select.c b/src/select.c index 6faf67df3..ebdb13b7f 100644 --- a/src/select.c +++ b/src/select.c @@ -37,9 +37,9 @@ #include #include #include +#include #include "filesdb.h" -#include "infodb.h" #include "main.h" static void getsel1package(struct pkginfo *pkg) { diff --git a/src/trigproc.c b/src/trigproc.c index 7b6537bb4..70a42eaa2 100644 --- a/src/trigproc.c +++ b/src/trigproc.c @@ -33,11 +33,11 @@ #include #include #include +#include #include #include "main.h" #include "filesdb.h" -#include "infodb.h" /* * Trigger processing algorithms: diff --git a/src/unpack.c b/src/unpack.c index f43c01e45..ae0e12132 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -51,11 +51,11 @@ #include #include #include +#include #include #include "filesdb.h" #include "file-match.h" -#include "infodb.h" #include "main.h" #include "archives.h" diff --git a/src/verify.c b/src/verify.c index e68ec7b44..2698fc216 100644 --- a/src/verify.c +++ b/src/verify.c @@ -29,9 +29,9 @@ #include #include #include +#include #include "filesdb.h" -#include "infodb.h" #include "main.h" -- cgit v1.2.3 From 2dc4354934aa940ea37324e0aabde4f6379536f0 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 5 May 2018 02:40:24 +0200 Subject: libdpkg: Use MD5_CTX instead of struct MD5Context The former is more portable as it's defined in more system md5.h implementations, such as Solaris, while the latter is not. Analysis-support-by: Bruno Ramos from IRC --- debian/changelog | 2 ++ lib/dpkg/buffer.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index d29543f88..8eb639c44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium always make sure it builds, even when we use an external implementation. - Convert libcompat md5 module to use C99 int types, instead of mapping them from the BSD types at configure time. + - Use MD5_CTX instead of struct MD5Context, as the prevalent more portable + type on system's headers. * Perl modules: - Check that $tarname is defined before use in Dpkg::Source::Package::V1. Thanks to Christoph Biedl . diff --git a/lib/dpkg/buffer.c b/lib/dpkg/buffer.c index 5fda05fe4..0af4da2b4 100644 --- a/lib/dpkg/buffer.c +++ b/lib/dpkg/buffer.c @@ -38,7 +38,7 @@ #include struct buffer_md5_ctx { - struct MD5Context ctx; + MD5_CTX ctx; char *hash; }; -- cgit v1.2.3 From 3c4272bb90086c05436b6e4b7a19fc11780c2afb Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 22 Oct 2010 01:11:42 +0200 Subject: Track package status dirtinness Now that the status changes are abstracted via a setter, which makes sure only new changes are recorded, we can also record whether those changes happened, so that we avoid unnecessarily logging unchanged states. Closes: #365921 --- debian/changelog | 2 ++ lib/dpkg/dbmodify.c | 14 +++++++++----- lib/dpkg/dpkg-db.h | 3 +++ lib/dpkg/pkg.c | 2 ++ 4 files changed, 16 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 58308cfdb..80211a553 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium * Only check required build dependencies for known targets specified with dpkg-buildpackage --rules-target option. Reported by Johannes Schauer . + * Track package status dirtiness in dpkg to only log and report in status-fd + when it has changed, removing duplication in output. Closes: #365921 * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c index 4e1457429..7351f3d00 100644 --- a/lib/dpkg/dbmodify.c +++ b/lib/dpkg/dbmodify.c @@ -442,11 +442,15 @@ void modstatdb_note(struct pkginfo *pkg) { pkg->trigaw.head = pkg->trigaw.tail = NULL; } - log_message("status %s %s %s", pkg_status_name(pkg), - pkg_name(pkg, pnaw_always), - versiondescribe(&pkg->installed.version, vdew_nonambig)); - statusfd_send("status: %s: %s", pkg_name(pkg, pnaw_nonambig), - pkg_status_name(pkg)); + if (pkg->status_dirty) { + log_message("status %s %s %s", pkg_status_name(pkg), + pkg_name(pkg, pnaw_always), + versiondescribe(&pkg->installed.version, vdew_nonambig)); + statusfd_send("status: %s: %s", pkg_name(pkg, pnaw_nonambig), + pkg_status_name(pkg)); + + pkg->status_dirty = false; + } if (cstatus >= msdbrw_write) modstatdb_note_core(pkg); diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index 56b4b5c39..2152ba26d 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -216,6 +216,9 @@ struct pkginfo { /* ->pend == this, non-NULL for us when Triggers-Pending. */ struct trigaw *othertrigaw_head; struct trigpend *trigpend_head; + + /* The status has changed, it needs to be logged. */ + bool status_dirty; }; /** diff --git a/lib/dpkg/pkg.c b/lib/dpkg/pkg.c index 4141fddb2..4f1828bbc 100644 --- a/lib/dpkg/pkg.c +++ b/lib/dpkg/pkg.c @@ -47,6 +47,7 @@ pkg_set_status(struct pkginfo *pkg, enum pkgstatus status) pkg->set->name, pkg->set->installed_instances); pkg->status = status; + pkg->status_dirty = true; } /** @@ -115,6 +116,7 @@ void pkg_blank(struct pkginfo *pkg) { pkg->status = PKG_STAT_NOTINSTALLED; + pkg->status_dirty = false; pkg->eflag = PKG_EFLAG_OK; pkg->want = PKG_WANT_UNKNOWN; pkg->priority = PKG_PRIO_UNKNOWN; -- cgit v1.2.3 From 6e5bd738efef1a0de4268ad12d87c27dfe91a687 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 26 May 2018 05:29:30 +0200 Subject: Use Synopsis instead of Summary for the short Description This unifies the term with the rest of the codebase, and makes it more descriptive. --- debian/changelog | 3 +++ lib/dpkg/libdpkg.map | 2 +- lib/dpkg/pkg-format.c | 11 ++++++----- lib/dpkg/pkg-show.c | 8 ++++---- lib/dpkg/pkg-show.h | 4 ++-- man/dpkg-query.man | 5 ++++- src/enquiry.c | 2 +- src/querycmd.c | 4 ++-- 8 files changed, 23 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 2ceefc850..bd72840b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,6 +73,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium Reported by Johannes Schauer . * Track package status dirtiness in dpkg to only log and report in status-fd when it has changed, removing duplication in output. Closes: #365921 + * Use Synopsis instead of Summary for the short Description, to unify the + nomenclature and to make it more descriptive. Add a new binary:Synopsis + virtual field to dpkg-query show format. * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 6f9b53e01..2c4c11181 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -280,7 +280,7 @@ LIBDPKG_PRIVATE { pkgbin_name; pkg_name; pkg_source_version; - pkgbin_summary; + pkgbin_synopsis; pkg_abbrev_want; pkg_abbrev_status; pkg_abbrev_eflag; diff --git a/lib/dpkg/pkg-format.c b/lib/dpkg/pkg-format.c index 40344a829..50c8bc581 100644 --- a/lib/dpkg/pkg-format.c +++ b/lib/dpkg/pkg-format.c @@ -269,14 +269,14 @@ virt_status_eflag(struct varbuf *vb, } static void -virt_summary(struct varbuf *vb, - const struct pkginfo *pkg, const struct pkgbin *pkgbin, - enum fwriteflags flags, const struct fieldinfo *fip) +virt_synopsis(struct varbuf *vb, + const struct pkginfo *pkg, const struct pkgbin *pkgbin, + enum fwriteflags flags, const struct fieldinfo *fip) { const char *desc; int len; - desc = pkgbin_summary(pkg, pkgbin, &len); + desc = pkgbin_synopsis(pkg, pkgbin, &len); varbuf_add_buf(vb, desc, len); } @@ -321,7 +321,8 @@ virt_source_upstream_version(struct varbuf *vb, static const struct fieldinfo virtinfos[] = { { FIELD("binary:Package"), NULL, virt_package }, - { FIELD("binary:Summary"), NULL, virt_summary }, + { FIELD("binary:Synopsis"), NULL, virt_synopsis }, + { FIELD("binary:Summary"), NULL, virt_synopsis }, { FIELD("db:Status-Abbrev"), NULL, virt_status_abbrev }, { FIELD("db:Status-Want"), NULL, virt_status_want }, { FIELD("db:Status-Status"), NULL, virt_status_status }, diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c index 4818675bb..479e7090b 100644 --- a/lib/dpkg/pkg-show.c +++ b/lib/dpkg/pkg-show.c @@ -119,22 +119,22 @@ pkg_name(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw) } /** - * Return a string representation of the package summary. + * Return a string representation of the package synopsis. * * The returned string must not be freed, and it's permanently allocated so * can be used as long as the non-freeing memory pool has not been freed. * - * The package summary is the short description, but it is not NUL terminated, + * The package synopsis is the short description, but it is not NUL terminated, * so the output len argument should be used to limit the string length. * * @param pkg The package to consider. * @param pkgbin The binary package instance to consider. - * @param[out] len The length of the summary string within the description. + * @param[out] len The length of the synopsis string within the description. * * @return The string representation. */ const char * -pkgbin_summary(const struct pkginfo *pkg, const struct pkgbin *pkgbin, int *len) +pkgbin_synopsis(const struct pkginfo *pkg, const struct pkgbin *pkgbin, int *len) { const char *pdesc; diff --git a/lib/dpkg/pkg-show.h b/lib/dpkg/pkg-show.h index dd8f666e6..9ef0ed459 100644 --- a/lib/dpkg/pkg-show.h +++ b/lib/dpkg/pkg-show.h @@ -34,8 +34,8 @@ DPKG_BEGIN_DECLS int pkg_sorter_by_nonambig_name_arch(const void *a, const void *b); -const char *pkgbin_summary(const struct pkginfo *pkg, - const struct pkgbin *pkgbin, int *len_ret); +const char *pkgbin_synopsis(const struct pkginfo *pkg, + const struct pkgbin *pkgbin, int *len_ret); int pkg_abbrev_want(const struct pkginfo *pkg); int pkg_abbrev_status(const struct pkginfo *pkg); int pkg_abbrev_eflag(const struct pkginfo *pkg); diff --git a/man/dpkg-query.man b/man/dpkg-query.man index 7e02cc5d7..46cf7c28c 100644 --- a/man/dpkg-query.man +++ b/man/dpkg-query.man @@ -249,8 +249,11 @@ An architecture qualifier will be present to make the package name unambiguous, for example if the package has a \fBMulti\-Arch\fP field with a value of \fBsame\fP or the package is of a foreign architecture. .TP +.B binary:Synopsis +It contains the package short description (since dpkg 1.19.1). +.TP .B binary:Summary -It contains the package short description (since dpkg 1.16.2). +This is an alias for \fBbinary:Synopsis\fP (since dpkg 1.16.2). .TP .B db:Status\-Abbrev It contains the abbreviated package status (as three characters), diff --git a/src/enquiry.c b/src/enquiry.c index 6182fce7f..e309f5516 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -169,7 +169,7 @@ static void describebriefly(struct pkginfo *pkg) { l= strlen(pkg->set->name); if (l>20) maxl -= (l-20); - pdesc = pkgbin_summary(pkg, &pkg->installed, &l); + pdesc = pkgbin_synopsis(pkg, &pkg->installed, &l); l = min(l, maxl); printf(" %-20s %.*s\n", pkg_name(pkg, pnaw_nonambig), l, pdesc); diff --git a/src/querycmd.c b/src/querycmd.c index 67b84b20a..2fd1b7827 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -179,7 +179,7 @@ list_format_init(struct list_format *fmt, struct pkg_array *array) vlen = str_width(versiondescribe(&array->pkgs[i]->installed.version, vdew_nonambig)); alen = str_width(dpkg_arch_describe(array->pkgs[i]->installed.arch)); - pkgbin_summary(array->pkgs[i], &array->pkgs[i]->installed, &dlen); + pkgbin_synopsis(array->pkgs[i], &array->pkgs[i]->installed, &dlen); if (plen > fmt->nw) fmt->nw = plen; @@ -285,7 +285,7 @@ pkg_array_list_item(struct pkg_array *array, struct pkginfo *pkg, void *pkg_data list_format_init(fmt, array); list_format_print_header(fmt); - pdesc = pkgbin_summary(pkg, &pkg->installed, &l); + pdesc = pkgbin_synopsis(pkg, &pkg->installed, &l); l = min(l, fmt->dw); list_format_print(fmt, -- cgit v1.2.3 From 9cc48e639eba62c41beb3b137b9cf8704dfc89ca Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 12 Jul 2018 05:21:52 +0200 Subject: libdpkg: Use memccpy() instead of strncpy() We were using strncpy() here as originally intended, to copy a string into a struct member without copying the NUL-terminator. But now gcc warns about the intended truncation, which might catch some people unexpectedly. Switch to use memccpy() which has similar semantics, but is more explicit. Warned-by: gcc-8 --- debian/changelog | 1 + lib/dpkg/t/t-ar.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 28568a5c4..661f739c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -159,6 +159,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium * Code internals: - Do not use stringy eval to define different sub implementations, just assign an anonymous sub to the typeglob. + - Use memccpy() instead of strncpy() to quiesce a gcc-8 warning. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/t/t-ar.c b/lib/dpkg/t/t-ar.c index 28b5e38f3..88e93872a 100644 --- a/lib/dpkg/t/t-ar.c +++ b/lib/dpkg/t/t-ar.c @@ -21,6 +21,8 @@ #include #include +#include + #include #include @@ -29,11 +31,11 @@ test_ar_normalize_name(void) { struct dpkg_ar_hdr arh; - strncpy(arh.ar_name, "member-name/ ", sizeof(arh.ar_name)); + memccpy(arh.ar_name, "member-name/ ", '\0', sizeof(arh.ar_name)); dpkg_ar_normalize_name(&arh); test_str(arh.ar_name, ==, "member-name"); - strncpy(arh.ar_name, "member-name ", sizeof(arh.ar_name)); + memccpy(arh.ar_name, "member-name ", '\0', sizeof(arh.ar_name)); dpkg_ar_normalize_name(&arh); test_str(arh.ar_name, ==, "member-name"); } -- cgit v1.2.3 From 31cdb7e05970744bca91977b0212b4eeee5fb420 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 5 Jun 2018 05:30:52 +0200 Subject: libdpkg: Turn variable into unsigned to match format string Warned-by: cppcheck --- lib/dpkg/db-ctrl-format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/dpkg/db-ctrl-format.c b/lib/dpkg/db-ctrl-format.c index f124ada61..a7c521773 100644 --- a/lib/dpkg/db-ctrl-format.c +++ b/lib/dpkg/db-ctrl-format.c @@ -41,7 +41,7 @@ static enum pkg_infodb_format pkg_infodb_parse_format(const char *file) { FILE *fp; - int format; + unsigned int format; fp = fopen(file, "r"); if (fp == NULL) { -- cgit v1.2.3 From 87c060b24b724f30e79406bc66b5342581ee29f1 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 5 Jun 2018 05:32:02 +0200 Subject: libdpkg: Improve unit test to use assigned variable Add a couple of checks to make the test more robust, and to use an assigned variable. Warned-by: cppcheck --- lib/dpkg/t/t-string.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/dpkg/t/t-string.c b/lib/dpkg/t/t-string.c index 1f5ee4cbe..fc2819b55 100644 --- a/lib/dpkg/t/t-string.c +++ b/lib/dpkg/t/t-string.c @@ -150,6 +150,8 @@ test_str_escape_fmt(void) memset(buf, 'a', sizeof(buf)); q = str_escape_fmt(buf, NULL, 0); test_mem(buf, ==, "aaaa", 4); + test_pass(buf == q); + test_pass(strnlen(buf, sizeof(buf)) == sizeof(buf)); memset(buf, 'a', sizeof(buf)); q = str_escape_fmt(buf, "b", 1); @@ -228,7 +230,7 @@ test_str_strip_quotes(void) TEST_ENTRY(test) { - test_plan(60); + test_plan(62); test_str_is_set(); test_str_match_end(); -- cgit v1.2.3 From ec1bd98b02630c00e4e367b7fba07e7ccbd64c77 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 5 Jun 2018 05:33:23 +0200 Subject: libdpkg: Do not compare an unsigned int with <= Warned-by: cppcheck --- lib/dpkg/tarfn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c index 3ad531555..16005e6f8 100644 --- a/lib/dpkg/tarfn.c +++ b/lib/dpkg/tarfn.c @@ -157,7 +157,7 @@ tar_atol256(const char *s, size_t size, intmax_t min, uintmax_t max) for (;;) { n = (n << 8) | c; - if (--size <= 0) + if (--size == 0) break; c = *s++; } -- cgit v1.2.3 From a4f0c6f04636ed066eb7e5162403d20a369fceec Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 11 Aug 2018 03:32:37 +0200 Subject: Fix some typos Thanks-to: Niels Thykier (for typo in dpkg(1)) --- ChangeLog.old | 12 ++++++------ debian/changelog | 4 ++-- debian/control | 2 +- doc/rootless-builds.txt | 2 +- lib/compat/getopt.c | 2 +- lib/dpkg/path-remove.c | 2 +- man/dpkg.man | 2 +- scripts/Dpkg/Source/Functions.pm | 2 +- scripts/dpkg-buildpackage.pl | 4 ++-- scripts/t/Dpkg_Changelog/shadow | 8 ++++---- t/pod-coverage.t | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/ChangeLog.old b/ChangeLog.old index 770c9d630..252d901b7 100644 --- a/ChangeLog.old +++ b/ChangeLog.old @@ -1361,7 +1361,7 @@ 2008-08-05 Guillem Jover - * scripts/dpkg-distaddfile.pl: Use _g() instead of mispelled gettext(). + * scripts/dpkg-distaddfile.pl: Use _g() instead of misspelled gettext(). 2008-08-03 Guillem Jover @@ -7444,7 +7444,7 @@ 2006-02-08 Guillem Jover - * debian/contrl (Build-Depends): Depend on version >= 1.28-4 of + * debian/control (Build-Depends): Depend on version >= 1.28-4 of libselinux1-dev as it has pkg-config support. Remove libsepol1-dev, now dragged by libselinux1-dev. Add pkg-config. * m4/libs.m4 (DPKG_LIB_SELINUX): Use pkg-config to get the static @@ -7689,7 +7689,7 @@ 2006-01-23 Bart Martens , Guillem Jover - * debian/contrl (Build-Depends): Add libsepol1-dev as a temporary + * debian/control (Build-Depends): Add libsepol1-dev as a temporary workaround until libselinux1-dev has pkg-config support. * m4/libs.m4 (DPKG_LIB_SELINUX): Explicitly statically link against libsepol. @@ -11001,7 +11001,7 @@ Sun May 19 04:09:25 CDT 2002 Adam Heath * debian/rules: Fix targets, so that if configure fails, but actually succeeds in creating config.status(as might happen if one has a - c-style comment in configure.in, and the shell trys running /foo), then + c-style comment in configure.in, and the shell tries running /foo), then the build will actually fail correctly. Sun May 19 02:31:11 CDT 2002 Adam Heath @@ -13730,7 +13730,7 @@ Tue Feb 8 21:33:58 EST 2000 Ben Collins * main/{processarc,archive}.c: Make the conflictor an array of structs and make sure that check_conflicts uses that and increments a global indexs for the array. The reason that multiple conflicts/replaces were getting - borked had something to do with thre first one in the hash not being + borked had something to do with the first one in the hash not being processed. This was the result of bad pointer games, so this makes it a lot cleaner. @@ -16705,7 +16705,7 @@ Changes in dpkg 0.93.15: * Put packages in `purge' state even if `deinstall' requested if they have no postrm and no conffiles. * Version number comparisons fixed. -* insert-version.pl now installes lib.pl filename too. +* insert-version.pl now installs lib.pl filename too. * Strip trailing slashes when reading files from file lists. Changes in dpkg 0.93.14: diff --git a/debian/changelog b/debian/changelog index b42616b84..fd30747c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -485,7 +485,7 @@ dpkg (1.18.24) unstable; urgency=medium on not cleaning the source tree. * Documentation: - Many spelling fixes. Thanks to Josh Soref . - - Do not include mispellings in changelogs, as that makes detecting them + - Do not include misspellings in changelogs, as that makes detecting them more difficult. * Build system: - Use libexec variable for auxiliary internal programs, and set it to @@ -12719,7 +12719,7 @@ Changes in dpkg 0.93.15: * Put packages in `purge' state even if `deinstall' requested if they have no postrm and no conffiles. * Version number comparisons fixed. -* insert-version.pl now installes lib.pl filename too. +* insert-version.pl now installs lib.pl filename too. * Strip trailing slashes when reading files from file lists. Changes in dpkg 0.93.14: diff --git a/debian/control b/debian/control index 29f9fc5ee..a3f819118 100644 --- a/debian/control +++ b/debian/control @@ -165,7 +165,7 @@ Description: Dpkg perl modules - Dpkg::Build::Info: build information functions - Dpkg::BuildFlags: set, modify and query compilation build flags - Dpkg::BuildOptions: parse and manipulate DEB_BUILD_OPTIONS - - Dpkg::BuildProfile: parse and manipulate build profiles + - Dpkg::BuildProfiles: parse and manipulate build profiles - Dpkg::Changelog: parse changelogs - Dpkg::Changelog::Entry: represents a changelog entry - Dpkg::Changelog::Parse: generic changelog parser for dpkg-parsechangelog diff --git a/doc/rootless-builds.txt b/doc/rootless-builds.txt index 0157879a4..0b6b9d849 100644 --- a/doc/rootless-builds.txt +++ b/doc/rootless-builds.txt @@ -57,7 +57,7 @@ When the builder supports this specification, it MUST notify this fact to the rules file via the "DEB_RULES_REQUIRES_ROOT" environment variable, with the value it has obtained from the Rules-Requires-Root field or some builder specific override mechanism, which will denote the level of support the -builder has choosen to commit to take effect during the build. When set, +builder has chosen to commit to take effect during the build. When set, it MUST be a valid value for the Rules-Requires-Root field. If unset, the build system SHOULD assume that the builder does not recognize the Rules-Requires-Root field at all. diff --git a/lib/compat/getopt.c b/lib/compat/getopt.c index 4c52b8b82..b13f81454 100644 --- a/lib/compat/getopt.c +++ b/lib/compat/getopt.c @@ -88,7 +88,7 @@ USA. */ #endif /* XXX: Disable intl support, because we do not carry the translations anyway - * and this pulls indirectly libintl, wich we do not want to impose. */ + * and this pulls indirectly libintl, which we do not want to impose. */ #ifndef _ #define _(msgid) (msgid) #endif diff --git a/lib/dpkg/path-remove.c b/lib/dpkg/path-remove.c index ef9cde7b5..6afb37607 100644 --- a/lib/dpkg/path-remove.c +++ b/lib/dpkg/path-remove.c @@ -1,6 +1,6 @@ /* * libdpkg - Debian packaging suite library routines - * path-remove.c - path removal functionss + * path-remove.c - path removal functions * * Copyright © 1994-1995 Ian Jackson * Copyright © 2007-2015 Guillem Jover diff --git a/man/dpkg.man b/man/dpkg.man index fdaa87b1c..772c1b324 100644 --- a/man/dpkg.man +++ b/man/dpkg.man @@ -623,7 +623,7 @@ any software not doing syncs before atomic renames. losing data, use with care.\fP \fBscript-chrootless\fP: -Run maintainer scrips without \fBchroot\fP(2)ing into \fBinstdir\fP even +Run maintainer scripts without \fBchroot\fP(2)ing into \fBinstdir\fP even if the package does not support this mode of operation (since dpkg 1.18.5). \fIWarning: This can destroy your host system, use with extreme care.\fP diff --git a/scripts/Dpkg/Source/Functions.pm b/scripts/Dpkg/Source/Functions.pm index dcb957e13..262b80ad1 100644 --- a/scripts/Dpkg/Source/Functions.pm +++ b/scripts/Dpkg/Source/Functions.pm @@ -73,7 +73,7 @@ sub fixperms { # Only change the pathname permissions if they differ from the desired. # -# To be able to build a source tree, a user needs write permisions on it, +# To be able to build a source tree, a user needs write permissions on it, # but not necessarily ownership of those files. sub chmod_if_needed { my ($newperms, $pathname) = @_; diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index 9cc6969d3..c50416580 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -629,7 +629,7 @@ if ($signsource) { error(g_('failed to sign %s file'), '.dsc'); } - # Recompute the checksums as the .dsc have changed now. + # Recompute the checksums as the .dsc has changed now. my $buildinfo = Dpkg::Control->new(type => CTRL_FILE_BUILDINFO); $buildinfo->load("../$pva.buildinfo"); my $checksums = Dpkg::Checksums->new(); @@ -731,7 +731,7 @@ sub parse_rules_requires_root { setup_rootcommand(); } - # Notify the childs we do support R³. + # Notify the children we do support R³. $ENV{DEB_RULES_REQUIRES_ROOT} = join ' ', sort keys %rrr; if ($keywords_base > 1 or $keywords_base and $keywords_impl) { diff --git a/scripts/t/Dpkg_Changelog/shadow b/scripts/t/Dpkg_Changelog/shadow index f9b2236f5..5f4bddb85 100644 --- a/scripts/t/Dpkg_Changelog/shadow +++ b/scripts/t/Dpkg_Changelog/shadow @@ -896,7 +896,7 @@ shadow (1:4.0.3-12) unstable; urgency=low shadow (1:4.0.3-11) unstable; urgency=low * update Japanese debconf translation. closes: #210382 - * update Brazilian Portugese debconf translation. closes: #208122 + * update Brazilian Portuguese debconf translation. closes: #208122 * run pam cleanup code as root. closes: #195048 -- Karl Ramm Sat, 13 Sep 2003 17:49:29 -0400 @@ -1108,7 +1108,7 @@ shadow (20000902-7) unstable; urgency=low * Cancel login timeout after authentication so that patient people timing out on network directory services can log in with local accounts. Closes: #107148 - * Add Brazillian Portugese debconf template translation for passwd. + * Add Brazillian Portuguese debconf template translation for passwd. Closes: #105292, #93223 * Pull /usr/share/doc/$package/README.shadow-paper.gz. Closes: #98058 * Use getent instead of group to verify existence of shadow group @@ -1382,7 +1382,7 @@ shadow (19990827-9) unstable; urgency=low shadow (19990827-8) unstable; urgency=low - * src/login.c: fixed loggin of username on successful login (was using + * src/login.c: fixed login of username on successful login (was using the normal username, when it should have used pam_user), closes: #47819 * src/login.c: check for hushed login and pass PAM_SILENT if true, @@ -1586,7 +1586,7 @@ shadow (19990827-1) unstable; urgency=low also call pam_fail_delay() with FAIL_DELAY as the arg before authentication. * etc/login.defs.pam.linux: new file, reflects options that PAM takesover * etc/login.defs.pam.hurd: new file, same for Hurd - * debian/passwd.mk: make sure that login.defs.5 get's installed for Hurd + * debian/passwd.mk: make sure that login.defs.5 gets installed for Hurd * pam.d/: Modified defaults for each service to reflect the old style and also added commented options on how to enable obsoleted options from login.defs in the PAM Way(tm). diff --git a/t/pod-coverage.t b/t/pod-coverage.t index 3cecd8b59..113feb264 100644 --- a/t/pod-coverage.t +++ b/t/pod-coverage.t @@ -34,7 +34,7 @@ sub all_pod_modules my $scan_perl_modules = sub { my $module = $File::Find::name; - # Only chack modules, scripts are documented in man pages. + # Only check modules, scripts are documented in man pages. return unless $module =~ s/\.pm$//; my $mod = Module::Metadata->new_from_file($File::Find::name); -- cgit v1.2.3 From 5b0721da81712f570ea744f11fa560f2492302a5 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 11 Aug 2018 03:31:49 +0200 Subject: libdpkg: Fix header file title --- lib/dpkg/ar.h | 2 +- lib/dpkg/db-ctrl-access.c | 2 +- lib/dpkg/db-ctrl-format.c | 2 +- lib/dpkg/db-ctrl-upgrade.c | 2 +- lib/dpkg/options-parsers.c | 2 +- lib/dpkg/pkg-format.h | 2 +- lib/dpkg/t/t-mod-db.c | 2 +- lib/dpkg/t/t-varbuf.c | 2 +- lib/dpkg/trigdeferred.c | 2 +- lib/dpkg/trigdeferred.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/dpkg/ar.h b/lib/dpkg/ar.h index 116703d84..55bfa6e99 100644 --- a/lib/dpkg/ar.h +++ b/lib/dpkg/ar.h @@ -1,6 +1,6 @@ /* * libdpkg - Debian packaging suite library routines - * ar.c - primitives for ar handling + * ar.h - primitives for ar handling * * Copyright © 2010 Guillem Jover * diff --git a/lib/dpkg/db-ctrl-access.c b/lib/dpkg/db-ctrl-access.c index 1c1dc1936..bd98d1409 100644 --- a/lib/dpkg/db-ctrl-access.c +++ b/lib/dpkg/db-ctrl-access.c @@ -1,6 +1,6 @@ /* * dpkg - main program for package management - * infodb.c - package control information database + * db-ctrl-access.c - package control information database * * Copyright © 1995 Ian Jackson * Copyright © 2011-2014 Guillem Jover diff --git a/lib/dpkg/db-ctrl-format.c b/lib/dpkg/db-ctrl-format.c index a7c521773..84b873c27 100644 --- a/lib/dpkg/db-ctrl-format.c +++ b/lib/dpkg/db-ctrl-format.c @@ -1,6 +1,6 @@ /* * dpkg - main program for package management - * infodb-format.c - package control information database format + * db-ctrl-format.c - package control information database format * * Copyright © 2011-2014 Guillem Jover * diff --git a/lib/dpkg/db-ctrl-upgrade.c b/lib/dpkg/db-ctrl-upgrade.c index 67c4ce0fa..fc88bd4d0 100644 --- a/lib/dpkg/db-ctrl-upgrade.c +++ b/lib/dpkg/db-ctrl-upgrade.c @@ -1,6 +1,6 @@ /* * dpkg - main program for package management - * infodb-upgrade.c - package control information database format upgrade + * db-ctrl-upgrade.c - package control information database format upgrade * * Copyright © 1995 Ian Jackson * Copyright © 2011-2014 Guillem Jover diff --git a/lib/dpkg/options-parsers.c b/lib/dpkg/options-parsers.c index b65215027..c26864278 100644 --- a/lib/dpkg/options-parsers.c +++ b/lib/dpkg/options-parsers.c @@ -1,6 +1,6 @@ /* * dpkg - main program for package management - * options-helper.c - command-line options parser helpers + * options-parsers.c - command-line options parser helpers * * Copyright © 2014 Guillem Jover * diff --git a/lib/dpkg/pkg-format.h b/lib/dpkg/pkg-format.h index cba39a147..3e013003d 100644 --- a/lib/dpkg/pkg-format.h +++ b/lib/dpkg/pkg-format.h @@ -1,6 +1,6 @@ /* * libdpkg - Debian packaging suite library routines - * pkg-format.c - customizable package formatting + * pkg-format.g - customizable package formatting * * Copyright © 2001 Wichert Akkerman * diff --git a/lib/dpkg/t/t-mod-db.c b/lib/dpkg/t/t-mod-db.c index 680dab5e5..c40d8e8ae 100644 --- a/lib/dpkg/t/t-mod-db.c +++ b/lib/dpkg/t/t-mod-db.c @@ -1,6 +1,6 @@ /* * libdpkg - Debian packaging suite library routines - * t-db.c - test database implementation + * t-mod-db.c - test database implementation * * Copyright © 2011 Guillem Jover * diff --git a/lib/dpkg/t/t-varbuf.c b/lib/dpkg/t/t-varbuf.c index 3fb4444b2..585251993 100644 --- a/lib/dpkg/t/t-varbuf.c +++ b/lib/dpkg/t/t-varbuf.c @@ -1,6 +1,6 @@ /* * libdpkg - Debian packaging suite library routines - * t-verbuf.c - test varbuf implementation + * t-varbuf.c - test varbuf implementation * * Copyright © 2009-2011, 2013-2015 Guillem Jover * diff --git a/lib/dpkg/trigdeferred.c b/lib/dpkg/trigdeferred.c index e5bb2c347..12677ddc9 100644 --- a/lib/dpkg/trigdeferred.c +++ b/lib/dpkg/trigdeferred.c @@ -1,6 +1,6 @@ /* * libdpkg - Debian packaging suite library routines - * trigdeferred.c - parsing of triggers/Deferred + * trigdeferred.c - parsing of triggers/Unincorp (was …/Deferred) * * Copyright © 2007 Canonical Ltd * written by Ian Jackson diff --git a/lib/dpkg/trigdeferred.h b/lib/dpkg/trigdeferred.h index 5b7b87cd3..c353ca150 100644 --- a/lib/dpkg/trigdeferred.h +++ b/lib/dpkg/trigdeferred.h @@ -1,6 +1,6 @@ /* * libdpkg - Debian packaging suite library routines - * trigdeferred.h - parsing of triggers/Deferred + * trigdeferred.h - parsing of triggers/Unincorp (was …/Deferred) * * Copyright © 2007 Canonical, Ltd. * written by Ian Jackson -- cgit v1.2.3 From 482d420fe0fdd9e077342fb82d29d69facbbf78b Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 12 Jul 2018 03:23:08 +0200 Subject: libdpkg: Fix dpkg_arch_find() Doxygen comment --- debian/changelog | 1 + lib/dpkg/arch.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index b1098d204..fa9812c87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -164,6 +164,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium Closes: #904060 - Fix man page markup. Closes: #900033, #900035, #900040 Thanks to Bjarni Ingi Gislason . + - Fix Doxygen comment for libdpkg dpkg_arch_find() function. * Code internals: - Do not use stringy eval to define different sub implementations, just assign an anonymous sub to the typeglob. diff --git a/lib/dpkg/arch.c b/lib/dpkg/arch.c index 36b482972..83c6579f1 100644 --- a/lib/dpkg/arch.c +++ b/lib/dpkg/arch.c @@ -124,10 +124,11 @@ dpkg_arch_new(const char *name, enum dpkg_arch_type type) /** * Retrieve the struct dpkg_arch for the given architecture. * - * Create a new structure for the architecture if it's not yet known from - * the system, in that case it will have arch->type == arch_unknown, if the - * architecture is illegal it will have arch->type == arch_illegal and if - * name is NULL or an empty string then it will have arch->type == arch_none. + * Create a new structure for the architecture if it is not yet known from + * the system, in that case it will have type == DPKG_ARCH_UNKNOWN, if the + * architecture is illegal it will have type == DPKG_ARCH_ILLEGAL, if name + * is an empty string it will have type == DPKG_ARCH_EMPTY, and if it is + * NULL then it will have type == DPKG_ARCH_NONE. * * @param name The architecture name. */ -- cgit v1.2.3 From 2b78637509e9f7c39ae0495c3f4718a60a55da9a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 16 Aug 2018 05:41:04 +0200 Subject: libdpkg: Add missing db-ctrl symbols to the libdpkg.map file --- lib/dpkg/libdpkg.map | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 2c4c11181..8dd62ccc9 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -381,6 +381,13 @@ LIBDPKG_PRIVATE { modstatdb_shutdown; modstatdb_done; + # Package on-disk control database support + pkg_infodb_foreach; + pkg_infodb_get_dir; + pkg_infodb_get_file; + pkg_infodb_has_file; + pkg_infodb_upgrade; + # Filesystem node hash support filesdbinit; files_db_reset; -- cgit v1.2.3 From 3a4e91f3c42850cf5d965c74b1714f78f6b7767c Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Aug 2018 22:07:53 +0200 Subject: libdpkg: Fix pkgbin_name_needs_arch() to ignore empty and missing arches There's no point in arch-qualifying a package name if we got no architecture to qualify it with. --- debian/changelog | 3 +++ lib/dpkg/pkg-show.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index fa9812c87..b877839c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -169,6 +169,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Do not use stringy eval to define different sub implementations, just assign an anonymous sub to the typeglob. - Use memccpy() instead of strncpy() to quiesce a gcc-8 warning. + - Change pkgbin_name_needs_arch() to never arch-qualify packages that + have an empty or no architecture, which was already handled as part + of varbuf_add_archqual(). * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c index 479e7090b..6767b5ca4 100644 --- a/lib/dpkg/pkg-show.c +++ b/lib/dpkg/pkg-show.c @@ -34,6 +34,10 @@ static bool pkgbin_name_needs_arch(const struct pkgbin *pkgbin, enum pkg_name_arch_when pnaw) { + if (pkgbin->arch->type == DPKG_ARCH_NONE || + pkgbin->arch->type == DPKG_ARCH_EMPTY) + return false; + switch (pnaw) { case pnaw_never: break; @@ -43,8 +47,7 @@ pkgbin_name_needs_arch(const struct pkgbin *pkgbin, /* Fall through. */ case pnaw_foreign: if (pkgbin->arch->type == DPKG_ARCH_NATIVE || - pkgbin->arch->type == DPKG_ARCH_ALL || - pkgbin->arch->type == DPKG_ARCH_NONE) + pkgbin->arch->type == DPKG_ARCH_ALL) break; /* Fall through. */ case pnaw_always: -- cgit v1.2.3 From 55eaddc5411b6eae85686a511a9b122e84c0e7fd Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Aug 2018 06:45:56 +0200 Subject: libdpkg: Factor out cached arch-qualified package name generation Move this into a proper function so that we can call it from multiple places. In addition we always return a non-freeing allocated string, in case the architecture is empty or none. --- debian/changelog | 2 ++ lib/dpkg/dpkg-db.h | 4 ++++ lib/dpkg/parse.c | 9 +-------- lib/dpkg/pkg-show.c | 17 +++++++++++++++++ 4 files changed, 24 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index b877839c1..094971925 100644 --- a/debian/changelog +++ b/debian/changelog @@ -172,6 +172,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Change pkgbin_name_needs_arch() to never arch-qualify packages that have an empty or no architecture, which was already handled as part of varbuf_add_archqual(). + - libdpkg: Factor out cached arch-qualified package name generation into + new pkgbin_name_archqual() function. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index 2152ba26d..a7b77aaa9 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -379,6 +379,10 @@ enum pkg_name_arch_when { void varbuf_add_pkgbin_name(struct varbuf *vb, const struct pkginfo *pkg, const struct pkgbin *pkgbin, enum pkg_name_arch_when pnaw); + +const char * +pkgbin_name_archqual(const struct pkginfo *pkg, const struct pkgbin *pkgbin); + const char *pkgbin_name(const struct pkginfo *pkg, const struct pkgbin *pkgbin, enum pkg_name_arch_when pnaw); const char *pkg_name(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw); diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index 221067881..155f80ad2 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -219,14 +219,7 @@ pkg_parse_verify(struct parsedb_state *ps, "Multi-Arch: same"); /* Generate the fully qualified package name representation. */ - if (pkgbin->arch->type != DPKG_ARCH_NONE && - pkgbin->arch->type != DPKG_ARCH_EMPTY) { - char *pkgname = nfmalloc(strlen(pkg->set->name) + 1 + - strlen(pkgbin->arch->name) + 1); - - str_concat(pkgname, pkg->set->name, ":", pkgbin->arch->name, NULL); - pkgbin->pkgname_archqual = pkgname; - } + pkgbin->pkgname_archqual = pkgbin_name_archqual(pkg, pkgbin); /* Initialize deps to be arch-specific unless stated otherwise. */ for (dep = pkgbin->depends; dep; dep = dep->next) diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c index 6767b5ca4..47bd55cab 100644 --- a/lib/dpkg/pkg-show.c +++ b/lib/dpkg/pkg-show.c @@ -79,6 +79,23 @@ varbuf_add_pkgbin_name(struct varbuf *vb, varbuf_end_str(vb); } +const char * +pkgbin_name_archqual(const struct pkginfo *pkg, const struct pkgbin *pkgbin) +{ + char *pkgname; + + if (pkgbin->arch->type == DPKG_ARCH_NONE || + pkgbin->arch->type == DPKG_ARCH_EMPTY) + return pkg->set->name; + + pkgname = nfmalloc(strlen(pkg->set->name) + 1 + + strlen(pkgbin->arch->name) + 1); + str_concat(pkgname, pkg->set->name, ":", + pkgbin->arch->name, NULL); + + return pkgname; +} + /** * Return a string representation of the package name. * -- cgit v1.2.3 From 8cbd195ff7227b7e628b378ae2961a793d53bdcc Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Aug 2018 22:09:56 +0200 Subject: libdpkg: Add new pkg_name() and pkgbin_name() const variants Because C does not have a C++ equivalent for the mutable keyword, we cannot mark the pkgname_archqual member as such. Instead we will add a new couple of const functions that will fallback to return a non-freeing string to be used mostly in error handling code paths in case there is no cached member, as otherwise we'd be "leaking" those strings (just generating new instances that will be released as part of the pool) every time we call these functions. --- debian/changelog | 1 + lib/dpkg/dpkg-db.h | 6 ++++++ lib/dpkg/libdpkg.map | 2 ++ lib/dpkg/pkg-show.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 094971925..7f5c17720 100644 --- a/debian/changelog +++ b/debian/changelog @@ -174,6 +174,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium of varbuf_add_archqual(). - libdpkg: Factor out cached arch-qualified package name generation into new pkgbin_name_archqual() function. + - libdpkg: Add new pkg_name() and pkgbin_name() const variants. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index a7b77aaa9..7b7591ebe 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -387,6 +387,12 @@ const char *pkgbin_name(const struct pkginfo *pkg, const struct pkgbin *pkgbin, enum pkg_name_arch_when pnaw); const char *pkg_name(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw); +const char * +pkgbin_name_const(const struct pkginfo *pkg, const struct pkgbin *pkgbin, + enum pkg_name_arch_when pnaw); +const char * +pkg_name_const(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw); + void pkg_source_version(struct dpkg_version *version, const struct pkginfo *pkg, const struct pkgbin *pkgbin); diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 8dd62ccc9..6260f7456 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -279,6 +279,8 @@ LIBDPKG_PRIVATE { varbuf_add_source_version; pkgbin_name; pkg_name; + pkgbin_name_const; + pkg_name_const; pkg_source_version; pkgbin_synopsis; pkg_abbrev_want; diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c index 47bd55cab..84889f4a1 100644 --- a/lib/dpkg/pkg-show.c +++ b/lib/dpkg/pkg-show.c @@ -96,6 +96,58 @@ pkgbin_name_archqual(const struct pkginfo *pkg, const struct pkgbin *pkgbin) return pkgname; } +/** + * Return a string representation of the package name. + * + * The returned string must not be freed, and it's permanently allocated so + * can be used as long as the non-freeing memory pool has not been freed. + * + * Note, that this const variant will "leak" a new non-freeing string on + * each call if the internal cache has not been previously initialized, + * so it is advised to use it only in error reporting code paths. + * + * The pnaw parameter should be one of pnaw_never (never print arch), + * pnaw_foreign (print arch for foreign packages only), pnaw_nonambig (print + * arch for non ambiguous cases) or pnaw_always (always print arch), + * + * @param pkg The package to consider. + * @param pkgbin The binary package instance to consider. + * @param pnaw When to display the architecture qualifier. + * + * @return The string representation. + */ +const char * +pkgbin_name_const(const struct pkginfo *pkg, const struct pkgbin *pkgbin, + enum pkg_name_arch_when pnaw) +{ + if (!pkgbin_name_needs_arch(pkgbin, pnaw)) + return pkg->set->name; + + /* Return a non-freeing package name representation, which + * is intended to be used in error-handling code, as we will keep + * "leaking" them until the next memory pool flush. */ + if (pkgbin->pkgname_archqual == NULL) + return pkgbin_name_archqual(pkg, pkgbin); + + return pkgbin->pkgname_archqual; +} + +/** + * Return a string representation of the installed package name. + * + * This is equivalent to pkgbin_name_const() but just for its installed pkgbin. + * + * @param pkg The package to consider. + * @param pnaw When to display the architecture qualifier. + * + * @return The string representation. + */ +const char * +pkg_name_const(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw) +{ + return pkgbin_name_const(pkg, &pkg->installed, pnaw); +} + /** * Return a string representation of the package name. * -- cgit v1.2.3 From d36b97a58ca207eae556f69637b4edaa2d1a169a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Aug 2018 22:13:38 +0200 Subject: libdpkg, dselect: Use new pkg_name_const() and pkgbin_name_const() This will make it possible to switch the pkg_name() and pkgbin_name() back to take non-const structs, and then fill the pkgname_archqual cache on demand. --- debian/changelog | 1 + dselect/pkgtop.cc | 2 +- lib/dpkg/dump.c | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 13 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 7f5c17720..118a3d2e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -175,6 +175,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Factor out cached arch-qualified package name generation into new pkgbin_name_archqual() function. - libdpkg: Add new pkg_name() and pkgbin_name() const variants. + - libdpkg, dselect: Use new pkg_name_const() and pkgbin_name_const(). * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc index 6e233a1f9..b8a644ca5 100644 --- a/dselect/pkgtop.cc +++ b/dselect/pkgtop.cc @@ -43,7 +43,7 @@ pkgprioritystring(const struct pkginfo *pkg) } else { if (pkg->priority > PKG_PRIO_UNKNOWN) internerr("package %s has out-of-range priority %d", - pkg_name(pkg, pnaw_always), pkg->priority); + pkg_name_const(pkg, pnaw_always), pkg->priority); return gettext(prioritystrings[pkg->priority]); } } diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c index 8086cf77f..a5f040184 100644 --- a/lib/dpkg/dump.c +++ b/lib/dpkg/dump.c @@ -234,7 +234,7 @@ w_priority(struct varbuf *vb, if (pkg->priority > PKG_PRIO_UNKNOWN) internerr("package %s has out-of-range priority %d", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg->priority); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg->priority); if (flags&fw_printheader) varbuf_add_str(vb, "Priority: "); @@ -253,39 +253,39 @@ w_status(struct varbuf *vb, if (pkg->want > PKG_WANT_PURGE) internerr("package %s has unknown want state %d", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg->want); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg->want); if (pkg->eflag > PKG_EFLAG_REINSTREQ) internerr("package %s has unknown error state %d", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg->eflag); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg->eflag); switch (pkg->status) { case PKG_STAT_NOTINSTALLED: case PKG_STAT_CONFIGFILES: if (pkg->trigpend_head || pkg->trigaw.head) internerr("package %s in state %s, has awaited or pending triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_HALFINSTALLED: case PKG_STAT_UNPACKED: case PKG_STAT_HALFCONFIGURED: if (pkg->trigpend_head) internerr("package %s in state %s, has pending triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_TRIGGERSAWAITED: if (pkg->trigaw.head == NULL) internerr("package %s in state %s, has no awaited triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_TRIGGERSPENDING: if (pkg->trigpend_head == NULL || pkg->trigaw.head) internerr("package %s in stata %s, has awaited or no pending triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_INSTALLED: if (pkg->trigpend_head || pkg->trigaw.head) internerr("package %s in state %s, has awaited or pending triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; default: internerr("unknown package status '%d'", pkg->status); @@ -357,7 +357,7 @@ w_dependency(struct varbuf *vb, if (dyp->up != pkg) internerr("dependency and package %s not linked properly", - pkgbin_name(pkg, pkgbin, pnaw_always)); + pkgbin_name_const(pkg, pkgbin, pnaw_always)); if (dep_found) { varbuf_add_str(vb, ", "); @@ -410,7 +410,7 @@ w_trigpend(struct varbuf *vb, if (pkg->status < PKG_STAT_TRIGGERSAWAITED || pkg->status > PKG_STAT_TRIGGERSPENDING) internerr("package %s in non-trigger state %s, has pending triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); if (flags & fw_printheader) varbuf_add_str(vb, "Triggers-Pending:"); @@ -435,7 +435,7 @@ w_trigaw(struct varbuf *vb, if (pkg->status <= PKG_STAT_CONFIGFILES || pkg->status > PKG_STAT_TRIGGERSAWAITED) internerr("package %s in state %s, has awaited triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); if (flags & fw_printheader) varbuf_add_str(vb, "Triggers-Awaited:"); @@ -486,7 +486,7 @@ writerecord(FILE *file, const char *filename, if (fputs(vb.buf, file) < 0) ohshite(_("failed to write details of '%.50s' to '%.250s'"), - pkgbin_name(pkg, pkgbin, pnaw_nonambig), filename); + pkgbin_name_const(pkg, pkgbin, pnaw_nonambig), filename); varbuf_destroy(&vb); } -- cgit v1.2.3 From 92a85658bdf1e590c7d66af8047c347984db1b26 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Aug 2018 19:31:56 +0200 Subject: libdpkg: Change pkg_name() and pkgbin_name() back to get non-const structs This partially reverts commit cd96cca4b2cf83f46d6e289418ed06e3c2ef7066. It is not safe to assume that the pkgname_arcqual member has been populated before. The caller might have used a local variable filled manually. So we should always check whether it is NULL and fill it ourselves, before returning it. In addition now that we have the const function variants we can turn these back into non-const so that we can do the archqualified package name generation, and cache it for later use. --- lib/dpkg/dpkg-db.h | 11 +++++---- lib/dpkg/parse.c | 2 +- lib/dpkg/pkg-show.c | 8 +++++-- lib/dpkg/t/.gitignore | 1 + lib/dpkg/t/Makefile.am | 1 + lib/dpkg/t/t-pkg-show.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 lib/dpkg/t/t-pkg-show.c (limited to 'lib') diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index 7b7591ebe..de8745b02 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -110,7 +110,8 @@ struct pkgbin { bool essential; enum pkgmultiarch multiarch; const struct dpkg_arch *arch; - /** The fully qualified package name, i.e. "pkgname:archqual". */ + /** The following is the "pkgname:archqual" cached string, if this was a + * C++ class this member would be mutable. */ const char *pkgname_archqual; const char *description; const char *maintainer; @@ -383,9 +384,11 @@ void varbuf_add_pkgbin_name(struct varbuf *vb, const struct pkginfo *pkg, const char * pkgbin_name_archqual(const struct pkginfo *pkg, const struct pkgbin *pkgbin); -const char *pkgbin_name(const struct pkginfo *pkg, const struct pkgbin *pkgbin, - enum pkg_name_arch_when pnaw); -const char *pkg_name(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw); +const char * +pkgbin_name(struct pkginfo *pkg, struct pkgbin *pkgbin, + enum pkg_name_arch_when pnaw); +const char * +pkg_name(struct pkginfo *pkg, enum pkg_name_arch_when pnaw); const char * pkgbin_name_const(const struct pkginfo *pkg, const struct pkgbin *pkgbin, diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index 155f80ad2..b0db8179d 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -218,7 +218,7 @@ pkg_parse_verify(struct parsedb_state *ps, parse_error(ps, _("package has field '%s' but is architecture all"), "Multi-Arch: same"); - /* Generate the fully qualified package name representation. */ + /* Generate the cached fully qualified package name representation. */ pkgbin->pkgname_archqual = pkgbin_name_archqual(pkg, pkgbin); /* Initialize deps to be arch-specific unless stated otherwise. */ diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c index 84889f4a1..569cbf5c2 100644 --- a/lib/dpkg/pkg-show.c +++ b/lib/dpkg/pkg-show.c @@ -165,12 +165,16 @@ pkg_name_const(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw) * @return The string representation. */ const char * -pkgbin_name(const struct pkginfo *pkg, const struct pkgbin *pkgbin, +pkgbin_name(struct pkginfo *pkg, struct pkgbin *pkgbin, enum pkg_name_arch_when pnaw) { if (!pkgbin_name_needs_arch(pkgbin, pnaw)) return pkg->set->name; + /* Cache the package name representation, for later reuse. */ + if (pkgbin->pkgname_archqual == NULL) + pkgbin->pkgname_archqual = pkgbin_name_archqual(pkg, pkgbin); + return pkgbin->pkgname_archqual; } @@ -185,7 +189,7 @@ pkgbin_name(const struct pkginfo *pkg, const struct pkgbin *pkgbin, * @return The string representation. */ const char * -pkg_name(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw) +pkg_name(struct pkginfo *pkg, enum pkg_name_arch_when pnaw) { return pkgbin_name(pkg, &pkg->installed, pnaw); } diff --git a/lib/dpkg/t/.gitignore b/lib/dpkg/t/.gitignore index e22bcc9e4..f88d0fa1c 100644 --- a/lib/dpkg/t/.gitignore +++ b/lib/dpkg/t/.gitignore @@ -15,6 +15,7 @@ t-path t-pkginfo t-pkg-list t-pkg-queue +t-pkg-show t-progname t-string t-subproc diff --git a/lib/dpkg/t/Makefile.am b/lib/dpkg/t/Makefile.am index 12dc4d86a..b2f227569 100644 --- a/lib/dpkg/t/Makefile.am +++ b/lib/dpkg/t/Makefile.am @@ -40,6 +40,7 @@ test_programs = \ t-pkginfo \ t-pkg-list \ t-pkg-queue \ + t-pkg-show \ t-trigger \ t-mod-db \ $(nil) diff --git a/lib/dpkg/t/t-pkg-show.c b/lib/dpkg/t/t-pkg-show.c new file mode 100644 index 000000000..f5a978e81 --- /dev/null +++ b/lib/dpkg/t/t-pkg-show.c @@ -0,0 +1,61 @@ +/* + * libdpkg - Debian packaging suite library routines + * t-pkg-show.c - test pkg-show implementation + * + * Copyright © 2018 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include +#include + +static void +test_pkg_show_name(void) +{ + struct dpkg_arch *arch; + struct pkginfo *pkg; + const char *pkgname; + + arch = dpkg_arch_find("arch"); + test_pass(arch); + + pkg = pkg_db_find_pkg("test", arch); + test_pass(pkg); + test_str(pkg->set->name, ==, "test"); + test_pass(pkg->installed.arch->type == DPKG_ARCH_UNKNOWN); + + pkgname = pkg_name(pkg, pnaw_never); + test_pass(pkgname); + test_str(pkgname, ==, "test"); + + pkgname = pkg_name(pkg, pnaw_nonambig); + test_pass(pkgname); + test_str(pkgname, ==, "test:arch"); + + pkgname = pkg_name(pkg, pnaw_always); + test_pass(pkgname); + test_str(pkgname, ==, "test:arch"); +} + +TEST_ENTRY(test) +{ + test_plan(10); + + test_pkg_show_name(); +} -- cgit v1.2.3 From 3491a330369d51fe1a1fb5b738082d5e0f83badc Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Aug 2018 06:45:56 +0200 Subject: libdpkg: Document in pkg_db_get_pkg() which pkgbin members can be initialized The only member that can be safely initialized in a new pkginfo's pkgbin is the arch member, because that's used as part of the lookup. Anything else might get overwritten with the data from the new object, for example during deb822 parsing. --- lib/dpkg/pkg-db.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/dpkg/pkg-db.c b/lib/dpkg/pkg-db.c index 7135450a3..ab90412a3 100644 --- a/lib/dpkg/pkg-db.c +++ b/lib/dpkg/pkg-db.c @@ -179,6 +179,8 @@ pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch) /* If there's a single unused slot, let's use that. */ if (pkg->installed.arch->type == DPKG_ARCH_NONE && pkg->arch_next == NULL) { + /* We can only initialize the arch pkgbin members, because those are used + * to find instances, anything else will be overwritten at parse time. */ pkg->installed.arch = arch; pkg->available.arch = arch; return pkg; @@ -197,6 +199,8 @@ pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch) pkg_blank(pkg); pkg->set = set; pkg->arch_next = NULL; + /* We can only initialize the arch pkgbin members, because those are used + * to find instances, anything else will be overwritten at parse time. */ pkg->installed.arch = arch; pkg->available.arch = arch; *pkgp = pkg; -- cgit v1.2.3 From 7ab849d1a814b2d2b2e29f9965fb5d51b654265a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 4 May 2018 05:04:01 +0200 Subject: libdpkg: Rename struct pkginfo files member to archives Rename matching types and macros, so that the purpose of the symbols is clear, and to open the way for moving the fsys files list from the dpkg clientdata. --- debian/changelog | 1 + dpkg-deb/info.c | 4 ++-- dselect/pkglist.cc | 2 +- lib/dpkg/dpkg-db.h | 11 ++++++----- lib/dpkg/dump.c | 18 +++++++++--------- lib/dpkg/fields.c | 22 +++++++++++----------- lib/dpkg/parse.c | 14 +++++++------- lib/dpkg/parsedump.h | 11 ++++++++--- lib/dpkg/pkg.c | 2 +- src/enquiry.c | 6 +++--- src/querycmd.c | 2 +- src/unpack.c | 14 ++++++++------ 12 files changed, 58 insertions(+), 49 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 118a3d2e8..c29836791 100644 --- a/debian/changelog +++ b/debian/changelog @@ -176,6 +176,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium new pkgbin_name_archqual() function. - libdpkg: Add new pkg_name() and pkgbin_name() const variants. - libdpkg, dselect: Use new pkg_name_const() and pkgbin_name_const(). + - libdpkg: Rename struct pkginfo files member to archives. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c index 0229f3a91..8169507c5 100644 --- a/dpkg-deb/info.c +++ b/dpkg-deb/info.c @@ -207,7 +207,7 @@ info_field(const char *debar, const char *dir, const char *const *fields, int i; controlfile = str_fmt("%s/%s", dir, CONTROLFILE); - parsedb(controlfile, pdb_parse_binary | pdb_ignorefiles, &pkg); + parsedb(controlfile, pdb_parse_binary | pdb_ignore_archives, &pkg); free(controlfile); for (i = 0; fields[i]; i++) { @@ -252,7 +252,7 @@ do_showinfo(const char *const *argv) info_prepare(&argv, &debar, &dir, 1); controlfile = str_fmt("%s/%s", dir, CONTROLFILE); - parsedb(controlfile, pdb_parse_binary | pdb_ignorefiles, &pkg); + parsedb(controlfile, pdb_parse_binary | pdb_ignore_archives, &pkg); pkg_format_show(fmt, pkg, &pkg->available); pkg_format_free(fmt); free(controlfile); diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc index cb144e773..ced7487d6 100644 --- a/dselect/pkglist.cc +++ b/dselect/pkglist.cc @@ -400,7 +400,7 @@ packagelist::packagelist(keybindings *kb) : baselist(kb) { struct perpackagestate *state= &datatable[nitems]; state->pkg= pkg; if (pkg->status == PKG_STAT_NOTINSTALLED && - !pkg->files && + !pkg->archives && pkg->want != PKG_WANT_INSTALL) { pkg->clientdata = nullptr; continue; diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index de8745b02..caa0cf0a2 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -84,8 +84,8 @@ struct conffile { bool obsolete; }; -struct filedetails { - struct filedetails *next; +struct archivedetails { + struct archivedetails *next; const char *name; const char *msdosname; const char *size; @@ -204,11 +204,12 @@ struct pkginfo { const char *otherpriority; const char *section; struct dpkg_version configversion; - struct filedetails *files; struct pkgbin installed; struct pkgbin available; struct perpackagestate *clientdata; + struct archivedetails *archives; + struct { /* ->aw == this */ struct trigaw *head, *tail; @@ -307,8 +308,8 @@ enum parsedbflags { pdb_rejectstatus = DPKG_BIT(2), /** Ignore priority/section info if we already have any. */ pdb_weakclassification = DPKG_BIT(3), - /** Ignore files info if we already have them. */ - pdb_ignorefiles = DPKG_BIT(4), + /** Ignore archives info if we already have them. */ + pdb_ignore_archives = DPKG_BIT(4), /** Ignore packages with older versions already read. */ pdb_ignoreolder = DPKG_BIT(5), /** Perform laxer version parsing. */ diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c index a5f040184..b70023c9e 100644 --- a/lib/dpkg/dump.c +++ b/lib/dpkg/dump.c @@ -140,16 +140,16 @@ w_charfield(struct varbuf *vb, } void -w_filecharf(struct varbuf *vb, - const struct pkginfo *pkg, const struct pkgbin *pkgbin, - enum fwriteflags flags, const struct fieldinfo *fip) +w_archives(struct varbuf *vb, + const struct pkginfo *pkg, const struct pkgbin *pkgbin, + enum fwriteflags flags, const struct fieldinfo *fip) { - struct filedetails *fdp; + struct archivedetails *archive; if (pkgbin != &pkg->available) return; - fdp = pkg->files; - if (!fdp || !STRUCTFIELD(fdp, fip->integer, const char *)) + archive = pkg->archives; + if (!archive || !STRUCTFIELD(archive, fip->integer, const char *)) return; if (flags&fw_printheader) { @@ -157,10 +157,10 @@ w_filecharf(struct varbuf *vb, varbuf_add_char(vb, ':'); } - while (fdp) { + while (archive) { varbuf_add_char(vb, ' '); - varbuf_add_str(vb, STRUCTFIELD(fdp, fip->integer, const char *)); - fdp= fdp->next; + varbuf_add_str(vb, STRUCTFIELD(archive, fip->integer, const char *)); + archive = archive->next; } if (flags&fw_printheader) diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c index aeb22b46c..cfa1075b2 100644 --- a/lib/dpkg/fields.c +++ b/lib/dpkg/fields.c @@ -109,22 +109,22 @@ f_name(struct pkginfo *pkg, struct pkgbin *pkgbin, } void -f_filecharf(struct pkginfo *pkg, struct pkgbin *pkgbin, - struct parsedb_state *ps, - const char *value, const struct fieldinfo *fip) +f_archives(struct pkginfo *pkg, struct pkgbin *pkgbin, + struct parsedb_state *ps, + const char *value, const struct fieldinfo *fip) { - struct filedetails *fdp, **fdpp; + struct archivedetails *fdp, **fdpp; char *cpos, *space; int allowextend; if (!*value) - parse_error(ps, _("empty file details field '%s'"), fip->name); + parse_error(ps, _("empty archive details field '%s'"), fip->name); if (!(ps->flags & pdb_recordavailable)) parse_error(ps, - _("file details field '%s' not allowed in status file"), + _("archive details field '%s' not allowed in status file"), fip->name); - allowextend = !pkg->files; - fdpp = &pkg->files; + allowextend = !pkg->archives; + fdpp = &pkg->archives; cpos= nfstrsave(value); while (*cpos) { space = cpos; @@ -136,9 +136,9 @@ f_filecharf(struct pkginfo *pkg, struct pkgbin *pkgbin, if (!fdp) { if (!allowextend) parse_error(ps, - _("too many values in file details field '%s' " + _("too many values in archive details field '%s' " "(compared to others)"), fip->name); - fdp= nfmalloc(sizeof(struct filedetails)); + fdp = nfmalloc(sizeof(struct archivedetails)); fdp->next= NULL; fdp->name= fdp->msdosname= fdp->size= fdp->md5sum= NULL; *fdpp= fdp; @@ -151,7 +151,7 @@ f_filecharf(struct pkginfo *pkg, struct pkgbin *pkgbin, } if (*fdpp) parse_error(ps, - _("too few values in file details field '%s' " + _("too few values in archive details field '%s' " "(compared to others)"), fip->name); } diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index b0db8179d..d9daa112c 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -76,10 +76,10 @@ const struct fieldinfo fieldinfos[]= { { FIELD("Conflicts"), f_dependency, w_dependency, dep_conflicts }, { FIELD("Enhances"), f_dependency, w_dependency, dep_enhances }, { FIELD("Conffiles"), f_conffiles, w_conffiles }, - { FIELD("Filename"), f_filecharf, w_filecharf, FILEFOFF(name) }, - { FIELD("Size"), f_filecharf, w_filecharf, FILEFOFF(size) }, - { FIELD("MD5sum"), f_filecharf, w_filecharf, FILEFOFF(md5sum) }, - { FIELD("MSDOS-Filename"), f_filecharf, w_filecharf, FILEFOFF(msdosname) }, + { FIELD("Filename"), f_archives, w_archives, ARCHIVEFOFF(name) }, + { FIELD("Size"), f_archives, w_archives, ARCHIVEFOFF(size) }, + { FIELD("MD5sum"), f_archives, w_archives, ARCHIVEFOFF(md5sum) }, + { FIELD("MSDOS-Filename"), f_archives, w_archives, ARCHIVEFOFF(msdosname) }, { FIELD("Description"), f_charfield, w_charfield, PKGIFPOFF(description) }, { FIELD("Triggers-Pending"), f_trigpend, w_trigpend }, { FIELD("Triggers-Awaited"), f_trigaw, w_trigaw }, @@ -480,7 +480,7 @@ pkg_parse_copy(struct parsedb_state *ps, pkg_copy_eflags(dst_pkg, src_pkg); pkg_set_status(dst_pkg, src_pkg->status); dst_pkg->configversion = src_pkg->configversion; - dst_pkg->files = NULL; + dst_pkg->archives = NULL; dst_pkg->trigpend_head = src_pkg->trigpend_head; dst_pkg->trigaw = src_pkg->trigaw; @@ -493,8 +493,8 @@ pkg_parse_copy(struct parsedb_state *ps, /* ->othertrigaw_head is updated by trig_note_aw in *(pkg_db_find()) * rather than in dst_pkg. */ } - } else if (!(ps->flags & pdb_ignorefiles)) { - dst_pkg->files = src_pkg->files; + } else if (!(ps->flags & pdb_ignore_archives)) { + dst_pkg->archives = src_pkg->archives; } } diff --git a/lib/dpkg/parsedump.h b/lib/dpkg/parsedump.h index 336f35f7f..2a857c47d 100644 --- a/lib/dpkg/parsedump.h +++ b/lib/dpkg/parsedump.h @@ -89,17 +89,22 @@ bool parse_stanza(struct parsedb_state *ps, struct field_state *fs, #define STRUCTFIELD(klass, off, type) (*(type *)((uintptr_t)(klass) + (off))) #define PKGIFPOFF(f) (offsetof(struct pkgbin, f)) -#define FILEFOFF(f) (offsetof(struct filedetails, f)) +#define ARCHIVEFOFF(f) (offsetof(struct archivedetails, f)) typedef void freadfunction(struct pkginfo *pkg, struct pkgbin *pkgbin, struct parsedb_state *ps, const char *value, const struct fieldinfo *fip); -freadfunction f_name, f_charfield, f_priority, f_section, f_status, f_filecharf; +freadfunction f_name; +freadfunction f_charfield; +freadfunction f_priority; +freadfunction f_section; +freadfunction f_status; freadfunction f_boolean, f_dependency, f_conffiles, f_version, f_revision; freadfunction f_configversion; freadfunction f_multiarch; freadfunction f_architecture; freadfunction f_trigpend, f_trigaw; +freadfunction f_archives; enum fwriteflags { /** Print field header and trailing newline. */ @@ -113,8 +118,8 @@ fwritefunction w_name, w_charfield, w_priority, w_section, w_status, w_configver fwritefunction w_version, w_null, w_booleandefno, w_dependency, w_conffiles; fwritefunction w_multiarch; fwritefunction w_architecture; -fwritefunction w_filecharf; fwritefunction w_trigpend, w_trigaw; +fwritefunction w_archives; void varbuf_add_arbfield(struct varbuf *vb, const struct arbitraryfield *arbfield, diff --git a/lib/dpkg/pkg.c b/lib/dpkg/pkg.c index 4f1828bbc..711df8fd8 100644 --- a/lib/dpkg/pkg.c +++ b/lib/dpkg/pkg.c @@ -123,7 +123,7 @@ pkg_blank(struct pkginfo *pkg) pkg->otherpriority = NULL; pkg->section = NULL; dpkg_version_blank(&pkg->configversion); - pkg->files = NULL; + pkg->archives = NULL; pkg->clientdata = NULL; pkg->trigaw.head = NULL; pkg->trigaw.tail = NULL; diff --git a/src/enquiry.c b/src/enquiry.c index e309f5516..9da4160d5 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -477,7 +477,7 @@ predeppackage(const char *const *argv) if (pkg->want != PKG_WANT_INSTALL) continue; /* Ignore packages not available. */ - if (!pkg->files) + if (!pkg->archives) continue; pkg->clientdata->istobe = PKG_ISTOBE_PREINSTALL; for (dep= pkg->available.depends; dep; dep= dep->next) { @@ -512,7 +512,7 @@ predeppackage(const char *const *argv) possi_iter = deppossi_pkg_iter_new(possi, wpb_available); while (!pkg && (trypkg = deppossi_pkg_iter_next(possi_iter))) { - if (trypkg->files && + if (trypkg->archives && trypkg->clientdata->istobe == PKG_ISTOBE_NORMAL && versionsatisfied(&trypkg->available, possi)) { pkg = trypkg; @@ -526,7 +526,7 @@ predeppackage(const char *const *argv) if (!pkg_virtual_deppossi_satisfied(possi, provider)) continue; trypkg = provider->up->up; - if (!trypkg->files) + if (!trypkg->archives) continue; if (trypkg->clientdata->istobe == PKG_ISTOBE_NORMAL) { pkg = trypkg; diff --git a/src/querycmd.c b/src/querycmd.c index 2fd1b7827..0c637bed7 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -461,7 +461,7 @@ enqperpackage(const char *const *argv) if (pkg->status == PKG_STAT_NOTINSTALLED && pkg->priority == PKG_PRIO_UNKNOWN && str_is_unset(pkg->section) && - !pkg->files && + !pkg->archives && pkg->want == PKG_WANT_UNKNOWN && !pkg_is_informative(pkg, &pkg->installed)) { notice(_("package '%s' is not installed and no information is available"), diff --git a/src/unpack.c b/src/unpack.c index ae0e12132..0ab4175e2 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -1130,22 +1130,24 @@ void process_archive(const char *filename) { parsedb_flags = pdb_parse_available; else parsedb_flags = pdb_parse_binary; - parsedb_flags |= pdb_ignorefiles; + parsedb_flags |= pdb_ignore_archives; if (fc_badversion) parsedb_flags |= pdb_lax_version_parser; parsedb(cidir, parsedb_flags, &pkg); - if (!pkg->files) { - pkg->files= nfmalloc(sizeof(struct filedetails)); - pkg->files->next = NULL; - pkg->files->name = pkg->files->msdosname = pkg->files->md5sum = NULL; + if (!pkg->archives) { + pkg->archives = nfmalloc(sizeof(struct archivedetails)); + pkg->archives->next = NULL; + pkg->archives->name = NULL; + pkg->archives->msdosname = NULL; + pkg->archives->md5sum = NULL; } /* Always nfmalloc. Otherwise, we may overwrite some other field (like * md5sum). */ psize = nfmalloc(30); sprintf(psize, "%jd", (intmax_t)stab.st_size); - pkg->files->size = psize; + pkg->archives->size = psize; if (cipaction->arg_int == act_avail) { printf(_("Recorded info about %s from %s.\n"), -- cgit v1.2.3 From a9663b000b9c96030c7062fa01c0bee038cd11f9 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 4 May 2018 05:22:32 +0200 Subject: libdpkg: Move files list information from dpkg clientdata to pkginfo This will make it possible to move the fsys database parsing and dumping code out from dpkg into libdpkg. This is general package information, even if some clients might not be interested in its contents, such as frontends that just manage metadata and drive dpkg itself. --- debian/changelog | 1 + lib/dpkg/dpkg-db.h | 13 +++++++++++++ lib/dpkg/pkg.c | 3 +++ src/archives.c | 2 +- src/filesdb.c | 47 +++++++++++++++++------------------------------ src/main.h | 13 ------------- src/querycmd.c | 2 +- src/remove.c | 8 ++++---- src/unpack.c | 17 ++++++++--------- src/verify.c | 2 +- 10 files changed, 49 insertions(+), 59 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index a7ed64367..bec8355b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -180,6 +180,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - dpkg: Call ensure_package_clientdata() defensively. - dpkg: For read-only state functions, check that clientdata is allocated before using it. + - libdpkg: Move files list information from dpkg clientdata to pkginfo. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index caa0cf0a2..a60da4a50 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -219,6 +219,19 @@ struct pkginfo { struct trigaw *othertrigaw_head; struct trigpend *trigpend_head; + /** + * files_list_valid files Meaning + * ---------------- ----- ------- + * false NULL Not read yet, must do so if want them. + * false !NULL Read, but rewritten and now out of date. If want + * info must throw away old and reread file. + * true !NULL Read, all is OK. + * true NULL Read OK, but, there were no files. + */ + struct fileinlist *files; + off_t files_list_phys_offs; + bool files_list_valid; + /* The status has changed, it needs to be logged. */ bool status_dirty; }; diff --git a/lib/dpkg/pkg.c b/lib/dpkg/pkg.c index 711df8fd8..893d14e18 100644 --- a/lib/dpkg/pkg.c +++ b/lib/dpkg/pkg.c @@ -123,6 +123,9 @@ pkg_blank(struct pkginfo *pkg) pkg->otherpriority = NULL; pkg->section = NULL; dpkg_version_blank(&pkg->configversion); + pkg->files_list_valid = false; + pkg->files_list_phys_offs = 0; + pkg->files = NULL; pkg->archives = NULL; pkg->clientdata = NULL; pkg->trigaw.head = NULL; diff --git a/src/archives.c b/src/archives.c index 9b736a5d9..c80db7fcd 100644 --- a/src/archives.c +++ b/src/archives.c @@ -198,7 +198,7 @@ filesavespackage(struct fileinlist *file, * we shouldn't try to make it take over this shared directory. */ debug(dbg_eachfiledetail,"filesavespackage ... is 3rd package"); - if (!thirdpkg->clientdata->fileslistvalid) { + if (!thirdpkg->files_list_valid) { debug(dbg_eachfiledetail, "process_archive ... already disappeared!"); continue; } diff --git a/src/filesdb.c b/src/filesdb.c index 8ca613e24..22aad89e0 100644 --- a/src/filesdb.c +++ b/src/filesdb.c @@ -67,18 +67,14 @@ ensure_package_clientdata(struct pkginfo *pkg) pkg->clientdata->istobe = PKG_ISTOBE_NORMAL; pkg->clientdata->color = PKG_CYCLE_WHITE; pkg->clientdata->enqueued = false; - pkg->clientdata->fileslistvalid = false; - pkg->clientdata->files = NULL; pkg->clientdata->replacingfilesandsaid = 0; pkg->clientdata->cmdline_seen = 0; - pkg->clientdata->listfile_phys_offs = 0; pkg->clientdata->trigprocdeferred = NULL; } void note_must_reread_files_inpackage(struct pkginfo *pkg) { allpackagesdone = false; - ensure_package_clientdata(pkg); - pkg->clientdata->fileslistvalid = false; + pkg->files_list_valid = false; } enum pkg_filesdb_load_status { @@ -97,11 +93,7 @@ pkg_files_blank(struct pkginfo *pkg) { struct fileinlist *current; - /* Anything to empty? */ - if (!pkg->clientdata) - return; - - for (current= pkg->clientdata->files; + for (current = pkg->files; current; current= current->next) { struct pkg_list *pkg_node, *pkg_prev = NULL; @@ -125,7 +117,7 @@ pkg_files_blank(struct pkginfo *pkg) pkg_prev = pkg_node; } } - pkg->clientdata->files = NULL; + pkg->files = NULL; } static struct fileinlist ** @@ -135,10 +127,8 @@ pkg_files_add_file(struct pkginfo *pkg, struct filenamenode *namenode, struct fileinlist *newent; struct pkg_list *pkg_node; - ensure_package_clientdata(pkg); - if (file_tail == NULL) - file_tail = &pkg->clientdata->files; + file_tail = &pkg->files; /* Make sure we're at the end. */ while ((*file_tail) != NULL) { @@ -175,16 +165,15 @@ ensure_packagefiles_available(struct pkginfo *pkg) struct stat stat_buf; char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr; - if (pkg->clientdata && pkg->clientdata->fileslistvalid) + if (pkg->files_list_valid) return; - ensure_package_clientdata(pkg); /* Throw away any stale data, if there was any. */ pkg_files_blank(pkg); /* Packages which aren't installed don't have a files list. */ if (pkg->status == PKG_STAT_NOTINSTALLED) { - pkg->clientdata->fileslistvalid = true; + pkg->files_list_valid = true; return; } @@ -205,8 +194,8 @@ ensure_packagefiles_available(struct pkginfo *pkg) "package has no files currently installed"), pkg_name(pkg, pnaw_nonambig)); } - pkg->clientdata->files = NULL; - pkg->clientdata->fileslistvalid = true; + pkg->files = NULL; + pkg->files_list_valid = true; return; } @@ -228,7 +217,7 @@ ensure_packagefiles_available(struct pkginfo *pkg) ohshite(_("reading files list for package '%.250s'"), pkg_name(pkg, pnaw_nonambig)); - lendp= &pkg->clientdata->files; + lendp = &pkg->files; thisline = loaded_list; while (thisline < loaded_list_end) { struct filenamenode *namenode; @@ -259,21 +248,21 @@ ensure_packagefiles_available(struct pkginfo *pkg) onerr_abort--; - pkg->clientdata->fileslistvalid = true; + pkg->files_list_valid = true; } #if defined(HAVE_LINUX_FIEMAP_H) static int -pkg_sorter_by_listfile_phys_offs(const void *a, const void *b) +pkg_sorter_by_files_list_phys_offs(const void *a, const void *b) { const struct pkginfo *pa = *(const struct pkginfo **)a; const struct pkginfo *pb = *(const struct pkginfo **)b; /* We can't simply subtract, because the difference may be greater than * INT_MAX. */ - if (pa->clientdata->listfile_phys_offs < pb->clientdata->listfile_phys_offs) + if (pa->files_list_phys_offs < pb->files_list_phys_offs) return -1; - else if (pa->clientdata->listfile_phys_offs > pb->clientdata->listfile_phys_offs) + else if (pa->files_list_phys_offs > pb->files_list_phys_offs) return 1; else return 0; @@ -300,13 +289,11 @@ pkg_files_optimize_load(struct pkg_array *array) const char *listfile; int fd; - ensure_package_clientdata(pkg); - if (pkg->status == PKG_STAT_NOTINSTALLED || - pkg->clientdata->listfile_phys_offs != 0) + pkg->files_list_phys_offs != 0) continue; - pkg->clientdata->listfile_phys_offs = -1; + pkg->files_list_phys_offs = -1; listfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE); @@ -321,12 +308,12 @@ pkg_files_optimize_load(struct pkg_array *array) fm.fiemap.fm_extent_count = 1; if (ioctl(fd, FS_IOC_FIEMAP, (unsigned long)&fm) == 0) - pkg->clientdata->listfile_phys_offs = fm.fiemap.fm_extents[0].fe_physical; + pkg->files_list_phys_offs = fm.fiemap.fm_extents[0].fe_physical; close(fd); } - pkg_array_sort(array, pkg_sorter_by_listfile_phys_offs); + pkg_array_sort(array, pkg_sorter_by_files_list_phys_offs); } #elif defined(HAVE_POSIX_FADVISE) static void diff --git a/src/main.h b/src/main.h index 1600abc25..f5695aeea 100644 --- a/src/main.h +++ b/src/main.h @@ -56,22 +56,9 @@ struct perpackagestate { bool enqueued; - /** - * filelistvalid files Meaning - * ------------- ----- ------- - * false NULL Not read yet, must do so if want them. - * false !NULL Read, but rewritten and now out of date. If want - * info must throw away old and reread file. - * true !NULL Read, all is OK. - * true NULL Read OK, but, there were no files. - */ - bool fileslistvalid; - struct fileinlist *files; int replacingfilesandsaid; int cmdline_seen; - off_t listfile_phys_offs; - /** Non-NULL iff in trigproc.c:deferred. */ struct pkg_list *trigprocdeferred; }; diff --git a/src/querycmd.c b/src/querycmd.c index 0c637bed7..555bccd3e 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -490,7 +490,7 @@ enqperpackage(const char *const *argv) default: ensure_packagefiles_available(pkg); ensure_diversions(); - file= pkg->clientdata->files; + file = pkg->files; if (!file) { printf(_("Package '%s' does not contain any files (!)\n"), pkg_name(pkg, pnaw_nonambig)); diff --git a/src/remove.c b/src/remove.c index 6eb2e5d90..735c9e0f3 100644 --- a/src/remove.c +++ b/src/remove.c @@ -266,7 +266,7 @@ removal_bulk_remove_files(struct pkginfo *pkg) modstatdb_note(pkg); push_checkpoint(~ehflag_bombout, ehflag_normaltidy); - reversefilelist_init(&rev_iter, pkg->clientdata->files); + reversefilelist_init(&rev_iter, pkg->files); leftover = NULL; while ((namenode = reversefilelist_next(&rev_iter))) { struct filenamenode *usenode; @@ -389,7 +389,7 @@ static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) { modstatdb_note(pkg); push_checkpoint(~ehflag_bombout, ehflag_normaltidy); - reversefilelist_init(&rev_iter, pkg->clientdata->files); + reversefilelist_init(&rev_iter, pkg->files); leftover = NULL; while ((namenode = reversefilelist_next(&rev_iter))) { struct filenamenode *usenode; @@ -498,7 +498,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) { * are involved in diversions, except if we are the package doing the * diverting. */ for (lconffp = &pkg->installed.conffiles; (conff = *lconffp) != NULL; ) { - for (searchfile= pkg->clientdata->files; + for (searchfile = pkg->files; searchfile && strcmp(searchfile->namenode->name,conff->name); searchfile= searchfile->next); if (!searchfile) { @@ -605,7 +605,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) { } /* Remove the conffiles from the file list file. */ - write_filelist_except(pkg, &pkg->installed, pkg->clientdata->files, + write_filelist_except(pkg, &pkg->installed, pkg->files, fnnf_old_conff); pkg->installed.conffiles = NULL; diff --git a/src/unpack.c b/src/unpack.c index 970871a3a..2fb138691 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -563,7 +563,7 @@ pkg_remove_old_files(struct pkginfo *pkg, struct filenamenode *namenode; struct stat stab, oldfs; - reversefilelist_init(&rev_iter, pkg->clientdata->files); + reversefilelist_init(&rev_iter, pkg->files); while ((namenode = reversefilelist_next(&rev_iter))) { struct filenamenode *usenode; @@ -824,7 +824,7 @@ pkg_disappear(struct pkginfo *pkg, struct pkginfo *infavour) dpkg_version_blank(&pkg->configversion); pkgbin_blank(&pkg->installed); - pkg->clientdata->fileslistvalid = false; + pkg->files_list_valid = false; modstatdb_note(pkg); } @@ -847,7 +847,7 @@ pkg_disappear_others(struct pkginfo *pkg) otherpkg->status == PKG_STAT_NOTINSTALLED || otherpkg->status == PKG_STAT_CONFIGFILES || otherpkg->clientdata->istobe == PKG_ISTOBE_REMOVE || - !otherpkg->clientdata->files) + !otherpkg->files) continue; /* Do not try to disappear other packages from the same set @@ -866,14 +866,14 @@ pkg_disappear_others(struct pkginfo *pkg) "is to be %d", pkg_name(otherpkg, pnaw_always), otherpkg->clientdata->istobe); - for (cfile = otherpkg->clientdata->files; + for (cfile = otherpkg->files; cfile && strcmp(cfile->namenode->name, "/.") == 0; cfile = cfile->next); if (!cfile) { debug(dbg_stupidlyverbose, "process_archive no non-root, no disappear"); continue; } - for (cfile = otherpkg->clientdata->files; + for (cfile = otherpkg->files; cfile && !filesavespackage(cfile, otherpkg, pkg); cfile = cfile->next); if (cfile) @@ -1012,18 +1012,17 @@ pkg_remove_files_from_others(struct pkginfo *pkg, struct fileinlist *newfileslis if (cfile->namenode->flags & fnnf_new_conff) conffile_mark_obsolete(otherpkg, cfile->namenode); - /* If !fileslistvalid then it's one of the disappeared packages above + /* If !files_list_valid then it's one of the disappeared packages above * or we have already updated the files list file, and we don't bother * with it here, clearly. */ - if (!otherpkg->clientdata->fileslistvalid) + if (!otherpkg->files_list_valid) continue; /* Found one. We delete the list entry for this file, * (and any others in the same package) and then mark the package * as requiring a reread. */ write_filelist_except(otherpkg, &otherpkg->installed, - otherpkg->clientdata->files, fnnf_elide_other_lists); - ensure_package_clientdata(otherpkg); + otherpkg->files, fnnf_elide_other_lists); debug(dbg_veryverbose, "process_archive overwrote from %s", pkg_name(otherpkg, pnaw_always)); } diff --git a/src/verify.c b/src/verify.c index 2698fc216..a4eb86ae7 100644 --- a/src/verify.c +++ b/src/verify.c @@ -102,7 +102,7 @@ verify_package(struct pkginfo *pkg) parse_filehash(pkg, &pkg->installed); pkg_conffiles_mark_old(pkg); - for (file = pkg->clientdata->files; file; file = file->next) { + for (file = pkg->files; file; file = file->next) { struct verify_checks checks; struct filenamenode *fnn; char hash[MD5HASHLEN + 1]; -- cgit v1.2.3 From eed3a9097deb1be5251cd31fbf9ec4d482a155d1 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 6 Apr 2018 01:14:42 +0200 Subject: libdpkg: Move db-fsys code from src to lib/dpkg This will prepare the ground for external programs to start using libdpkg to access the dpkg fsys database via a proper API, instead of messing with the on-disk layout in so many improper ways. --- debian/changelog | 1 + lib/dpkg/Makefile.am | 5 + lib/dpkg/db-fsys-digest.c | 174 +++++++++++++++++++ lib/dpkg/db-fsys-divert.c | 132 ++++++++++++++ lib/dpkg/db-fsys-files.c | 409 +++++++++++++++++++++++++++++++++++++++++++ lib/dpkg/db-fsys-override.c | 266 ++++++++++++++++++++++++++++ lib/dpkg/db-fsys.h | 75 ++++++++ lib/dpkg/libdpkg.map | 17 ++ po/POTFILES.in | 8 +- src/Makefile.am | 14 -- src/archives.c | 2 +- src/cleanup.c | 2 +- src/configure.c | 2 +- src/depcon.c | 2 +- src/divertcmd.c | 3 +- src/divertdb.c | 133 -------------- src/enquiry.c | 2 +- src/filesdb-hash.c | 175 ------------------- src/filesdb.c | 410 -------------------------------------------- src/filesdb.h | 75 -------- src/filters.c | 2 +- src/help.c | 2 +- src/main.c | 2 +- src/main.h | 2 +- src/packages.c | 2 +- src/querycmd.c | 2 +- src/remove.c | 2 +- src/script.c | 2 +- src/select.c | 2 +- src/statcmd.c | 2 +- src/statdb.c | 267 ----------------------------- src/trigproc.c | 2 +- src/unpack.c | 2 +- src/verify.c | 2 +- 34 files changed, 1102 insertions(+), 1098 deletions(-) create mode 100644 lib/dpkg/db-fsys-digest.c create mode 100644 lib/dpkg/db-fsys-divert.c create mode 100644 lib/dpkg/db-fsys-files.c create mode 100644 lib/dpkg/db-fsys-override.c create mode 100644 lib/dpkg/db-fsys.h delete mode 100644 src/divertdb.c delete mode 100644 src/filesdb-hash.c delete mode 100644 src/filesdb.c delete mode 100644 src/filesdb.h delete mode 100644 src/statdb.c (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index d9985ff11..389afc626 100644 --- a/debian/changelog +++ b/debian/changelog @@ -182,6 +182,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium before using it. - libdpkg: Move files list information from dpkg clientdata to pkginfo. - dpkg: Move ensure_package_clientdata() into its own file. + - libdpkg: Move db-fsys code from src to lib/dpkg. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index 22cef8266..e3d68576c 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -56,6 +56,10 @@ libdpkg_la_SOURCES = \ db-ctrl-access.c \ db-ctrl-format.c \ db-ctrl-upgrade.c \ + db-fsys-digest.c \ + db-fsys-divert.c \ + db-fsys-files.c \ + db-fsys-override.c \ deb-version.c \ debug.c \ depcon.c \ @@ -118,6 +122,7 @@ pkginclude_HEADERS = \ command.h \ compress.h \ db-ctrl.h \ + db-fsys.h \ deb-version.h \ debug.h \ dir.h \ diff --git a/lib/dpkg/db-fsys-digest.c b/lib/dpkg/db-fsys-digest.c new file mode 100644 index 000000000..05137c2f2 --- /dev/null +++ b/lib/dpkg/db-fsys-digest.c @@ -0,0 +1,174 @@ +/* + * libdpkg - Debian packaging suite library routines + * db-fsys-digest.c - management of filesystem digests database + * + * Copyright © 2012-2014 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * If mask is nonzero, will not write any file whose filenamenode + * has any flag bits set in mask. + */ +void +write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin, + struct fileinlist *list, enum filenamenode_flags mask) +{ + struct atomic_file *file; + const char *hashfile; + + debug(dbg_general, "generating infodb hashfile"); + + if (pkg_infodb_has_file(pkg, &pkg->available, HASHFILE)) + return; + + hashfile = pkg_infodb_get_file(pkg, pkgbin, HASHFILE); + + file = atomic_file_new(hashfile, 0); + atomic_file_open(file); + + for (; list; list = list->next) { + struct filenamenode *namenode = list->namenode; + + if (mask && (namenode->flags & mask)) + continue; + if (strcmp(namenode->newhash, EMPTYHASHFLAG) == 0) + continue; + + fprintf(file->fp, "%s %s\n", + namenode->newhash, namenode->name + 1); + } + + atomic_file_sync(file); + atomic_file_close(file); + atomic_file_commit(file); + atomic_file_free(file); + + dir_sync_path(pkg_infodb_get_dir()); +} + +static void +parse_filehash_buffer(char *buf, char *buf_end, + struct pkginfo *pkg, struct pkgbin *pkgbin) +{ + char *thisline, *nextline; + const char *pkgname = pkg_name(pkg, pnaw_nonambig); + + for (thisline = buf; thisline < buf_end; thisline = nextline) { + struct filenamenode *namenode; + char *endline, *hash_end, *filename; + + endline = memchr(thisline, '\n', buf_end - thisline); + if (endline == NULL) + ohshit(_("control file '%s' for package '%s' is " + "missing final newline"), HASHFILE, pkgname); + + /* The md5sum hash has a constant length. */ + hash_end = thisline + MD5HASHLEN; + + filename = hash_end + 2; + if (filename + 1 > endline) + ohshit(_("control file '%s' for package '%s' is " + "missing value"), HASHFILE, pkgname); + + if (hash_end[0] != ' ' || hash_end[1] != ' ') + ohshit(_("control file '%s' for package '%s' is " + "missing value separator"), HASHFILE, pkgname); + hash_end[0] = '\0'; + + /* Where to start next time around. */ + nextline = endline + 1; + + /* Strip trailing ‘/’. */ + if (endline > thisline && endline[-1] == '/') + endline--; + *endline = '\0'; + + if (endline == thisline) + ohshit(_("control file '%s' for package '%s' " + "contains empty filename"), HASHFILE, pkgname); + + debug(dbg_eachfiledetail, "load hash '%s' for filename '%s'", + thisline, filename); + + /* Add the file to the list. */ + namenode = findnamenode(filename, fnn_nocopy); + namenode->newhash = thisline; + } +} + +void +parse_filehash(struct pkginfo *pkg, struct pkgbin *pkgbin) +{ + static int fd; + const char *hashfile; + struct stat st; + + hashfile = pkg_infodb_get_file(pkg, pkgbin, HASHFILE); + + fd = open(hashfile, O_RDONLY); + if (fd < 0) { + if (errno == ENOENT) + return; + + ohshite(_("cannot open control file '%s' for package '%s'"), + HASHFILE, pkg_name(pkg, pnaw_nonambig)); + } + + if (fstat(fd, &st) < 0) + ohshite(_("cannot stat control file '%s' for package '%s'"), + HASHFILE, pkg_name(pkg, pnaw_nonambig)); + + if (!S_ISREG(st.st_mode)) + ohshit(_("control file '%s' for package '%s' is not a regular file"), + HASHFILE, pkg_name(pkg, pnaw_nonambig)); + + if (st.st_size > 0) { + char *buf, *buf_end; + + buf = nfmalloc(st.st_size); + buf_end = buf + st.st_size; + + if (fd_read(fd, buf, st.st_size) < 0) + ohshite(_("cannot read control file '%s' for package '%s'"), + HASHFILE, pkg_name(pkg, pnaw_nonambig)); + + parse_filehash_buffer(buf, buf_end, pkg, pkgbin); + } + + if (close(fd)) + ohshite(_("cannot close control file '%s' for package '%s'"), + HASHFILE, pkg_name(pkg, pnaw_nonambig)); +} diff --git a/lib/dpkg/db-fsys-divert.c b/lib/dpkg/db-fsys-divert.c new file mode 100644 index 000000000..775662382 --- /dev/null +++ b/lib/dpkg/db-fsys-divert.c @@ -0,0 +1,132 @@ +/* + * libdpkg - Debian packaging suite library routines + * db-fsys-divert.c - management of filesystem diverted files database + * + * Copyright © 1995 Ian Jackson + * Copyright © 2000, 2001 Wichert Akkerman + * + * This 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 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 . + */ + +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +static struct diversion *diversions = NULL; +static char *diversionsname; + +void +ensure_diversions(void) +{ + static struct stat sb_prev; + struct stat sb_next; + char linebuf[MAXDIVERTFILENAME]; + static FILE *file_prev; + FILE *file; + struct diversion *ov, *oicontest, *oialtname; + + if (diversionsname == NULL) + diversionsname = dpkg_db_get_path(DIVERSIONSFILE); + + onerr_abort++; + + file = fopen(diversionsname, "r"); + if (!file) { + if (errno != ENOENT) + ohshite(_("failed to open diversions file")); + } else { + setcloexec(fileno(file), diversionsname); + + if (fstat(fileno(file), &sb_next)) + ohshite(_("failed to fstat diversions file")); + + /* + * We need to keep the database file open so that the + * filesystem cannot reuse the inode number (f.ex. during + * multiple dpkg-divert invocations in a maintainer script), + * otherwise the following check might turn true, and we + * would skip reloading a modified database. + */ + if (file_prev && + sb_prev.st_dev == sb_next.st_dev && + sb_prev.st_ino == sb_next.st_ino) { + fclose(file); + onerr_abort--; + debug(dbg_general, "%s: same, skipping", __func__); + return; + } + sb_prev = sb_next; + } + if (file_prev) + fclose(file_prev); + file_prev = file; + + for (ov = diversions; ov; ov = ov->next) { + ov->useinstead->divert->camefrom->divert = NULL; + ov->useinstead->divert = NULL; + } + diversions = NULL; + if (!file) { + onerr_abort--; + debug(dbg_general, "%s: none, resetting", __func__); + return; + } + debug(dbg_general, "%s: new, (re)loading", __func__); + + while (fgets_checked(linebuf, sizeof(linebuf), file, diversionsname) >= 0) { + oicontest = nfmalloc(sizeof(struct diversion)); + oialtname = nfmalloc(sizeof(struct diversion)); + + oialtname->camefrom = findnamenode(linebuf, 0); + oialtname->useinstead = NULL; + + fgets_must(linebuf, sizeof(linebuf), file, diversionsname); + oicontest->useinstead = findnamenode(linebuf, 0); + oicontest->camefrom = NULL; + + fgets_must(linebuf, sizeof(linebuf), file, diversionsname); + oicontest->pkgset = strcmp(linebuf, ":") ? + pkg_db_find_set(linebuf) : NULL; + oialtname->pkgset = oicontest->pkgset; + + if (oialtname->camefrom->divert || + oicontest->useinstead->divert) + ohshit(_("conflicting diversions involving '%.250s' or '%.250s'"), + oialtname->camefrom->name, oicontest->useinstead->name); + + oialtname->camefrom->divert = oicontest; + oicontest->useinstead->divert = oialtname; + + oicontest->next = diversions; + diversions = oicontest; + } + + onerr_abort--; +} diff --git a/lib/dpkg/db-fsys-files.c b/lib/dpkg/db-fsys-files.c new file mode 100644 index 000000000..6290ed283 --- /dev/null +++ b/lib/dpkg/db-fsys-files.c @@ -0,0 +1,409 @@ +/* + * libdpkg - Debian packaging suite library routines + * db-fsys-files.c - management of filesystem files database + * + * Copyright © 1995 Ian Jackson + * Copyright © 2000,2001 Wichert Akkerman + * Copyright © 2008-2014 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#ifdef HAVE_LINUX_FIEMAP_H +#include +#include +#include +#include +#endif +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/*** Generic data structures and routines. ***/ + +static bool allpackagesdone = false; + +void note_must_reread_files_inpackage(struct pkginfo *pkg) { + allpackagesdone = false; + pkg->files_list_valid = false; +} + +enum pkg_filesdb_load_status { + PKG_FILESDB_LOAD_NONE = 0, + PKG_FILESDB_LOAD_INPROGRESS = 1, + PKG_FILESDB_LOAD_DONE = 2, +}; + +static enum pkg_filesdb_load_status saidread = PKG_FILESDB_LOAD_NONE; + +/** + * Erase the files saved in pkg. + */ +static void +pkg_files_blank(struct pkginfo *pkg) +{ + struct fileinlist *current; + + for (current = pkg->files; + current; + current= current->next) { + struct pkg_list *pkg_node, *pkg_prev = NULL; + + /* For each file that used to be in the package, + * go through looking for this package's entry in the list + * of packages containing this file, and blank it out. */ + for (pkg_node = current->namenode->packages; + pkg_node; + pkg_node = pkg_node->next) { + if (pkg_node->pkg == pkg) { + if (pkg_prev) + pkg_prev->next = pkg_node->next; + else + current->namenode->packages = pkg_node->next; + + /* The actual filelist links were allocated using nfmalloc, so + * we shouldn't free them. */ + break; + } + pkg_prev = pkg_node; + } + } + pkg->files = NULL; +} + +static struct fileinlist ** +pkg_files_add_file(struct pkginfo *pkg, struct filenamenode *namenode, + struct fileinlist **file_tail) +{ + struct fileinlist *newent; + struct pkg_list *pkg_node; + + if (file_tail == NULL) + file_tail = &pkg->files; + + /* Make sure we're at the end. */ + while ((*file_tail) != NULL) { + file_tail = &((*file_tail)->next); + } + + /* Create a new node. */ + newent = nfmalloc(sizeof(struct fileinlist)); + newent->namenode = namenode; + newent->next = NULL; + *file_tail = newent; + file_tail = &newent->next; + + /* Add pkg to newent's package list. */ + pkg_node = nfmalloc(sizeof(*pkg_node)); + pkg_node->pkg = pkg; + pkg_node->next = newent->namenode->packages; + newent->namenode->packages = pkg_node; + + /* Return the position for the next guy. */ + return file_tail; +} + +/** + * Load the list of files in this package into memory, or update the + * list if it is there but stale. + */ +void +ensure_packagefiles_available(struct pkginfo *pkg) +{ + static int fd; + const char *filelistfile; + struct fileinlist **lendp; + struct stat stat_buf; + char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr; + + if (pkg->files_list_valid) + return; + + /* Throw away any stale data, if there was any. */ + pkg_files_blank(pkg); + + /* Packages which aren't installed don't have a files list. */ + if (pkg->status == PKG_STAT_NOTINSTALLED) { + pkg->files_list_valid = true; + return; + } + + filelistfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE); + + onerr_abort++; + + fd= open(filelistfile,O_RDONLY); + + if (fd==-1) { + if (errno != ENOENT) + ohshite(_("unable to open files list file for package '%.250s'"), + pkg_name(pkg, pnaw_nonambig)); + onerr_abort--; + if (pkg->status != PKG_STAT_CONFIGFILES && + dpkg_version_is_informative(&pkg->configversion)) { + warning(_("files list file for package '%.250s' missing; assuming " + "package has no files currently installed"), + pkg_name(pkg, pnaw_nonambig)); + } + pkg->files = NULL; + pkg->files_list_valid = true; + return; + } + + push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd); + + if (fstat(fd, &stat_buf)) + ohshite(_("unable to stat files list file for package '%.250s'"), + pkg_name(pkg, pnaw_nonambig)); + + if (!S_ISREG(stat_buf.st_mode)) + ohshit(_("files list for package '%.250s' is not a regular file"), + pkg_name(pkg, pnaw_nonambig)); + + if (stat_buf.st_size) { + loaded_list = nfmalloc(stat_buf.st_size); + loaded_list_end = loaded_list + stat_buf.st_size; + + if (fd_read(fd, loaded_list, stat_buf.st_size) < 0) + ohshite(_("reading files list for package '%.250s'"), + pkg_name(pkg, pnaw_nonambig)); + + lendp = &pkg->files; + thisline = loaded_list; + while (thisline < loaded_list_end) { + struct filenamenode *namenode; + + ptr = memchr(thisline, '\n', loaded_list_end - thisline); + if (ptr == NULL) + ohshit(_("files list file for package '%.250s' is missing final newline"), + pkg_name(pkg, pnaw_nonambig)); + /* Where to start next time around. */ + nextline = ptr + 1; + /* Strip trailing ‘/’. */ + if (ptr > thisline && ptr[-1] == '/') ptr--; + /* Add the file to the list. */ + if (ptr == thisline) + ohshit(_("files list file for package '%.250s' contains empty filename"), + pkg_name(pkg, pnaw_nonambig)); + *ptr = '\0'; + + namenode = findnamenode(thisline, fnn_nocopy); + lendp = pkg_files_add_file(pkg, namenode, lendp); + thisline = nextline; + } + } + pop_cleanup(ehflag_normaltidy); /* fd = open() */ + if (close(fd)) + ohshite(_("error closing files list file for package '%.250s'"), + pkg_name(pkg, pnaw_nonambig)); + + onerr_abort--; + + pkg->files_list_valid = true; +} + +#if defined(HAVE_LINUX_FIEMAP_H) +static int +pkg_sorter_by_files_list_phys_offs(const void *a, const void *b) +{ + const struct pkginfo *pa = *(const struct pkginfo **)a; + const struct pkginfo *pb = *(const struct pkginfo **)b; + + /* We can't simply subtract, because the difference may be greater than + * INT_MAX. */ + if (pa->files_list_phys_offs < pb->files_list_phys_offs) + return -1; + else if (pa->files_list_phys_offs > pb->files_list_phys_offs) + return 1; + else + return 0; +} + +static void +pkg_files_optimize_load(struct pkg_array *array) +{ + struct statfs fs; + int i; + + /* Get the filesystem block size. */ + if (statfs(pkg_infodb_get_dir(), &fs) < 0) + return; + + /* Sort packages by the physical location of their list files, so that + * scanning them later will minimize disk drive head movements. */ + for (i = 0; i < array->n_pkgs; i++) { + struct pkginfo *pkg = array->pkgs[i]; + struct { + struct fiemap fiemap; + struct fiemap_extent extent; + } fm; + const char *listfile; + int fd; + + if (pkg->status == PKG_STAT_NOTINSTALLED || + pkg->files_list_phys_offs != 0) + continue; + + pkg->files_list_phys_offs = -1; + + listfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE); + + fd = open(listfile, O_RDONLY); + if (fd < 0) + continue; + + memset(&fm, 0, sizeof(fm)); + fm.fiemap.fm_start = 0; + fm.fiemap.fm_length = fs.f_bsize; + fm.fiemap.fm_flags = 0; + fm.fiemap.fm_extent_count = 1; + + if (ioctl(fd, FS_IOC_FIEMAP, (unsigned long)&fm) == 0) + pkg->files_list_phys_offs = fm.fiemap.fm_extents[0].fe_physical; + + close(fd); + } + + pkg_array_sort(array, pkg_sorter_by_files_list_phys_offs); +} +#elif defined(HAVE_POSIX_FADVISE) +static void +pkg_files_optimize_load(struct pkg_array *array) +{ + int i; + + /* Ask the kernel to start preloading the list files, so as to get a + * boost when later we actually load them. */ + for (i = 0; i < array->n_pkgs; i++) { + struct pkginfo *pkg = array->pkgs[i]; + const char *listfile; + int fd; + + listfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE); + + fd = open(listfile, O_RDONLY | O_NONBLOCK); + if (fd != -1) { + posix_fadvise(fd, 0, 0, POSIX_FADV_WILLNEED); + close(fd); + } + } +} +#else +static void +pkg_files_optimize_load(struct pkg_array *array) +{ +} +#endif + +void ensure_allinstfiles_available(void) { + struct pkg_array array; + struct pkginfo *pkg; + struct progress progress; + int i; + + if (allpackagesdone) return; + if (saidread < PKG_FILESDB_LOAD_DONE) { + int max = pkg_db_count_pkg(); + + saidread = PKG_FILESDB_LOAD_INPROGRESS; + progress_init(&progress, _("(Reading database ... "), max); + } + + pkg_array_init_from_db(&array); + + pkg_files_optimize_load(&array); + + for (i = 0; i < array.n_pkgs; i++) { + pkg = array.pkgs[i]; + ensure_packagefiles_available(pkg); + + if (saidread == PKG_FILESDB_LOAD_INPROGRESS) + progress_step(&progress); + } + + pkg_array_destroy(&array); + + allpackagesdone = true; + + if (saidread == PKG_FILESDB_LOAD_INPROGRESS) { + progress_done(&progress); + printf(P_("%d file or directory currently installed.)\n", + "%d files and directories currently installed.)\n", + fsys_hash_entries()), + fsys_hash_entries()); + saidread = PKG_FILESDB_LOAD_DONE; + } +} + +void ensure_allinstfiles_available_quiet(void) { + saidread = PKG_FILESDB_LOAD_DONE; + ensure_allinstfiles_available(); +} + +/* + * If mask is nonzero, will not write any file whose filenamenode + * has any flag bits set in mask. + */ +void +write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin, + struct fileinlist *list, enum filenamenode_flags mask) +{ + struct atomic_file *file; + struct fileinlist *node; + const char *listfile; + + listfile = pkg_infodb_get_file(pkg, pkgbin, LISTFILE); + + file = atomic_file_new(listfile, 0); + atomic_file_open(file); + + for (node = list; node; node = node->next) { + if (!(mask && (node->namenode->flags & mask))) { + fputs(node->namenode->name, file->fp); + putc('\n', file->fp); + } + } + + atomic_file_sync(file); + atomic_file_close(file); + atomic_file_commit(file); + atomic_file_free(file); + + dir_sync_path(pkg_infodb_get_dir()); + + note_must_reread_files_inpackage(pkg); +} diff --git a/lib/dpkg/db-fsys-override.c b/lib/dpkg/db-fsys-override.c new file mode 100644 index 000000000..10a8a273d --- /dev/null +++ b/lib/dpkg/db-fsys-override.c @@ -0,0 +1,266 @@ +/* + * libdpkg - Debian packaging suite library routines + * db-fsys-override.c - management of filesystem stat overrides database + * + * Copyright © 1995 Ian Jackson + * Copyright © 2000, 2001 Wichert Akkerman + * Copyright © 2008-2012 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +static char *statoverridename; + +uid_t +statdb_parse_uid(const char *str) +{ + char *endptr; + uid_t uid; + + if (str[0] == '#') { + long int value; + + errno = 0; + value = strtol(str + 1, &endptr, 10); + if (str + 1 == endptr || *endptr || value < 0 || errno != 0) + ohshit(_("invalid statoverride uid %s"), str); + uid = (uid_t)value; + } else { + struct passwd *pw = getpwnam(str); + + if (pw == NULL) + uid = (uid_t)-1; + else + uid = pw->pw_uid; + } + + return uid; +} + +gid_t +statdb_parse_gid(const char *str) +{ + char *endptr; + gid_t gid; + + if (str[0] == '#') { + long int value; + + errno = 0; + value = strtol(str + 1, &endptr, 10); + if (str + 1 == endptr || *endptr || value < 0 || errno != 0) + ohshit(_("invalid statoverride gid %s"), str); + gid = (gid_t)value; + } else { + struct group *gr = getgrnam(str); + + if (gr == NULL) + gid = (gid_t)-1; + else + gid = gr->gr_gid; + } + + return gid; +} + +mode_t +statdb_parse_mode(const char *str) +{ + char *endptr; + long int mode; + + mode = strtol(str, &endptr, 8); + if (str == endptr || *endptr || mode < 0 || mode > 07777) + ohshit(_("invalid statoverride mode %s"), str); + + return (mode_t)mode; +} + +void +ensure_statoverrides(enum statdb_parse_flags flags) +{ + static struct stat sb_prev; + struct stat sb_next; + static FILE *file_prev; + FILE *file; + char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr; + struct file_stat *fso; + struct filenamenode *fnn; + struct fileiterator *iter; + + if (statoverridename == NULL) + statoverridename = dpkg_db_get_path(STATOVERRIDEFILE); + + onerr_abort++; + + file = fopen(statoverridename, "r"); + if (!file) { + if (errno != ENOENT) + ohshite(_("failed to open statoverride file")); + } else { + setcloexec(fileno(file), statoverridename); + + if (fstat(fileno(file), &sb_next)) + ohshite(_("failed to fstat statoverride file")); + + /* + * We need to keep the database file open so that the + * filesystem cannot reuse the inode number (f.ex. during + * multiple dpkg-statoverride invocations in a maintainer + * script), otherwise the following check might turn true, + * and we would skip reloading a modified database. + */ + if (file_prev && + sb_prev.st_dev == sb_next.st_dev && + sb_prev.st_ino == sb_next.st_ino) { + fclose(file); + onerr_abort--; + debug(dbg_general, "%s: same, skipping", __func__); + return; + } + sb_prev = sb_next; + } + if (file_prev) + fclose(file_prev); + file_prev = file; + + /* Reset statoverride information. */ + iter = files_db_iter_new(); + while ((fnn = files_db_iter_next(iter))) + fnn->statoverride = NULL; + files_db_iter_free(iter); + + if (!file) { + onerr_abort--; + debug(dbg_general, "%s: none, resetting", __func__); + return; + } + debug(dbg_general, "%s: new, (re)loading", __func__); + + /* If the statoverride list is empty we don't need to bother + * reading it. */ + if (!sb_next.st_size) { + onerr_abort--; + return; + } + + loaded_list = m_malloc(sb_next.st_size); + loaded_list_end = loaded_list + sb_next.st_size; + + if (fd_read(fileno(file), loaded_list, sb_next.st_size) < 0) + ohshite(_("reading statoverride file '%.250s'"), statoverridename); + + thisline = loaded_list; + while (thisline < loaded_list_end) { + fso = nfmalloc(sizeof(struct file_stat)); + + ptr = memchr(thisline, '\n', loaded_list_end - thisline); + if (ptr == NULL) + ohshit(_("statoverride file is missing final newline")); + /* Where to start next time around. */ + nextline = ptr + 1; + if (ptr == thisline) + ohshit(_("statoverride file contains empty line")); + *ptr = '\0'; + + /* Extract the uid. */ + ptr = memchr(thisline, ' ', nextline - thisline); + if (ptr == NULL) + ohshit(_("syntax error in statoverride file")); + *ptr = '\0'; + + fso->uid = statdb_parse_uid(thisline); + if (fso->uid == (uid_t)-1) + fso->uname = nfstrsave(thisline); + else + fso->uname = NULL; + + if (fso->uid == (uid_t)-1 && !(flags & STATDB_PARSE_LAX)) + ohshit(_("unknown user '%s' in statoverride file"), + thisline); + + /* Move to the next bit */ + thisline = ptr + 1; + if (thisline >= loaded_list_end) + ohshit(_("unexpected end of line in statoverride file")); + + /* Extract the gid */ + ptr = memchr(thisline, ' ', nextline - thisline); + if (ptr == NULL) + ohshit(_("syntax error in statoverride file")); + *ptr = '\0'; + + fso->gid = statdb_parse_gid(thisline); + if (fso->gid == (gid_t)-1) + fso->gname = nfstrsave(thisline); + else + fso->gname = NULL; + + if (fso->gid == (gid_t)-1 && !(flags & STATDB_PARSE_LAX)) + ohshit(_("unknown group '%s' in statoverride file"), + thisline); + + /* Move to the next bit */ + thisline = ptr + 1; + if (thisline >= loaded_list_end) + ohshit(_("unexpected end of line in statoverride file")); + + /* Extract the mode */ + ptr = memchr(thisline, ' ', nextline - thisline); + if (ptr == NULL) + ohshit(_("syntax error in statoverride file")); + *ptr = '\0'; + + fso->mode = statdb_parse_mode(thisline); + + /* Move to the next bit */ + thisline = ptr + 1; + if (thisline >= loaded_list_end) + ohshit(_("unexpected end of line in statoverride file")); + + fnn = findnamenode(thisline, 0); + if (fnn->statoverride) + ohshit(_("multiple statoverrides present for file '%.250s'"), + thisline); + fnn->statoverride = fso; + + /* Moving on... */ + thisline = nextline; + } + + free(loaded_list); + + onerr_abort--; +} diff --git a/lib/dpkg/db-fsys.h b/lib/dpkg/db-fsys.h new file mode 100644 index 000000000..35c971552 --- /dev/null +++ b/lib/dpkg/db-fsys.h @@ -0,0 +1,75 @@ +/* + * libdpkg - Debian packaging suite library routines + * db-fsys.h - management of database of files installed on system + * + * Copyright © 1995 Ian Jackson + * Copyright © 2008-2014 Guillem Jover + * + * This 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 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 . + */ + +#ifndef LIBDPKG_DB_FSYS_H +#define LIBDPKG_DB_FSYS_H + +#include +#include + +/* + * Data structure here is as follows: + * + * For each package we have a ‘struct fileinlist *’, the head of a list of + * files in that package. They are in ‘forwards’ order. Each entry has a + * pointer to the ‘struct filenamenode’. + * + * The struct filenamenodes are in a hash table, indexed by name. + * (This hash table is not visible to callers.) + * + * Each filenamenode has a (possibly empty) list of ‘struct filepackage’, + * giving a list of the packages listing that filename. + * + * When we read files contained info about a particular package we set the + * ‘files’ member of the clientdata struct to the appropriate thing. When + * not yet set the files pointer is made to point to ‘fileslist_uninited’ + * (this is available only internally, within filesdb.c - the published + * interface is ensure_*_available). + */ + +struct pkginfo; + +void ensure_diversions(void); + +enum statdb_parse_flags { + STATDB_PARSE_NORMAL = 0, + STATDB_PARSE_LAX = 1, +}; + +uid_t statdb_parse_uid(const char *str); +gid_t statdb_parse_gid(const char *str); +mode_t statdb_parse_mode(const char *str); +void ensure_statoverrides(enum statdb_parse_flags flags); + +#define LISTFILE "list" +#define HASHFILE "md5sums" + +void ensure_packagefiles_available(struct pkginfo *pkg); +void ensure_allinstfiles_available(void); +void ensure_allinstfiles_available_quiet(void); +void note_must_reread_files_inpackage(struct pkginfo *pkg); +void parse_filehash(struct pkginfo *pkg, struct pkgbin *pkgbin); +void write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin, + struct fileinlist *list, enum filenamenode_flags mask); +void write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin, + struct fileinlist *list, enum filenamenode_flags mask); + +#endif /* LIBDPKG_DB_FSYS_H */ diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 6260f7456..cf176d6c9 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -390,6 +390,9 @@ LIBDPKG_PRIVATE { pkg_infodb_has_file; pkg_infodb_upgrade; + # Package on-disk diversion database support + ensure_diversions; + # Filesystem node hash support filesdbinit; files_db_reset; @@ -408,6 +411,20 @@ LIBDPKG_PRIVATE { filepackages_iter_next; filepackages_iter_free; + # Package on-disk filesystem database support + parse_filehash; + write_filelist_except; + write_filehash_except; + ensure_packagefiles_available; + ensure_allinstfiles_available; + ensure_allinstfiles_available_quiet; + + # Package on-disk stat override database support + statdb_parse_uid; + statdb_parse_gid; + statdb_parse_mode; + ensure_statoverrides; + # Triggers support trig_name_is_illegal; trigdef_set_methods; diff --git a/po/POTFILES.in b/po/POTFILES.in index bc549a21c..8aeef181e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -14,6 +14,10 @@ lib/dpkg/dbmodify.c lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-format.c lib/dpkg/db-ctrl-upgrade.c +lib/dpkg/db-fsys-digest.c +lib/dpkg/db-fsys-divert.c +lib/dpkg/db-fsys-files.c +lib/dpkg/db-fsys-override.c lib/dpkg/deb-version.c lib/dpkg/debug.c lib/dpkg/depcon.c @@ -70,12 +74,9 @@ src/cleanup.c src/configure.c src/depcon.c src/divertcmd.c -src/divertdb.c src/enquiry.c src/errors.c src/file-match.c -src/filesdb-hash.c -src/filesdb.c src/filters.c src/help.c src/main.c @@ -87,7 +88,6 @@ src/script.c src/select.c src/selinux.c src/statcmd.c -src/statdb.c src/trigcmd.c src/trigproc.c src/unpack.c diff --git a/src/Makefile.am b/src/Makefile.am index 38b725169..e6c957062 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,10 +25,6 @@ bin_PROGRAMS = \ dpkg-statoverride \ dpkg-trigger -noinst_HEADERS = \ - filesdb.h \ - $(nil) - dpkg_SOURCES = \ archives.c archives.h \ cleanup.c \ @@ -36,12 +32,8 @@ dpkg_SOURCES = \ depcon.c \ enquiry.c \ errors.c \ - filesdb.c \ - filesdb-hash.c \ file-match.c file-match.h \ filters.c filters.h \ - divertdb.c \ - statdb.c \ help.c \ main.c main.h \ packages.c \ @@ -61,19 +53,13 @@ dpkg_LDADD = \ $(SELINUX_LIBS) dpkg_divert_SOURCES = \ - filesdb.c \ - divertdb.c \ divertcmd.c dpkg_query_SOURCES = \ - filesdb.c \ - divertdb.c \ querycmd.c dpkg_statoverride_SOURCES = \ - filesdb.c \ selinux.c \ - statdb.c \ statcmd.c dpkg_statoverride_LDADD = \ diff --git a/src/archives.c b/src/archives.c index c80db7fcd..4c5fb8897 100644 --- a/src/archives.c +++ b/src/archives.c @@ -56,8 +56,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" #include "archives.h" #include "filters.h" diff --git a/src/cleanup.c b/src/cleanup.c index ded8219c0..cbc690de9 100644 --- a/src/cleanup.c +++ b/src/cleanup.c @@ -40,8 +40,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" #include "archives.h" diff --git a/src/configure.c b/src/configure.c index 720812b38..2d9173eba 100644 --- a/src/configure.c +++ b/src/configure.c @@ -53,8 +53,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" enum conffopt { diff --git a/src/depcon.c b/src/depcon.c index 55f08ef08..a34384da7 100644 --- a/src/depcon.c +++ b/src/depcon.c @@ -35,8 +35,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" struct deppossi_pkg_iterator { diff --git a/src/divertcmd.c b/src/divertcmd.c index 170c9e93e..d50409d02 100644 --- a/src/divertcmd.c +++ b/src/divertcmd.c @@ -45,8 +45,7 @@ #include #include #include - -#include "filesdb.h" +#include static const char printforhelp[] = N_( diff --git a/src/divertdb.c b/src/divertdb.c deleted file mode 100644 index a056e8296..000000000 --- a/src/divertdb.c +++ /dev/null @@ -1,133 +0,0 @@ -/* - * dpkg - main program for package management - * divertdb.c - management of database of diverted files - * - * Copyright © 1995 Ian Jackson - * Copyright © 2000, 2001 Wichert Akkerman - * - * This 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 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 . - */ - -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "filesdb.h" - -static struct diversion *diversions = NULL; -static char *diversionsname; - -void -ensure_diversions(void) -{ - static struct stat sb_prev; - struct stat sb_next; - char linebuf[MAXDIVERTFILENAME]; - static FILE *file_prev; - FILE *file; - struct diversion *ov, *oicontest, *oialtname; - - if (diversionsname == NULL) - diversionsname = dpkg_db_get_path(DIVERSIONSFILE); - - onerr_abort++; - - file = fopen(diversionsname, "r"); - if (!file) { - if (errno != ENOENT) - ohshite(_("failed to open diversions file")); - } else { - setcloexec(fileno(file), diversionsname); - - if (fstat(fileno(file), &sb_next)) - ohshite(_("failed to fstat diversions file")); - - /* - * We need to keep the database file open so that the - * filesystem cannot reuse the inode number (f.ex. during - * multiple dpkg-divert invocations in a maintainer script), - * otherwise the following check might turn true, and we - * would skip reloading a modified database. - */ - if (file_prev && - sb_prev.st_dev == sb_next.st_dev && - sb_prev.st_ino == sb_next.st_ino) { - fclose(file); - onerr_abort--; - debug(dbg_general, "%s: same, skipping", __func__); - return; - } - sb_prev = sb_next; - } - if (file_prev) - fclose(file_prev); - file_prev = file; - - for (ov = diversions; ov; ov = ov->next) { - ov->useinstead->divert->camefrom->divert = NULL; - ov->useinstead->divert = NULL; - } - diversions = NULL; - if (!file) { - onerr_abort--; - debug(dbg_general, "%s: none, resetting", __func__); - return; - } - debug(dbg_general, "%s: new, (re)loading", __func__); - - while (fgets_checked(linebuf, sizeof(linebuf), file, diversionsname) >= 0) { - oicontest = nfmalloc(sizeof(struct diversion)); - oialtname = nfmalloc(sizeof(struct diversion)); - - oialtname->camefrom = findnamenode(linebuf, 0); - oialtname->useinstead = NULL; - - fgets_must(linebuf, sizeof(linebuf), file, diversionsname); - oicontest->useinstead = findnamenode(linebuf, 0); - oicontest->camefrom = NULL; - - fgets_must(linebuf, sizeof(linebuf), file, diversionsname); - oicontest->pkgset = strcmp(linebuf, ":") ? - pkg_db_find_set(linebuf) : NULL; - oialtname->pkgset = oicontest->pkgset; - - if (oialtname->camefrom->divert || - oicontest->useinstead->divert) - ohshit(_("conflicting diversions involving '%.250s' or '%.250s'"), - oialtname->camefrom->name, oicontest->useinstead->name); - - oialtname->camefrom->divert = oicontest; - oicontest->useinstead->divert = oialtname; - - oicontest->next = diversions; - diversions = oicontest; - } - - onerr_abort--; -} diff --git a/src/enquiry.c b/src/enquiry.c index 9da4160d5..baf26daab 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -43,8 +43,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" struct audit_problem { diff --git a/src/filesdb-hash.c b/src/filesdb-hash.c deleted file mode 100644 index c04d7a8e6..000000000 --- a/src/filesdb-hash.c +++ /dev/null @@ -1,175 +0,0 @@ -/* - * dpkg - main program for package management - * filesdb-hash.c - management of database of files installed on system - * - * Copyright © 2012-2014 Guillem Jover - * - * This 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 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 . - */ - -#include -#include - -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "filesdb.h" - -/* - * If mask is nonzero, will not write any file whose filenamenode - * has any flag bits set in mask. - */ -void -write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin, - struct fileinlist *list, enum filenamenode_flags mask) -{ - struct atomic_file *file; - const char *hashfile; - - debug(dbg_general, "generating infodb hashfile"); - - if (pkg_infodb_has_file(pkg, &pkg->available, HASHFILE)) - return; - - hashfile = pkg_infodb_get_file(pkg, pkgbin, HASHFILE); - - file = atomic_file_new(hashfile, 0); - atomic_file_open(file); - - for (; list; list = list->next) { - struct filenamenode *namenode = list->namenode; - - if (mask && (namenode->flags & mask)) - continue; - if (strcmp(namenode->newhash, EMPTYHASHFLAG) == 0) - continue; - - fprintf(file->fp, "%s %s\n", - namenode->newhash, namenode->name + 1); - } - - atomic_file_sync(file); - atomic_file_close(file); - atomic_file_commit(file); - atomic_file_free(file); - - dir_sync_path(pkg_infodb_get_dir()); -} - -static void -parse_filehash_buffer(char *buf, char *buf_end, - struct pkginfo *pkg, struct pkgbin *pkgbin) -{ - char *thisline, *nextline; - const char *pkgname = pkg_name(pkg, pnaw_nonambig); - - for (thisline = buf; thisline < buf_end; thisline = nextline) { - struct filenamenode *namenode; - char *endline, *hash_end, *filename; - - endline = memchr(thisline, '\n', buf_end - thisline); - if (endline == NULL) - ohshit(_("control file '%s' for package '%s' is " - "missing final newline"), HASHFILE, pkgname); - - /* The md5sum hash has a constant length. */ - hash_end = thisline + MD5HASHLEN; - - filename = hash_end + 2; - if (filename + 1 > endline) - ohshit(_("control file '%s' for package '%s' is " - "missing value"), HASHFILE, pkgname); - - if (hash_end[0] != ' ' || hash_end[1] != ' ') - ohshit(_("control file '%s' for package '%s' is " - "missing value separator"), HASHFILE, pkgname); - hash_end[0] = '\0'; - - /* Where to start next time around. */ - nextline = endline + 1; - - /* Strip trailing ‘/’. */ - if (endline > thisline && endline[-1] == '/') - endline--; - *endline = '\0'; - - if (endline == thisline) - ohshit(_("control file '%s' for package '%s' " - "contains empty filename"), HASHFILE, pkgname); - - debug(dbg_eachfiledetail, "load hash '%s' for filename '%s'", - thisline, filename); - - /* Add the file to the list. */ - namenode = findnamenode(filename, fnn_nocopy); - namenode->newhash = thisline; - } -} - -void -parse_filehash(struct pkginfo *pkg, struct pkgbin *pkgbin) -{ - static int fd; - const char *hashfile; - struct stat st; - - hashfile = pkg_infodb_get_file(pkg, pkgbin, HASHFILE); - - fd = open(hashfile, O_RDONLY); - if (fd < 0) { - if (errno == ENOENT) - return; - - ohshite(_("cannot open control file '%s' for package '%s'"), - HASHFILE, pkg_name(pkg, pnaw_nonambig)); - } - - if (fstat(fd, &st) < 0) - ohshite(_("cannot stat control file '%s' for package '%s'"), - HASHFILE, pkg_name(pkg, pnaw_nonambig)); - - if (!S_ISREG(st.st_mode)) - ohshit(_("control file '%s' for package '%s' is not a regular file"), - HASHFILE, pkg_name(pkg, pnaw_nonambig)); - - if (st.st_size > 0) { - char *buf, *buf_end; - - buf = nfmalloc(st.st_size); - buf_end = buf + st.st_size; - - if (fd_read(fd, buf, st.st_size) < 0) - ohshite(_("cannot read control file '%s' for package '%s'"), - HASHFILE, pkg_name(pkg, pnaw_nonambig)); - - parse_filehash_buffer(buf, buf_end, pkg, pkgbin); - } - - if (close(fd)) - ohshite(_("cannot close control file '%s' for package '%s'"), - HASHFILE, pkg_name(pkg, pnaw_nonambig)); -} diff --git a/src/filesdb.c b/src/filesdb.c deleted file mode 100644 index 8421d327e..000000000 --- a/src/filesdb.c +++ /dev/null @@ -1,410 +0,0 @@ -/* - * dpkg - main program for package management - * filesdb.c - management of database of files installed on system - * - * Copyright © 1995 Ian Jackson - * Copyright © 2000,2001 Wichert Akkerman - * Copyright © 2008-2014 Guillem Jover - * - * This 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 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 . - */ - -#include -#include - -#ifdef HAVE_LINUX_FIEMAP_H -#include -#include -#include -#include -#endif -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "filesdb.h" -#include "main.h" - -/*** Generic data structures and routines. ***/ - -static bool allpackagesdone = false; - -void note_must_reread_files_inpackage(struct pkginfo *pkg) { - allpackagesdone = false; - pkg->files_list_valid = false; -} - -enum pkg_filesdb_load_status { - PKG_FILESDB_LOAD_NONE = 0, - PKG_FILESDB_LOAD_INPROGRESS = 1, - PKG_FILESDB_LOAD_DONE = 2, -}; - -static enum pkg_filesdb_load_status saidread = PKG_FILESDB_LOAD_NONE; - -/** - * Erase the files saved in pkg. - */ -static void -pkg_files_blank(struct pkginfo *pkg) -{ - struct fileinlist *current; - - for (current = pkg->files; - current; - current= current->next) { - struct pkg_list *pkg_node, *pkg_prev = NULL; - - /* For each file that used to be in the package, - * go through looking for this package's entry in the list - * of packages containing this file, and blank it out. */ - for (pkg_node = current->namenode->packages; - pkg_node; - pkg_node = pkg_node->next) { - if (pkg_node->pkg == pkg) { - if (pkg_prev) - pkg_prev->next = pkg_node->next; - else - current->namenode->packages = pkg_node->next; - - /* The actual filelist links were allocated using nfmalloc, so - * we shouldn't free them. */ - break; - } - pkg_prev = pkg_node; - } - } - pkg->files = NULL; -} - -static struct fileinlist ** -pkg_files_add_file(struct pkginfo *pkg, struct filenamenode *namenode, - struct fileinlist **file_tail) -{ - struct fileinlist *newent; - struct pkg_list *pkg_node; - - if (file_tail == NULL) - file_tail = &pkg->files; - - /* Make sure we're at the end. */ - while ((*file_tail) != NULL) { - file_tail = &((*file_tail)->next); - } - - /* Create a new node. */ - newent = nfmalloc(sizeof(struct fileinlist)); - newent->namenode = namenode; - newent->next = NULL; - *file_tail = newent; - file_tail = &newent->next; - - /* Add pkg to newent's package list. */ - pkg_node = nfmalloc(sizeof(*pkg_node)); - pkg_node->pkg = pkg; - pkg_node->next = newent->namenode->packages; - newent->namenode->packages = pkg_node; - - /* Return the position for the next guy. */ - return file_tail; -} - -/** - * Load the list of files in this package into memory, or update the - * list if it is there but stale. - */ -void -ensure_packagefiles_available(struct pkginfo *pkg) -{ - static int fd; - const char *filelistfile; - struct fileinlist **lendp; - struct stat stat_buf; - char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr; - - if (pkg->files_list_valid) - return; - - /* Throw away any stale data, if there was any. */ - pkg_files_blank(pkg); - - /* Packages which aren't installed don't have a files list. */ - if (pkg->status == PKG_STAT_NOTINSTALLED) { - pkg->files_list_valid = true; - return; - } - - filelistfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE); - - onerr_abort++; - - fd= open(filelistfile,O_RDONLY); - - if (fd==-1) { - if (errno != ENOENT) - ohshite(_("unable to open files list file for package '%.250s'"), - pkg_name(pkg, pnaw_nonambig)); - onerr_abort--; - if (pkg->status != PKG_STAT_CONFIGFILES && - dpkg_version_is_informative(&pkg->configversion)) { - warning(_("files list file for package '%.250s' missing; assuming " - "package has no files currently installed"), - pkg_name(pkg, pnaw_nonambig)); - } - pkg->files = NULL; - pkg->files_list_valid = true; - return; - } - - push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd); - - if (fstat(fd, &stat_buf)) - ohshite(_("unable to stat files list file for package '%.250s'"), - pkg_name(pkg, pnaw_nonambig)); - - if (!S_ISREG(stat_buf.st_mode)) - ohshit(_("files list for package '%.250s' is not a regular file"), - pkg_name(pkg, pnaw_nonambig)); - - if (stat_buf.st_size) { - loaded_list = nfmalloc(stat_buf.st_size); - loaded_list_end = loaded_list + stat_buf.st_size; - - if (fd_read(fd, loaded_list, stat_buf.st_size) < 0) - ohshite(_("reading files list for package '%.250s'"), - pkg_name(pkg, pnaw_nonambig)); - - lendp = &pkg->files; - thisline = loaded_list; - while (thisline < loaded_list_end) { - struct filenamenode *namenode; - - ptr = memchr(thisline, '\n', loaded_list_end - thisline); - if (ptr == NULL) - ohshit(_("files list file for package '%.250s' is missing final newline"), - pkg_name(pkg, pnaw_nonambig)); - /* Where to start next time around. */ - nextline = ptr + 1; - /* Strip trailing ‘/’. */ - if (ptr > thisline && ptr[-1] == '/') ptr--; - /* Add the file to the list. */ - if (ptr == thisline) - ohshit(_("files list file for package '%.250s' contains empty filename"), - pkg_name(pkg, pnaw_nonambig)); - *ptr = '\0'; - - namenode = findnamenode(thisline, fnn_nocopy); - lendp = pkg_files_add_file(pkg, namenode, lendp); - thisline = nextline; - } - } - pop_cleanup(ehflag_normaltidy); /* fd = open() */ - if (close(fd)) - ohshite(_("error closing files list file for package '%.250s'"), - pkg_name(pkg, pnaw_nonambig)); - - onerr_abort--; - - pkg->files_list_valid = true; -} - -#if defined(HAVE_LINUX_FIEMAP_H) -static int -pkg_sorter_by_files_list_phys_offs(const void *a, const void *b) -{ - const struct pkginfo *pa = *(const struct pkginfo **)a; - const struct pkginfo *pb = *(const struct pkginfo **)b; - - /* We can't simply subtract, because the difference may be greater than - * INT_MAX. */ - if (pa->files_list_phys_offs < pb->files_list_phys_offs) - return -1; - else if (pa->files_list_phys_offs > pb->files_list_phys_offs) - return 1; - else - return 0; -} - -static void -pkg_files_optimize_load(struct pkg_array *array) -{ - struct statfs fs; - int i; - - /* Get the filesystem block size. */ - if (statfs(pkg_infodb_get_dir(), &fs) < 0) - return; - - /* Sort packages by the physical location of their list files, so that - * scanning them later will minimize disk drive head movements. */ - for (i = 0; i < array->n_pkgs; i++) { - struct pkginfo *pkg = array->pkgs[i]; - struct { - struct fiemap fiemap; - struct fiemap_extent extent; - } fm; - const char *listfile; - int fd; - - if (pkg->status == PKG_STAT_NOTINSTALLED || - pkg->files_list_phys_offs != 0) - continue; - - pkg->files_list_phys_offs = -1; - - listfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE); - - fd = open(listfile, O_RDONLY); - if (fd < 0) - continue; - - memset(&fm, 0, sizeof(fm)); - fm.fiemap.fm_start = 0; - fm.fiemap.fm_length = fs.f_bsize; - fm.fiemap.fm_flags = 0; - fm.fiemap.fm_extent_count = 1; - - if (ioctl(fd, FS_IOC_FIEMAP, (unsigned long)&fm) == 0) - pkg->files_list_phys_offs = fm.fiemap.fm_extents[0].fe_physical; - - close(fd); - } - - pkg_array_sort(array, pkg_sorter_by_files_list_phys_offs); -} -#elif defined(HAVE_POSIX_FADVISE) -static void -pkg_files_optimize_load(struct pkg_array *array) -{ - int i; - - /* Ask the kernel to start preloading the list files, so as to get a - * boost when later we actually load them. */ - for (i = 0; i < array->n_pkgs; i++) { - struct pkginfo *pkg = array->pkgs[i]; - const char *listfile; - int fd; - - listfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE); - - fd = open(listfile, O_RDONLY | O_NONBLOCK); - if (fd != -1) { - posix_fadvise(fd, 0, 0, POSIX_FADV_WILLNEED); - close(fd); - } - } -} -#else -static void -pkg_files_optimize_load(struct pkg_array *array) -{ -} -#endif - -void ensure_allinstfiles_available(void) { - struct pkg_array array; - struct pkginfo *pkg; - struct progress progress; - int i; - - if (allpackagesdone) return; - if (saidread < PKG_FILESDB_LOAD_DONE) { - int max = pkg_db_count_pkg(); - - saidread = PKG_FILESDB_LOAD_INPROGRESS; - progress_init(&progress, _("(Reading database ... "), max); - } - - pkg_array_init_from_db(&array); - - pkg_files_optimize_load(&array); - - for (i = 0; i < array.n_pkgs; i++) { - pkg = array.pkgs[i]; - ensure_packagefiles_available(pkg); - - if (saidread == PKG_FILESDB_LOAD_INPROGRESS) - progress_step(&progress); - } - - pkg_array_destroy(&array); - - allpackagesdone = true; - - if (saidread == PKG_FILESDB_LOAD_INPROGRESS) { - progress_done(&progress); - printf(P_("%d file or directory currently installed.)\n", - "%d files and directories currently installed.)\n", - fsys_hash_entries()), - fsys_hash_entries()); - saidread = PKG_FILESDB_LOAD_DONE; - } -} - -void ensure_allinstfiles_available_quiet(void) { - saidread = PKG_FILESDB_LOAD_DONE; - ensure_allinstfiles_available(); -} - -/* - * If mask is nonzero, will not write any file whose filenamenode - * has any flag bits set in mask. - */ -void -write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin, - struct fileinlist *list, enum filenamenode_flags mask) -{ - struct atomic_file *file; - struct fileinlist *node; - const char *listfile; - - listfile = pkg_infodb_get_file(pkg, pkgbin, LISTFILE); - - file = atomic_file_new(listfile, 0); - atomic_file_open(file); - - for (node = list; node; node = node->next) { - if (!(mask && (node->namenode->flags & mask))) { - fputs(node->namenode->name, file->fp); - putc('\n', file->fp); - } - } - - atomic_file_sync(file); - atomic_file_close(file); - atomic_file_commit(file); - atomic_file_free(file); - - dir_sync_path(pkg_infodb_get_dir()); - - note_must_reread_files_inpackage(pkg); -} diff --git a/src/filesdb.h b/src/filesdb.h deleted file mode 100644 index f38fdd245..000000000 --- a/src/filesdb.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * dpkg - main program for package management - * filesdb.h - management of database of files installed on system - * - * Copyright © 1995 Ian Jackson - * Copyright © 2008-2014 Guillem Jover - * - * This 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 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 . - */ - -#ifndef FILESDB_H -#define FILESDB_H - -#include -#include - -/* - * Data structure here is as follows: - * - * For each package we have a ‘struct fileinlist *’, the head of a list of - * files in that package. They are in ‘forwards’ order. Each entry has a - * pointer to the ‘struct filenamenode’. - * - * The struct filenamenodes are in a hash table, indexed by name. - * (This hash table is not visible to callers.) - * - * Each filenamenode has a (possibly empty) list of ‘struct filepackage’, - * giving a list of the packages listing that filename. - * - * When we read files contained info about a particular package we set the - * ‘files’ member of the clientdata struct to the appropriate thing. When - * not yet set the files pointer is made to point to ‘fileslist_uninited’ - * (this is available only internally, within filesdb.c - the published - * interface is ensure_*_available). - */ - -struct pkginfo; - -void ensure_diversions(void); - -enum statdb_parse_flags { - STATDB_PARSE_NORMAL = 0, - STATDB_PARSE_LAX = 1, -}; - -uid_t statdb_parse_uid(const char *str); -gid_t statdb_parse_gid(const char *str); -mode_t statdb_parse_mode(const char *str); -void ensure_statoverrides(enum statdb_parse_flags flags); - -#define LISTFILE "list" -#define HASHFILE "md5sums" - -void ensure_packagefiles_available(struct pkginfo *pkg); -void ensure_allinstfiles_available(void); -void ensure_allinstfiles_available_quiet(void); -void note_must_reread_files_inpackage(struct pkginfo *pkg); -void parse_filehash(struct pkginfo *pkg, struct pkgbin *pkgbin); -void write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin, - struct fileinlist *list, enum filenamenode_flags mask); -void write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin, - struct fileinlist *list, enum filenamenode_flags mask); - -#endif /* FILESDB_H */ diff --git a/src/filters.c b/src/filters.c index 2b8b43263..f770fb74c 100644 --- a/src/filters.c +++ b/src/filters.c @@ -29,9 +29,9 @@ #include #include #include +#include #include "main.h" -#include "filesdb.h" #include "filters.h" struct filter_node { diff --git a/src/help.c b/src/help.c index c5b06b4b6..cfcdd8ebf 100644 --- a/src/help.c +++ b/src/help.c @@ -34,8 +34,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" const char *const statusstrings[]= { diff --git a/src/main.c b/src/main.c index 9710f08dd..0a45f812e 100644 --- a/src/main.c +++ b/src/main.c @@ -50,9 +50,9 @@ #include #include #include +#include #include "main.h" -#include "filesdb.h" #include "filters.h" static void DPKG_ATTR_NORET diff --git a/src/main.h b/src/main.h index bc3f07a65..319d8afd0 100644 --- a/src/main.h +++ b/src/main.h @@ -25,7 +25,7 @@ #include #include -/* These two are defined in filesdb.h. */ +/* These two are defined in . */ struct fileinlist; struct filenamenode; diff --git a/src/packages.c b/src/packages.c index b78d6ffe9..f735ec3e1 100644 --- a/src/packages.c +++ b/src/packages.c @@ -42,8 +42,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" static struct pkginfo *progress_bytrigproc; diff --git a/src/querycmd.c b/src/querycmd.c index 555bccd3e..76ab99e66 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -55,8 +55,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" static const char *showformat = "${binary:Package}\t${Version}\n"; diff --git a/src/remove.c b/src/remove.c index 735c9e0f3..18d470aea 100644 --- a/src/remove.c +++ b/src/remove.c @@ -43,8 +43,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" /* diff --git a/src/script.c b/src/script.c index bb5f9825c..fc6f6117e 100644 --- a/src/script.c +++ b/src/script.c @@ -43,8 +43,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" void diff --git a/src/select.c b/src/select.c index ebdb13b7f..3eae4cbcf 100644 --- a/src/select.c +++ b/src/select.c @@ -38,8 +38,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" static void getsel1package(struct pkginfo *pkg) { diff --git a/src/statcmd.c b/src/statcmd.c index af8a2f756..b7ca09eeb 100644 --- a/src/statcmd.c +++ b/src/statcmd.c @@ -43,10 +43,10 @@ #include #include #include +#include #include #include "main.h" -#include "filesdb.h" static const char printforhelp[] = N_( "Use --help for help about overriding file stat information."); diff --git a/src/statdb.c b/src/statdb.c deleted file mode 100644 index 042f1bb1e..000000000 --- a/src/statdb.c +++ /dev/null @@ -1,267 +0,0 @@ -/* - * dpkg - main program for package management - * statdb.c - management of database of ownership and mode of files - * - * Copyright © 1995 Ian Jackson - * Copyright © 2000, 2001 Wichert Akkerman - * Copyright © 2008-2012 Guillem Jover - * - * This 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 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 . - */ - -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "filesdb.h" - -static char *statoverridename; - -uid_t -statdb_parse_uid(const char *str) -{ - char *endptr; - uid_t uid; - - if (str[0] == '#') { - long int value; - - errno = 0; - value = strtol(str + 1, &endptr, 10); - if (str + 1 == endptr || *endptr || value < 0 || errno != 0) - ohshit(_("invalid statoverride uid %s"), str); - uid = (uid_t)value; - } else { - struct passwd *pw = getpwnam(str); - - if (pw == NULL) - uid = (uid_t)-1; - else - uid = pw->pw_uid; - } - - return uid; -} - -gid_t -statdb_parse_gid(const char *str) -{ - char *endptr; - gid_t gid; - - if (str[0] == '#') { - long int value; - - errno = 0; - value = strtol(str + 1, &endptr, 10); - if (str + 1 == endptr || *endptr || value < 0 || errno != 0) - ohshit(_("invalid statoverride gid %s"), str); - gid = (gid_t)value; - } else { - struct group *gr = getgrnam(str); - - if (gr == NULL) - gid = (gid_t)-1; - else - gid = gr->gr_gid; - } - - return gid; -} - -mode_t -statdb_parse_mode(const char *str) -{ - char *endptr; - long int mode; - - mode = strtol(str, &endptr, 8); - if (str == endptr || *endptr || mode < 0 || mode > 07777) - ohshit(_("invalid statoverride mode %s"), str); - - return (mode_t)mode; -} - -void -ensure_statoverrides(enum statdb_parse_flags flags) -{ - static struct stat sb_prev; - struct stat sb_next; - static FILE *file_prev; - FILE *file; - char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr; - struct file_stat *fso; - struct filenamenode *fnn; - struct fileiterator *iter; - - if (statoverridename == NULL) - statoverridename = dpkg_db_get_path(STATOVERRIDEFILE); - - onerr_abort++; - - file = fopen(statoverridename, "r"); - if (!file) { - if (errno != ENOENT) - ohshite(_("failed to open statoverride file")); - } else { - setcloexec(fileno(file), statoverridename); - - if (fstat(fileno(file), &sb_next)) - ohshite(_("failed to fstat statoverride file")); - - /* - * We need to keep the database file open so that the - * filesystem cannot reuse the inode number (f.ex. during - * multiple dpkg-statoverride invocations in a maintainer - * script), otherwise the following check might turn true, - * and we would skip reloading a modified database. - */ - if (file_prev && - sb_prev.st_dev == sb_next.st_dev && - sb_prev.st_ino == sb_next.st_ino) { - fclose(file); - onerr_abort--; - debug(dbg_general, "%s: same, skipping", __func__); - return; - } - sb_prev = sb_next; - } - if (file_prev) - fclose(file_prev); - file_prev = file; - - /* Reset statoverride information. */ - iter = files_db_iter_new(); - while ((fnn = files_db_iter_next(iter))) - fnn->statoverride = NULL; - files_db_iter_free(iter); - - if (!file) { - onerr_abort--; - debug(dbg_general, "%s: none, resetting", __func__); - return; - } - debug(dbg_general, "%s: new, (re)loading", __func__); - - /* If the statoverride list is empty we don't need to bother - * reading it. */ - if (!sb_next.st_size) { - onerr_abort--; - return; - } - - loaded_list = m_malloc(sb_next.st_size); - loaded_list_end = loaded_list + sb_next.st_size; - - if (fd_read(fileno(file), loaded_list, sb_next.st_size) < 0) - ohshite(_("reading statoverride file '%.250s'"), statoverridename); - - thisline = loaded_list; - while (thisline < loaded_list_end) { - fso = nfmalloc(sizeof(struct file_stat)); - - ptr = memchr(thisline, '\n', loaded_list_end - thisline); - if (ptr == NULL) - ohshit(_("statoverride file is missing final newline")); - /* Where to start next time around. */ - nextline = ptr + 1; - if (ptr == thisline) - ohshit(_("statoverride file contains empty line")); - *ptr = '\0'; - - /* Extract the uid. */ - ptr = memchr(thisline, ' ', nextline - thisline); - if (ptr == NULL) - ohshit(_("syntax error in statoverride file")); - *ptr = '\0'; - - fso->uid = statdb_parse_uid(thisline); - if (fso->uid == (uid_t)-1) - fso->uname = nfstrsave(thisline); - else - fso->uname = NULL; - - if (fso->uid == (uid_t)-1 && !(flags & STATDB_PARSE_LAX)) - ohshit(_("unknown user '%s' in statoverride file"), - thisline); - - /* Move to the next bit */ - thisline = ptr + 1; - if (thisline >= loaded_list_end) - ohshit(_("unexpected end of line in statoverride file")); - - /* Extract the gid */ - ptr = memchr(thisline, ' ', nextline - thisline); - if (ptr == NULL) - ohshit(_("syntax error in statoverride file")); - *ptr = '\0'; - - fso->gid = statdb_parse_gid(thisline); - if (fso->gid == (gid_t)-1) - fso->gname = nfstrsave(thisline); - else - fso->gname = NULL; - - if (fso->gid == (gid_t)-1 && !(flags & STATDB_PARSE_LAX)) - ohshit(_("unknown group '%s' in statoverride file"), - thisline); - - /* Move to the next bit */ - thisline = ptr + 1; - if (thisline >= loaded_list_end) - ohshit(_("unexpected end of line in statoverride file")); - - /* Extract the mode */ - ptr = memchr(thisline, ' ', nextline - thisline); - if (ptr == NULL) - ohshit(_("syntax error in statoverride file")); - *ptr = '\0'; - - fso->mode = statdb_parse_mode(thisline); - - /* Move to the next bit */ - thisline = ptr + 1; - if (thisline >= loaded_list_end) - ohshit(_("unexpected end of line in statoverride file")); - - fnn = findnamenode(thisline, 0); - if (fnn->statoverride) - ohshit(_("multiple statoverrides present for file '%.250s'"), - thisline); - fnn->statoverride = fso; - - /* Moving on... */ - thisline = nextline; - } - - free(loaded_list); - - onerr_abort--; -} diff --git a/src/trigproc.c b/src/trigproc.c index ef59455e3..4aee33a80 100644 --- a/src/trigproc.c +++ b/src/trigproc.c @@ -34,10 +34,10 @@ #include #include #include +#include #include #include "main.h" -#include "filesdb.h" /* * Trigger processing algorithms: diff --git a/src/unpack.c b/src/unpack.c index 2fb138691..827211d63 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -52,9 +52,9 @@ #include #include #include +#include #include -#include "filesdb.h" #include "file-match.h" #include "main.h" #include "archives.h" diff --git a/src/verify.c b/src/verify.c index a4eb86ae7..6067fb1ac 100644 --- a/src/verify.c +++ b/src/verify.c @@ -30,8 +30,8 @@ #include #include #include +#include -#include "filesdb.h" #include "main.h" -- cgit v1.2.3 From 7d8b505882cc9cae1913a909f1fafa515a227d96 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 14 Aug 2018 05:51:39 +0200 Subject: libdpkg: Rename pkg-db module to pkg-hash It contains the package hash table implementation. The on-disk database is handled elsewhere, and using db here instead of hash makes it fairly confusing. --- debian/changelog | 1 + lib/dpkg/Makefile.am | 2 +- lib/dpkg/pkg-db.c | 393 --------------------------------------------------- lib/dpkg/pkg-hash.c | 393 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/POTFILES.in | 2 +- 5 files changed, 396 insertions(+), 395 deletions(-) delete mode 100644 lib/dpkg/pkg-db.c create mode 100644 lib/dpkg/pkg-hash.c (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 389afc626..9b36cf7f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -183,6 +183,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Move files list information from dpkg clientdata to pkginfo. - dpkg: Move ensure_package_clientdata() into its own file. - libdpkg: Move db-fsys code from src to lib/dpkg. + - libdpkg: Rename pkg-db module to pkg-hash. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index e3d68576c..fae6e8ca7 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -85,9 +85,9 @@ libdpkg_la_SOURCES = \ path.c \ path-remove.c \ pkg.c \ - pkg-db.c \ pkg-array.c \ pkg-format.c \ + pkg-hash.c \ pkg-list.c \ pkg-namevalue.c \ pkg-queue.c \ diff --git a/lib/dpkg/pkg-db.c b/lib/dpkg/pkg-db.c deleted file mode 100644 index ab90412a3..000000000 --- a/lib/dpkg/pkg-db.c +++ /dev/null @@ -1,393 +0,0 @@ -/* - * libdpkg - Debian packaging suite library routines - * pkg-db.c - low level package database routines (hash tables, etc.) - * - * Copyright © 1995 Ian Jackson - * Copyright © 2008-2014 Guillem Jover - * Copyright © 2011 Linaro Limited - * Copyright © 2011 Raphaël Hertzog - * - * This 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 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 . - */ - -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include - -/* This must always be a prime for optimal performance. - * With 4093 buckets, we glean a 20% speedup, for 8191 buckets - * we get 23%. The nominal increase in memory usage is a mere - * sizeof(void *) * 8191 (i.e. less than 32 KiB on 32bit systems). */ -#define BINS 8191 - -static struct pkgset *bins[BINS]; -static int npkg, nset; - -/** - * Return the package set with the given name. - * - * If the package already exists in the internal database, then it returns - * the existing structure. Otherwise it allocates a new one and will return - * it. The actual name associated to the package set is a lowercase version - * of the name given in parameter. - * - * A package set (struct pkgset) can be composed of multiple package instances - * (struct pkginfo) where each instance is distinguished by its architecture - * (as recorded in pkg.installed.arch and pkg.available.arch). - * - * @param inname Name of the package set. - * - * @return The package set. - */ -struct pkgset * -pkg_db_find_set(const char *inname) -{ - struct pkgset **setp, *new_set; - char *name = m_strdup(inname), *p; - - p= name; - while (*p) { - *p = c_tolower(*p); - p++; - } - - setp = bins + (str_fnv_hash(name) % (BINS)); - while (*setp && strcasecmp((*setp)->name, name)) - setp = &(*setp)->next; - if (*setp) { - free(name); - return *setp; - } - - new_set = nfmalloc(sizeof(struct pkgset)); - pkgset_blank(new_set); - new_set->name = nfstrsave(name); - new_set->next = NULL; - *setp = new_set; - nset++; - npkg++; - - free(name); - - return new_set; -} - -/** - * Return the singleton package instance from a package set. - * - * This means, if none are installed either an instance with native or - * all arch or the first if none found, the single installed instance, - * or NULL if more than one instance is installed. - * - * @param set The package set to use. - * - * @return The singleton package instance. - */ -struct pkginfo * -pkg_db_get_singleton(struct pkgset *set) -{ - struct pkginfo *pkg; - - switch (pkgset_installed_instances(set)) { - case 0: - /* Pick an available candidate. */ - for (pkg = &set->pkg; pkg; pkg = pkg->arch_next) { - const struct dpkg_arch *arch = pkg->available.arch; - - if (arch->type == DPKG_ARCH_NATIVE || arch->type == DPKG_ARCH_ALL) - return pkg; - } - /* Or failing that, the first entry. */ - return &set->pkg; - case 1: - for (pkg = &set->pkg; pkg; pkg = pkg->arch_next) { - if (pkg->status > PKG_STAT_NOTINSTALLED) - return pkg; - } - internerr("pkgset '%s' should have one installed instance", set->name); - default: - return NULL; - } -} - -/** - * Return the singleton package instance with the given name. - * - * @param name The package name. - * - * @return The package instance. - */ -struct pkginfo * -pkg_db_find_singleton(const char *name) -{ - struct pkgset *set; - struct pkginfo *pkg; - - set = pkg_db_find_set(name); - pkg = pkg_db_get_singleton(set); - if (pkg == NULL) - ohshit(_("ambiguous package name '%s' with more " - "than one installed instance"), set->name); - - return pkg; -} - -/** - * Return the package instance in a set with the given architecture. - * - * It traverse the various instances to find out whether there's one - * matching the given architecture. If found, it returns it. Otherwise it - * allocates a new instance and registers it in the package set before - * returning it. - * - * @param set The package set to use. - * @param arch The requested architecture. - * - * @return The package instance. - */ -struct pkginfo * -pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch) -{ - struct pkginfo *pkg, **pkgp; - - if (arch == NULL) - internerr("arch argument is NULL"); - if (arch->type == DPKG_ARCH_NONE) - internerr("arch argument is none"); - - pkg = &set->pkg; - - /* If there's a single unused slot, let's use that. */ - if (pkg->installed.arch->type == DPKG_ARCH_NONE && pkg->arch_next == NULL) { - /* We can only initialize the arch pkgbin members, because those are used - * to find instances, anything else will be overwritten at parse time. */ - pkg->installed.arch = arch; - pkg->available.arch = arch; - return pkg; - } - - /* Match the slot with the most appropriate architecture. The installed - * architecture always has preference over the available one, as there's - * a small time window on cross-grades, where they might differ. */ - for (pkgp = &pkg; *pkgp; pkgp = &(*pkgp)->arch_next) { - if ((*pkgp)->installed.arch == arch) - return *pkgp; - } - - /* Need to create a new instance for the wanted architecture. */ - pkg = nfmalloc(sizeof(struct pkginfo)); - pkg_blank(pkg); - pkg->set = set; - pkg->arch_next = NULL; - /* We can only initialize the arch pkgbin members, because those are used - * to find instances, anything else will be overwritten at parse time. */ - pkg->installed.arch = arch; - pkg->available.arch = arch; - *pkgp = pkg; - npkg++; - - return pkg; -} - -/** - * Return the package instance with the given name and architecture. - * - * @param name The package name. - * @param arch The requested architecture. - * - * @return The package instance. - */ -struct pkginfo * -pkg_db_find_pkg(const char *name, const struct dpkg_arch *arch) -{ - struct pkgset *set; - struct pkginfo *pkg; - - set = pkg_db_find_set(name); - pkg = pkg_db_get_pkg(set, arch); - - return pkg; -} - -/** - * Return the number of package sets available in the database. - * - * @return The number of package sets. - */ -int -pkg_db_count_set(void) -{ - return nset; -} - -/** - * Return the number of package instances available in the database. - * - * @return The number of package instances. - */ -int -pkg_db_count_pkg(void) -{ - return npkg; -} - -struct pkgiterator { - struct pkginfo *pkg; - int nbinn; -}; - -/** - * Create a new package iterator. - * - * It can iterate either over package sets or over package instances. - * - * @return The iterator. - */ -struct pkgiterator * -pkg_db_iter_new(void) -{ - struct pkgiterator *iter; - - iter = m_malloc(sizeof(struct pkgiterator)); - iter->pkg = NULL; - iter->nbinn = 0; - - return iter; -} - -/** - * Return the next package set in the database. - * - * If no further package set is available, it will return NULL. - * - * @name iter The iterator. - * - * @return A package set. - */ -struct pkgset * -pkg_db_iter_next_set(struct pkgiterator *iter) -{ - struct pkgset *set; - - while (!iter->pkg) { - if (iter->nbinn >= BINS) - return NULL; - if (bins[iter->nbinn]) - iter->pkg = &bins[iter->nbinn]->pkg; - iter->nbinn++; - } - - set = iter->pkg->set; - if (set->next) - iter->pkg = &set->next->pkg; - else - iter->pkg = NULL; - - return set; -} - -/** - * Return the next package instance in the database. - * - * If no further package instance is available, it will return NULL. Note - * that it will return all instances of a given package set in sequential - * order. The first instance for a given package set will always correspond - * to the native architecture even if that package is not installed or - * available. - * - * @name iter The iterator. - * - * @return A package instance. - */ -struct pkginfo * -pkg_db_iter_next_pkg(struct pkgiterator *iter) -{ - struct pkginfo *pkg; - - while (!iter->pkg) { - if (iter->nbinn >= BINS) - return NULL; - if (bins[iter->nbinn]) - iter->pkg = &bins[iter->nbinn]->pkg; - iter->nbinn++; - } - - pkg = iter->pkg; - if (pkg->arch_next) - iter->pkg = pkg->arch_next; - else if (pkg->set->next) - iter->pkg = &pkg->set->next->pkg; - else - iter->pkg = NULL; - - return pkg; -} - -/** - * Free the package database iterator. - * - * @name iter The iterator. - */ -void -pkg_db_iter_free(struct pkgiterator *iter) -{ - free(iter); -} - -void -pkg_db_reset(void) -{ - int i; - - dpkg_arch_reset_list(); - nffreeall(); - nset = 0; - npkg = 0; - for (i=0; inext); - fprintf(file,"bin %5d has %7d\n",i,c); - freq[c]++; - } - for (i = nset; i > 0 && freq[i] == 0; i--); - while (i >= 0) { - fprintf(file, "size %7d occurs %5d times\n", i, freq[i]); - i--; - } - - m_output(file, ""); - - free(freq); -} diff --git a/lib/dpkg/pkg-hash.c b/lib/dpkg/pkg-hash.c new file mode 100644 index 000000000..6413b5058 --- /dev/null +++ b/lib/dpkg/pkg-hash.c @@ -0,0 +1,393 @@ +/* + * libdpkg - Debian packaging suite library routines + * pkg-hash.c - low level package database routines (hash tables, etc.) + * + * Copyright © 1995 Ian Jackson + * Copyright © 2008-2014 Guillem Jover + * Copyright © 2011 Linaro Limited + * Copyright © 2011 Raphaël Hertzog + * + * This 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 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 . + */ + +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +/* This must always be a prime for optimal performance. + * With 4093 buckets, we glean a 20% speedup, for 8191 buckets + * we get 23%. The nominal increase in memory usage is a mere + * sizeof(void *) * 8191 (i.e. less than 32 KiB on 32bit systems). */ +#define BINS 8191 + +static struct pkgset *bins[BINS]; +static int npkg, nset; + +/** + * Return the package set with the given name. + * + * If the package already exists in the internal database, then it returns + * the existing structure. Otherwise it allocates a new one and will return + * it. The actual name associated to the package set is a lowercase version + * of the name given in parameter. + * + * A package set (struct pkgset) can be composed of multiple package instances + * (struct pkginfo) where each instance is distinguished by its architecture + * (as recorded in pkg.installed.arch and pkg.available.arch). + * + * @param inname Name of the package set. + * + * @return The package set. + */ +struct pkgset * +pkg_db_find_set(const char *inname) +{ + struct pkgset **setp, *new_set; + char *name = m_strdup(inname), *p; + + p= name; + while (*p) { + *p = c_tolower(*p); + p++; + } + + setp = bins + (str_fnv_hash(name) % (BINS)); + while (*setp && strcasecmp((*setp)->name, name)) + setp = &(*setp)->next; + if (*setp) { + free(name); + return *setp; + } + + new_set = nfmalloc(sizeof(struct pkgset)); + pkgset_blank(new_set); + new_set->name = nfstrsave(name); + new_set->next = NULL; + *setp = new_set; + nset++; + npkg++; + + free(name); + + return new_set; +} + +/** + * Return the singleton package instance from a package set. + * + * This means, if none are installed either an instance with native or + * all arch or the first if none found, the single installed instance, + * or NULL if more than one instance is installed. + * + * @param set The package set to use. + * + * @return The singleton package instance. + */ +struct pkginfo * +pkg_db_get_singleton(struct pkgset *set) +{ + struct pkginfo *pkg; + + switch (pkgset_installed_instances(set)) { + case 0: + /* Pick an available candidate. */ + for (pkg = &set->pkg; pkg; pkg = pkg->arch_next) { + const struct dpkg_arch *arch = pkg->available.arch; + + if (arch->type == DPKG_ARCH_NATIVE || arch->type == DPKG_ARCH_ALL) + return pkg; + } + /* Or failing that, the first entry. */ + return &set->pkg; + case 1: + for (pkg = &set->pkg; pkg; pkg = pkg->arch_next) { + if (pkg->status > PKG_STAT_NOTINSTALLED) + return pkg; + } + internerr("pkgset '%s' should have one installed instance", set->name); + default: + return NULL; + } +} + +/** + * Return the singleton package instance with the given name. + * + * @param name The package name. + * + * @return The package instance. + */ +struct pkginfo * +pkg_db_find_singleton(const char *name) +{ + struct pkgset *set; + struct pkginfo *pkg; + + set = pkg_db_find_set(name); + pkg = pkg_db_get_singleton(set); + if (pkg == NULL) + ohshit(_("ambiguous package name '%s' with more " + "than one installed instance"), set->name); + + return pkg; +} + +/** + * Return the package instance in a set with the given architecture. + * + * It traverse the various instances to find out whether there's one + * matching the given architecture. If found, it returns it. Otherwise it + * allocates a new instance and registers it in the package set before + * returning it. + * + * @param set The package set to use. + * @param arch The requested architecture. + * + * @return The package instance. + */ +struct pkginfo * +pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch) +{ + struct pkginfo *pkg, **pkgp; + + if (arch == NULL) + internerr("arch argument is NULL"); + if (arch->type == DPKG_ARCH_NONE) + internerr("arch argument is none"); + + pkg = &set->pkg; + + /* If there's a single unused slot, let's use that. */ + if (pkg->installed.arch->type == DPKG_ARCH_NONE && pkg->arch_next == NULL) { + /* We can only initialize the arch pkgbin members, because those are used + * to find instances, anything else will be overwritten at parse time. */ + pkg->installed.arch = arch; + pkg->available.arch = arch; + return pkg; + } + + /* Match the slot with the most appropriate architecture. The installed + * architecture always has preference over the available one, as there's + * a small time window on cross-grades, where they might differ. */ + for (pkgp = &pkg; *pkgp; pkgp = &(*pkgp)->arch_next) { + if ((*pkgp)->installed.arch == arch) + return *pkgp; + } + + /* Need to create a new instance for the wanted architecture. */ + pkg = nfmalloc(sizeof(struct pkginfo)); + pkg_blank(pkg); + pkg->set = set; + pkg->arch_next = NULL; + /* We can only initialize the arch pkgbin members, because those are used + * to find instances, anything else will be overwritten at parse time. */ + pkg->installed.arch = arch; + pkg->available.arch = arch; + *pkgp = pkg; + npkg++; + + return pkg; +} + +/** + * Return the package instance with the given name and architecture. + * + * @param name The package name. + * @param arch The requested architecture. + * + * @return The package instance. + */ +struct pkginfo * +pkg_db_find_pkg(const char *name, const struct dpkg_arch *arch) +{ + struct pkgset *set; + struct pkginfo *pkg; + + set = pkg_db_find_set(name); + pkg = pkg_db_get_pkg(set, arch); + + return pkg; +} + +/** + * Return the number of package sets available in the database. + * + * @return The number of package sets. + */ +int +pkg_db_count_set(void) +{ + return nset; +} + +/** + * Return the number of package instances available in the database. + * + * @return The number of package instances. + */ +int +pkg_db_count_pkg(void) +{ + return npkg; +} + +struct pkgiterator { + struct pkginfo *pkg; + int nbinn; +}; + +/** + * Create a new package iterator. + * + * It can iterate either over package sets or over package instances. + * + * @return The iterator. + */ +struct pkgiterator * +pkg_db_iter_new(void) +{ + struct pkgiterator *iter; + + iter = m_malloc(sizeof(struct pkgiterator)); + iter->pkg = NULL; + iter->nbinn = 0; + + return iter; +} + +/** + * Return the next package set in the database. + * + * If no further package set is available, it will return NULL. + * + * @name iter The iterator. + * + * @return A package set. + */ +struct pkgset * +pkg_db_iter_next_set(struct pkgiterator *iter) +{ + struct pkgset *set; + + while (!iter->pkg) { + if (iter->nbinn >= BINS) + return NULL; + if (bins[iter->nbinn]) + iter->pkg = &bins[iter->nbinn]->pkg; + iter->nbinn++; + } + + set = iter->pkg->set; + if (set->next) + iter->pkg = &set->next->pkg; + else + iter->pkg = NULL; + + return set; +} + +/** + * Return the next package instance in the database. + * + * If no further package instance is available, it will return NULL. Note + * that it will return all instances of a given package set in sequential + * order. The first instance for a given package set will always correspond + * to the native architecture even if that package is not installed or + * available. + * + * @name iter The iterator. + * + * @return A package instance. + */ +struct pkginfo * +pkg_db_iter_next_pkg(struct pkgiterator *iter) +{ + struct pkginfo *pkg; + + while (!iter->pkg) { + if (iter->nbinn >= BINS) + return NULL; + if (bins[iter->nbinn]) + iter->pkg = &bins[iter->nbinn]->pkg; + iter->nbinn++; + } + + pkg = iter->pkg; + if (pkg->arch_next) + iter->pkg = pkg->arch_next; + else if (pkg->set->next) + iter->pkg = &pkg->set->next->pkg; + else + iter->pkg = NULL; + + return pkg; +} + +/** + * Free the package database iterator. + * + * @name iter The iterator. + */ +void +pkg_db_iter_free(struct pkgiterator *iter) +{ + free(iter); +} + +void +pkg_db_reset(void) +{ + int i; + + dpkg_arch_reset_list(); + nffreeall(); + nset = 0; + npkg = 0; + for (i=0; inext); + fprintf(file,"bin %5d has %7d\n",i,c); + freq[c]++; + } + for (i = nset; i > 0 && freq[i] == 0; i--); + while (i >= 0) { + fprintf(file, "size %7d occurs %5d times\n", i, freq[i]); + i--; + } + + m_output(file, ""); + + free(freq); +} diff --git a/po/POTFILES.in b/po/POTFILES.in index 8aeef181e..78bb36950 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -43,8 +43,8 @@ lib/dpkg/parsehelp.c lib/dpkg/path-remove.c lib/dpkg/path.c lib/dpkg/pkg-array.c -lib/dpkg/pkg-db.c lib/dpkg/pkg-format.c +lib/dpkg/pkg-hash.c lib/dpkg/pkg-list.c lib/dpkg/pkg-namevalue.c lib/dpkg/pkg-queue.c -- cgit v1.2.3 From 72c2b44655be986fa0422725a005f69d41a77841 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 14 Aug 2018 06:08:56 +0200 Subject: libdpkg: Use a pointer to pointer to track previous entry in pkg_files_blank() We reduce the nesting level, and avoid a conditional inside the loop. --- debian/changelog | 2 ++ lib/dpkg/db-fsys-files.c | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 9b36cf7f8..9ed4a732c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -184,6 +184,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - dpkg: Move ensure_package_clientdata() into its own file. - libdpkg: Move db-fsys code from src to lib/dpkg. - libdpkg: Rename pkg-db module to pkg-hash. + - libdpkg: Simplify pkg_files_blank() by using a pointer to pointer to + track the previous entry. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/db-fsys-files.c b/lib/dpkg/db-fsys-files.c index 6290ed283..085cb143d 100644 --- a/lib/dpkg/db-fsys-files.c +++ b/lib/dpkg/db-fsys-files.c @@ -81,7 +81,7 @@ pkg_files_blank(struct pkginfo *pkg) for (current = pkg->files; current; current= current->next) { - struct pkg_list *pkg_node, *pkg_prev = NULL; + struct pkg_list *pkg_node, **pkg_prev = ¤t->namenode->packages; /* For each file that used to be in the package, * go through looking for this package's entry in the list @@ -90,16 +90,14 @@ pkg_files_blank(struct pkginfo *pkg) pkg_node; pkg_node = pkg_node->next) { if (pkg_node->pkg == pkg) { - if (pkg_prev) - pkg_prev->next = pkg_node->next; - else - current->namenode->packages = pkg_node->next; + *pkg_prev = pkg_node->next; /* The actual filelist links were allocated using nfmalloc, so * we shouldn't free them. */ break; } - pkg_prev = pkg_node; + + pkg_prev = &pkg_node->next; } } pkg->files = NULL; -- cgit v1.2.3 From 5a678bf493de3630cb2dd58e8d124a86c74568ab Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 14 Aug 2018 06:08:56 +0200 Subject: libdpkg: Factor out package files handling into its own module We need these functions from the list and mtree implementations. Move them out so that they can be shared. In addition this is pure in-core handling so it makes sense to split out from the db-fsys modules. --- debian/changelog | 1 + lib/dpkg/Makefile.am | 2 + lib/dpkg/db-fsys-files.c | 67 +--------------------------------- lib/dpkg/pkg-files.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/dpkg/pkg-files.h | 46 +++++++++++++++++++++++ po/POTFILES.in | 1 + 6 files changed, 146 insertions(+), 66 deletions(-) create mode 100644 lib/dpkg/pkg-files.c create mode 100644 lib/dpkg/pkg-files.h (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 9ed4a732c..4fa07bb48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -186,6 +186,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Rename pkg-db module to pkg-hash. - libdpkg: Simplify pkg_files_blank() by using a pointer to pointer to track the previous entry. + - libdpkg: Factor out package files handling into its own module. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index fae6e8ca7..7ecf6639f 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -86,6 +86,7 @@ libdpkg_la_SOURCES = \ path-remove.c \ pkg.c \ pkg-array.c \ + pkg-files.c \ pkg-format.c \ pkg-hash.c \ pkg-list.c \ @@ -141,6 +142,7 @@ pkginclude_HEADERS = \ path.h \ pkg.h \ pkg-array.h \ + pkg-files.h \ pkg-format.h \ pkg-list.h \ pkg-queue.h \ diff --git a/lib/dpkg/db-fsys-files.c b/lib/dpkg/db-fsys-files.c index 085cb143d..bfc2ccbe6 100644 --- a/lib/dpkg/db-fsys-files.c +++ b/lib/dpkg/db-fsys-files.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include @@ -70,71 +70,6 @@ enum pkg_filesdb_load_status { static enum pkg_filesdb_load_status saidread = PKG_FILESDB_LOAD_NONE; -/** - * Erase the files saved in pkg. - */ -static void -pkg_files_blank(struct pkginfo *pkg) -{ - struct fileinlist *current; - - for (current = pkg->files; - current; - current= current->next) { - struct pkg_list *pkg_node, **pkg_prev = ¤t->namenode->packages; - - /* For each file that used to be in the package, - * go through looking for this package's entry in the list - * of packages containing this file, and blank it out. */ - for (pkg_node = current->namenode->packages; - pkg_node; - pkg_node = pkg_node->next) { - if (pkg_node->pkg == pkg) { - *pkg_prev = pkg_node->next; - - /* The actual filelist links were allocated using nfmalloc, so - * we shouldn't free them. */ - break; - } - - pkg_prev = &pkg_node->next; - } - } - pkg->files = NULL; -} - -static struct fileinlist ** -pkg_files_add_file(struct pkginfo *pkg, struct filenamenode *namenode, - struct fileinlist **file_tail) -{ - struct fileinlist *newent; - struct pkg_list *pkg_node; - - if (file_tail == NULL) - file_tail = &pkg->files; - - /* Make sure we're at the end. */ - while ((*file_tail) != NULL) { - file_tail = &((*file_tail)->next); - } - - /* Create a new node. */ - newent = nfmalloc(sizeof(struct fileinlist)); - newent->namenode = namenode; - newent->next = NULL; - *file_tail = newent; - file_tail = &newent->next; - - /* Add pkg to newent's package list. */ - pkg_node = nfmalloc(sizeof(*pkg_node)); - pkg_node->pkg = pkg; - pkg_node->next = newent->namenode->packages; - newent->namenode->packages = pkg_node; - - /* Return the position for the next guy. */ - return file_tail; -} - /** * Load the list of files in this package into memory, or update the * list if it is there but stale. diff --git a/lib/dpkg/pkg-files.c b/lib/dpkg/pkg-files.c new file mode 100644 index 000000000..e60134a32 --- /dev/null +++ b/lib/dpkg/pkg-files.c @@ -0,0 +1,95 @@ +/* + * libdpkg - Debian packaging suite library routines + * pkg-files.c - handle list of filesystem files per package + * + * Copyright © 1995 Ian Jackson + * Copyright © 2000,2001 Wichert Akkerman + * Copyright © 2008-2014 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include +#include +#include +#include + +/** + * Erase the files saved in pkg. + */ +void +pkg_files_blank(struct pkginfo *pkg) +{ + struct fileinlist *current; + + for (current = pkg->files; + current; + current = current->next) { + struct pkg_list **pkg_prev = ¤t->namenode->packages; + struct pkg_list *pkg_node; + + /* For each file that used to be in the package, go through + * looking for this package's entry in the list of packages + * containing this file, and blank it out. */ + for (pkg_node = current->namenode->packages; + pkg_node; + pkg_node = pkg_node->next) { + if (pkg_node->pkg == pkg) { + *pkg_prev = pkg_node->next; + + /* The actual filelist links were allocated + * w/ nfmalloc, so we should not free them. */ + break; + } + + pkg_prev = &pkg_node->next; + } + } + pkg->files = NULL; +} + +struct fileinlist ** +pkg_files_add_file(struct pkginfo *pkg, struct filenamenode *namenode, + struct fileinlist **file_tail) +{ + struct fileinlist *newent; + struct pkg_list *pkg_node; + + if (file_tail == NULL) + file_tail = &pkg->files; + + /* Make sure we're at the end. */ + while ((*file_tail) != NULL) + file_tail = &((*file_tail)->next); + + /* Create a new node. */ + newent = nfmalloc(sizeof(struct fileinlist)); + newent->namenode = namenode; + newent->next = NULL; + *file_tail = newent; + file_tail = &newent->next; + + /* Add pkg to newent's package list. */ + pkg_node = nfmalloc(sizeof(*pkg_node)); + pkg_node->pkg = pkg; + pkg_node->next = newent->namenode->packages; + newent->namenode->packages = pkg_node; + + /* Return the position for the next guy. */ + return file_tail; +} diff --git a/lib/dpkg/pkg-files.h b/lib/dpkg/pkg-files.h new file mode 100644 index 000000000..73770b7dc --- /dev/null +++ b/lib/dpkg/pkg-files.h @@ -0,0 +1,46 @@ +/* + * libdpkg - Debian packaging suite library routines + * pkg-files.h - primitives for pkg files handling + * + * Copyright © 2018 Guillem Jover + * + * This 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 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 . + */ + +#ifndef LIBDPKG_PKG_FILES_H +#define LIBDPKG_PKG_FILES_H + +#include +#include + +DPKG_BEGIN_DECLS + +/** + * @defgroup pkg-files Package files handling + * @ingroup dpkg-public + * @{ + */ + +void +pkg_files_blank(struct pkginfo *pkg); + +struct fileinlist ** +pkg_files_add_file(struct pkginfo *pkg, struct filenamenode *namenode, + struct fileinlist **file_tail); + +/** @} */ + +DPKG_END_DECLS + +#endif /* LIBDPKG_PKG_FILES_H */ diff --git a/po/POTFILES.in b/po/POTFILES.in index 78bb36950..ce3e29c56 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -43,6 +43,7 @@ lib/dpkg/parsehelp.c lib/dpkg/path-remove.c lib/dpkg/path.c lib/dpkg/pkg-array.c +lib/dpkg/pkg-files.c lib/dpkg/pkg-format.c lib/dpkg/pkg-hash.c lib/dpkg/pkg-list.c -- cgit v1.2.3 From 93424411d3b840f1a88a42b97b226e34b193e81b Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 2 Jun 2018 16:05:32 +0200 Subject: libdpkg: Switch to a new tiny struct to track file ondisk identity We only need the device and inode numbers for a given file to be able to compare them for identity. Avoid storing the entire struct stat which is rather fat. --- debian/changelog | 2 ++ lib/dpkg/fsys-hash.c | 4 ++-- lib/dpkg/fsys.h | 10 +++++++++- src/unpack.c | 20 ++++++++++++-------- 4 files changed, 25 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 4fa07bb48..a3ab57e77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -187,6 +187,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Simplify pkg_files_blank() by using a pointer to pointer to track the previous entry. - libdpkg: Factor out package files handling into its own module. + - libdpkg: Switch to a new tiny struct to track file on-disk identity. + This should reduce the run-time memory used. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/fsys-hash.c b/lib/dpkg/fsys-hash.c index 54d0d57b7..15d9669b4 100644 --- a/lib/dpkg/fsys-hash.c +++ b/lib/dpkg/fsys-hash.c @@ -51,7 +51,7 @@ filesdbinit(void) fnn->flags = 0; fnn->oldhash = NULL; fnn->newhash = EMPTYHASHFLAG; - fnn->filestat = NULL; + fnn->file_ondisk_id = NULL; } } } @@ -117,7 +117,7 @@ findnamenode(const char *name, enum fnnflags flags) newnode->statoverride = NULL; newnode->oldhash = NULL; newnode->newhash = EMPTYHASHFLAG; - newnode->filestat = NULL; + newnode->file_ondisk_id = NULL; newnode->trig_interested = NULL; *pointerp = newnode; nfiles++; diff --git a/lib/dpkg/fsys.h b/lib/dpkg/fsys.h index 7d63b04e6..8a2efbffa 100644 --- a/lib/dpkg/fsys.h +++ b/lib/dpkg/fsys.h @@ -77,6 +77,14 @@ enum filenamenode_flags { fnnf_filtered = DPKG_BIT(9), }; +/** + * Stores information to uniquely identify an on-disk file. + */ +struct file_ondisk_id { + dev_t id_dev; + ino_t id_ino; +}; + struct filenamenode { struct filenamenode *next; const char *name; @@ -105,7 +113,7 @@ struct filenamenode { /** Valid iff the file was unpacked and hashed on this run. */ const char *newhash; - struct stat *filestat; + struct file_ondisk_id *file_ondisk_id; }; /** diff --git a/src/unpack.c b/src/unpack.c index 827211d63..cae756222 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -608,7 +608,7 @@ pkg_remove_old_files(struct pkginfo *pkg, } else { struct fileinlist *sameas = NULL; struct fileinlist *cfile; - static struct stat empty_stat; + static struct file_ondisk_id empty_ondisk_id; struct varbuf cfilename = VARBUF_INIT; /* @@ -637,7 +637,7 @@ pkg_remove_old_files(struct pkginfo *pkg, if (cfile->namenode->flags & fnnf_filtered) continue; - if (!cfile->namenode->filestat) { + if (cfile->namenode->file_ondisk_id == NULL) { struct stat tmp_stat; varbuf_reset(&cfilename); @@ -646,22 +646,26 @@ pkg_remove_old_files(struct pkginfo *pkg, varbuf_end_str(&cfilename); if (lstat(cfilename.buf, &tmp_stat) == 0) { - cfile->namenode->filestat = nfmalloc(sizeof(struct stat)); - memcpy(cfile->namenode->filestat, &tmp_stat, sizeof(struct stat)); + struct file_ondisk_id *file_ondisk_id; + + file_ondisk_id = nfmalloc(sizeof(*file_ondisk_id)); + file_ondisk_id->id_dev = tmp_stat.st_dev; + file_ondisk_id->id_ino = tmp_stat.st_ino; + cfile->namenode->file_ondisk_id = file_ondisk_id; } else { if (!(errno == ENOENT || errno == ELOOP || errno == ENOTDIR)) ohshite(_("unable to stat other new file '%.250s'"), cfile->namenode->name); - cfile->namenode->filestat = &empty_stat; + cfile->namenode->file_ondisk_id = &empty_ondisk_id; continue; } } - if (cfile->namenode->filestat == &empty_stat) + if (cfile->namenode->file_ondisk_id == &empty_ondisk_id) continue; - if (oldfs.st_dev == cfile->namenode->filestat->st_dev && - oldfs.st_ino == cfile->namenode->filestat->st_ino) { + if (oldfs.st_dev == cfile->namenode->file_ondisk_id->id_dev && + oldfs.st_ino == cfile->namenode->file_ondisk_id->id_ino) { if (sameas) warning(_("old file '%.250s' is the same as several new files! " "(both '%.250s' and '%.250s')"), fnamevb.buf, -- cgit v1.2.3 From ae6a3ddd2a774ee1cedc5ee0c87ab8c66ae5f786 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 24 Aug 2018 20:51:09 +0200 Subject: libdpkg: Reset nfiles in files_db_reset() --- debian/changelog | 1 + lib/dpkg/fsys-hash.c | 2 ++ 2 files changed, 3 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index a3ab57e77..227839fc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -189,6 +189,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Factor out package files handling into its own module. - libdpkg: Switch to a new tiny struct to track file on-disk identity. This should reduce the run-time memory used. + - libdpkg: Reset nfiles in files_db_reset(). * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/fsys-hash.c b/lib/dpkg/fsys-hash.c index 15d9669b4..002528c6c 100644 --- a/lib/dpkg/fsys-hash.c +++ b/lib/dpkg/fsys-hash.c @@ -63,6 +63,8 @@ files_db_reset(void) for (i = 0; i < BINS; i++) bins[i] = NULL; + + nfiles = 0; } int -- cgit v1.2.3 From c7c948d8b9ed774163d35c573f25029d69e45348 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 13 Jan 2018 02:37:02 +0100 Subject: libdpkg: Split push_cleanup() into push_cleanup_fallback() We separate the function in one that takes one callback, and another that takes two. This simplifies most of the call sites which only need one callback. --- debian/changelog | 1 + dpkg-deb/info.c | 2 +- dselect/baselist.cc | 2 +- dselect/method.cc | 2 +- lib/dpkg/atomic-file.c | 2 +- lib/dpkg/db-ctrl-access.c | 2 +- lib/dpkg/db-ctrl-upgrade.c | 4 ++-- lib/dpkg/db-fsys-files.c | 2 +- lib/dpkg/ehandle.c | 32 +++++++++++++++++++++++++++++--- lib/dpkg/ehandle.h | 6 ++++-- lib/dpkg/file.c | 2 +- lib/dpkg/libdpkg.map | 1 + lib/dpkg/parse.c | 2 +- lib/dpkg/subproc.c | 2 +- lib/dpkg/t/t-ehandle.c | 2 +- lib/dpkg/triglib.c | 4 ++-- src/archives.c | 4 ++-- src/configure.c | 2 +- src/divertcmd.c | 2 +- src/remove.c | 4 ++-- src/script.c | 2 +- src/unpack.c | 32 ++++++++++++++++---------------- 22 files changed, 72 insertions(+), 42 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 227839fc8..38078b2d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -190,6 +190,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Switch to a new tiny struct to track file on-disk identity. This should reduce the run-time memory used. - libdpkg: Reset nfiles in files_db_reset(). + - libdpkg: Split push_cleanup() into push_cleanup_fallback(). * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c index 8169507c5..794eeb051 100644 --- a/dpkg-deb/info.c +++ b/dpkg-deb/info.c @@ -71,7 +71,7 @@ static void info_prepare(const char *const **argvp, ohshite(_("unable to create temporary directory")); *dirp = dbuf; - push_cleanup(cu_info_prepare, -1, NULL, 0, 1, (void *)dbuf); + push_cleanup(cu_info_prepare, -1, 1, (void *)dbuf); extracthalf(*debarp, dbuf, DPKG_TAR_EXTRACT | DPKG_TAR_NOMTIME, admininfo); } diff --git a/dselect/baselist.cc b/dselect/baselist.cc index 80fee6935..05465fc92 100644 --- a/dselect/baselist.cc +++ b/dselect/baselist.cc @@ -101,7 +101,7 @@ baselist::setupsigwinch() if (sigaction(SIGWINCH, nullptr, osigactp)) ohshite(_("failed to get old SIGWINCH sigact")); - push_cleanup(cu_sigwinch, ~0, nullptr, 0, 2, osigactp, oblockedp); + push_cleanup(cu_sigwinch, ~0, 2, osigactp, oblockedp); sigwinch_mask(SIG_BLOCK); diff --git a/dselect/method.cc b/dselect/method.cc index 76863bc34..0f17431b5 100644 --- a/dselect/method.cc +++ b/dselect/method.cc @@ -125,7 +125,7 @@ static enum urqresult lockmethod(void) { sthfailed(_("cannot lock access method area")); return urqr_fail; } - push_cleanup(cu_unlockmethod, ~0, nullptr, 0, 0); + push_cleanup(cu_unlockmethod, ~0, 0); return urqr_normal; } diff --git a/lib/dpkg/atomic-file.c b/lib/dpkg/atomic-file.c index b49a47b9b..20b1fb37e 100644 --- a/lib/dpkg/atomic-file.c +++ b/lib/dpkg/atomic-file.c @@ -58,7 +58,7 @@ atomic_file_open(struct atomic_file *file) file->name_new); fchmod(fileno(file->fp), 0644); - push_cleanup(cu_closestream, ~ehflag_normaltidy, NULL, 0, 1, file->fp); + push_cleanup(cu_closestream, ~ehflag_normaltidy, 1, file->fp); } void diff --git a/lib/dpkg/db-ctrl-access.c b/lib/dpkg/db-ctrl-access.c index bd98d1409..d31f5466f 100644 --- a/lib/dpkg/db-ctrl-access.c +++ b/lib/dpkg/db-ctrl-access.c @@ -81,7 +81,7 @@ pkg_infodb_foreach(struct pkginfo *pkg, struct pkgbin *pkgbin, if (!db_dir) ohshite(_("cannot read info directory")); - push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)db_dir); + push_cleanup(cu_closedir, ~0, 1, (void *)db_dir); while ((db_de = readdir(db_dir)) != NULL) { const char *filename, *filetype, *dot; diff --git a/lib/dpkg/db-ctrl-upgrade.c b/lib/dpkg/db-ctrl-upgrade.c index fc88bd4d0..1770ecaeb 100644 --- a/lib/dpkg/db-ctrl-upgrade.c +++ b/lib/dpkg/db-ctrl-upgrade.c @@ -91,7 +91,7 @@ pkg_infodb_link_multiarch_files(void) if (!db_dir) ohshite(_("cannot read info directory")); - push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)db_dir); + push_cleanup(cu_closedir, ~0, 1, (void *)db_dir); while ((db_de = readdir(db_dir)) != NULL) { const char *filetype, *dot; struct pkginfo *pkg; @@ -213,7 +213,7 @@ pkg_infodb_upgrade_to_multiarch(void) db_file = atomic_file_new(db_format_file, 0); atomic_file_open(db_file); - push_cleanup(cu_abort_db_upgrade, ehflag_bombout, NULL, 0, 1, db_file); + push_cleanup(cu_abort_db_upgrade, ehflag_bombout, 1, db_file); pkg_infodb_link_multiarch_files(); pkg_infodb_write_format(db_file, 1); diff --git a/lib/dpkg/db-fsys-files.c b/lib/dpkg/db-fsys-files.c index bfc2ccbe6..ff2ee7063 100644 --- a/lib/dpkg/db-fsys-files.c +++ b/lib/dpkg/db-fsys-files.c @@ -117,7 +117,7 @@ ensure_packagefiles_available(struct pkginfo *pkg) return; } - push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd); + push_cleanup(cu_closefd, ehflag_bombout, 1, &fd); if (fstat(fd, &stat_buf)) ohshite(_("unable to stat files list file for package '%.250s'"), diff --git a/lib/dpkg/ehandle.c b/lib/dpkg/ehandle.c index f21fb07e9..ae3b46aad 100644 --- a/lib/dpkg/ehandle.c +++ b/lib/dpkg/ehandle.c @@ -324,9 +324,11 @@ void push_checkpoint(int mask, int value) { econtext->cleanups= cep; } -void push_cleanup(void (*call1)(int argc, void **argv), int mask1, +static void +cleanup_entry_new(void (*call1)(int argc, void **argv), int mask1, void (*call2)(int argc, void **argv), int mask2, - unsigned int nargs, ...) { + unsigned int nargs, va_list vargs) +{ struct cleanup_entry *cep; void **argv; int e = 0; @@ -343,7 +345,8 @@ void push_cleanup(void (*call1)(int argc, void **argv), int mask1, cep->calls[0].call= call1; cep->calls[0].mask= mask1; cep->calls[1].call= call2; cep->calls[1].mask= mask2; cep->cpmask=~0; cep->cpvalue=0; cep->argc= nargs; - va_start(args, nargs); + + va_copy(args, vargs); argv = cep->argv; while (nargs-- > 0) *argv++ = va_arg(args, void *); @@ -359,6 +362,29 @@ void push_cleanup(void (*call1)(int argc, void **argv), int mask1, onerr_abort--; } +void +push_cleanup(void (*call)(int argc, void **argv), int mask, + unsigned int nargs, ...) +{ + va_list args; + + va_start(args, nargs); + cleanup_entry_new(call, mask, NULL, 0, nargs, args); + va_end(args); +} + +void +push_cleanup_fallback(void (*call1)(int argc, void **argv), int mask1, + void (*call2)(int argc, void **argv), int mask2, + unsigned int nargs, ...) +{ + va_list args; + + va_start(args, nargs); + cleanup_entry_new(call1, mask1, call2, mask2, nargs, args); + va_end(args); +} + void pop_cleanup(int flagset) { struct cleanup_entry *cep; int i; diff --git a/lib/dpkg/ehandle.h b/lib/dpkg/ehandle.h index 370614812..36059048a 100644 --- a/lib/dpkg/ehandle.h +++ b/lib/dpkg/ehandle.h @@ -59,8 +59,10 @@ void push_error_context_func(error_handler_func *handler, void push_error_context(void); void pop_error_context(int flagset); -void push_cleanup(void (*f1)(int argc, void **argv), int flagmask1, - void (*f2)(int argc, void **argv), int flagmask2, +void push_cleanup_fallback(void (*f1)(int argc, void **argv), int flagmask1, + void (*f2)(int argc, void **argv), int flagmask2, + unsigned int nargs, ...); +void push_cleanup(void (*call)(int argc, void **argv), int flagmask, unsigned int nargs, ...); void push_checkpoint(int mask, int value); void pop_cleanup(int flagset); diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index cd261222c..364f8aed6 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -150,7 +150,7 @@ file_lock(int *lockfd, enum file_lock_flags flags, const char *filename, ohshite(_("unable to lock %s"), desc); } - push_cleanup(file_unlock_cleanup, ~0, NULL, 0, 2, lockfd, desc); + push_cleanup(file_unlock_cleanup, ~0, 2, lockfd, desc); } void diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index cf176d6c9..cd0bd255d 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -46,6 +46,7 @@ LIBDPKG_PRIVATE { catch_fatal_error; push_checkpoint; push_cleanup; + push_cleanup_fallback; pop_cleanup; onerr_abort; # XXX variable, do not export ohshitv; diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index d9daa112c..158e4d11e 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -557,7 +557,7 @@ parsedb_open(const char *filename, enum parsedbflags flags) ps = parsedb_new(filename, fd, flags | pdb_close_fd); - push_cleanup(cu_closefd, ~ehflag_normaltidy, NULL, 0, 1, &ps->fd); + push_cleanup(cu_closefd, ~ehflag_normaltidy, 1, &ps->fd); return ps; } diff --git a/lib/dpkg/subproc.c b/lib/dpkg/subproc.c index b2f36ec2e..7b3fb9906 100644 --- a/lib/dpkg/subproc.c +++ b/lib/dpkg/subproc.c @@ -73,7 +73,7 @@ subproc_signals_ignore(const char *name) for (i = 0; i < array_count(signo_ignores); i++) subproc_set_signal(signo_ignores[i], &sa, &sa_save[i], name); - push_cleanup(subproc_signals_cleanup, ~0, NULL, 0, 0); + push_cleanup(subproc_signals_cleanup, ~0, 0); onerr_abort--; } diff --git a/lib/dpkg/t/t-ehandle.c b/lib/dpkg/t/t-ehandle.c index 5904bfae1..7a20887af 100644 --- a/lib/dpkg/t/t-ehandle.c +++ b/lib/dpkg/t/t-ehandle.c @@ -100,7 +100,7 @@ test_cleanup_error(void) pass = false; push_error_context_jump(&handler_jump, printer_empty, "test cleanup"); - push_cleanup(cleanup_error, ~ehflag_normaltidy, NULL, 0, 0); + push_cleanup(cleanup_error, ~ehflag_normaltidy, 0); pop_error_context(ehflag_bombout); /* We should have recovered from the cleanup handler failing, diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c index 395601359..f7488ee61 100644 --- a/lib/dpkg/triglib.c +++ b/lib/dpkg/triglib.c @@ -507,7 +507,7 @@ trig_file_interests_ensure(void) triggersfilefile); } - push_cleanup(cu_closestream, ~0, NULL, 0, 1, f); + push_cleanup(cu_closestream, ~0, 1, f); while (fgets_checked(linebuf, sizeof(linebuf), f, triggersfilefile) >= 0) { struct dpkg_error err; char *slash; @@ -694,7 +694,7 @@ trig_parse_ci(const char *file, trig_parse_cicb *interest, return; /* No file is just like an empty one. */ ohshite(_("unable to open triggers ci file '%.250s'"), file); } - push_cleanup(cu_closestream, ~0, NULL, 0, 1, f); + push_cleanup(cu_closestream, ~0, 1, f); while ((l = fgets_checked(linebuf, sizeof(linebuf), f, file)) >= 0) { for (cmd = linebuf; c_iswhite(*cmd); cmd++) ; diff --git a/src/archives.c b/src/archives.c index 4c5fb8897..e802baaee 100644 --- a/src/archives.c +++ b/src/archives.c @@ -362,7 +362,7 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te, if (fd < 0) ohshite(_("unable to create '%.255s' (while processing '%.255s')"), path, te->name); - push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd); + push_cleanup(cu_closefd, ehflag_bombout, 1, &fd); debug(dbg_eachfiledetail, "tarobject file open size=%jd", (intmax_t)te->size); @@ -965,7 +965,7 @@ tarobject(void *ctx, struct tar_entry *ti) /* Now we start to do things that we need to be able to undo * if something goes wrong. Watch out for the CLEANUP comments to * keep an eye on what's installed on the disk at each point. */ - push_cleanup(cu_installnew, ~ehflag_normaltidy, NULL, 0, 1, nifd->namenode); + push_cleanup(cu_installnew, ~ehflag_normaltidy, 1, nifd->namenode); /* * CLEANUP: Now we either have the old file on the disk, or not, in diff --git a/src/configure.c b/src/configure.c index 2d9173eba..076abbd9d 100644 --- a/src/configure.c +++ b/src/configure.c @@ -831,7 +831,7 @@ md5hash(struct pkginfo *pkg, char *hashbuf, const char *fn) fd = open(fn, O_RDONLY); if (fd >= 0) { - push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd); + push_cleanup(cu_closefd, ehflag_bombout, 1, &fd); if (fd_md5(fd, hashbuf, -1, &err) < 0) ohshit(_("cannot compute MD5 hash for file '%s': %s"), fn, err.str); diff --git a/src/divertcmd.c b/src/divertcmd.c index d50409d02..69d187c45 100644 --- a/src/divertcmd.c +++ b/src/divertcmd.c @@ -232,7 +232,7 @@ file_copy(const char *src, const char *dst) if (dstfd < 0) ohshite(_("unable to create file '%s'"), tmp); - push_cleanup(cu_filename, ~ehflag_normaltidy, NULL, 0, 1, tmp); + push_cleanup(cu_filename, ~ehflag_normaltidy, 1, tmp); if (fd_fd_copy(srcfd, dstfd, -1, &err) < 0) ohshit(_("cannot copy '%s' to '%s': %s"), src, tmp, err.str); diff --git a/src/remove.c b/src/remove.c index 18d470aea..fb27341f6 100644 --- a/src/remove.c +++ b/src/remove.c @@ -189,7 +189,7 @@ void deferred_remove(struct pkginfo *pkg) { oldpkgstatus= pkg->status; pkg_set_status(pkg, PKG_STAT_HALFCONFIGURED); modstatdb_note(pkg); - push_cleanup(cu_prermremove, ~ehflag_normaltidy, NULL, 0, 2, + push_cleanup(cu_prermremove, ~ehflag_normaltidy, 2, (void *)pkg, (void *)&oldpkgstatus); maintscript_installed(pkg, PRERMFILE, "pre-removal", "remove", NULL); @@ -564,7 +564,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) { fnvb.buf, conff->name); } debug(dbg_conffdetail, "removal_bulk conffile cleaning dsd %s", fnvb.buf); - push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)dsd); + push_cleanup(cu_closedir, ~0, 1, (void *)dsd); *p= '/'; conffbasenamelen= strlen(++p); conffbasename= fnvb.buf+conffnameused-conffbasenamelen; diff --git a/src/script.c b/src/script.c index fc6f6117e..9c8585b64 100644 --- a/src/script.c +++ b/src/script.c @@ -171,7 +171,7 @@ maintscript_exec(struct pkginfo *pkg, struct pkgbin *pkgbin, setexecute(cmd->filename, stab); - push_cleanup(cu_post_script_tasks, ehflag_bombout, NULL, 0, 0); + push_cleanup(cu_post_script_tasks, ehflag_bombout, 0); pid = subproc_fork(); if (pid == 0) { diff --git a/src/unpack.c b/src/unpack.c index cae756222..a42d0f7fa 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -94,7 +94,7 @@ deb_reassemble(const char **filename, const char **pfilename) if (unlink(reasmbuf) && errno != ENOENT) ohshite(_("error ensuring '%.250s' doesn't exist"), reasmbuf); - push_cleanup(cu_pathname, ~0, NULL, 0, 1, (void *)reasmbuf); + push_cleanup(cu_pathname, ~0, 1, (void *)reasmbuf); pid = subproc_fork(); if (!pid) { @@ -291,9 +291,9 @@ pkg_deconfigure_others(struct pkginfo *pkg) /* This means that we *either* go and run postinst abort-deconfigure, * *or* queue the package for later configure processing, depending * on which error cleanup route gets taken. */ - push_cleanup(cu_prermdeconfigure, ~ehflag_normaltidy, - ok_prermdeconfigure, ehflag_normaltidy, - 3, (void *)deconpil->pkg, (void *)removing, (void *)pkg); + push_cleanup_fallback(cu_prermdeconfigure, ~ehflag_normaltidy, + ok_prermdeconfigure, ehflag_normaltidy, + 3, (void *)deconpil->pkg, (void *)removing, (void *)pkg); if (removing) { maintscript_installed(deconpil->pkg, PRERMFILE, "pre-removal", @@ -334,7 +334,7 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles, ohshite(_("error trying to open %.250s"), control_conffiles); } - push_cleanup(cu_closestream, ehflag_bombout, NULL, 0, 1, conff); + push_cleanup(cu_closestream, ehflag_bombout, 1, conff); while (fgets(conffilenamebuf, MAXCONFFILENAME - 2, conff)) { struct pkginfo *otherpkg; @@ -495,7 +495,7 @@ pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest) dsd = opendir(cidir); if (!dsd) ohshite(_("unable to open temp control directory")); - push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)dsd); + push_cleanup(cu_closedir, ~0, 1, (void *)dsd); while ((de = readdir(dsd))) { const char *newinfofilename; @@ -1110,7 +1110,7 @@ void process_archive(const char *filename) { /* Get the control information directory. */ cidir = get_control_dir(cidir); cidirrest = cidir + strlen(cidir); - push_cleanup(cu_cidir, ~0, NULL, 0, 2, (void *)cidir, (void *)cidirrest); + push_cleanup(cu_cidir, ~0, 2, (void *)cidir, (void *)cidirrest); pid = subproc_fork(); if (pid == 0) { @@ -1221,7 +1221,7 @@ void process_archive(const char *filename) { /* Read the conffiles, and copy the hashes across. */ newconffiles.head = NULL; newconffiles.tail = &newconffiles.head; - push_cleanup(cu_fileslist, ~0, NULL, 0, 0); + push_cleanup(cu_fileslist, ~0, 0); strcpy(cidirrest,CONFFILESFILE); deb_parse_conffiles(pkg, cidir, &newconffiles); @@ -1249,7 +1249,7 @@ void process_archive(const char *filename) { pkg_set_eflags(pkg, PKG_EFLAG_REINSTREQ); pkg_set_status(pkg, PKG_STAT_HALFCONFIGURED); modstatdb_note(pkg); - push_cleanup(cu_prermupgrade, ~ehflag_normaltidy, NULL, 0, 1, (void *)pkg); + push_cleanup(cu_prermupgrade, ~ehflag_normaltidy, 1, (void *)pkg); if (dpkg_version_compare(&pkg->available.version, &pkg->installed.version) >= 0) /* Upgrade or reinstall. */ @@ -1282,7 +1282,7 @@ void process_archive(const char *filename) { trig_activate_packageprocessing(conflictor); pkg_set_status(conflictor, PKG_STAT_HALFCONFIGURED); modstatdb_note(conflictor); - push_cleanup(cu_prerminfavour, ~ehflag_normaltidy, NULL, 0, + push_cleanup(cu_prerminfavour, ~ehflag_normaltidy, 2, conflictor, pkg); maintscript_installed(conflictor, PRERMFILE, "pre-removal", "remove", "in-favour", @@ -1302,12 +1302,12 @@ void process_archive(const char *filename) { pkg_set_status(pkg, PKG_STAT_HALFINSTALLED); modstatdb_note(pkg); if (oldversionstatus == PKG_STAT_NOTINSTALLED) { - push_cleanup(cu_preinstverynew, ~ehflag_normaltidy, NULL, 0, + push_cleanup(cu_preinstverynew, ~ehflag_normaltidy, 3,(void*)pkg,(void*)cidir,(void*)cidirrest); maintscript_new(pkg, PREINSTFILE, "pre-installation", cidir, cidirrest, "install", NULL); } else if (oldversionstatus == PKG_STAT_CONFIGFILES) { - push_cleanup(cu_preinstnew, ~ehflag_normaltidy, NULL, 0, + push_cleanup(cu_preinstnew, ~ehflag_normaltidy, 3,(void*)pkg,(void*)cidir,(void*)cidirrest); maintscript_new(pkg, PREINSTFILE, "pre-installation", cidir, cidirrest, "install", @@ -1315,7 +1315,7 @@ void process_archive(const char *filename) { versiondescribe(&pkg->available.version, vdew_nonambig), NULL); } else { - push_cleanup(cu_preinstupgrade, ~ehflag_normaltidy, NULL, 0, + push_cleanup(cu_preinstupgrade, ~ehflag_normaltidy, 4,(void*)pkg,(void*)cidir,(void*)cidirrest,(void*)&oldversionstatus); maintscript_new(pkg, PREINSTFILE, "pre-installation", cidir, cidirrest, "upgrade", @@ -1412,7 +1412,7 @@ void process_archive(const char *filename) { */ m_pipe(p1); - push_cleanup(cu_closepipe, ehflag_bombout, NULL, 0, 1, (void *)&p1[0]); + push_cleanup(cu_closepipe, ehflag_bombout, 1, (void *)&p1[0]); pid = subproc_fork(); if (pid == 0) { m_dup2(p1[1],1); close(p1[0]); close(p1[1]); @@ -1426,7 +1426,7 @@ void process_archive(const char *filename) { newfiles_queue.head = NULL; newfiles_queue.tail = &newfiles_queue.head; tc.newfiles_queue = &newfiles_queue; - push_cleanup(cu_fileslist, ~0, NULL, 0, 0); + push_cleanup(cu_fileslist, ~0, 0); tc.pkg= pkg; tc.backendpipe= p1[0]; tc.pkgset_getting_in_sync = pkgset_getting_in_sync(pkg); @@ -1453,7 +1453,7 @@ void process_archive(const char *filename) { * reduced to ‘unpacked’ by now, by the running of the prerm script. */ pkg_set_status(pkg, PKG_STAT_HALFINSTALLED); modstatdb_note(pkg); - push_cleanup(cu_postrmupgrade, ~ehflag_normaltidy, NULL, 0, 1, (void *)pkg); + push_cleanup(cu_postrmupgrade, ~ehflag_normaltidy, 1, (void *)pkg); maintscript_fallback(pkg, POSTRMFILE, "post-removal", cidir, cidirrest, "upgrade", "failed-upgrade"); } -- cgit v1.2.3 From fbed23421fe867d76e6123d2cf79ffafeed5aafd Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 12 Jul 2018 02:14:48 +0200 Subject: libcompat: Add new strchrnul() compat function --- configure.ac | 1 + debian/changelog | 1 + lib/compat/Makefile.am | 5 +++++ lib/compat/compat.h | 6 ++++++ lib/compat/strchrnul.c | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 lib/compat/strchrnul.c (limited to 'lib') diff --git a/configure.ac b/configure.ac index 3e0fae7b1..bdf05ffb4 100644 --- a/configure.ac +++ b/configure.ac @@ -152,6 +152,7 @@ DPKG_CHECK_COMPAT_FUNCS([\ getopt \ getopt_long \ obstack_free \ + strchrnul \ strnlen \ strndup \ strerror \ diff --git a/debian/changelog b/debian/changelog index 38078b2d1..264730e2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium type on system's headers. - Check for ldconfig command in dpkg only on platforms that do have it. - Fix file descriptor leak in start-stop-daemon on AIX. + - libcompat: Add new strchrnul() implementation. * Perl modules: - Check that $tarname is defined before use in Dpkg::Source::Package::V1. Thanks to Christoph Biedl . diff --git a/lib/compat/Makefile.am b/lib/compat/Makefile.am index 19ddcef86..4477c27b4 100644 --- a/lib/compat/Makefile.am +++ b/lib/compat/Makefile.am @@ -11,6 +11,7 @@ libcompat_test_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_LIBCOMPAT=1 libcompat_test_la_SOURCES = \ compat.h \ md5.c md5.h \ + strchrnul.c \ strnlen.c \ strndup.c \ strsignal.c \ @@ -57,6 +58,10 @@ if !HAVE_STRNLEN libcompat_la_SOURCES += strnlen.c endif +if !HAVE_STRCHRNUL +libcompat_la_SOURCES += strchrnul.c +endif + if !HAVE_STRNDUP libcompat_la_SOURCES += strndup.c endif diff --git a/lib/compat/compat.h b/lib/compat/compat.h index 320ffdbc9..c1aa60180 100644 --- a/lib/compat/compat.h +++ b/lib/compat/compat.h @@ -109,6 +109,8 @@ extern "C" { #define asprintf test_asprintf #undef vasprintf #define vasprintf test_vasprintf +#undef strchrnul +#define strchrnul test_strchrnul #undef strndup #define strndup test_strndup #undef strnlen @@ -139,6 +141,10 @@ int vasprintf(char **str, const char *fmt, va_list args) LIBCOMPAT_ATTR_VPRINTF(2); #endif +#if TEST_LIBCOMPAT || !defined(HAVE_STRCHRNUL) +char *strchrnul(const char *s, int c); +#endif + #if TEST_LIBCOMPAT || !defined(HAVE_STRNLEN) size_t strnlen(const char *s, size_t n); #endif diff --git a/lib/compat/strchrnul.c b/lib/compat/strchrnul.c new file mode 100644 index 000000000..b072e1ad3 --- /dev/null +++ b/lib/compat/strchrnul.c @@ -0,0 +1,37 @@ +/* + * libcompat - system compatibility library + * + * Copyright © 2018 Guillem Jover + * + * This 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 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 . + */ + +#include + +#include +#include + +#include "compat.h" + +char * +strchrnul(const char *s, int c) +{ + char *match; + + match = strchr(s, c); + if (match) + return match; + + return (char *)s + strlen(s); +} -- cgit v1.2.3 From 05c5c373dad18117942ea59440f9867c2f0d6a73 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 12 Jul 2018 03:22:37 +0200 Subject: Switch from strchr() + strlen() to strchrnul() --- debian/changelog | 1 + dselect/baselist.cc | 7 ++++--- dselect/pkginfo.cc | 6 +++--- lib/dpkg/pkg-format.c | 7 ++----- src/help.c | 6 +++--- src/main.c | 7 ++++--- utils/start-stop-daemon.c | 8 ++++---- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 264730e2f..5dfc4ae03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -192,6 +192,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium This should reduce the run-time memory used. - libdpkg: Reset nfiles in files_db_reset(). - libdpkg: Split push_cleanup() into push_cleanup_fallback(). + - Switch from strchr() + strlen() to strchrnul(). * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/dselect/baselist.cc b/dselect/baselist.cc index 05465fc92..6fd769239 100644 --- a/dselect/baselist.cc +++ b/dselect/baselist.cc @@ -410,8 +410,8 @@ void baselist::wordwrapinfo(int offset, const char *m) { for (;;) { int offleft=offset; while (*m == ' ' && offleft>0) { m++; offleft--; } - const char *p= strchr(m,'\n'); - int l= p ? (int)(p-m) : strlen(m); + const char *p = strchrnul(m, '\n'); + int l = (int)(p - m); while (l && c_isspace(m[l - 1])) l--; if (!l || (*m == '.' && l == 1)) { @@ -452,7 +452,8 @@ void baselist::wordwrapinfo(int offset, const char *m) { } wrapping = true; } - if (!p) break; + if (*p == '\0') + break; if (getcury(infopad) == (MAX_DISPLAY_INFO - 1)) { waddstr(infopad, "[The package description is too long and has been truncated...]"); diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc index e11067fdf..31a45994f 100644 --- a/dselect/pkginfo.cc +++ b/dselect/pkginfo.cc @@ -114,14 +114,14 @@ void packagelist::itd_description() { m = table[cursorline]->pkg->installed.description; if (str_is_unset(m)) m = _("No description available."); - const char *p= strchr(m,'\n'); - int l= p ? (int)(p-m) : strlen(m); + const char *p = strchrnul(m, '\n'); + int l = (int)(p - m); wattrset(infopad, part_attr[info_head]); waddstr(infopad, table[cursorline]->pkg->set->name); waddstr(infopad," - "); waddnstr(infopad,m,l); wattrset(infopad, part_attr[info_body]); - if (p) { + if (*p) { waddstr(infopad,"\n\n"); wordwrapinfo(1,++p); } diff --git a/lib/dpkg/pkg-format.c b/lib/dpkg/pkg-format.c index 50c8bc581..aa2372a64 100644 --- a/lib/dpkg/pkg-format.c +++ b/lib/dpkg/pkg-format.c @@ -194,11 +194,8 @@ pkg_format_parse(const char *fmt, struct dpkg_error *err) fmtend = fmt; do { fmtend += 1; - fmtend = strchr(fmtend, '$'); - } while (fmtend && fmtend[1] != '{'); - - if (!fmtend) - fmtend = fmt + strlen(fmt); + fmtend = strchrnul(fmtend, '$'); + } while (fmtend[0] && fmtend[1] != '{'); if (!parsestring(node, fmt, fmtend - 1, err)) { pkg_format_free(head); diff --git a/src/help.c b/src/help.c index cfcdd8ebf..e4db356bd 100644 --- a/src/help.c +++ b/src/help.c @@ -90,9 +90,9 @@ find_command(const char *prog) if (!path_list) ohshit(_("PATH is not set")); - for (path = path_list; path; path = path_end ? path_end + 1 : NULL) { - path_end = strchr(path, ':'); - path_len = path_end ? (size_t)(path_end - path) : strlen(path); + for (path = path_list; path; path = *path_end ? path_end + 1 : NULL) { + path_end = strchrnul(path, ':'); + path_len = (size_t)(path_end - path); varbuf_reset(&filename); varbuf_add_buf(&filename, path, path_len); diff --git a/src/main.c b/src/main.c index 0a45f812e..c1276c96d 100644 --- a/src/main.c +++ b/src/main.c @@ -642,8 +642,8 @@ set_force(const struct cmdinfo *cip, const char *value) } for (;;) { - comma= strchr(value,','); - l = comma ? (size_t)(comma - value) : strlen(value); + comma = strchrnul(value, ','); + l = (size_t)(comma - value); for (fip=forceinfos; fip->name; fip++) if (strncmp(fip->name, value, l) == 0 && strlen(fip->name) == l) break; @@ -661,7 +661,8 @@ set_force(const struct cmdinfo *cip, const char *value) warning(_("obsolete force/refuse option '%s'"), fip->name); } - if (!comma) break; + if (*comma == '\0') + break; value= ++comma; } } diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index e9720425a..e0339c4cc 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -930,15 +930,15 @@ parse_schedule(const char *schedule_str) } else { count = 0; repeatat = -1; - while (schedule_str != NULL) { - slash = strchr(schedule_str, '/'); - str_len = slash ? (size_t)(slash - schedule_str) : strlen(schedule_str); + while (*schedule_str) { + slash = strchrnul(schedule_str, '/'); + str_len = (size_t)(slash - schedule_str); if (str_len >= sizeof(item_buf)) badusage("invalid schedule item: far too long" " (you must delimit items with slashes)"); memcpy(item_buf, schedule_str, str_len); item_buf[str_len] = '\0'; - schedule_str = slash ? slash + 1 : NULL; + schedule_str = *slash ? slash + 1 : slash; parse_schedule_item(item_buf, &schedule[count]); if (schedule[count].type == sched_forever) { -- cgit v1.2.3 From ac47acc3f816672852bd5ad036e663aa150abe3f Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 22 Aug 2018 01:18:34 +0200 Subject: libdpkg: Change dpkg_error to track errno values This will make it possible for the caller to check what errno caused an error to be emitted, if any. --- debian/changelog | 1 + lib/dpkg/error.c | 14 +++++++++----- lib/dpkg/error.h | 3 ++- lib/dpkg/t/t-error.c | 10 ++++++++-- 4 files changed, 20 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 5dfc4ae03..b61741174 100644 --- a/debian/changelog +++ b/debian/changelog @@ -193,6 +193,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Reset nfiles in files_db_reset(). - libdpkg: Split push_cleanup() into push_cleanup_fallback(). - Switch from strchr() + strlen() to strchrnul(). + - libdpkg: Change dpkg_error to track errno values. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/error.c b/lib/dpkg/error.c index b2b0e3f9c..ecbf35fba 100644 --- a/lib/dpkg/error.c +++ b/lib/dpkg/error.c @@ -29,8 +29,9 @@ #include #include -static void DPKG_ATTR_VPRINTF(3) -dpkg_error_set(struct dpkg_error *err, int type, const char *fmt, va_list args) +static void DPKG_ATTR_VPRINTF(4) +dpkg_error_set(struct dpkg_error *err, enum dpkg_msg_type type, int syserrno, + const char *fmt, va_list args) { struct varbuf str = VARBUF_INIT; @@ -38,6 +39,7 @@ dpkg_error_set(struct dpkg_error *err, int type, const char *fmt, va_list args) return; err->type = type; + err->syserrno = syserrno; varbuf_vprintf(&str, fmt, args); err->str = str.buf; @@ -49,7 +51,7 @@ dpkg_put_warn(struct dpkg_error *err, const char *fmt, ...) va_list args; va_start(args, fmt); - dpkg_error_set(err, DPKG_MSG_WARN, fmt, args); + dpkg_error_set(err, DPKG_MSG_WARN, 0, fmt, args); va_end(args); return -1; @@ -61,7 +63,7 @@ dpkg_put_error(struct dpkg_error *err, const char *fmt, ...) va_list args; va_start(args, fmt); - dpkg_error_set(err, DPKG_MSG_ERROR, fmt, args); + dpkg_error_set(err, DPKG_MSG_ERROR, 0, fmt, args); va_end(args); return -1; @@ -72,11 +74,12 @@ dpkg_put_errno(struct dpkg_error *err, const char *fmt, ...) { va_list args; char *new_fmt; + int syserrno = errno; new_fmt = str_fmt("%s (%s)", fmt, strerror(errno)); va_start(args, fmt); - dpkg_error_set(err, DPKG_MSG_ERROR, new_fmt, args); + dpkg_error_set(err, DPKG_MSG_ERROR, syserrno, new_fmt, args); va_end(args); free(new_fmt); @@ -106,6 +109,7 @@ void dpkg_error_destroy(struct dpkg_error *err) { err->type = DPKG_MSG_NONE; + err->syserrno = 0; free(err->str); err->str = NULL; } diff --git a/lib/dpkg/error.h b/lib/dpkg/error.h index 4d8b048df..da06e028d 100644 --- a/lib/dpkg/error.h +++ b/lib/dpkg/error.h @@ -40,10 +40,11 @@ enum dpkg_msg_type { struct dpkg_error { enum dpkg_msg_type type; + int syserrno; char *str; }; -#define DPKG_ERROR_INIT { DPKG_MSG_NONE, NULL } +#define DPKG_ERROR_INIT { DPKG_MSG_NONE, 0, NULL } int dpkg_put_warn(struct dpkg_error *err, const char *fmt, ...) DPKG_ATTR_PRINTF(2); diff --git a/lib/dpkg/t/t-error.c b/lib/dpkg/t/t-error.c index 5e2f55fcd..e93459e7e 100644 --- a/lib/dpkg/t/t-error.c +++ b/lib/dpkg/t/t-error.c @@ -42,10 +42,12 @@ test_dpkg_error_put(void) test_pass(dpkg_put_errno(NULL, "void error") < 0); test_pass(dpkg_put_warn(&err, "test warning %d", 10) < 0); + test_pass(err.syserrno == 0); test_str(err.str, ==, "test warning 10"); test_warn(err); test_pass(dpkg_put_error(&err, "test error %d", 20) < 0); + test_pass(err.syserrno == 0); test_str(err.str, ==, "test error 20"); test_error(err); @@ -54,6 +56,7 @@ test_dpkg_error_put(void) test_bail("cannot allocate string"); test_pass(dpkg_put_errno(&err, "test errno %d", 30) < 0); test_str(err.str, ==, errstr_ref); + test_pass(err.syserrno == ENOENT); test_error(err); free(errstr_ref); errno = 0; @@ -64,17 +67,20 @@ test_dpkg_error_destroy(void) { struct dpkg_error err = DPKG_ERROR_INIT; - test_pass(dpkg_put_error(&err, "test destroy") < 0); + errno = ENOENT; + test_pass(dpkg_put_errno(&err, "test destroy") < 0); + test_pass(err.syserrno == ENOENT); test_pass(err.type == DPKG_MSG_ERROR); test_pass(err.str != NULL); dpkg_error_destroy(&err); test_pass(err.type == DPKG_MSG_NONE); + test_pass(err.syserrno == 0); test_pass(err.str == NULL); } TEST_ENTRY(test) { - test_plan(19); + test_plan(24); test_dpkg_error_put(); test_dpkg_error_destroy(); -- cgit v1.2.3 From 2edd9981db1f572588b2493f81d67915183865e8 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 17 Jun 2018 20:34:19 +0200 Subject: libdpkg: Add new varbuf_new() and varbuf_free() functions --- debian/changelog | 1 + lib/dpkg/libdpkg.map | 2 ++ lib/dpkg/t/t-varbuf.c | 23 ++++++++++++++++++++++- lib/dpkg/varbuf.c | 18 ++++++++++++++++++ lib/dpkg/varbuf.h | 2 ++ 5 files changed, 45 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index b61741174..4d0f1d143 100644 --- a/debian/changelog +++ b/debian/changelog @@ -194,6 +194,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Split push_cleanup() into push_cleanup_fallback(). - Switch from strchr() + strlen() to strchrnul(). - libdpkg: Change dpkg_error to track errno values. + - libdpkg: Add new varbuf_new() and varbuf_free() functions. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index cd0bd255d..20eccb72a 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -100,6 +100,7 @@ LIBDPKG_PRIVATE { str_gen_crop; # Variable buffer support + varbuf_new; varbuf_init; varbuf_reset; varbuf_grow; @@ -116,6 +117,7 @@ LIBDPKG_PRIVATE { varbuf_snapshot; varbuf_rollback; varbuf_destroy; + varbuf_free; # Path, directory and file functions secure_unlink_statted; diff --git a/lib/dpkg/t/t-varbuf.c b/lib/dpkg/t/t-varbuf.c index 585251993..8df733b9b 100644 --- a/lib/dpkg/t/t-varbuf.c +++ b/lib/dpkg/t/t-varbuf.c @@ -59,6 +59,26 @@ test_varbuf_prealloc(void) test_pass(vb.buf == NULL); } +static void +test_varbuf_new(void) +{ + struct varbuf *vb; + + vb = varbuf_new(0); + test_pass(vb != NULL); + test_pass(vb->used == 0); + test_pass(vb->size == 0); + test_pass(vb->buf == NULL); + varbuf_free(vb); + + vb = varbuf_new(10); + test_pass(vb != NULL); + test_pass(vb->used == 0); + test_pass(vb->size >= 10); + test_pass(vb->buf != NULL); + varbuf_free(vb); +} + static void test_varbuf_grow(void) { @@ -350,10 +370,11 @@ test_varbuf_detach(void) TEST_ENTRY(test) { - test_plan(120); + test_plan(128); test_varbuf_init(); test_varbuf_prealloc(); + test_varbuf_new(); test_varbuf_grow(); test_varbuf_trunc(); test_varbuf_add_buf(); diff --git a/lib/dpkg/varbuf.c b/lib/dpkg/varbuf.c index 9a62f92e9..ee757bcc7 100644 --- a/lib/dpkg/varbuf.c +++ b/lib/dpkg/varbuf.c @@ -115,6 +115,17 @@ varbuf_get_str(struct varbuf *v) return v->buf; } +struct varbuf * +varbuf_new(size_t size) +{ + struct varbuf *v; + + v = m_malloc(sizeof(*v)); + varbuf_init(v, size); + + return v; +} + void varbuf_init(struct varbuf *v, size_t size) { @@ -186,3 +197,10 @@ varbuf_destroy(struct varbuf *v) { free(v->buf); v->buf=NULL; v->size=0; v->used=0; } + +void +varbuf_free(struct varbuf *v) +{ + free(v->buf); + free(v); +} diff --git a/lib/dpkg/varbuf.h b/lib/dpkg/varbuf.h index 9b9a30f95..06f09f5e8 100644 --- a/lib/dpkg/varbuf.h +++ b/lib/dpkg/varbuf.h @@ -72,12 +72,14 @@ struct varbuf { #define VARBUF_INIT { 0, 0, NULL } +struct varbuf *varbuf_new(size_t size); void varbuf_init(struct varbuf *v, size_t size); void varbuf_grow(struct varbuf *v, size_t need_size); void varbuf_trunc(struct varbuf *v, size_t used_size); char *varbuf_detach(struct varbuf *v); void varbuf_reset(struct varbuf *v); void varbuf_destroy(struct varbuf *v); +void varbuf_free(struct varbuf *v); void varbuf_add_char(struct varbuf *v, int c); void varbuf_dup_char(struct varbuf *v, int c, size_t n); -- cgit v1.2.3 From 7ebd4d381b439baa730ad941340b3a1ac129497c Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 13 Jan 2018 14:46:46 +0100 Subject: libdpkg: Add new file_slurp() function --- debian/changelog | 1 + lib/dpkg/file.c | 44 +++++++++++++++++++++++ lib/dpkg/file.h | 5 +++ lib/dpkg/t/.gitignore | 1 + lib/dpkg/t/Makefile.am | 1 + lib/dpkg/t/t-file.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 148 insertions(+) create mode 100644 lib/dpkg/t/t-file.c (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 4d0f1d143..12f817c00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -195,6 +195,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Switch from strchr() + strlen() to strchrnul(). - libdpkg: Change dpkg_error to track errno values. - libdpkg: Add new varbuf_new() and varbuf_free() functions. + - libdpkg: Add new file_slurp() function. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index 364f8aed6..c6a756ae3 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -33,6 +33,7 @@ #include #include #include +#include #include /** @@ -60,6 +61,49 @@ file_copy_perms(const char *src, const char *dst) ohshite(_("unable to set mode of target file '%.250s'"), dst); } +static int +file_slurp_fd(int fd, const char *filename, struct varbuf *vb, + struct dpkg_error *err) +{ + struct stat st; + + if (fstat(fd, &st) < 0) + return dpkg_put_errno(err, _("cannot stat %s"), filename); + + if (!S_ISREG(st.st_mode)) + return dpkg_put_error(err, _("%s is not a regular file"), + filename); + + if (st.st_size == 0) + return 0; + + varbuf_init(vb, st.st_size); + if (fd_read(fd, vb->buf, st.st_size) < 0) + return dpkg_put_errno(err, _("cannot read %s"), filename); + vb->used = st.st_size; + + return 0; +} + +int +file_slurp(const char *filename, struct varbuf *vb, struct dpkg_error *err) +{ + int fd; + int rc; + + varbuf_init(vb, 0); + + fd = open(filename, O_RDONLY); + if (fd < 0) + return dpkg_put_errno(err, _("cannot open %s"), filename); + + rc = file_slurp_fd(fd, filename, vb, err); + + (void)close(fd); + + return rc; +} + static void file_lock_setup(struct flock *fl, short type) { diff --git a/lib/dpkg/file.h b/lib/dpkg/file.h index a1dd270ec..0f46cc07b 100644 --- a/lib/dpkg/file.h +++ b/lib/dpkg/file.h @@ -26,6 +26,8 @@ #include #include +#include +#include DPKG_BEGIN_DECLS @@ -48,6 +50,9 @@ struct file_stat { void file_copy_perms(const char *src, const char *dst); +int +file_slurp(const char *filename, struct varbuf *vb, struct dpkg_error *err); + enum file_lock_flags { FILE_LOCK_NOWAIT, FILE_LOCK_WAIT, diff --git a/lib/dpkg/t/.gitignore b/lib/dpkg/t/.gitignore index f88d0fa1c..6d5e0abd7 100644 --- a/lib/dpkg/t/.gitignore +++ b/lib/dpkg/t/.gitignore @@ -9,6 +9,7 @@ t-command t-deb-version t-ehandle t-error +t-file t-macros t-mod-db t-path diff --git a/lib/dpkg/t/Makefile.am b/lib/dpkg/t/Makefile.am index b2f227569..e655d72d5 100644 --- a/lib/dpkg/t/Makefile.am +++ b/lib/dpkg/t/Makefile.am @@ -26,6 +26,7 @@ test_programs = \ t-ehandle \ t-error \ t-string \ + t-file \ t-buffer \ t-path \ t-progname \ diff --git a/lib/dpkg/t/t-file.c b/lib/dpkg/t/t-file.c new file mode 100644 index 000000000..db900a5e3 --- /dev/null +++ b/lib/dpkg/t/t-file.c @@ -0,0 +1,96 @@ +/* + * libdpkg - Debian packaging suite library routines + * t-file.c - test file functions + * + * Copyright © 2018 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include +#include + +#include + +#include +#include +#include +#include + +static const char ref_data[] = + "this is a test string\n" + "within a test file\n" + "containing multiple lines\n" +; + +static void +test_file_slurp(void) +{ + struct varbuf vb = VARBUF_INIT; + struct dpkg_error err = DPKG_ERROR_INIT; + char *test_file; + char *test_dir; + int fd; + + test_pass(file_slurp("/nonexistent", &vb, &err) < 0); + test_pass(vb.used == 0); + test_pass(vb.buf == NULL); + test_pass(err.syserrno == ENOENT); + test_error(err); + varbuf_destroy(&vb); + + test_dir = test_alloc(strdup("test.XXXXXX")); + test_pass(mkdtemp(test_dir) != NULL); + test_pass(file_slurp(test_dir, &vb, &err) < 0); + test_pass(vb.used == 0); + test_pass(vb.buf == NULL); + test_pass(err.syserrno == 0); + test_error(err); + varbuf_destroy(&vb); + test_pass(rmdir(test_dir) == 0); + + test_file = test_alloc(strdup("test.XXXXXX")); + fd = mkstemp(test_file); + test_pass(fd >= 0); + + test_pass(file_slurp(test_file, &vb, &err) == 0); + test_pass(vb.used == 0); + test_pass(vb.buf == NULL); + test_pass(err.syserrno == 0); + test_pass(err.type == DPKG_MSG_NONE); + varbuf_destroy(&vb); + + test_pass(write(fd, ref_data, strlen(ref_data)) == (ssize_t)strlen(ref_data)); + test_pass(lseek(fd, 0, SEEK_SET) == 0); + + test_pass(file_slurp(test_file, &vb, &err) == 0); + test_pass(vb.used == strlen(ref_data)); + test_str(vb.buf, ==, ref_data); + test_pass(err.syserrno == 0); + test_pass(err.type == DPKG_MSG_NONE); + varbuf_destroy(&vb); + + test_pass(unlink(test_file) == 0); +} + +TEST_ENTRY(test) +{ + test_plan(26); + + test_file_slurp(); +} -- cgit v1.2.3 From 1166bbb5f099580a0c1c26d0e29b1ae3fe11ad0f Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 13 Jan 2018 14:46:46 +0100 Subject: libdpkg: Switch db-fsys to use the new file_slurp() function This reduces code duplication. --- debian/changelog | 1 + lib/dpkg/db-fsys-digest.c | 49 +++++++++++++---------------------------------- lib/dpkg/db-fsys-files.c | 44 +++++++++++++----------------------------- 3 files changed, 27 insertions(+), 67 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 12f817c00..5ad7d759b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -196,6 +196,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Change dpkg_error to track errno values. - libdpkg: Add new varbuf_new() and varbuf_free() functions. - libdpkg: Add new file_slurp() function. + - libdpkg: Switch db-fsys to use the new file_slurp() function. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/db-fsys-digest.c b/lib/dpkg/db-fsys-digest.c index 05137c2f2..cc032f14a 100644 --- a/lib/dpkg/db-fsys-digest.c +++ b/lib/dpkg/db-fsys-digest.c @@ -80,13 +80,14 @@ write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin, } static void -parse_filehash_buffer(char *buf, char *buf_end, +parse_filehash_buffer(struct varbuf *buf, struct pkginfo *pkg, struct pkgbin *pkgbin) { char *thisline, *nextline; const char *pkgname = pkg_name(pkg, pnaw_nonambig); + const char *buf_end = buf->buf + buf->used; - for (thisline = buf; thisline < buf_end; thisline = nextline) { + for (thisline = buf->buf; thisline < buf_end; thisline = nextline) { struct filenamenode *namenode; char *endline, *hash_end, *filename; @@ -124,7 +125,7 @@ parse_filehash_buffer(char *buf, char *buf_end, thisline, filename); /* Add the file to the list. */ - namenode = findnamenode(filename, fnn_nocopy); + namenode = findnamenode(filename, 0); namenode->newhash = thisline; } } @@ -132,43 +133,19 @@ parse_filehash_buffer(char *buf, char *buf_end, void parse_filehash(struct pkginfo *pkg, struct pkgbin *pkgbin) { - static int fd; const char *hashfile; - struct stat st; + struct varbuf buf = VARBUF_INIT; + struct dpkg_error err = DPKG_ERROR_INIT; hashfile = pkg_infodb_get_file(pkg, pkgbin, HASHFILE); - fd = open(hashfile, O_RDONLY); - if (fd < 0) { - if (errno == ENOENT) - return; + if (file_slurp(hashfile, &buf, &err) < 0 && err.syserrno != ENOENT) + dpkg_error_print(&err, + _("loading control file '%s' for package '%s'"), + HASHFILE, pkg_name(pkg, pnaw_nonambig)); - ohshite(_("cannot open control file '%s' for package '%s'"), - HASHFILE, pkg_name(pkg, pnaw_nonambig)); - } - - if (fstat(fd, &st) < 0) - ohshite(_("cannot stat control file '%s' for package '%s'"), - HASHFILE, pkg_name(pkg, pnaw_nonambig)); - - if (!S_ISREG(st.st_mode)) - ohshit(_("control file '%s' for package '%s' is not a regular file"), - HASHFILE, pkg_name(pkg, pnaw_nonambig)); - - if (st.st_size > 0) { - char *buf, *buf_end; - - buf = nfmalloc(st.st_size); - buf_end = buf + st.st_size; - - if (fd_read(fd, buf, st.st_size) < 0) - ohshite(_("cannot read control file '%s' for package '%s'"), - HASHFILE, pkg_name(pkg, pnaw_nonambig)); - - parse_filehash_buffer(buf, buf_end, pkg, pkgbin); - } + if (buf.used > 0) + parse_filehash_buffer(&buf, pkg, pkgbin); - if (close(fd)) - ohshite(_("cannot close control file '%s' for package '%s'"), - HASHFILE, pkg_name(pkg, pnaw_nonambig)); + varbuf_destroy(&buf); } diff --git a/lib/dpkg/db-fsys-files.c b/lib/dpkg/db-fsys-files.c index ff2ee7063..534109329 100644 --- a/lib/dpkg/db-fsys-files.c +++ b/lib/dpkg/db-fsys-files.c @@ -77,11 +77,11 @@ static enum pkg_filesdb_load_status saidread = PKG_FILESDB_LOAD_NONE; void ensure_packagefiles_available(struct pkginfo *pkg) { - static int fd; const char *filelistfile; struct fileinlist **lendp; - struct stat stat_buf; - char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr; + char *loaded_list_end, *thisline, *nextline, *ptr; + struct varbuf buf = VARBUF_INIT; + struct dpkg_error err = DPKG_ERROR_INIT; if (pkg->files_list_valid) return; @@ -99,12 +99,11 @@ ensure_packagefiles_available(struct pkginfo *pkg) onerr_abort++; - fd= open(filelistfile,O_RDONLY); + if (file_slurp(filelistfile, &buf, &err) < 0) { + if (err.syserrno != ENOENT) + dpkg_error_print(&err, _("loading files list file for package '%s'"), + pkg_name(pkg, pnaw_nonambig)); - if (fd==-1) { - if (errno != ENOENT) - ohshite(_("unable to open files list file for package '%.250s'"), - pkg_name(pkg, pnaw_nonambig)); onerr_abort--; if (pkg->status != PKG_STAT_CONFIGFILES && dpkg_version_is_informative(&pkg->configversion)) { @@ -117,26 +116,11 @@ ensure_packagefiles_available(struct pkginfo *pkg) return; } - push_cleanup(cu_closefd, ehflag_bombout, 1, &fd); - - if (fstat(fd, &stat_buf)) - ohshite(_("unable to stat files list file for package '%.250s'"), - pkg_name(pkg, pnaw_nonambig)); - - if (!S_ISREG(stat_buf.st_mode)) - ohshit(_("files list for package '%.250s' is not a regular file"), - pkg_name(pkg, pnaw_nonambig)); - - if (stat_buf.st_size) { - loaded_list = nfmalloc(stat_buf.st_size); - loaded_list_end = loaded_list + stat_buf.st_size; - - if (fd_read(fd, loaded_list, stat_buf.st_size) < 0) - ohshite(_("reading files list for package '%.250s'"), - pkg_name(pkg, pnaw_nonambig)); + if (buf.used) { + loaded_list_end = buf.buf + buf.used; lendp = &pkg->files; - thisline = loaded_list; + thisline = buf.buf; while (thisline < loaded_list_end) { struct filenamenode *namenode; @@ -154,15 +138,13 @@ ensure_packagefiles_available(struct pkginfo *pkg) pkg_name(pkg, pnaw_nonambig)); *ptr = '\0'; - namenode = findnamenode(thisline, fnn_nocopy); + namenode = findnamenode(thisline, 0); lendp = pkg_files_add_file(pkg, namenode, lendp); thisline = nextline; } } - pop_cleanup(ehflag_normaltidy); /* fd = open() */ - if (close(fd)) - ohshite(_("error closing files list file for package '%.250s'"), - pkg_name(pkg, pnaw_nonambig)); + + varbuf_destroy(&buf); onerr_abort--; -- cgit v1.2.3 From 7094f7c428f1f871b1b83bf5f895ab66f9e3d55a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 22 Aug 2018 22:38:50 +0200 Subject: libdpkg: Add support for new test_get_srcdir() and test_get_builddir() --- debian/changelog | 1 + lib/dpkg/t/t-test.c | 7 ++++++- lib/dpkg/test.h | 12 ++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 5ad7d759b..b52f91e05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -243,6 +243,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Add new test cases to clarify arch-qualified dependency simplification. - Add several TODO tests cases for dependency simplification. - Add new cppcheck author test. + - Add support for new test_get_srcdir() test_get_builddir(). [ Updated programs translations ] * Dutch (Frans Spiesschaert). Closes: #881401 diff --git a/lib/dpkg/t/t-test.c b/lib/dpkg/t/t-test.c index 62b35ce2f..48ce8726b 100644 --- a/lib/dpkg/t/t-test.c +++ b/lib/dpkg/t/t-test.c @@ -25,7 +25,7 @@ TEST_ENTRY(test) { - test_plan(20); + test_plan(22); test_pass(1); test_fail(0); @@ -58,4 +58,9 @@ TEST_ENTRY(test) test_mem("abcd", ==, "abcd", 5); test_mem("ababcd", ==, "ababff", 4); test_mem("ababcd", !=, "ababff", 6); + + setenv("srcdir", "aaa", 1); + setenv("builddir", "bbb", 1); + test_str(test_get_srcdir(), ==, "aaa"); + test_str(test_get_builddir(), ==, "bbb"); } diff --git a/lib/dpkg/test.h b/lib/dpkg/test.h index 39ecb967b..a0e5ffdae 100644 --- a/lib/dpkg/test.h +++ b/lib/dpkg/test.h @@ -59,6 +59,18 @@ test_alloc(void *ptr, const char *reason) #define test_alloc(ptr) \ test_alloc((ptr), "cannot allocate memory for " #ptr " in " __FILE__ ":" test_stringify(__LINE__)) +static inline const char * +test_get_envdir(const char *envvar) +{ + const char *envdir = getenv(envvar); + return envdir ? envdir : "."; +} + +#define test_get_srcdir() \ + test_get_envdir("srcdir") +#define test_get_builddir() \ + test_get_envdir("builddir") + static int test_id = 1; static int test_skip_code; static const char *test_skip_prefix; -- cgit v1.2.3 From 187d689217e274e79fa61018bc23a0d43f7d678c Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 12 Jul 2018 05:09:14 +0200 Subject: libdpkg: Add new pkg_infodb_reset_dir() This makes it possible to update the infodb directory when we have changed the underlying directory with dpkg_db_set_dir(). --- debian/changelog | 1 + lib/dpkg/db-ctrl-format.c | 18 +++++++++++++----- lib/dpkg/db-ctrl.h | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index b52f91e05..881439d4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -197,6 +197,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Add new varbuf_new() and varbuf_free() functions. - libdpkg: Add new file_slurp() function. - libdpkg: Switch db-fsys to use the new file_slurp() function. + - libdpkg: Add new pkg_infodb_reset_dir(). * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/db-ctrl-format.c b/lib/dpkg/db-ctrl-format.c index 84b873c27..256c7b7e4 100644 --- a/lib/dpkg/db-ctrl-format.c +++ b/lib/dpkg/db-ctrl-format.c @@ -36,6 +36,7 @@ static enum pkg_infodb_format db_format = PKG_INFODB_FORMAT_UNKNOWN; static bool db_upgrading; +static char *db_infodir; static enum pkg_infodb_format pkg_infodb_parse_format(const char *file) @@ -117,12 +118,10 @@ pkg_infodb_is_upgrading(void) const char * pkg_infodb_get_dir(void) { - static char *infodir; + if (db_infodir == NULL) + db_infodir = dpkg_db_get_path(INFODIR); - if (infodir == NULL) - infodir = dpkg_db_get_path(INFODIR); - - return infodir; + return db_infodir; } const char * @@ -148,3 +147,12 @@ pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin, return vb.buf; } + +const char * +pkg_infodb_reset_dir(void) +{ + free(db_infodir); + db_infodir = NULL; + + return pkg_infodb_get_dir(); +} diff --git a/lib/dpkg/db-ctrl.h b/lib/dpkg/db-ctrl.h index 93bed39de..57f67e022 100644 --- a/lib/dpkg/db-ctrl.h +++ b/lib/dpkg/db-ctrl.h @@ -40,6 +40,7 @@ void pkg_infodb_upgrade(void); const char *pkg_infodb_get_dir(void); const char *pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin, const char *filetype); +const char *pkg_infodb_reset_dir(void); bool pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin, const char *name); -- cgit v1.2.3 From 23f575c23e9d141dd4b1b34bb41060b4f99ea611 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 9 Aug 2018 03:05:46 +0200 Subject: libdpkg: Add new m_dup() function --- debian/changelog | 1 + lib/dpkg/dpkg.h | 1 + lib/dpkg/libdpkg.map | 1 + lib/dpkg/mlib.c | 13 +++++++++++++ 4 files changed, 16 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 881439d4d..3d949507b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -198,6 +198,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Add new file_slurp() function. - libdpkg: Switch db-fsys to use the new file_slurp() function. - libdpkg: Add new pkg_infodb_reset_dir(). + - libdpkg: Add new m_dup() function. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h index 7bc348039..2bb067af3 100644 --- a/lib/dpkg/dpkg.h +++ b/lib/dpkg/dpkg.h @@ -146,6 +146,7 @@ char *m_strndup(const char *str, size_t n); int m_asprintf(char **strp, const char *fmt, ...) DPKG_ATTR_PRINTF(2); int m_vasprintf(char **strp, const char *fmt, va_list args) DPKG_ATTR_VPRINTF(2); +int m_dup(int oldfd); void m_dup2(int oldfd, int newfd); void m_pipe(int fds[2]); void m_output(FILE *f, const char *name); diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 20eccb72a..2bcbc99ff 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -80,6 +80,7 @@ LIBDPKG_PRIVATE { m_strdup; m_vasprintf; m_asprintf; + m_dup; m_dup2; m_pipe; m_output; diff --git a/lib/dpkg/mlib.c b/lib/dpkg/mlib.c index 1470a7f61..8de77b7ea 100644 --- a/lib/dpkg/mlib.c +++ b/lib/dpkg/mlib.c @@ -110,6 +110,19 @@ m_asprintf(char **strp, const char *fmt, ...) return n; } +int +m_dup(int oldfd) +{ + int newfd; + + newfd = dup(oldfd); + if (newfd >= 0) + return newfd; + + onerr_abort++; + ohshite(_("failed to dup for fd %d"), oldfd); +} + void m_dup2(int oldfd, int newfd) { const char *const stdstrings[]= { "in", "out", "err" }; -- cgit v1.2.3 From d2ec96cc99b15b97cfcecead3f2872c45a510855 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 10 Aug 2018 02:22:39 +0200 Subject: libdpkg: Factor out package stanza printing into its own function We will then be able to use it to print the package database into stdout, for example. --- debian/changelog | 1 + lib/dpkg/dpkg-db.h | 1 + lib/dpkg/dump.c | 21 +++++++++++++++------ lib/dpkg/libdpkg.map | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 3d949507b..4cf04b4c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -199,6 +199,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Switch db-fsys to use the new file_slurp() function. - libdpkg: Add new pkg_infodb_reset_dir(). - libdpkg: Add new m_dup() function. + - libdpkg: Factor out package stanza printing into its own function. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index a60da4a50..8f34d6682 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -436,6 +436,7 @@ enum writedb_flags { wdb_must_sync = DPKG_BIT(1), }; +void writedb_records(FILE *fp, const char *filename, enum writedb_flags flags); void writedb(const char *filename, enum writedb_flags flags); /* Note: The varbufs must have been initialized and will not be diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c index b70023c9e..0933b6dff 100644 --- a/lib/dpkg/dump.c +++ b/lib/dpkg/dump.c @@ -492,7 +492,7 @@ writerecord(FILE *file, const char *filename, } void -writedb(const char *filename, enum writedb_flags flags) +writedb_records(FILE *fp, const char *filename, enum writedb_flags flags) { static char writebuf[8192]; @@ -500,14 +500,11 @@ writedb(const char *filename, enum writedb_flags flags) struct pkginfo *pkg; struct pkgbin *pkgbin; const char *which; - struct atomic_file *file; struct varbuf vb = VARBUF_INIT; which = (flags & wdb_dump_available) ? "available" : "status"; - file = atomic_file_new(filename, ATOMIC_FILE_BACKUP); - atomic_file_open(file); - if (setvbuf(file->fp, writebuf, _IOFBF, sizeof(writebuf))) + if (setvbuf(fp, writebuf, _IOFBF, sizeof(writebuf))) ohshite(_("unable to set buffering on %s database file"), which); iter = pkg_db_iter_new(); @@ -519,13 +516,25 @@ writedb(const char *filename, enum writedb_flags flags) varbufrecord(&vb, pkg, pkgbin); varbuf_add_char(&vb, '\n'); varbuf_end_str(&vb); - if (fputs(vb.buf, file->fp) < 0) + if (fputs(vb.buf, fp) < 0) ohshite(_("failed to write %s database record about '%.50s' to '%.250s'"), which, pkgbin_name(pkg, pkgbin, pnaw_nonambig), filename); varbuf_reset(&vb); } pkg_db_iter_free(iter); varbuf_destroy(&vb); +} + +void +writedb(const char *filename, enum writedb_flags flags) +{ + struct atomic_file *file; + + file = atomic_file_new(filename, ATOMIC_FILE_BACKUP); + atomic_file_open(file); + + writedb_records(file->fp, filename, flags); + if (flags & wdb_must_sync) atomic_file_sync(file); diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 2bcbc99ff..cc570f09c 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -367,6 +367,7 @@ LIBDPKG_PRIVATE { parsedb_parse; parsedb_close; parsedb; + writedb_records; writedb; dpkg_db_set_dir; -- cgit v1.2.3 From 683e95c0b13b6274d1785741d63551cd39b6ee45 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 11 Aug 2018 03:10:09 +0200 Subject: libdpkg: Dump database package records in alphabetical order When dumping all stanzas from the package database, do it in alphabetical order, so that we get reproducible output, both on disk and for the upcoming output to stdout. --- debian/changelog | 3 +++ lib/dpkg/dump.c | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 4cf04b4c1..c0e1bea44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium virtual field to dpkg-query show format. * Add new dpkg-buildpackage --no-post-clean option, to be able to explicitly select the current default behavior. + * Dump database package records in alphabetical order. This will give + reproducible status and available database files, and make it possible + to output other deb822 formatted data in a deterministic way. * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c index 0933b6dff..c400ae307 100644 --- a/lib/dpkg/dump.c +++ b/lib/dpkg/dump.c @@ -40,6 +40,8 @@ #include #include #include +#include +#include #include #include #include @@ -496,23 +498,29 @@ writedb_records(FILE *fp, const char *filename, enum writedb_flags flags) { static char writebuf[8192]; - struct pkgiterator *iter; + struct pkg_array array; struct pkginfo *pkg; struct pkgbin *pkgbin; const char *which; struct varbuf vb = VARBUF_INIT; + int i; which = (flags & wdb_dump_available) ? "available" : "status"; if (setvbuf(fp, writebuf, _IOFBF, sizeof(writebuf))) ohshite(_("unable to set buffering on %s database file"), which); - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter)) != NULL) { + pkg_array_init_from_db(&array); + pkg_array_sort(&array, pkg_sorter_by_nonambig_name_arch); + + for (i = 0; i < array.n_pkgs; i++) { + pkg = array.pkgs[i]; pkgbin = (flags & wdb_dump_available) ? &pkg->available : &pkg->installed; + /* Don't dump records which have no useful content. */ if (!pkg_is_informative(pkg, pkgbin)) continue; + varbufrecord(&vb, pkg, pkgbin); varbuf_add_char(&vb, '\n'); varbuf_end_str(&vb); @@ -521,7 +529,8 @@ writedb_records(FILE *fp, const char *filename, enum writedb_flags flags) which, pkgbin_name(pkg, pkgbin, pnaw_nonambig), filename); varbuf_reset(&vb); } - pkg_db_iter_free(iter); + + pkg_array_destroy(&array); varbuf_destroy(&vb); } -- cgit v1.2.3 From 7f7eb8cc77e84dd03791f7317c38242e49760b49 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Aug 2018 05:10:12 +0200 Subject: libdpkg: Fix internerr format string Do not print filename which is going to be NULL. Fixes: commit 9f7e58acdf28043bce2dfaf24ba27bb878418658 --- lib/dpkg/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index c6a756ae3..3b3511549 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -203,7 +203,7 @@ file_show(const char *filename) pid_t pid; if (filename == NULL) - internerr("file '%s' does not exist", filename); + internerr("filename is NULL"); pid = subproc_fork(); if (pid == 0) { -- cgit v1.2.3 From e8dddc5bd19195f48aeeccdc6eb82bfc275e3627 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Aug 2018 05:10:12 +0200 Subject: libdpkg: Split pager specific code into its own module We also namespace the pager function with the module name. --- debian/changelog | 1 + lib/dpkg/Makefile.am | 2 ++ lib/dpkg/command.c | 21 -------------- lib/dpkg/command.h | 1 - lib/dpkg/file.c | 3 +- lib/dpkg/libdpkg.map | 3 +- lib/dpkg/pager.c | 50 +++++++++++++++++++++++++++++++++ lib/dpkg/pager.h | 43 +++++++++++++++++++++++++++++ lib/dpkg/t/.gitignore | 1 + lib/dpkg/t/Makefile.am | 1 + lib/dpkg/t/t-command.c | 38 +------------------------ lib/dpkg/t/t-pager.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/POTFILES.in | 1 + src/configure.c | 3 +- 14 files changed, 181 insertions(+), 62 deletions(-) create mode 100644 lib/dpkg/pager.c create mode 100644 lib/dpkg/pager.h create mode 100644 lib/dpkg/t/t-pager.c (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index c0e1bea44..f8dc624ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -203,6 +203,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Add new pkg_infodb_reset_dir(). - libdpkg: Add new m_dup() function. - libdpkg: Factor out package stanza printing into its own function. + - libdpkg: Split pager specific code into its own module. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index 7ecf6639f..58bd403ab 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -80,6 +80,7 @@ libdpkg_la_SOURCES = \ nfmalloc.c \ options.c \ options-parsers.c \ + pager.c \ parse.c \ parsehelp.c \ path.c \ @@ -138,6 +139,7 @@ pkginclude_HEADERS = \ macros.h \ namevalue.h \ options.h \ + pager.h \ parsedump.h \ path.h \ pkg.h \ diff --git a/lib/dpkg/command.c b/lib/dpkg/command.c index b6a79d7c8..c8b8ae5af 100644 --- a/lib/dpkg/command.c +++ b/lib/dpkg/command.c @@ -182,27 +182,6 @@ command_exec(struct command *cmd) ohshite(_("unable to execute %s (%s)"), cmd->name, cmd->filename); } - -/** - * Get a suitable pager. - * - * @return A string representing a pager. - */ -const char * -command_get_pager(void) -{ - const char *pager; - - if (!isatty(1)) - return CAT; - - pager = getenv("PAGER"); - if (str_is_unset(pager)) - pager = DEFAULTPAGER; - - return pager; -} - /** * Execute a shell with a possible command. * diff --git a/lib/dpkg/command.h b/lib/dpkg/command.h index 8cd2af9f1..7d2098a29 100644 --- a/lib/dpkg/command.h +++ b/lib/dpkg/command.h @@ -54,7 +54,6 @@ void command_add_args(struct command *cmd, ...) DPKG_ATTR_SENTINEL; void command_exec(struct command *cmd) DPKG_ATTR_NORET; -const char *command_get_pager(void); void command_shell(const char *cmd, const char *name) DPKG_ATTR_NORET; /** @} */ diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index 3b3511549..c62c3121f 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -210,7 +211,7 @@ file_show(const char *filename) struct command cmd; const char *pager; - pager = command_get_pager(); + pager = pager_get_exec(); command_init(&cmd, pager, _("showing file on pager")); command_add_arg(&cmd, pager); diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index cc570f09c..b562d7aad 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -181,10 +181,11 @@ LIBDPKG_PRIVATE { command_add_argv; command_add_args; command_exec; - command_get_pager; command_shell; command_destroy; + pager_get_exec; + setcloexec; # Compression support diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c new file mode 100644 index 000000000..a1cb10107 --- /dev/null +++ b/lib/dpkg/pager.c @@ -0,0 +1,50 @@ +/* + * libdpkg - Debian packaging suite library routines + * pager.c - pager execution support + * + * Copyright © 2018 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include + +#include +#include +#include +#include + +/** + * Get a suitable pager. + * + * @return A string representing a pager. + */ +const char * +pager_get_exec(void) +{ + const char *pager; + + if (!isatty(1)) + return CAT; + + pager = getenv("PAGER"); + if (str_is_unset(pager)) + pager = DEFAULTPAGER; + + return pager; +} diff --git a/lib/dpkg/pager.h b/lib/dpkg/pager.h new file mode 100644 index 000000000..8ecc93b97 --- /dev/null +++ b/lib/dpkg/pager.h @@ -0,0 +1,43 @@ +/* + * libdpkg - Debian packaging suite library routines + * pager.h - pager execution support + * + * Copyright © 2018 Guillem Jover + * + * This 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 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 . + */ + +#ifndef LIBDPKG_PAGER_H +#define LIBDPKG_PAGER_H + +#include + +DPKG_BEGIN_DECLS + +/** + * @defgroup pager Pager execution + * @ingroup dpkg-internal + * @{ + */ + +struct pager; + +const char * +pager_get_exec(void); + +/** @} */ + +DPKG_END_DECLS + +#endif /* LIBDPKG_PAGER_H */ diff --git a/lib/dpkg/t/.gitignore b/lib/dpkg/t/.gitignore index 6d5e0abd7..ee1ab73ec 100644 --- a/lib/dpkg/t/.gitignore +++ b/lib/dpkg/t/.gitignore @@ -12,6 +12,7 @@ t-error t-file t-macros t-mod-db +t-pager t-path t-pkginfo t-pkg-list diff --git a/lib/dpkg/t/Makefile.am b/lib/dpkg/t/Makefile.am index e655d72d5..6dff6267a 100644 --- a/lib/dpkg/t/Makefile.am +++ b/lib/dpkg/t/Makefile.am @@ -32,6 +32,7 @@ test_programs = \ t-progname \ t-subproc \ t-command \ + t-pager \ t-varbuf \ t-ar \ t-tar \ diff --git a/lib/dpkg/t/t-command.c b/lib/dpkg/t/t-command.c index b59abd4e4..099884560 100644 --- a/lib/dpkg/t/t-command.c +++ b/lib/dpkg/t/t-command.c @@ -208,44 +208,9 @@ test_command_shell(void) test_pass(ret == 0); } -static void -test_dup_file(int fd, const char *filename, int flags) -{ - int newfd; - - newfd = open(filename, flags); - dup2(newfd, fd); - close(newfd); -} - -static void -test_command_pager(void) -{ - const char *pager, *default_pager; - int origfd = dup(STDOUT_FILENO); - - /* Test stdout being a tty. */ - test_todo_block("environment might not expose controlling terminal") { - test_dup_file(STDOUT_FILENO, "/dev/tty", O_WRONLY); - setenv("PAGER", "test-pager", 1); - pager = command_get_pager(); - unsetenv("PAGER"); - default_pager = command_get_pager(); - dup2(origfd, STDOUT_FILENO); - test_str(pager, ==, "test-pager"); - test_str(default_pager, ==, DEFAULTPAGER); - } - - /* Test stdout not being a tty. */ - test_dup_file(STDOUT_FILENO, "/dev/null", O_WRONLY); - pager = command_get_pager(); - dup2(origfd, STDOUT_FILENO); - test_str(pager, ==, CAT); -} - TEST_ENTRY(test) { - test_plan(52); + test_plan(49); test_command_init(); test_command_grow_argv(); @@ -254,5 +219,4 @@ TEST_ENTRY(test) test_command_add_args(); test_command_exec(); test_command_shell(); - test_command_pager(); } diff --git a/lib/dpkg/t/t-pager.c b/lib/dpkg/t/t-pager.c new file mode 100644 index 000000000..2481e8065 --- /dev/null +++ b/lib/dpkg/t/t-pager.c @@ -0,0 +1,75 @@ +/* + * libdpkg - Debian packaging suite library routines + * t-pager.c - test pager implementation + * + * Copyright © 2010-2012 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include + +static void +test_dup_file(int fd, const char *filename, int flags) +{ + int newfd; + + newfd = open(filename, flags); + dup2(newfd, fd); + close(newfd); +} + +static void +test_pager_get_exec(void) +{ + const char *pager, *default_pager; + int origfd = dup(STDOUT_FILENO); + + /* Test stdout being a tty. */ + test_todo_block("environment might not expose controlling terminal") { + test_dup_file(STDOUT_FILENO, "/dev/tty", O_WRONLY); + setenv("PAGER", "test-pager", 1); + pager = pager_get_exec(); + unsetenv("PAGER"); + default_pager = pager_get_exec(); + dup2(origfd, STDOUT_FILENO); + test_str(pager, ==, "test-pager"); + test_str(default_pager, ==, DEFAULTPAGER); + } + + /* Test stdout not being a tty. */ + test_dup_file(STDOUT_FILENO, "/dev/null", O_WRONLY); + pager = pager_get_exec(); + dup2(origfd, STDOUT_FILENO); + test_str(pager, ==, CAT); +} + +TEST_ENTRY(test) +{ + test_plan(3); + + test_pager_get_exec(); +} diff --git a/po/POTFILES.in b/po/POTFILES.in index ce3e29c56..43212d541 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -38,6 +38,7 @@ lib/dpkg/namevalue.c lib/dpkg/nfmalloc.c lib/dpkg/options-parsers.c lib/dpkg/options.c +lib/dpkg/pager.c lib/dpkg/parse.c lib/dpkg/parsehelp.c lib/dpkg/path-remove.c diff --git a/src/configure.c b/src/configure.c index 076abbd9d..d021e2040 100644 --- a/src/configure.c +++ b/src/configure.c @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -206,7 +207,7 @@ show_diff(const char *old, const char *new) sprintf(cmdbuf, DIFF " -Nu %.250s %.250s | %.250s", str_quote_meta(old), str_quote_meta(new), - command_get_pager()); + pager_get_exec()); command_shell(cmdbuf, _("conffile difference visualizer")); } -- cgit v1.2.3 From 7a6cdb430bd85bd38601730fef816e7c89e5e1b8 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 27 Aug 2018 01:27:49 +0200 Subject: libdpkg: Require both stdin and stdout to be a tty to use a pager A pager requires both input being connected to a tty, and we want to use it when the output goes to the tty, so require both. --- debian/changelog | 2 ++ lib/dpkg/pager.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index f8dc624ce..7bcfc04ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -81,6 +81,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium * Dump database package records in alphabetical order. This will give reproducible status and available database files, and make it possible to output other deb822 formatted data in a deterministic way. + * Require both standard input and output to be connected to a terminal to + use a pager. * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c index a1cb10107..4922b537a 100644 --- a/lib/dpkg/pager.c +++ b/lib/dpkg/pager.c @@ -39,7 +39,7 @@ pager_get_exec(void) { const char *pager; - if (!isatty(1)) + if (!isatty(0) || !isatty(1)) return CAT; pager = getenv("PAGER"); -- cgit v1.2.3 From 3b8cd0ea54e2027fd7c972e3edcbbc8bb43afa52 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Aug 2018 05:10:12 +0200 Subject: libdpkg: Add pager spawning and reaping support This will make using a pager way easier, and make it possible to remove some redundant and unsafe system() usage. --- debian/changelog | 1 + lib/dpkg/libdpkg.map | 2 ++ lib/dpkg/pager.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/dpkg/pager.h | 6 +++++ 4 files changed, 73 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 7bcfc04ae..06462517a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -206,6 +206,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Add new m_dup() function. - libdpkg: Factor out package stanza printing into its own function. - libdpkg: Split pager specific code into its own module. + - libdpkg: Add pager spawning and reaping support. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index b562d7aad..cb3062845 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -185,6 +185,8 @@ LIBDPKG_PRIVATE { command_destroy; pager_get_exec; + pager_spawn; + pager_reap; setcloexec; diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c index 4922b537a..c9adf5bce 100644 --- a/lib/dpkg/pager.c +++ b/lib/dpkg/pager.c @@ -21,12 +21,17 @@ #include #include +#include + +#include #include #include #include #include #include +#include +#include #include /** @@ -48,3 +53,62 @@ pager_get_exec(void) return pager; } + +struct pager { + bool used; + const char *desc; + pid_t pid; + int stdout_old; + int pipe[2]; +}; + +struct pager * +pager_spawn(const char *desc, const char *filename) +{ + struct pager *pager; + + pager = m_calloc(1, sizeof(*pager)); + pager->used = filename || (isatty(0) && isatty(1)); + pager->desc = desc; + + if (!pager->used) + return pager; + + m_pipe(pager->pipe); + + pager->pid = subproc_fork(); + if (pager->pid == 0) { + struct command cmd; + const char *exec; + + exec = pager_get_exec(); + + m_dup2(pager->pipe[0], 0); + close(pager->pipe[0]); + close(pager->pipe[1]); + + command_init(&cmd, exec, desc); + command_add_arg(&cmd, exec); + command_add_arg(&cmd, filename); + command_exec(&cmd); + } + + pager->stdout_old = m_dup(1); + m_dup2(pager->pipe[1], 1); + close(pager->pipe[0]); + close(pager->pipe[1]); + + return pager; +} + +void +pager_reap(struct pager *pager) +{ + if (!pager->used) + return; + + m_dup2(pager->stdout_old, 1); + subproc_reap(pager->pid, pager->desc, SUBPROC_NOPIPE); + + free(pager); +} diff --git a/lib/dpkg/pager.h b/lib/dpkg/pager.h index 8ecc93b97..7d7ea0dff 100644 --- a/lib/dpkg/pager.h +++ b/lib/dpkg/pager.h @@ -36,6 +36,12 @@ struct pager; const char * pager_get_exec(void); +struct pager * +pager_spawn(const char *desc, const char *filename); + +void +pager_reap(struct pager *pager); + /** @} */ DPKG_END_DECLS -- cgit v1.2.3 From c2929d087701dd36f84e8ba5e25ba060466c1c2a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 15 Aug 2018 05:10:12 +0200 Subject: libdpkg, dpkg: Use new pager spawning support Use it instead of open-coding it, or piping it via a shell invocation, which required metacharacter escaping. --- debian/changelog | 2 ++ lib/dpkg/file.c | 19 +++---------------- src/configure.c | 19 ++++++++++++------- 3 files changed, 17 insertions(+), 23 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 06462517a..1d46bb361 100644 --- a/debian/changelog +++ b/debian/changelog @@ -207,6 +207,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Factor out package stanza printing into its own function. - libdpkg: Split pager specific code into its own module. - libdpkg: Add pager spawning and reaping support. + - Use new pager spawning support instead of open-coding it, or piping it + via a shell invocation, which required metacharacter escaping. * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index c62c3121f..4b3a24fed 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -31,8 +31,6 @@ #include #include -#include -#include #include #include #include @@ -201,22 +199,11 @@ file_lock(int *lockfd, enum file_lock_flags flags, const char *filename, void file_show(const char *filename) { - pid_t pid; + struct pager *pager; if (filename == NULL) internerr("filename is NULL"); - pid = subproc_fork(); - if (pid == 0) { - struct command cmd; - const char *pager; - - pager = pager_get_exec(); - - command_init(&cmd, pager, _("showing file on pager")); - command_add_arg(&cmd, pager); - command_add_arg(&cmd, filename); - command_exec(&cmd); - } - subproc_reap(pid, _("showing file on pager"), SUBPROC_NOCHECK); + pager = pager_spawn(_("pager to show file"), filename); + pager_reap(pager); } diff --git a/src/configure.c b/src/configure.c index d021e2040..66019071b 100644 --- a/src/configure.c +++ b/src/configure.c @@ -198,22 +198,27 @@ show_prompt(const char *cfgfile, const char *realold, const char *realnew, static void show_diff(const char *old, const char *new) { + struct pager *pager; pid_t pid; + pager = pager_spawn(_("conffile difference visualizer"), NULL); + pid = subproc_fork(); if (!pid) { /* Child process. */ - char cmdbuf[1024]; - - sprintf(cmdbuf, DIFF " -Nu %.250s %.250s | %.250s", - str_quote_meta(old), str_quote_meta(new), - pager_get_exec()); - - command_shell(cmdbuf, _("conffile difference visualizer")); + struct command cmd; + + command_init(&cmd, DIFF, _("conffile difference visualizer")); + command_add_arg(&cmd, DIFF); + command_add_arg(&cmd, "-Nu"); + command_add_arg(&cmd, old); + command_add_arg(&cmd, new); + command_exec(&cmd); } /* Parent process. */ subproc_reap(pid, _("conffile difference visualizer"), SUBPROC_NOCHECK); + pager_reap(pager); } /** -- cgit v1.2.3 From b051c0d58e99a76c3be616f374307d78503da5c5 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 25 Aug 2018 01:29:32 +0200 Subject: libdpkg: Add new unit tests for namevalue, fsys-hash and pkg-hash modules --- debian/changelog | 1 + lib/dpkg/t/.gitignore | 3 + lib/dpkg/t/Makefile.am | 3 + lib/dpkg/t/t-fsys-hash.c | 108 ++++++++++++++++++++++++++++ lib/dpkg/t/t-namevalue.c | 48 +++++++++++++ lib/dpkg/t/t-pkg-hash.c | 178 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 341 insertions(+) create mode 100644 lib/dpkg/t/t-fsys-hash.c create mode 100644 lib/dpkg/t/t-namevalue.c create mode 100644 lib/dpkg/t/t-pkg-hash.c (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 6ebe703fc..3b883b060 100644 --- a/debian/changelog +++ b/debian/changelog @@ -275,6 +275,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Add several TODO tests cases for dependency simplification. - Add new cppcheck author test. - Add support for new test_get_srcdir() test_get_builddir(). + - Add new unit tests for namevalue, fsys-hash and pkg-hash libdpkg modules. [ Updated programs translations ] * Dutch (Frans Spiesschaert). Closes: #881401 diff --git a/lib/dpkg/t/.gitignore b/lib/dpkg/t/.gitignore index ee1ab73ec..38bfe340f 100644 --- a/lib/dpkg/t/.gitignore +++ b/lib/dpkg/t/.gitignore @@ -10,11 +10,14 @@ t-deb-version t-ehandle t-error t-file +t-fsys-hash t-macros t-mod-db +t-namevalue t-pager t-path t-pkginfo +t-pkg-hash t-pkg-list t-pkg-queue t-pkg-show diff --git a/lib/dpkg/t/Makefile.am b/lib/dpkg/t/Makefile.am index 6dff6267a..dcecc6155 100644 --- a/lib/dpkg/t/Makefile.am +++ b/lib/dpkg/t/Makefile.am @@ -23,6 +23,7 @@ test_programs = \ t-test-skip \ t-macros \ t-c-ctype \ + t-namevalue \ t-ehandle \ t-error \ t-string \ @@ -42,7 +43,9 @@ test_programs = \ t-pkginfo \ t-pkg-list \ t-pkg-queue \ + t-pkg-hash \ t-pkg-show \ + t-fsys-hash \ t-trigger \ t-mod-db \ $(nil) diff --git a/lib/dpkg/t/t-fsys-hash.c b/lib/dpkg/t/t-fsys-hash.c new file mode 100644 index 000000000..8d34d4807 --- /dev/null +++ b/lib/dpkg/t/t-fsys-hash.c @@ -0,0 +1,108 @@ +/* + * libdpkg - Debian packaging suite library routines + * t-fsys-hash.c - test fsys-hash implementation + * + * Copyright © 2018 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include +#include + +static void +test_fsys_nodes(void) +{ + struct filenamenode *fnn; + struct fileiterator *iter; + const char *name; + + test_pass(fsys_hash_entries() == 0); + + filesdbinit(); + + fnn = findnamenode("/nonexistent", fnn_nonew); + test_pass(fnn == NULL); + test_pass(fsys_hash_entries() == 0); + + name = "/test/path/aa"; + fnn = findnamenode(name, fnn_nocopy); + test_pass(fnn != NULL); + test_pass(fsys_hash_entries() == 1); + test_pass(fnn->name == name); + test_str(fnn->name, ==, "/test/path/aa"); + test_pass(fnn->flags == 0); + test_pass(fnn->oldhash == NULL); + test_str(fnn->newhash, ==, EMPTYHASHFLAG); + + fnn = findnamenode("//./test/path/bb", 0); + test_pass(fnn != NULL); + test_pass(fsys_hash_entries() == 2); + test_str(fnn->name, ==, "/test/path/bb"); + test_pass(fnn->flags == 0); + test_pass(fnn->oldhash == NULL); + test_str(fnn->newhash, ==, EMPTYHASHFLAG); + + fnn = findnamenode("/test/path/cc", 0); + test_pass(fnn != NULL); + test_pass(fsys_hash_entries() == 3); + test_str(fnn->name, ==, "/test/path/cc"); + test_pass(fnn->flags == 0); + test_pass(fnn->oldhash == NULL); + test_str(fnn->newhash, ==, EMPTYHASHFLAG); + + iter = files_db_iter_new(); + while ((fnn = files_db_iter_next(iter))) { + if (strcmp(fnn->name, "/test/path/aa") == 0) + test_str(fnn->name, ==, "/test/path/aa"); + else if (strcmp(fnn->name, "/test/path/bb") == 0) + test_str(fnn->name, ==, "/test/path/bb"); + else if (strcmp(fnn->name, "/test/path/cc") == 0) + test_str(fnn->name, ==, "/test/path/cc"); + else + test_fail("unknown filenamenode"); + } + files_db_iter_free(iter); + + filesdbinit(); + test_pass(fsys_hash_entries() == 3); + fnn = findnamenode("/test/path/aa", fnn_nonew); + test_pass(fnn != NULL); + fnn = findnamenode("/test/path/bb", fnn_nonew); + test_pass(fnn != NULL); + fnn = findnamenode("/test/path/cc", fnn_nonew); + test_pass(fnn != NULL); + test_pass(fsys_hash_entries() == 3); + + files_db_reset(); + test_pass(fsys_hash_entries() == 0); + fnn = findnamenode("/test/path/aa", fnn_nonew); + test_pass(fnn == NULL); + fnn = findnamenode("/test/path/bb", fnn_nonew); + test_pass(fnn == NULL); + fnn = findnamenode("/test/path/cc", fnn_nonew); + test_pass(fnn == NULL); + test_pass(fsys_hash_entries() == 0); +} + +TEST_ENTRY(test) +{ + test_plan(35); + + test_fsys_nodes(); +} diff --git a/lib/dpkg/t/t-namevalue.c b/lib/dpkg/t/t-namevalue.c new file mode 100644 index 000000000..c8647662e --- /dev/null +++ b/lib/dpkg/t/t-namevalue.c @@ -0,0 +1,48 @@ +/* + * libdpkg - Debian packaging suite library routines + * t-namevalue.c - test name/value implementation + * + * Copyright © 2018 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include +#include + +static void +test_namevalue(void) +{ + const struct namevalue *nv; + + nv = namevalue_find_by_name(booleaninfos, ""); + test_pass(nv == NULL); + + nv = namevalue_find_by_name(booleaninfos, "no"); + test_pass(nv != NULL); + test_pass(nv->value == false); + test_pass(nv->length == strlen("no")); + test_str(nv->name, ==, "no"); +} + +TEST_ENTRY(test) +{ + test_plan(5); + + test_namevalue(); +} diff --git a/lib/dpkg/t/t-pkg-hash.c b/lib/dpkg/t/t-pkg-hash.c new file mode 100644 index 000000000..f45594f15 --- /dev/null +++ b/lib/dpkg/t/t-pkg-hash.c @@ -0,0 +1,178 @@ +/* + * libdpkg - Debian packaging suite library routines + * t-pkg-hash.c - test pkg-hash implementation + * + * Copyright © 2018 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include +#include +#include +#include + +static void +test_pkg_hash(void) +{ + struct dpkg_arch *arch; + struct pkgset *set; + struct pkginfo *pkg; + struct pkgiterator *iter; + int pkginstance; + + test_pass(pkg_db_count_set() == 0); + test_pass(pkg_db_count_pkg() == 0); + + set = pkg_db_find_set("pkg-aa"); + test_pass(set != NULL); + test_str(set->name, ==, "pkg-aa"); + test_pass(pkg_db_count_set() == 1); + test_pass(pkg_db_count_pkg() == 1); + + set = pkg_db_find_set("pkg-aa"); + test_pass(set != NULL); + test_str(set->name, ==, "pkg-aa"); + test_pass(pkg_db_count_set() == 1); + test_pass(pkg_db_count_pkg() == 1); + + set = pkg_db_find_set("Pkg-AA"); + test_pass(set != NULL); + test_str(set->name, ==, "pkg-aa"); + test_pass(pkg_db_count_set() == 1); + test_pass(pkg_db_count_pkg() == 1); + + set = pkg_db_find_set("pkg-bb"); + pkg_set_status(&set->pkg, PKG_STAT_INSTALLED); + test_pass(set != NULL); + test_str(set->name, ==, "pkg-bb"); + test_pass(pkg_db_count_set() == 2); + test_pass(pkg_db_count_pkg() == 2); + + set = pkg_db_find_set("pkg-cc"); + test_pass(set != NULL); + test_str(set->name, ==, "pkg-cc"); + test_pass(pkg_db_count_set() == 3); + test_pass(pkg_db_count_pkg() == 3); + + arch = dpkg_arch_find("arch-xx"); + pkg = pkg_db_find_pkg("pkg-aa", arch); + pkg_set_status(pkg, PKG_STAT_INSTALLED); + test_pass(pkg != NULL); + test_str(pkg->set->name, ==, "pkg-aa"); + test_str(pkg->installed.arch->name, ==, "arch-xx"); + test_str(pkg->available.arch->name, ==, "arch-xx"); + test_pass(pkg_db_count_set() == 3); + test_pass(pkg_db_count_pkg() == 3); + + arch = dpkg_arch_find("arch-yy"); + pkg = pkg_db_find_pkg("pkg-aa", arch); + test_pass(pkg != NULL); + test_str(pkg->set->name, ==, "pkg-aa"); + test_str(pkg->installed.arch->name, ==, "arch-yy"); + test_str(pkg->available.arch->name, ==, "arch-yy"); + test_pass(pkg_db_count_set() == 3); + test_pass(pkg_db_count_pkg() == 4); + + arch = dpkg_arch_find("arch-zz"); + pkg = pkg_db_find_pkg("pkg-aa", arch); + pkg_set_status(pkg, PKG_STAT_UNPACKED); + test_pass(pkg != NULL); + test_str(pkg->set->name, ==, "pkg-aa"); + test_str(pkg->installed.arch->name, ==, "arch-zz"); + test_str(pkg->available.arch->name, ==, "arch-zz"); + test_pass(pkg_db_count_set() == 3); + test_pass(pkg_db_count_pkg() == 5); + + arch = dpkg_arch_find("arch-xx"); + pkg = pkg_db_find_pkg("pkg-aa", arch); + test_pass(pkg != NULL); + test_str(pkg->set->name, ==, "pkg-aa"); + test_str(pkg->installed.arch->name, ==, "arch-xx"); + test_str(pkg->available.arch->name, ==, "arch-xx"); + test_pass(pkg_db_count_set() == 3); + test_pass(pkg_db_count_pkg() == 5); + + set = pkg_db_find_set("pkg-aa"); + test_str(set->name, ==, "pkg-aa"); + pkg = pkg_db_get_singleton(set); + test_pass(pkg == NULL); + test_pass(pkg_db_count_set() == 3); + test_pass(pkg_db_count_pkg() == 5); + + pkg = pkg_db_find_singleton("pkg-bb"); + test_pass(pkg != NULL); + test_str(pkg->set->name, ==, "pkg-bb"); + test_pass(pkg_db_count_set() == 3); + test_pass(pkg_db_count_pkg() == 5); + + pkg = pkg_db_find_singleton("pkg-cc"); + test_pass(pkg != NULL); + test_str(pkg->set->name, ==, "pkg-cc"); + test_pass(pkg_db_count_set() == 3); + test_pass(pkg_db_count_pkg() == 5); + + iter = pkg_db_iter_new(); + while ((set = pkg_db_iter_next_set(iter))) { + if (strcmp(set->name, "pkg-aa") == 0) + test_str(set->name, ==, "pkg-aa"); + else if (strcmp(set->name, "pkg-bb") == 0) + test_str(set->name, ==, "pkg-bb"); + else if (strcmp(set->name, "pkg-cc") == 0) + test_str(set->name, ==, "pkg-cc"); + else + test_fail("unknown filenamenode"); + } + pkg_db_iter_free(iter); + + pkginstance = 0; + iter = pkg_db_iter_new(); + while ((pkg = pkg_db_iter_next_pkg(iter))) { + pkginstance++; + if (strcmp(pkg->set->name, "pkg-aa") == 0) { + struct pkgbin *pkgbin = &pkg->installed; + + test_str(pkg->set->name, ==, "pkg-aa"); + if (strcmp(pkgbin->arch->name, "arch-xx") == 0) + test_str(pkgbin->arch->name, ==, "arch-xx"); + else if (strcmp(pkgbin->arch->name, "arch-yy") == 0) + test_str(pkgbin->arch->name, ==, "arch-yy"); + else if (strcmp(pkgbin->arch->name, "arch-zz") == 0) + test_str(pkgbin->arch->name, ==, "arch-zz"); + else + test_fail("unknown pkginfo instance"); + } else if (strcmp(pkg->set->name, "pkg-bb") == 0) { + test_str(pkg->set->name, ==, "pkg-bb"); + } else if (strcmp(pkg->set->name, "pkg-cc") == 0) { + test_str(pkg->set->name, ==, "pkg-cc"); + } else { + test_fail("unknown filenamenode"); + } + } + pkg_db_iter_free(iter); + + pkg_db_reset(); + test_pass(pkg_db_count_set() == 0); + test_pass(pkg_db_count_pkg() == 0); +} + +TEST_ENTRY(test) +{ + test_plan(71); + + test_pkg_hash(); +} -- cgit v1.2.3 From 04f63813361b97b7da13653d547736b00e852b90 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 15 Sep 2018 02:33:24 +0200 Subject: libdpkg: Fix filesystem digest parsing Allocate the digest into the non-freeing memory pool, as we have stopped doing that for the entire loaded file with the switch to the file_slurp() function. Otherwise when we release the varbuf the fsys nodes will be pointing to garbage. Fixes: commit 1166bbb5f099580a0c1c26d0e29b1ae3fe11ad0f Reported-by: Sven Joachim Bisected-by: Sven Joachim --- lib/dpkg/db-fsys-digest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/dpkg/db-fsys-digest.c b/lib/dpkg/db-fsys-digest.c index cc032f14a..d5f11ffea 100644 --- a/lib/dpkg/db-fsys-digest.c +++ b/lib/dpkg/db-fsys-digest.c @@ -126,7 +126,7 @@ parse_filehash_buffer(struct varbuf *buf, /* Add the file to the list. */ namenode = findnamenode(filename, 0); - namenode->newhash = thisline; + namenode->newhash = nfstrsave(thisline); } } -- cgit v1.2.3 From 2848db123e1452d2c71840b7c00ca198c3626d4e Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sat, 15 Sep 2018 16:10:29 -0700 Subject: perl: Replace all calls to Cwd::cwd with Cwd::getcwd The former calls /bin/pwd, while the latter uses the getcwd() syscall directly. Signed-off-by: Guillem Jover --- debian/changelog | 4 ++++ doc/lcov-inject.pl | 2 +- lib/dpkg/t/t-tarextract.t | 2 +- lib/dpkg/t/t-treewalk.t | 2 +- scripts/Dpkg/Vendor/Debian.pm | 2 +- scripts/dpkg-genbuildinfo.pl | 2 +- scripts/dpkg-source.pl | 2 +- scripts/t/Dpkg_Shlibs.t | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 10d681f61..3f8de197d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -296,6 +296,10 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Delete fixup lines from i18nspector output instead of emptying them. - Add new codespell author test. + [ Josh Triplett ] + * Perl: Replace all calls to Cwd::cwd with Cwd::getcwd; the former calls + /bin/pwd, while the latter uses the getcwd() syscall directly. + [ Updated programs translations ] * Dutch (Frans Spiesschaert). Closes: #881401 * German (Sven Joachim). diff --git a/doc/lcov-inject.pl b/doc/lcov-inject.pl index a74c8010d..12b78bd9a 100755 --- a/doc/lcov-inject.pl +++ b/doc/lcov-inject.pl @@ -25,7 +25,7 @@ use Cwd; use Devel::Cover::DB; my $dir = 'scripts'; -my $cwd = cwd(); +my $cwd = getcwd(); chdir $dir or die "cannot switch to $dir\n"; diff --git a/lib/dpkg/t/t-tarextract.t b/lib/dpkg/t/t-tarextract.t index 25916bb8d..5fb9afa09 100755 --- a/lib/dpkg/t/t-tarextract.t +++ b/lib/dpkg/t/t-tarextract.t @@ -119,7 +119,7 @@ TAR make_path($tmpdir); - my $cwd = cwd(); + my $cwd = getcwd(); # Check generated tarballs. foreach my $type (qw(v7 ustar oldgnu gnu)) { diff --git a/lib/dpkg/t/t-treewalk.t b/lib/dpkg/t/t-treewalk.t index dcde7901e..6f379c81b 100755 --- a/lib/dpkg/t/t-treewalk.t +++ b/lib/dpkg/t/t-treewalk.t @@ -45,7 +45,7 @@ sub make_file { # Populate the tree hierarchy. sub make_tree { my ($dirtree) = @_; - my $cwd = cwd(); + my $cwd = getcwd(); make_path($dirtree); chdir $dirtree; diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index 4bcf120e0..7d4b6d802 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -210,7 +210,7 @@ sub _add_build_flags { $use_feature{reproducible}{fixdebugpath}) { require Cwd; - $build_path = $ENV{DEB_BUILD_PATH} || Cwd::cwd(); + $build_path = $ENV{DEB_BUILD_PATH} || Cwd::getcwd(); # If we have any unsafe character in the path, disable the flag, # so that we do not need to worry about escaping the characters diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl index 96b06093a..fe296506e 100755 --- a/scripts/dpkg-genbuildinfo.pl +++ b/scripts/dpkg-genbuildinfo.pl @@ -423,7 +423,7 @@ if ($use_feature{kernel}) { $fields->{'Build-Kernel-Version'} = "$kern_rel $kern_ver"; } -my $cwd = cwd(); +my $cwd = getcwd(); if ($use_feature{path}) { $fields->{'Build-Path'} = $cwd; } else { diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 107408d79..6a4825d22 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -118,7 +118,7 @@ if (defined($options{opmode}) && } if ($dir eq '.') { # . is never correct, adjust automatically - $dir = basename(cwd()); + $dir = basename(getcwd()); chdir '..' or syserr(g_("unable to chdir to '%s'"), '..'); } # --format options are not allowed, they would take precedence diff --git a/scripts/t/Dpkg_Shlibs.t b/scripts/t/Dpkg_Shlibs.t index 4dc98bb3f..a2b892d74 100644 --- a/scripts/t/Dpkg_Shlibs.t +++ b/scripts/t/Dpkg_Shlibs.t @@ -54,7 +54,7 @@ Dpkg::Shlibs::blank_library_paths(); # We want relative paths inside the ld.so.conf fragments to work, and $srcdir # is usually a relative path, so let's temporarily switch directory. # XXX: An alternative would be to make parse_ldso_conf relative path aware. -my $cwd = cwd(); +my $cwd = getcwd(); test_needs_srcdir_switch(); Dpkg::Shlibs::parse_ldso_conf('t/Dpkg_Shlibs/ld.so.conf'); chdir($cwd); -- cgit v1.2.3 From eca1fdbfe00d1b0bb8de2c96cbdba23164b46c64 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 14 Sep 2018 21:34:49 +0200 Subject: libdpkg: Check that the public headers can be compiled with C++ --- debian/changelog | 1 + lib/dpkg/t/.gitignore | 1 + lib/dpkg/t/Makefile.am | 3 ++ lib/dpkg/t/t-headers-cpp.cc | 82 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+) create mode 100644 lib/dpkg/t/t-headers-cpp.cc (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 277da7a0f..ef297822c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -296,6 +296,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Improve coverage of perl unit tests. - Delete fixup lines from i18nspector output instead of emptying them. - Add new codespell author test. + - Add new test that the public libdpkg headers can be compiled with C++. [ Josh Triplett ] * Perl: Replace all calls to Cwd::cwd with Cwd::getcwd; the former calls diff --git a/lib/dpkg/t/.gitignore b/lib/dpkg/t/.gitignore index 38bfe340f..db7126c04 100644 --- a/lib/dpkg/t/.gitignore +++ b/lib/dpkg/t/.gitignore @@ -11,6 +11,7 @@ t-ehandle t-error t-file t-fsys-hash +t-headers-cpp t-macros t-mod-db t-namevalue diff --git a/lib/dpkg/t/Makefile.am b/lib/dpkg/t/Makefile.am index dcecc6155..9e83836e4 100644 --- a/lib/dpkg/t/Makefile.am +++ b/lib/dpkg/t/Makefile.am @@ -17,11 +17,14 @@ TEST_ENV_VARS = \ DPKG_PROGTAR=$(TAR) \ $(nil) +t_headers_cpp_SOURCES = t-headers-cpp.cc + # The tests are sorted in order of increasing complexity. test_programs = \ t-test \ t-test-skip \ t-macros \ + t-headers-cpp \ t-c-ctype \ t-namevalue \ t-ehandle \ diff --git a/lib/dpkg/t/t-headers-cpp.cc b/lib/dpkg/t/t-headers-cpp.cc new file mode 100644 index 000000000..b5becf9ae --- /dev/null +++ b/lib/dpkg/t/t-headers-cpp.cc @@ -0,0 +1,82 @@ +/* + * libdpkg - Debian packaging suite library routines + * t-headers-cpp.cc - test C++ inclusion of headers + * + * Copyright © 2018 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +TEST_ENTRY(test) +{ + test_plan(1); + + test_pass(true); +} -- cgit v1.2.3 From 3d494a7ab27debd8842157c50c46d5bb49952671 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 31 Aug 2018 01:49:20 +0200 Subject: libdpkg: Add new fsys-dir module This module handles setting and getting the filesystem root directory. --- debian/changelog | 1 + lib/dpkg/Makefile.am | 1 + lib/dpkg/fsys-dir.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/dpkg/fsys.h | 4 +++ lib/dpkg/libdpkg.map | 4 +++ lib/dpkg/t/.gitignore | 1 + lib/dpkg/t/Makefile.am | 1 + lib/dpkg/t/t-fsys-dir.c | 65 ++++++++++++++++++++++++++++++++++ po/POTFILES.in | 1 + 9 files changed, 171 insertions(+) create mode 100644 lib/dpkg/fsys-dir.c create mode 100644 lib/dpkg/t/t-fsys-dir.c (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index eb68b75dc..6f9e4a0a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium - Dpkg(1): Add POD documentation about the module hierarchy and API. * Code internals: - dpkg-split: Use nfstrnsave() instead of nfmalloc() + memcpy(). + - libdpkg: Add new fsys-dir module. * Build system: - Distribute a LICENSE file on CPAN. - Do not make the Build.PL script executable. diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index 58bd403ab..a2828af4b 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -70,6 +70,7 @@ libdpkg_la_SOURCES = \ fdio.c \ file.c \ fields.c \ + fsys-dir.c\ fsys-iter.c \ fsys-hash.c \ glob.c \ diff --git a/lib/dpkg/fsys-dir.c b/lib/dpkg/fsys-dir.c new file mode 100644 index 000000000..15335b23e --- /dev/null +++ b/lib/dpkg/fsys-dir.c @@ -0,0 +1,93 @@ +/* + * libdpkg - Debian packaging suite library routines + * fsys-dir.c - filesystem root directory functions + * + * Copyright © 2011, 2018 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include + +#include +#include +#include +#include + +static const char *fsys_dir = ""; + +/** + * Set current on-disk filesystem root directory. + * + * The directory is initially set to "", this function can be used to + * set the directory to a new value, or to set it to a default value if dir + * is NULL. For the latter the order is, value from environment variable + * DPKG_ROOT, and then the built-in default "", + * + * @param dir The new filesystem root directory, or NULL to set to default. + * + * @return The new filesystem root directory. + */ +const char * +dpkg_fsys_set_dir(const char *dir) +{ + char *new_dir; + + if (dir == NULL) { + const char *env; + + env = getenv("DPKG_ROOT"); + if (env) + dir = env; + else + dir = ""; + } + + new_dir = m_strdup(dir); + path_trim_slash_slashdot(new_dir); + + fsys_dir = new_dir; + + return fsys_dir; +} + +/** + * Get current on-disk filesystem root directory. + * + * @return The current filesystem root directory. + */ +const char * +dpkg_fsys_get_dir(void) +{ + return fsys_dir; +} + +/** + * Get a pathname to the current on-disk filesystem root directory. + * + * This function returns an allocated string, which should be freed with + * free(2). + * + * @param pathpart The pathpart to append to the new pathname. + * + * @return The newly allocated pathname. + */ +char * +dpkg_fsys_get_path(const char *pathpart) +{ + return str_fmt("%s/%s", fsys_dir, pathpart); +} diff --git a/lib/dpkg/fsys.h b/lib/dpkg/fsys.h index 8a2efbffa..72d76f715 100644 --- a/lib/dpkg/fsys.h +++ b/lib/dpkg/fsys.h @@ -190,4 +190,8 @@ struct filepackages_iterator *filepackages_iter_new(struct filenamenode *fnn); struct pkginfo *filepackages_iter_next(struct filepackages_iterator *iter); void filepackages_iter_free(struct filepackages_iterator *iter); +const char *dpkg_fsys_set_dir(const char *dir); +const char *dpkg_fsys_get_dir(void); +char *dpkg_fsys_get_path(const char *pathpart); + #endif /* LIBDPKG_FSYS_H */ diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index cb3062845..082732405 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -419,6 +419,10 @@ LIBDPKG_PRIVATE { filepackages_iter_next; filepackages_iter_free; + dpkg_fsys_set_dir; + dpkg_fsys_get_dir; + dpkg_fsys_get_path; + # Package on-disk filesystem database support parse_filehash; write_filelist_except; diff --git a/lib/dpkg/t/.gitignore b/lib/dpkg/t/.gitignore index db7126c04..5b019c86e 100644 --- a/lib/dpkg/t/.gitignore +++ b/lib/dpkg/t/.gitignore @@ -10,6 +10,7 @@ t-deb-version t-ehandle t-error t-file +t-fsys-dir t-fsys-hash t-headers-cpp t-macros diff --git a/lib/dpkg/t/Makefile.am b/lib/dpkg/t/Makefile.am index 9e83836e4..83c96f329 100644 --- a/lib/dpkg/t/Makefile.am +++ b/lib/dpkg/t/Makefile.am @@ -48,6 +48,7 @@ test_programs = \ t-pkg-queue \ t-pkg-hash \ t-pkg-show \ + t-fsys-dir \ t-fsys-hash \ t-trigger \ t-mod-db \ diff --git a/lib/dpkg/t/t-fsys-dir.c b/lib/dpkg/t/t-fsys-dir.c new file mode 100644 index 000000000..7dbe753d1 --- /dev/null +++ b/lib/dpkg/t/t-fsys-dir.c @@ -0,0 +1,65 @@ +/* + * libdpkg - Debian packaging suite library routines + * t-fsys.c - test filesystem handling + * + * Copyright © 2018 Guillem Jover + * + * This 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 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 . + */ + +#include +#include + +#include + +#include +#include + +static void +test_fsys_dir(void) +{ + char *dir; + + test_str(dpkg_fsys_get_dir(), ==, ""); + + dpkg_fsys_set_dir("/testdir"); + test_str(dpkg_fsys_get_dir(), ==, "/testdir"); + + dir = dpkg_fsys_get_path("testfile"); + test_str(dir, ==, "/testdir/testfile"); + free(dir); + + setenv("DPKG_ROOT", "/testenvdir", 1); + dpkg_fsys_set_dir(NULL); + test_str(dpkg_fsys_get_dir(), ==, "/testenvdir"); + + dir = dpkg_fsys_get_path("testfile"); + test_str(dir, ==, "/testenvdir/testfile"); + free(dir); + + unsetenv("DPKG_ROOT"); + dpkg_fsys_set_dir(NULL); + test_str(dpkg_fsys_get_dir(), ==, ""); + + dir = dpkg_fsys_get_path("testfile"); + test_str(dir, ==, "/testfile"); + free(dir); +} + +TEST_ENTRY(test) +{ + test_plan(7); + + test_fsys_dir(); +} diff --git a/po/POTFILES.in b/po/POTFILES.in index 43212d541..1fc14b9f6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -28,6 +28,7 @@ lib/dpkg/error.c lib/dpkg/fdio.c lib/dpkg/fields.c lib/dpkg/file.c +lib/dpkg/fsys-dir.c lib/dpkg/fsys-iter.c lib/dpkg/fsys-hash.c lib/dpkg/glob.c -- cgit v1.2.3 From ce9b2e88602dcdff93963b9cb8aef302179b81c9 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 5 Oct 2018 02:01:28 +0200 Subject: libdpkg: Pass the file contents to the pager instead of the filename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's just handle opening the file and passing its data to the pager ourselves, as that gives us more control, and then can decide not to run a pager at all, and do not need to mess with arguments which might need to be passed to «sh -c». --- debian/changelog | 1 + lib/dpkg/file.c | 17 ++++++++++++++++- lib/dpkg/pager.c | 5 ++--- lib/dpkg/pager.h | 2 +- src/configure.c | 2 +- src/querycmd.c | 2 +- 6 files changed, 22 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 52a48cc4c..eb7c52735 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium * Code internals: - dpkg-split: Use nfstrnsave() instead of nfmalloc() + memcpy(). - libdpkg: Add new fsys-dir module. + - libdpkg: Pass the file contents to the pager instead of the filename. * Build system: - Distribute a LICENSE file on CPAN. - Do not make the Build.PL script executable. diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index 4b3a24fed..a949bd49e 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -33,6 +33,7 @@ #include #include #include +#include #include /** @@ -200,10 +201,24 @@ void file_show(const char *filename) { struct pager *pager; + struct dpkg_error err; + int fd, rc; if (filename == NULL) internerr("filename is NULL"); - pager = pager_spawn(_("pager to show file"), filename); + fd = open(filename, O_RDONLY); + if (fd < 0) + ohshite(_("cannot open file %s"), filename); + + pager = pager_spawn(_("pager to show file")); + rc = fd_fd_copy(fd, STDOUT_FILENO, -1, &err); pager_reap(pager); + + close(fd); + + if (rc < 0 && err.syserrno != EPIPE) { + errno = err.syserrno; + ohshite(_("cannot write file %s into the pager"), filename); + } } diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c index c9adf5bce..bdbce06c9 100644 --- a/lib/dpkg/pager.c +++ b/lib/dpkg/pager.c @@ -63,12 +63,12 @@ struct pager { }; struct pager * -pager_spawn(const char *desc, const char *filename) +pager_spawn(const char *desc) { struct pager *pager; pager = m_calloc(1, sizeof(*pager)); - pager->used = filename || (isatty(0) && isatty(1)); + pager->used = isatty(0) && isatty(1); pager->desc = desc; if (!pager->used) @@ -89,7 +89,6 @@ pager_spawn(const char *desc, const char *filename) command_init(&cmd, exec, desc); command_add_arg(&cmd, exec); - command_add_arg(&cmd, filename); command_exec(&cmd); } diff --git a/lib/dpkg/pager.h b/lib/dpkg/pager.h index 7d7ea0dff..34bcf2fd5 100644 --- a/lib/dpkg/pager.h +++ b/lib/dpkg/pager.h @@ -37,7 +37,7 @@ const char * pager_get_exec(void); struct pager * -pager_spawn(const char *desc, const char *filename); +pager_spawn(const char *desc); void pager_reap(struct pager *pager); diff --git a/src/configure.c b/src/configure.c index 66019071b..0da9723f6 100644 --- a/src/configure.c +++ b/src/configure.c @@ -201,7 +201,7 @@ show_diff(const char *old, const char *new) struct pager *pager; pid_t pid; - pager = pager_spawn(_("conffile difference visualizer"), NULL); + pager = pager_spawn(_("conffile difference visualizer")); pid = subproc_fork(); if (!pid) { diff --git a/src/querycmd.c b/src/querycmd.c index 415235bff..a62b27655 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -265,7 +265,7 @@ listpackages(const char *const *argv) memset(&fmt, 0, sizeof(fmt)); - pager = pager_spawn(_("showing package list on pager"), NULL); + pager = pager_spawn(_("showing package list on pager")); if (!*argv) { for (i = 0; i < array.n_pkgs; i++) { -- cgit v1.2.3 From ac4d95c3a18545787589433dbfefa377e45b7f8d Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 2 Oct 2018 03:52:22 +0200 Subject: libdpkg: Call the pager with «$SHELL -c» to respect POSIX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The PAGER environment variable is specified in POSIX as taking a pager command and any number of arguments to be passed to «sh -c», so we have to preserve that behavior or this breaks badly on systems where PAGER is set that way. This actually gets in the way of improving the pager command presence detection, but we'll fix that later on, by making the scanning of the environment variable smarter or by trying to execute the fallbacks. Closes: #910009 --- debian/changelog | 1 + lib/dpkg/pager.c | 5 +---- man/dpkg-query.man | 8 +++++++- man/dpkg.man | 11 +++++++---- 4 files changed, 16 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index eb7c52735..ef868465a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium give a more meaningful error message on chroot(). Closes: #614126 * dpkg-divert, dpkg-statoverride: Add new --instdir and --root options, and make the commands honor the DPKG_ROOT environment variable. + * libdpkg: Call the pager with «$SHELL -c» to respect POSIX. Closes: #910009 * Perl modules: - Dpkg::OpenPGP: Ignore Version field in enarmored output. Fixes CPAN#127217. diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c index bdbce06c9..e7e251ff0 100644 --- a/lib/dpkg/pager.c +++ b/lib/dpkg/pager.c @@ -78,7 +78,6 @@ pager_spawn(const char *desc) pager->pid = subproc_fork(); if (pager->pid == 0) { - struct command cmd; const char *exec; exec = pager_get_exec(); @@ -87,9 +86,7 @@ pager_spawn(const char *desc) close(pager->pipe[0]); close(pager->pipe[1]); - command_init(&cmd, exec, desc); - command_add_arg(&cmd, exec); - command_exec(&cmd); + command_shell(exec, desc); } pager->stdout_old = m_dup(1); diff --git a/man/dpkg-query.man b/man/dpkg-query.man index 992309a9f..531faa4ed 100644 --- a/man/dpkg-query.man +++ b/man/dpkg-query.man @@ -318,8 +318,14 @@ memory allocations, etc. . .SH ENVIRONMENT .TP +.B SHELL +Sets the program to execute when spawning a command via a shell +(since dpkg 1.19.2). +.TP .B PAGER -Sets the pager program to use (since dpkg 1.19.1). +Sets the pager command to use (since dpkg 1.19.1), which will be executed +with «\fB$SHELL -c\fP». +If \fBSHELL\fP is not set, «\fBsh\fP» will be used instead. .TP .B DPKG_ADMINDIR If set and the \fB\-\-admindir\fP option has not been specified, it will diff --git a/man/dpkg.man b/man/dpkg.man index eff9d6667..6696b17b3 100644 --- a/man/dpkg.man +++ b/man/dpkg.man @@ -880,11 +880,14 @@ specific configuration file. If set, \fBdpkg\fP will use it as the directory in which to create temporary files and directories. .TP -.B PAGER -The program \fBdpkg\fP will execute when displaying the conffiles. -.TP .B SHELL -The program \fBdpkg\fP will execute when starting a new interactive shell. +The program \fBdpkg\fP will execute when starting a new interactive shell, +or when spawning a command via a shell. +.TP +.B PAGER +The program \fBdpkg\fP will execute when running a pager, for example when +displaying the conffile differences. +If \fBSHELL\fP is not set, «\fBsh\fP» will be used instead. .TP .B DPKG_COLORS Sets the color mode (since dpkg 1.18.5). -- cgit v1.2.3 From 9f7a5e6d0a6a9b300e4556db4be29aeb77546a2f Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 1 Oct 2018 02:48:27 +0200 Subject: libdpkg: Do not spawn a pager if we are going to call «cat» MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no point in executing «cat», we are already dumping the contents to stdout. --- debian/changelog | 1 + lib/dpkg/pager.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index ef868465a..0da74e559 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium * dpkg-divert, dpkg-statoverride: Add new --instdir and --root options, and make the commands honor the DPKG_ROOT environment variable. * libdpkg: Call the pager with «$SHELL -c» to respect POSIX. Closes: #910009 + * libdpkg: Do not spawn a pager if we are going to call «cat». * Perl modules: - Dpkg::OpenPGP: Ignore Version field in enarmored output. Fixes CPAN#127217. diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c index e7e251ff0..24cea9dfb 100644 --- a/lib/dpkg/pager.c +++ b/lib/dpkg/pager.c @@ -66,11 +66,16 @@ struct pager * pager_spawn(const char *desc) { struct pager *pager; + const char *exec; pager = m_calloc(1, sizeof(*pager)); pager->used = isatty(0) && isatty(1); pager->desc = desc; + exec = pager_get_exec(); + if (strcmp(exec, CAT) == 0) + pager->used = false; + if (!pager->used) return pager; @@ -78,10 +83,6 @@ pager_spawn(const char *desc) pager->pid = subproc_fork(); if (pager->pid == 0) { - const char *exec; - - exec = pager_get_exec(); - m_dup2(pager->pipe[0], 0); close(pager->pipe[0]); close(pager->pipe[1]); -- cgit v1.2.3 From 799a9fbeda50739c2eb9b872cdad0ff78710587c Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 1 Oct 2018 02:47:52 +0200 Subject: libdpkg: Honor DPKG_PAGER This makes it possible to use a dpkg specific pager. Suggested-by: Craig Sanders Ref: #909754 --- debian/changelog | 2 ++ lib/dpkg/pager.c | 4 +++- man/dpkg-query.man | 4 ++++ man/dpkg.man | 4 ++++ t/codespell/stopwords | 1 + 5 files changed, 14 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 0da74e559..a1476c1a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ dpkg (1.19.2) UNRELEASED; urgency=medium and make the commands honor the DPKG_ROOT environment variable. * libdpkg: Call the pager with «$SHELL -c» to respect POSIX. Closes: #910009 * libdpkg: Do not spawn a pager if we are going to call «cat». + * libdpkg: Honor DPKG_PAGER when spawning a pager. + Suggested by Craig Sanders . * Perl modules: - Dpkg::OpenPGP: Ignore Version field in enarmored output. Fixes CPAN#127217. diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c index 24cea9dfb..fd326d67d 100644 --- a/lib/dpkg/pager.c +++ b/lib/dpkg/pager.c @@ -47,7 +47,9 @@ pager_get_exec(void) if (!isatty(0) || !isatty(1)) return CAT; - pager = getenv("PAGER"); + pager = getenv("DPKG_PAGER"); + if (str_is_unset(pager)) + pager = getenv("PAGER"); if (str_is_unset(pager)) pager = DEFAULTPAGER; diff --git a/man/dpkg-query.man b/man/dpkg-query.man index 531faa4ed..639cba8c0 100644 --- a/man/dpkg-query.man +++ b/man/dpkg-query.man @@ -323,9 +323,13 @@ Sets the program to execute when spawning a command via a shell (since dpkg 1.19.2). .TP .B PAGER +.TQ +.B DPKG_PAGER Sets the pager command to use (since dpkg 1.19.1), which will be executed with «\fB$SHELL -c\fP». If \fBSHELL\fP is not set, «\fBsh\fP» will be used instead. +The \fBDPKG_PAGER\fP overrides the \fBPAGER\fP environment variable +(since dpkg 1.19.2). .TP .B DPKG_ADMINDIR If set and the \fB\-\-admindir\fP option has not been specified, it will diff --git a/man/dpkg.man b/man/dpkg.man index 6696b17b3..ffb799d43 100644 --- a/man/dpkg.man +++ b/man/dpkg.man @@ -885,9 +885,13 @@ The program \fBdpkg\fP will execute when starting a new interactive shell, or when spawning a command via a shell. .TP .B PAGER +.TQ +.B DPKG_PAGER The program \fBdpkg\fP will execute when running a pager, for example when displaying the conffile differences. If \fBSHELL\fP is not set, «\fBsh\fP» will be used instead. +The \fBDPKG_PAGER\fP overrides the \fBPAGER\fP environment variable +(since dpkg 1.19.2). .TP .B DPKG_COLORS Sets the color mode (since dpkg 1.18.5). diff --git a/t/codespell/stopwords b/t/codespell/stopwords index a8ef90dde..1909fdd40 100644 --- a/t/codespell/stopwords +++ b/t/codespell/stopwords @@ -1,3 +1,4 @@ +cas chage cmo creat -- cgit v1.2.3 From f59933deb70c1b67de20df4f00a9a4f0da42c05d Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 2 Oct 2018 04:32:43 +0200 Subject: libdpkg: When spawning a pager set LESS to “-FRSXMQ” if not already set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 1 + lib/dpkg/pager.c | 3 +++ man/dpkg-query.man | 10 ++++++++++ man/dpkg.man | 8 ++++++++ 4 files changed, 22 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index a1476c1a9..c7e9fc8ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium * libdpkg: Do not spawn a pager if we are going to call «cat». * libdpkg: Honor DPKG_PAGER when spawning a pager. Suggested by Craig Sanders . + * libdpkg: Set LESS to “-FRSXMQ” if not already set, when spawning a pager. * Perl modules: - Dpkg::OpenPGP: Ignore Version field in enarmored output. Fixes CPAN#127217. diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c index fd326d67d..96cfbb0da 100644 --- a/lib/dpkg/pager.c +++ b/lib/dpkg/pager.c @@ -85,6 +85,9 @@ pager_spawn(const char *desc) pager->pid = subproc_fork(); if (pager->pid == 0) { + /* Set better defaults for less if not already set. */ + setenv("LESS", "-FRSXMQ", 0); + m_dup2(pager->pipe[0], 0); close(pager->pipe[0]); close(pager->pipe[1]); diff --git a/man/dpkg-query.man b/man/dpkg-query.man index 639cba8c0..bcd477cd0 100644 --- a/man/dpkg-query.man +++ b/man/dpkg-query.man @@ -317,6 +317,7 @@ interactions with the system, such as accesses to the database, memory allocations, etc. . .SH ENVIRONMENT +.SS External environment .TP .B SHELL Sets the program to execute when spawning a command via a shell @@ -339,6 +340,15 @@ be used as the \fBdpkg\fP data directory. Sets the color mode (since dpkg 1.18.5). The currently accepted values are: \fBauto\fP (default), \fBalways\fP and \fBnever\fP. +.SS Internal environment +.TP +.B LESS +Defined by \fBdpkg\-query\fP to “\fB-FRSXMQ\fP”, if not already set, when +spawning a pager (since dpkg 1.19.2). +To change the default behavior, this variable can be preset to some other +value including an empty string, or the \fBPAGER\fP or \fBDPKG_PAGER\fP +variables can be set to disable specific options with «\fB\-+\fP», for +example \fBDPKG_PAGER="less \-+F"\fP. . .SH SEE ALSO .BR dpkg (1). diff --git a/man/dpkg.man b/man/dpkg.man index ffb799d43..dd414b816 100644 --- a/man/dpkg.man +++ b/man/dpkg.man @@ -903,6 +903,14 @@ Set by a package manager frontend to notify dpkg that it should not acquire the frontend lock (since dpkg 1.19.1). .SS Internal environment .TP +.B LESS +Defined by \fBdpkg\fP to “\fB-FRSXMQ\fP”, if not already set, when +spawning a pager (since dpkg 1.19.2). +To change the default behavior, this variable can be preset to some other +value including an empty string, or the \fBPAGER\fP or \fBDPKG_PAGER\fP +variables can be set to disable specific options with «\fB\-+\fP», for +example \fBDPKG_PAGER="less \-+F"\fP. +.TP .B DPKG_ROOT Defined by \fBdpkg\fP on the maintainer script environment to indicate which installation to act on (since dpkg 1.18.5). -- cgit v1.2.3 From 5d194d5d55d5a7ac62422b7c98aa23548c5d7349 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 2 Oct 2018 04:57:47 +0200 Subject: libdpkg: Ignore SIGPIPE when setting up a pager If the pager quits early, the parent will receive a SIGPIPE as the write end of the pipe will not be available anymore. Instead we ignore SIGPIPE and also EPIPE errors when writing to stdout. Otherwise if we quit the pager early, the program will exit with an error code. Reported-by: Holger Levsen Ref: #909754 --- debian/changelog | 3 +++ lib/dpkg/mlib.c | 3 ++- lib/dpkg/pager.c | 12 ++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index c7e9fc8ef..359d23f6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ dpkg (1.19.2) UNRELEASED; urgency=medium * libdpkg: Honor DPKG_PAGER when spawning a pager. Suggested by Craig Sanders . * libdpkg: Set LESS to “-FRSXMQ” if not already set, when spawning a pager. + * libdpkg: Ignore SIGPIPE when setting up a pager, and then ignore EPIPE + errors when writing to stdout, otherwise if we quit the pager early, the + program will exit with an error code. * Perl modules: - Dpkg::OpenPGP: Ignore Version field in enarmored output. Fixes CPAN#127217. diff --git a/lib/dpkg/mlib.c b/lib/dpkg/mlib.c index 8de77b7ea..4e5e5b1a8 100644 --- a/lib/dpkg/mlib.c +++ b/lib/dpkg/mlib.c @@ -24,6 +24,7 @@ #include +#include #include #include #include @@ -143,7 +144,7 @@ void m_output(FILE *f, const char *name) { fflush(f); - if (ferror(f)) + if (ferror(f) && errno != EPIPE) ohshite(_("error writing to '%s'"), name); } diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c index 96cfbb0da..ed41daedb 100644 --- a/lib/dpkg/pager.c +++ b/lib/dpkg/pager.c @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -60,6 +61,7 @@ struct pager { bool used; const char *desc; pid_t pid; + struct sigaction sigpipe; int stdout_old; int pipe[2]; }; @@ -67,6 +69,7 @@ struct pager { struct pager * pager_spawn(const char *desc) { + struct sigaction sa; struct pager *pager; const char *exec; @@ -83,6 +86,13 @@ pager_spawn(const char *desc) m_pipe(pager->pipe); + memset(&sa, 0, sizeof(sa)); + sigemptyset(&sa.sa_mask); + sa.sa_handler = SIG_IGN; + sa.sa_flags = 0; + + sigaction(SIGPIPE, &sa, &pager->sigpipe); + pager->pid = subproc_fork(); if (pager->pid == 0) { /* Set better defaults for less if not already set. */ @@ -112,5 +122,7 @@ pager_reap(struct pager *pager) m_dup2(pager->stdout_old, 1); subproc_reap(pager->pid, pager->desc, SUBPROC_NOPIPE); + sigaction(SIGPIPE, &pager->sigpipe, NULL); + free(pager); } -- cgit v1.2.3 From 473cbd6a163eb685ec1fbd5301224c2964d7efb4 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 3 Oct 2018 04:37:35 +0200 Subject: libdpkg: Set stdout to be fully buffered when using a pager Force the output to fully buffered, because originally stdout was a tty, so it was set as line buffered. This way we send as much as possible to the pager, which will handle the output by itself. --- debian/changelog | 1 + lib/dpkg/pager.c | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 359d23f6b..616491dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium * libdpkg: Ignore SIGPIPE when setting up a pager, and then ignore EPIPE errors when writing to stdout, otherwise if we quit the pager early, the program will exit with an error code. + * libdpkg: Set stdout to be fully buffered when using a pager. * Perl modules: - Dpkg::OpenPGP: Ignore Version field in enarmored output. Fixes CPAN#127217. diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c index ed41daedb..b2dad68b4 100644 --- a/lib/dpkg/pager.c +++ b/lib/dpkg/pager.c @@ -110,6 +110,11 @@ pager_spawn(const char *desc) close(pager->pipe[0]); close(pager->pipe[1]); + /* Force the output to fully buffered, because originally stdout was + * a tty, so it was set as line buffered. This way we send as much as + * possible to the pager, which will handle the output by itself. */ + setvbuf(stdout, NULL, _IOFBF, 0); + return pager; } -- cgit v1.2.3 From 68b0f4dd8ac3f541926796a303015df782ef76ed Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 1 Oct 2018 02:49:20 +0200 Subject: libdpkg: Add a pager kill switch This way we will be able to forcefully disable it. --- debian/changelog | 1 + lib/dpkg/pager.c | 11 +++++++++++ lib/dpkg/pager.h | 5 +++++ 3 files changed, 17 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 616491dfb..6a958a519 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium - dpkg-split: Use nfstrnsave() instead of nfmalloc() + memcpy(). - libdpkg: Add new fsys-dir module. - libdpkg: Pass the file contents to the pager instead of the filename. + - libdpkg: Add a pager kill switch, so that it can be forcefully disabled. * Build system: - Distribute a LICENSE file on CPAN. - Do not make the Build.PL script executable. diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c index b2dad68b4..b0e54101e 100644 --- a/lib/dpkg/pager.c +++ b/lib/dpkg/pager.c @@ -35,6 +35,14 @@ #include #include +static bool pager_enabled = true; + +void +pager_enable(bool enable) +{ + pager_enabled = enable; +} + /** * Get a suitable pager. * @@ -81,6 +89,9 @@ pager_spawn(const char *desc) if (strcmp(exec, CAT) == 0) pager->used = false; + if (!pager_enabled) + pager->used = false; + if (!pager->used) return pager; diff --git a/lib/dpkg/pager.h b/lib/dpkg/pager.h index 34bcf2fd5..f9029d0a5 100644 --- a/lib/dpkg/pager.h +++ b/lib/dpkg/pager.h @@ -21,6 +21,8 @@ #ifndef LIBDPKG_PAGER_H #define LIBDPKG_PAGER_H +#include + #include DPKG_BEGIN_DECLS @@ -33,6 +35,9 @@ DPKG_BEGIN_DECLS struct pager; +void +pager_enable(bool enable); + const char * pager_get_exec(void); -- cgit v1.2.3 From e29648778ccd54ff834c3581b460542fdb766d44 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 17 Nov 2018 20:35:54 +0100 Subject: When allocating use the variable instead of the type in sizeof() This makes it easier to guarantee we use the correct size for the involved variable. --- debian/changelog | 1 + dpkg-split/join.c | 4 ++-- dpkg-split/queue.c | 8 ++++---- lib/compat/scandir.c | 6 +++--- lib/dpkg/db-fsys-divert.c | 4 ++-- lib/dpkg/db-fsys-override.c | 2 +- lib/dpkg/ehandle.c | 6 +++--- lib/dpkg/fields.c | 8 ++++---- lib/dpkg/fsys-hash.c | 4 ++-- lib/dpkg/fsys-iter.c | 2 +- lib/dpkg/log.c | 2 +- lib/dpkg/parse.c | 2 +- lib/dpkg/pkg-files.c | 2 +- lib/dpkg/pkg-hash.c | 6 +++--- lib/dpkg/treewalk.c | 4 ++-- src/archives.c | 2 +- src/enquiry.c | 2 +- src/errors.c | 2 +- src/main.c | 2 +- src/perpkgstate.c | 2 +- src/remove.c | 2 +- src/unpack.c | 8 ++++---- 22 files changed, 41 insertions(+), 40 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 745a79025..c056e6a7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -109,6 +109,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium - dpkg: Split trigger processing types into required, try-queued and try-deferred. - dpkg-query: Rename variable to avoid shadowing a local function. + - When allocating use the variable instead of the type in sizeof(). * Build system: - get-version: Use a format string with printf. - run-script: Use $() instead of deprecated ``. diff --git a/dpkg-split/join.c b/dpkg-split/join.c index 305b9d41e..40afb378e 100644 --- a/dpkg-split/join.c +++ b/dpkg-split/join.c @@ -109,7 +109,7 @@ do_join(const char *const *argv) badusage(_("--%s requires one or more part file arguments"), cipaction->olong); while ((thisarg= *argv++)) { - pq= nfmalloc(sizeof(struct partqueue)); + pq = nfmalloc(sizeof(*pq)); mustgetpartinfo(thisarg,&pq->info); @@ -122,7 +122,7 @@ do_join(const char *const *argv) if (refi == NULL) internerr("empty deb part queue"); - partlist= nfmalloc(sizeof(struct partinfo*)*refi->maxpartn); + partlist = nfmalloc(sizeof(*partlist) * refi->maxpartn); for (i = 0; i < refi->maxpartn; i++) partlist[i] = NULL; for (pq= queue; pq; pq= pq->nextinqueue) { diff --git a/dpkg-split/queue.c b/dpkg-split/queue.c index 1ef083ea5..6f9688035 100644 --- a/dpkg-split/queue.c +++ b/dpkg-split/queue.c @@ -99,7 +99,7 @@ scandepot(void) char *p; if (de->d_name[0] == '.') continue; - pq= nfmalloc(sizeof(struct partqueue)); + pq = nfmalloc(sizeof(*pq)); pq->info.fmtversion.major = 0; pq->info.fmtversion.minor = 0; pq->info.package = NULL; @@ -148,7 +148,7 @@ do_auto(const char *const *argv) if (partfile == NULL || *argv) badusage(_("--auto requires exactly one part file argument")); - refi= nfmalloc(sizeof(struct partqueue)); + refi = nfmalloc(sizeof(*refi)); part = dpkg_ar_open(partfile); if (!part) ohshite(_("unable to read part file '%.250s'"), partfile); @@ -161,14 +161,14 @@ do_auto(const char *const *argv) dpkg_ar_close(part); queue = scandepot(); - partlist= nfmalloc(sizeof(struct partinfo*)*refi->maxpartn); + partlist = nfmalloc(sizeof(*partlist) * refi->maxpartn); for (i = 0; i < refi->maxpartn; i++) partlist[i] = NULL; for (pq= queue; pq; pq= pq->nextinqueue) { struct partinfo *npi, *pi = &pq->info; if (!partmatches(pi,refi)) continue; - npi= nfmalloc(sizeof(struct partinfo)); + npi = nfmalloc(sizeof(*npi)); mustgetpartinfo(pi->filename,npi); addtopartlist(partlist,npi,refi); } diff --git a/lib/compat/scandir.c b/lib/compat/scandir.c index 4765d7dcb..8771de093 100644 --- a/lib/compat/scandir.c +++ b/lib/compat/scandir.c @@ -72,13 +72,13 @@ scandir(const char *dir, struct dirent ***namelist, avail *= 2; else avail = 20; - newlist = realloc(list, avail * sizeof(struct dirent *)); + newlist = realloc(list, avail * sizeof(*newlist)); if (!newlist) return cleanup(d, list, used); list = newlist; } - m = malloc(sizeof(struct dirent) + strlen(e->d_name)); + m = malloc(sizeof(*m) + strlen(e->d_name)); if (!m) return cleanup(d, list, used); *m = *e; @@ -91,7 +91,7 @@ scandir(const char *dir, struct dirent ***namelist, closedir(d); if (list != NULL && cmp != NULL) - qsort(list, used, sizeof(struct dirent *), cmp); + qsort(list, used, sizeof(list[0]), cmp); *namelist = list; diff --git a/lib/dpkg/db-fsys-divert.c b/lib/dpkg/db-fsys-divert.c index 775662382..b0edd1805 100644 --- a/lib/dpkg/db-fsys-divert.c +++ b/lib/dpkg/db-fsys-divert.c @@ -101,8 +101,8 @@ ensure_diversions(void) debug(dbg_general, "%s: new, (re)loading", __func__); while (fgets_checked(linebuf, sizeof(linebuf), file, diversionsname) >= 0) { - oicontest = nfmalloc(sizeof(struct diversion)); - oialtname = nfmalloc(sizeof(struct diversion)); + oicontest = nfmalloc(sizeof(*oicontest)); + oialtname = nfmalloc(sizeof(*oialtname)); oialtname->camefrom = findnamenode(linebuf, 0); oialtname->useinstead = NULL; diff --git a/lib/dpkg/db-fsys-override.c b/lib/dpkg/db-fsys-override.c index 10a8a273d..8da3afc29 100644 --- a/lib/dpkg/db-fsys-override.c +++ b/lib/dpkg/db-fsys-override.c @@ -184,7 +184,7 @@ ensure_statoverrides(enum statdb_parse_flags flags) thisline = loaded_list; while (thisline < loaded_list_end) { - fso = nfmalloc(sizeof(struct file_stat)); + fso = nfmalloc(sizeof(*fso)); ptr = memchr(thisline, '\n', loaded_list_end - thisline); if (ptr == NULL) diff --git a/lib/dpkg/ehandle.c b/lib/dpkg/ehandle.c index ae3b46aad..81ce47e31 100644 --- a/lib/dpkg/ehandle.c +++ b/lib/dpkg/ehandle.c @@ -135,7 +135,7 @@ error_context_new(void) { struct error_context *necp; - necp = malloc(sizeof(struct error_context)); + necp = malloc(sizeof(*necp)); if (!necp) ohshite(_("out of memory for new error context")); necp->next= econtext; @@ -311,7 +311,7 @@ void push_checkpoint(int mask, int value) { struct cleanup_entry *cep; int i; - cep = malloc(sizeof(struct cleanup_entry) + sizeof(char *)); + cep = malloc(sizeof(*cep) + sizeof(void *)); if (cep == NULL) { onerr_abort++; ohshite(_("out of memory for new cleanup entry")); @@ -336,7 +336,7 @@ cleanup_entry_new(void (*call1)(int argc, void **argv), int mask1, onerr_abort++; - cep = malloc(sizeof(struct cleanup_entry) + sizeof(char *) * (nargs + 1)); + cep = malloc(sizeof(*cep) + sizeof(void *) * (nargs + 1)); if (!cep) { if (nargs > array_count(emergency.args)) ohshite(_("out of memory for new cleanup entry with many arguments")); diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c index cfa1075b2..39044e2a5 100644 --- a/lib/dpkg/fields.c +++ b/lib/dpkg/fields.c @@ -138,7 +138,7 @@ f_archives(struct pkginfo *pkg, struct pkgbin *pkgbin, parse_error(ps, _("too many values in archive details field '%s' " "(compared to others)"), fip->name); - fdp = nfmalloc(sizeof(struct archivedetails)); + fdp = nfmalloc(sizeof(*fdp)); fdp->next= NULL; fdp->name= fdp->msdosname= fdp->size= fdp->md5sum= NULL; *fdpp= fdp; @@ -360,7 +360,7 @@ f_conffiles(struct pkginfo *pkg, struct pkgbin *pkgbin, conffvalue_lastword(value, endfn, endent, &hashstart, &hashlen, &endfn, ps); - newlink= nfmalloc(sizeof(struct conffile)); + newlink = nfmalloc(sizeof(*newlink)); value = path_skip_slash_dotslash(value); namelen= (int)(endfn-value); if (namelen <= 0) @@ -408,7 +408,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin, /* Loop creating new struct dependency's. */ for (;;) { - dyp= nfmalloc(sizeof(struct dependency)); + dyp = nfmalloc(sizeof(*dyp)); /* Set this to NULL for now, as we don't know what our real * struct pkginfo address (in the database) is going to be yet. */ dyp->up = NULL; @@ -438,7 +438,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin, parse_error(ps, _("'%s' field, invalid package name '%.255s': %s"), fip->name, depname.buf, emsg); - dop= nfmalloc(sizeof(struct deppossi)); + dop = nfmalloc(sizeof(*dop)); dop->up= dyp; dop->ed = pkg_db_find_set(depname.buf); dop->next= NULL; *ldopp= dop; ldopp= &dop->next; diff --git a/lib/dpkg/fsys-hash.c b/lib/dpkg/fsys-hash.c index 002528c6c..0190d94fb 100644 --- a/lib/dpkg/fsys-hash.c +++ b/lib/dpkg/fsys-hash.c @@ -102,7 +102,7 @@ findnamenode(const char *name, enum fnnflags flags) if (flags & fnn_nonew) return NULL; - newnode = nfmalloc(sizeof(struct filenamenode)); + newnode = nfmalloc(sizeof(*newnode)); newnode->packages = NULL; if ((flags & fnn_nocopy) && name > orig_name && name[-1] == '/') { newnode->name = name - 1; @@ -141,7 +141,7 @@ files_db_iter_new(void) { struct fileiterator *iter; - iter = m_malloc(sizeof(struct fileiterator)); + iter = m_malloc(sizeof(*iter)); iter->namenode = NULL; iter->nbinn = 0; diff --git a/lib/dpkg/fsys-iter.c b/lib/dpkg/fsys-iter.c index aba31aa47..fb47197ef 100644 --- a/lib/dpkg/fsys-iter.c +++ b/lib/dpkg/fsys-iter.c @@ -49,7 +49,7 @@ reversefilelist_init(struct reversefilelistiter *iter, iter->todo = NULL; while (files) { - newent = m_malloc(sizeof(struct fileinlist)); + newent = m_malloc(sizeof(*newent)); newent->namenode = files->namenode; newent->next = iter->todo; iter->todo = newent; diff --git a/lib/dpkg/log.c b/lib/dpkg/log.c index 3079f3ca6..c2221c819 100644 --- a/lib/dpkg/log.c +++ b/lib/dpkg/log.c @@ -83,7 +83,7 @@ statusfd_add(int fd) setcloexec(fd, _("")); - pipe_new = nfmalloc(sizeof(struct pipef)); + pipe_new = nfmalloc(sizeof(*pipe_new)); pipe_new->fd = fd; pipe_new->next = status_pipes; status_pipes = pipe_new; diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index 158e4d11e..14d6192f5 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -159,7 +159,7 @@ pkg_parse_field(struct parsedb_state *ps, struct field_state *fs, fs->fieldlen, fs->fieldstart); larpp = &arp->next; } - arp = nfmalloc(sizeof(struct arbitraryfield)); + arp = nfmalloc(sizeof(*arp)); arp->name = nfstrnsave(fs->fieldstart, fs->fieldlen); arp->value = nfstrnsave(fs->valuestart, fs->valuelen); arp->next = NULL; diff --git a/lib/dpkg/pkg-files.c b/lib/dpkg/pkg-files.c index e60134a32..349e63d4f 100644 --- a/lib/dpkg/pkg-files.c +++ b/lib/dpkg/pkg-files.c @@ -78,7 +78,7 @@ pkg_files_add_file(struct pkginfo *pkg, struct filenamenode *namenode, file_tail = &((*file_tail)->next); /* Create a new node. */ - newent = nfmalloc(sizeof(struct fileinlist)); + newent = nfmalloc(sizeof(*newent)); newent->namenode = namenode; newent->next = NULL; *file_tail = newent; diff --git a/lib/dpkg/pkg-hash.c b/lib/dpkg/pkg-hash.c index 6413b5058..398c20607 100644 --- a/lib/dpkg/pkg-hash.c +++ b/lib/dpkg/pkg-hash.c @@ -79,7 +79,7 @@ pkg_db_find_set(const char *inname) return *setp; } - new_set = nfmalloc(sizeof(struct pkgset)); + new_set = nfmalloc(sizeof(*new_set)); pkgset_blank(new_set); new_set->name = nfstrsave(name); new_set->next = NULL; @@ -195,7 +195,7 @@ pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch) } /* Need to create a new instance for the wanted architecture. */ - pkg = nfmalloc(sizeof(struct pkginfo)); + pkg = nfmalloc(sizeof(*pkg)); pkg_blank(pkg); pkg->set = set; pkg->arch_next = NULL; @@ -268,7 +268,7 @@ pkg_db_iter_new(void) { struct pkgiterator *iter; - iter = m_malloc(sizeof(struct pkgiterator)); + iter = m_malloc(sizeof(*iter)); iter->pkg = NULL; iter->nbinn = 0; diff --git a/lib/dpkg/treewalk.c b/lib/dpkg/treewalk.c index 3a669e6b0..dee072f2d 100644 --- a/lib/dpkg/treewalk.c +++ b/lib/dpkg/treewalk.c @@ -206,7 +206,7 @@ treenode_resize_down(struct treenode *node) else node->down_size = 8; - new_size = node->down_size * sizeof(struct treenode *); + new_size = node->down_size * sizeof(*node); node->down = m_realloc(node->down, new_size); } @@ -367,7 +367,7 @@ treewalk_open(const char *rootdir, enum treewalk_options options, struct treeroot *tree; struct treenode *root; - tree = m_malloc(sizeof(struct treeroot)); + tree = m_malloc(sizeof(*tree)); tree->options = options; if (func) diff --git a/src/archives.c b/src/archives.c index a1013d73a..3df6424de 100644 --- a/src/archives.c +++ b/src/archives.c @@ -1188,7 +1188,7 @@ enqueue_deconfigure(struct pkginfo *pkg, struct pkginfo *pkg_removal) ensure_package_clientdata(pkg); pkg->clientdata->istobe = PKG_ISTOBE_DECONFIGURE; - newdeconf = m_malloc(sizeof(struct pkg_deconf_list)); + newdeconf = m_malloc(sizeof(*newdeconf)); newdeconf->next = deconfigure; newdeconf->pkg = pkg; newdeconf->pkg_removal = pkg_removal; diff --git a/src/enquiry.c b/src/enquiry.c index baf26daab..632322faa 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -292,7 +292,7 @@ unpackchk(const char *const *argv) if (!yettobeunpacked(pkg, &thissect)) continue; for (se= sectionentries; se && strcasecmp(thissect,se->name); se= se->next); if (!se) { - se= nfmalloc(sizeof(struct sectionentry)); + se = nfmalloc(sizeof(*se)); for (sep= §ionentries; *sep && strcasecmp(thissect,(*sep)->name) > 0; sep= &(*sep)->next); diff --git a/src/errors.c b/src/errors.c index 6fa940856..5ecc101c3 100644 --- a/src/errors.c +++ b/src/errors.c @@ -59,7 +59,7 @@ enqueue_error_report(const char *arg) { struct error_report *nr; - nr= malloc(sizeof(struct error_report)); + nr = malloc(sizeof(*nr)); if (!nr) { notice(_("failed to allocate memory for new entry in list of failed packages: %s"), strerror(errno)); diff --git a/src/main.c b/src/main.c index fc5804beb..b90e736c2 100644 --- a/src/main.c +++ b/src/main.c @@ -448,7 +448,7 @@ set_invoke_hook(const struct cmdinfo *cip, const char *value) struct invoke_list *hook_list = cip->arg_ptr; struct invoke_hook *hook_new; - hook_new = m_malloc(sizeof(struct invoke_hook)); + hook_new = m_malloc(sizeof(*hook_new)); hook_new->command = m_strdup(value); hook_new->next = NULL; diff --git a/src/perpkgstate.c b/src/perpkgstate.c index 8a0667a68..75421122a 100644 --- a/src/perpkgstate.c +++ b/src/perpkgstate.c @@ -33,7 +33,7 @@ ensure_package_clientdata(struct pkginfo *pkg) { if (pkg->clientdata) return; - pkg->clientdata = nfmalloc(sizeof(struct perpackagestate)); + pkg->clientdata = nfmalloc(sizeof(*pkg->clientdata)); pkg->clientdata->istobe = PKG_ISTOBE_NORMAL; pkg->clientdata->color = PKG_CYCLE_WHITE; pkg->clientdata->enqueued = false; diff --git a/src/remove.c b/src/remove.c index 75f9c0f86..01d926387 100644 --- a/src/remove.c +++ b/src/remove.c @@ -206,7 +206,7 @@ void deferred_remove(struct pkginfo *pkg) { static void push_leftover(struct fileinlist **leftoverp, struct filenamenode *namenode) { struct fileinlist *newentry; - newentry= nfmalloc(sizeof(struct fileinlist)); + newentry = nfmalloc(sizeof(*newentry)); newentry->next= *leftoverp; newentry->namenode= namenode; *leftoverp= newentry; diff --git a/src/unpack.c b/src/unpack.c index a42d0f7fa..3459b93c4 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -731,14 +731,14 @@ pkg_update_fields(struct pkginfo *pkg, struct filenamenode_queue *newconffiles) newdeplist = NULL; newdeplistlastp = &newdeplist; for (dep = pkg->available.depends; dep; dep = dep->next) { - newdep = nfmalloc(sizeof(struct dependency)); + newdep = nfmalloc(sizeof(*newdep)); newdep->up = pkg; newdep->next = NULL; newdep->list = NULL; newpossilastp = &newdep->list; for (possi = dep->list; possi; possi = possi->next) { - newpossi = nfmalloc(sizeof(struct deppossi)); + newpossi = nfmalloc(sizeof(*newpossi)); newpossi->up = newdep; newpossi->ed = possi->ed; newpossi->next = NULL; @@ -783,7 +783,7 @@ pkg_update_fields(struct pkginfo *pkg, struct filenamenode_queue *newconffiles) pkg->installed.conffiles = NULL; iconffileslastp = &pkg->installed.conffiles; for (cfile = newconffiles->head; cfile; cfile = cfile->next) { - newiconff = nfmalloc(sizeof(struct conffile)); + newiconff = nfmalloc(sizeof(*newiconff)); newiconff->next = NULL; newiconff->name = nfstrsave(cfile->namenode->name); newiconff->hash = nfstrsave(cfile->namenode->oldhash); @@ -1141,7 +1141,7 @@ void process_archive(const char *filename) { parsedb(cidir, parsedb_flags, &pkg); if (!pkg->archives) { - pkg->archives = nfmalloc(sizeof(struct archivedetails)); + pkg->archives = nfmalloc(sizeof(*pkg->archives)); pkg->archives->next = NULL; pkg->archives->name = NULL; pkg->archives->msdosname = NULL; -- cgit v1.2.3 From 35845f9962dfe2a004a6509c8d0850b4af1ae597 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 18 Nov 2018 05:32:47 +0100 Subject: libdpkg, dpkg: Rename r variables to fnn --- debian/changelog | 1 + lib/dpkg/fsys-hash.c | 8 ++++---- src/help.c | 17 +++++++---------- 3 files changed, 12 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index d48eb25cb..100195c75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -111,6 +111,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium - dpkg-query: Rename variable to avoid shadowing a local function. - When allocating use the variable instead of the type in sizeof(). - dselect: Rename variable r to pkgbin. + - libdpkg, dpkg: Rename r variables to fnn. * Build system: - get-version: Use a format string with printf. - run-script: Use $() instead of deprecated ``. diff --git a/lib/dpkg/fsys-hash.c b/lib/dpkg/fsys-hash.c index 0190d94fb..9648d5bb1 100644 --- a/lib/dpkg/fsys-hash.c +++ b/lib/dpkg/fsys-hash.c @@ -151,17 +151,17 @@ files_db_iter_new(void) struct filenamenode * files_db_iter_next(struct fileiterator *iter) { - struct filenamenode *r= NULL; + struct filenamenode *fnn = NULL; while (!iter->namenode) { if (iter->nbinn >= BINS) return NULL; iter->namenode = bins[iter->nbinn++]; } - r = iter->namenode; - iter->namenode = r->next; + fnn = iter->namenode; + iter->namenode = fnn->next; - return r; + return fnn; } void diff --git a/src/help.c b/src/help.c index e4db356bd..1859c34d1 100644 --- a/src/help.c +++ b/src/help.c @@ -53,28 +53,25 @@ struct filenamenode * namenodetouse(struct filenamenode *namenode, struct pkginfo *pkg, struct pkgbin *pkgbin) { - struct filenamenode *r; + struct filenamenode *fnn; - if (!namenode->divert) { - r = namenode; - return r; - } + if (!namenode->divert) + return namenode; debug(dbg_eachfile, "namenodetouse namenode='%s' pkg=%s", namenode->name, pkgbin_name(pkg, pkgbin, pnaw_always)); - r= - (namenode->divert->useinstead && namenode->divert->pkgset != pkg->set) - ? namenode->divert->useinstead : namenode; + fnn = (namenode->divert->useinstead && namenode->divert->pkgset != pkg->set) + ? namenode->divert->useinstead : namenode; debug(dbg_eachfile, "namenodetouse ... useinstead=%s camefrom=%s pkg=%s return %s", namenode->divert->useinstead ? namenode->divert->useinstead->name : "", namenode->divert->camefrom ? namenode->divert->camefrom->name : "", namenode->divert->pkgset ? namenode->divert->pkgset->name : "", - r->name); + fnn->name); - return r; + return fnn; } bool -- cgit v1.2.3 From 9e5750015bd6187c8612380015924b82ad6739ac Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 18 Nov 2018 05:32:19 +0100 Subject: libdpkg: Rename ret variable to next --- debian/changelog | 1 + lib/dpkg/fsys-iter.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 100195c75..3decd20dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -112,6 +112,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium - When allocating use the variable instead of the type in sizeof(). - dselect: Rename variable r to pkgbin. - libdpkg, dpkg: Rename r variables to fnn. + - libdpkg: Rename ret variable to next. * Build system: - get-version: Use a format string with printf. - run-script: Use $() instead of deprecated ``. diff --git a/lib/dpkg/fsys-iter.c b/lib/dpkg/fsys-iter.c index fb47197ef..a5aa48be5 100644 --- a/lib/dpkg/fsys-iter.c +++ b/lib/dpkg/fsys-iter.c @@ -60,17 +60,17 @@ reversefilelist_init(struct reversefilelistiter *iter, struct filenamenode * reversefilelist_next(struct reversefilelistiter *iter) { - struct filenamenode *ret; + struct filenamenode *next; struct fileinlist *todo; todo = iter->todo; if (!todo) return NULL; - ret = todo->namenode; + next = todo->namenode; iter->todo = todo->next; free(todo); - return ret; + return next; } /* -- cgit v1.2.3 From f7e9dc18083d5677a633db108c209675e7602417 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 20 Nov 2018 04:54:31 +0100 Subject: libdpkg: Cleanup fsys module symbol names --- debian/changelog | 1 + lib/dpkg/db-fsys-digest.c | 10 +-- lib/dpkg/db-fsys-divert.c | 8 +-- lib/dpkg/db-fsys-files.c | 12 ++-- lib/dpkg/db-fsys-override.c | 12 ++-- lib/dpkg/db-fsys.h | 12 ++-- lib/dpkg/dpkg-db.h | 2 +- lib/dpkg/fsys-hash.c | 36 +++++----- lib/dpkg/fsys-iter.c | 36 +++++----- lib/dpkg/fsys.h | 165 ++++++++++++++++++++++---------------------- lib/dpkg/libdpkg.map | 24 +++---- lib/dpkg/pkg-files.c | 10 +-- lib/dpkg/pkg-files.h | 6 +- lib/dpkg/t/t-fsys-hash.c | 38 +++++----- lib/dpkg/t/t-pkg-hash.c | 4 +- lib/dpkg/triglib.c | 10 +-- lib/dpkg/triglib.h | 20 +++--- src/archives.c | 128 +++++++++++++++++----------------- src/archives.h | 18 ++--- src/cleanup.c | 8 +-- src/configure.c | 4 +- src/divertcmd.c | 84 +++++++++++----------- src/help.c | 34 ++++----- src/main.c | 6 +- src/main.h | 23 +++--- src/querycmd.c | 30 ++++---- src/remove.c | 57 +++++++-------- src/statcmd.c | 32 ++++----- src/trigcmd.c | 2 +- src/unpack.c | 94 ++++++++++++------------- src/verify.c | 10 +-- 31 files changed, 476 insertions(+), 460 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 3decd20dd..af1ba3c9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -113,6 +113,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium - dselect: Rename variable r to pkgbin. - libdpkg, dpkg: Rename r variables to fnn. - libdpkg: Rename ret variable to next. + - libdpkg: Cleanup fsys module symbol names. * Build system: - get-version: Use a format string with printf. - run-script: Use $() instead of deprecated ``. diff --git a/lib/dpkg/db-fsys-digest.c b/lib/dpkg/db-fsys-digest.c index d5f11ffea..5b32d9179 100644 --- a/lib/dpkg/db-fsys-digest.c +++ b/lib/dpkg/db-fsys-digest.c @@ -39,12 +39,12 @@ #include /* - * If mask is nonzero, will not write any file whose filenamenode + * If mask is nonzero, will not write any file whose fsys_namenode * has any flag bits set in mask. */ void write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin, - struct fileinlist *list, enum filenamenode_flags mask) + struct fsys_namenode_list *list, enum fsys_namenode_flags mask) { struct atomic_file *file; const char *hashfile; @@ -60,7 +60,7 @@ write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin, atomic_file_open(file); for (; list; list = list->next) { - struct filenamenode *namenode = list->namenode; + struct fsys_namenode *namenode = list->namenode; if (mask && (namenode->flags & mask)) continue; @@ -88,7 +88,7 @@ parse_filehash_buffer(struct varbuf *buf, const char *buf_end = buf->buf + buf->used; for (thisline = buf->buf; thisline < buf_end; thisline = nextline) { - struct filenamenode *namenode; + struct fsys_namenode *namenode; char *endline, *hash_end, *filename; endline = memchr(thisline, '\n', buf_end - thisline); @@ -125,7 +125,7 @@ parse_filehash_buffer(struct varbuf *buf, thisline, filename); /* Add the file to the list. */ - namenode = findnamenode(filename, 0); + namenode = fsys_hash_find_node(filename, 0); namenode->newhash = nfstrsave(thisline); } } diff --git a/lib/dpkg/db-fsys-divert.c b/lib/dpkg/db-fsys-divert.c index b0edd1805..985ed1bbe 100644 --- a/lib/dpkg/db-fsys-divert.c +++ b/lib/dpkg/db-fsys-divert.c @@ -39,7 +39,7 @@ #include #include -static struct diversion *diversions = NULL; +static struct fsys_diversion *diversions = NULL; static char *diversionsname; void @@ -50,7 +50,7 @@ ensure_diversions(void) char linebuf[MAXDIVERTFILENAME]; static FILE *file_prev; FILE *file; - struct diversion *ov, *oicontest, *oialtname; + struct fsys_diversion *ov, *oicontest, *oialtname; if (diversionsname == NULL) diversionsname = dpkg_db_get_path(DIVERSIONSFILE); @@ -104,11 +104,11 @@ ensure_diversions(void) oicontest = nfmalloc(sizeof(*oicontest)); oialtname = nfmalloc(sizeof(*oialtname)); - oialtname->camefrom = findnamenode(linebuf, 0); + oialtname->camefrom = fsys_hash_find_node(linebuf, 0); oialtname->useinstead = NULL; fgets_must(linebuf, sizeof(linebuf), file, diversionsname); - oicontest->useinstead = findnamenode(linebuf, 0); + oicontest->useinstead = fsys_hash_find_node(linebuf, 0); oicontest->camefrom = NULL; fgets_must(linebuf, sizeof(linebuf), file, diversionsname); diff --git a/lib/dpkg/db-fsys-files.c b/lib/dpkg/db-fsys-files.c index 534109329..c944d5339 100644 --- a/lib/dpkg/db-fsys-files.c +++ b/lib/dpkg/db-fsys-files.c @@ -78,7 +78,7 @@ void ensure_packagefiles_available(struct pkginfo *pkg) { const char *filelistfile; - struct fileinlist **lendp; + struct fsys_namenode_list **lendp; char *loaded_list_end, *thisline, *nextline, *ptr; struct varbuf buf = VARBUF_INIT; struct dpkg_error err = DPKG_ERROR_INIT; @@ -122,7 +122,7 @@ ensure_packagefiles_available(struct pkginfo *pkg) lendp = &pkg->files; thisline = buf.buf; while (thisline < loaded_list_end) { - struct filenamenode *namenode; + struct fsys_namenode *namenode; ptr = memchr(thisline, '\n', loaded_list_end - thisline); if (ptr == NULL) @@ -138,7 +138,7 @@ ensure_packagefiles_available(struct pkginfo *pkg) pkg_name(pkg, pnaw_nonambig)); *ptr = '\0'; - namenode = findnamenode(thisline, 0); + namenode = fsys_hash_find_node(thisline, 0); lendp = pkg_files_add_file(pkg, namenode, lendp); thisline = nextline; } @@ -290,15 +290,15 @@ void ensure_allinstfiles_available_quiet(void) { } /* - * If mask is nonzero, will not write any file whose filenamenode + * If mask is nonzero, will not write any file whose fsys_namenode * has any flag bits set in mask. */ void write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin, - struct fileinlist *list, enum filenamenode_flags mask) + struct fsys_namenode_list *list, enum fsys_namenode_flags mask) { struct atomic_file *file; - struct fileinlist *node; + struct fsys_namenode_list *node; const char *listfile; listfile = pkg_infodb_get_file(pkg, pkgbin, LISTFILE); diff --git a/lib/dpkg/db-fsys-override.c b/lib/dpkg/db-fsys-override.c index 8da3afc29..981bd1891 100644 --- a/lib/dpkg/db-fsys-override.c +++ b/lib/dpkg/db-fsys-override.c @@ -117,8 +117,8 @@ ensure_statoverrides(enum statdb_parse_flags flags) FILE *file; char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr; struct file_stat *fso; - struct filenamenode *fnn; - struct fileiterator *iter; + struct fsys_namenode *fnn; + struct fsys_hash_iter *iter; if (statoverridename == NULL) statoverridename = dpkg_db_get_path(STATOVERRIDEFILE); @@ -157,10 +157,10 @@ ensure_statoverrides(enum statdb_parse_flags flags) file_prev = file; /* Reset statoverride information. */ - iter = files_db_iter_new(); - while ((fnn = files_db_iter_next(iter))) + iter = fsys_hash_iter_new(); + while ((fnn = fsys_hash_iter_next(iter))) fnn->statoverride = NULL; - files_db_iter_free(iter); + fsys_hash_iter_free(iter); if (!file) { onerr_abort--; @@ -250,7 +250,7 @@ ensure_statoverrides(enum statdb_parse_flags flags) if (thisline >= loaded_list_end) ohshit(_("unexpected end of line in statoverride file")); - fnn = findnamenode(thisline, 0); + fnn = fsys_hash_find_node(thisline, 0); if (fnn->statoverride) ohshit(_("multiple statoverrides present for file '%.250s'"), thisline); diff --git a/lib/dpkg/db-fsys.h b/lib/dpkg/db-fsys.h index 35c971552..339a0fb45 100644 --- a/lib/dpkg/db-fsys.h +++ b/lib/dpkg/db-fsys.h @@ -28,14 +28,14 @@ /* * Data structure here is as follows: * - * For each package we have a ‘struct fileinlist *’, the head of a list of + * For each package we have a ‘struct fsys_namenode_list *’, the head of a list of * files in that package. They are in ‘forwards’ order. Each entry has a - * pointer to the ‘struct filenamenode’. + * pointer to the ‘struct fsys_namenode’. * - * The struct filenamenodes are in a hash table, indexed by name. + * The struct fsys_namenodes are in a hash table, indexed by name. * (This hash table is not visible to callers.) * - * Each filenamenode has a (possibly empty) list of ‘struct filepackage’, + * Each fsys_namenode has a (possibly empty) list of ‘struct filepackage’, * giving a list of the packages listing that filename. * * When we read files contained info about a particular package we set the @@ -68,8 +68,8 @@ void ensure_allinstfiles_available_quiet(void); void note_must_reread_files_inpackage(struct pkginfo *pkg); void parse_filehash(struct pkginfo *pkg, struct pkgbin *pkgbin); void write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin, - struct fileinlist *list, enum filenamenode_flags mask); + struct fsys_namenode_list *list, enum fsys_namenode_flags mask); void write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin, - struct fileinlist *list, enum filenamenode_flags mask); + struct fsys_namenode_list *list, enum fsys_namenode_flags mask); #endif /* LIBDPKG_DB_FSYS_H */ diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index 8f34d6682..6ea525657 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -228,7 +228,7 @@ struct pkginfo { * true !NULL Read, all is OK. * true NULL Read OK, but, there were no files. */ - struct fileinlist *files; + struct fsys_namenode_list *files; off_t files_list_phys_offs; bool files_list_valid; diff --git a/lib/dpkg/fsys-hash.c b/lib/dpkg/fsys-hash.c index 9648d5bb1..cb173bb9a 100644 --- a/lib/dpkg/fsys-hash.c +++ b/lib/dpkg/fsys-hash.c @@ -37,13 +37,13 @@ * This is the closest one to 2^18 (262144). */ #define BINS 262139 -static struct filenamenode *bins[BINS]; +static struct fsys_namenode *bins[BINS]; static int nfiles = 0; void -filesdbinit(void) +fsys_hash_init(void) { - struct filenamenode *fnn; + struct fsys_namenode *fnn; int i; for (i = 0; i < BINS; i++) { @@ -57,7 +57,7 @@ filesdbinit(void) } void -files_db_reset(void) +fsys_hash_reset(void) { int i; @@ -73,10 +73,10 @@ fsys_hash_entries(void) return nfiles; } -struct filenamenode * -findnamenode(const char *name, enum fnnflags flags) +struct fsys_namenode * +fsys_hash_find_node(const char *name, enum fsys_hash_find_flags flags) { - struct filenamenode **pointerp, *newnode; + struct fsys_namenode **pointerp, *newnode; const char *orig_name = name; /* We skip initial slashes and ‘./’ pairs, and add our own single @@ -99,12 +99,12 @@ findnamenode(const char *name, enum fnnflags flags) if (*pointerp) return *pointerp; - if (flags & fnn_nonew) + if (flags & FHFF_NONE) return NULL; newnode = nfmalloc(sizeof(*newnode)); newnode->packages = NULL; - if ((flags & fnn_nocopy) && name > orig_name && name[-1] == '/') { + if ((flags & FHFF_NOCOPY) && name > orig_name && name[-1] == '/') { newnode->name = name - 1; } else { char *newname = nfmalloc(strlen(name) + 2); @@ -131,15 +131,15 @@ findnamenode(const char *name, enum fnnflags flags) * Forward iterator. */ -struct fileiterator { - struct filenamenode *namenode; +struct fsys_hash_iter { + struct fsys_namenode *namenode; int nbinn; }; -struct fileiterator * -files_db_iter_new(void) +struct fsys_hash_iter * +fsys_hash_iter_new(void) { - struct fileiterator *iter; + struct fsys_hash_iter *iter; iter = m_malloc(sizeof(*iter)); iter->namenode = NULL; @@ -148,10 +148,10 @@ files_db_iter_new(void) return iter; } -struct filenamenode * -files_db_iter_next(struct fileiterator *iter) +struct fsys_namenode * +fsys_hash_iter_next(struct fsys_hash_iter *iter) { - struct filenamenode *fnn = NULL; + struct fsys_namenode *fnn = NULL; while (!iter->namenode) { if (iter->nbinn >= BINS) @@ -165,7 +165,7 @@ files_db_iter_next(struct fileiterator *iter) } void -files_db_iter_free(struct fileiterator *iter) +fsys_hash_iter_free(struct fsys_hash_iter *iter) { free(iter); } diff --git a/lib/dpkg/fsys-iter.c b/lib/dpkg/fsys-iter.c index a5aa48be5..807aabbb0 100644 --- a/lib/dpkg/fsys-iter.c +++ b/lib/dpkg/fsys-iter.c @@ -32,7 +32,7 @@ #include "fsys.h" /* - * Reverse fileinlist iterator. + * Reverse iterator. */ /* @@ -42,10 +42,10 @@ * it apart one entry at a time. */ void -reversefilelist_init(struct reversefilelistiter *iter, - struct fileinlist *files) +fsys_hash_rev_iter_init(struct fsys_hash_rev_iter *iter, + struct fsys_namenode_list *files) { - struct fileinlist *newent; + struct fsys_namenode_list *newent; iter->todo = NULL; while (files) { @@ -57,11 +57,11 @@ reversefilelist_init(struct reversefilelistiter *iter, } } -struct filenamenode * -reversefilelist_next(struct reversefilelistiter *iter) +struct fsys_namenode * +fsys_hash_rev_iter_next(struct fsys_hash_rev_iter *iter) { - struct filenamenode *next; - struct fileinlist *todo; + struct fsys_namenode *next; + struct fsys_namenode_list *todo; todo = iter->todo; if (!todo) @@ -74,15 +74,15 @@ reversefilelist_next(struct reversefilelistiter *iter) } /* - * Clients must call this function to clean up the reversefilelistiter + * Clients must call this function to clean up the fsys_hash_rev_iter * if they wish to break out of the iteration before it is all done. - * Calling this function is not necessary if reversefilelist_next() has + * Calling this function is not necessary if fsys_hash_rev_iter_next() has * been called until it returned 0. */ void -reversefilelist_abort(struct reversefilelistiter *iter) +fsys_hash_rev_iter_abort(struct fsys_hash_rev_iter *iter) { - while (reversefilelist_next(iter)) + while (fsys_hash_rev_iter_next(iter)) ; } @@ -90,14 +90,14 @@ reversefilelist_abort(struct reversefilelistiter *iter) * Iterator for packages owning a file. */ -struct filepackages_iterator { +struct fsys_node_pkgs_iter { struct pkg_list *pkg_node; }; -struct filepackages_iterator * -filepackages_iter_new(struct filenamenode *fnn) +struct fsys_node_pkgs_iter * +fsys_node_pkgs_iter_new(struct fsys_namenode *fnn) { - struct filepackages_iterator *iter; + struct fsys_node_pkgs_iter *iter; iter = m_malloc(sizeof(*iter)); iter->pkg_node = fnn->packages; @@ -106,7 +106,7 @@ filepackages_iter_new(struct filenamenode *fnn) } struct pkginfo * -filepackages_iter_next(struct filepackages_iterator *iter) +fsys_node_pkgs_iter_next(struct fsys_node_pkgs_iter *iter) { struct pkg_list *pkg_node; @@ -120,7 +120,7 @@ filepackages_iter_next(struct filepackages_iterator *iter) } void -filepackages_iter_free(struct filepackages_iterator *iter) +fsys_node_pkgs_iter_free(struct fsys_node_pkgs_iter *iter) { free(iter); } diff --git a/lib/dpkg/fsys.h b/lib/dpkg/fsys.h index 72d76f715..67fce2ad2 100644 --- a/lib/dpkg/fsys.h +++ b/lib/dpkg/fsys.h @@ -27,14 +27,14 @@ /* * Data structure here is as follows: * - * For each package we have a ‘struct fileinlist *’, the head of a list - * of files in that package. They are in ‘forwards’ order. Each entry has - * a pointer to the ‘struct filenamenode’. + * For each package we have a ‘struct fsys_namenode_list *’, the head of a list of + * files in that package. They are in ‘forwards’ order. Each entry has a + * pointer to the ‘struct fsys_namenode’. * - * The struct filenamenodes are in a hash table, indexed by name. + * The struct fsys_namenodes are in a hash table, indexed by name. * (This hash table is not visible to callers.) * - * Each filenamenode has a (possibly empty) list of ‘struct filepackage’, + * Each fsys_namenode has a (possibly empty) list of ‘struct filepackage’, * giving a list of the packages listing that filename. * * When we read files contained info about a particular package we set the @@ -47,34 +47,34 @@ struct pkginfo; /** - * Flags to findnamenode(). + * Flags to fsys_hash_find_node(). */ -enum fnnflags { +enum fsys_hash_find_flags { /** Do not need to copy filename. */ - fnn_nocopy = DPKG_BIT(0), - /** findnamenode may return NULL. */ - fnn_nonew = DPKG_BIT(1), + FHFF_NOCOPY = DPKG_BIT(0), + /** The find function might return NULL. */ + FHFF_NONE = DPKG_BIT(1), }; -enum filenamenode_flags { +enum fsys_namenode_flags { /** In the newconffiles list. */ - fnnf_new_conff = DPKG_BIT(0), + FNNF_NEW_CONFF = DPKG_BIT(0), /** In the new filesystem archive. */ - fnnf_new_inarchive = DPKG_BIT(1), + FNNF_NEW_INARCHIVE = DPKG_BIT(1), /** In the old package's conffiles list. */ - fnnf_old_conff = DPKG_BIT(2), + FNNF_OLD_CONFF = DPKG_BIT(2), /** Obsolete conffile. */ - fnnf_obs_conff = DPKG_BIT(3), + FNNF_OBS_CONFF = DPKG_BIT(3), /** Must remove from other packages' lists. */ - fnnf_elide_other_lists = DPKG_BIT(4), + FNNF_ELIDE_OTHER_LISTS = DPKG_BIT(4), /** >= 1 instance is a dir, cannot rename over. */ - fnnf_no_atomic_overwrite = DPKG_BIT(5), + FNNF_NO_ATOMIC_OVERWRITE = DPKG_BIT(5), /** New file has been placed on the disk. */ - fnnf_placed_on_disk = DPKG_BIT(6), - fnnf_deferred_fsync = DPKG_BIT(7), - fnnf_deferred_rename = DPKG_BIT(8), + FNNF_PLACED_ON_DISK = DPKG_BIT(6), + FNNF_DEFERRED_FSYNC = DPKG_BIT(7), + FNNF_DEFERRED_RENAME = DPKG_BIT(8), /** Path being filtered. */ - fnnf_filtered = DPKG_BIT(9), + FNNF_FILTERED = DPKG_BIT(9), }; /** @@ -85,12 +85,11 @@ struct file_ondisk_id { ino_t id_ino; }; -struct filenamenode { - struct filenamenode *next; +struct fsys_namenode { + struct fsys_namenode *next; const char *name; - struct pkg_list *packages; - struct diversion *divert; + struct fsys_diversion *divert; /** We allow the administrator to override the owner, group and mode * of a file. If such an override is present we use that instead of @@ -102,93 +101,97 @@ struct filenamenode { struct trigfileint *trig_interested; /* - * Fields from here on are cleared by filesdbinit(). + * Fields from here on are used by archives.c &c, and cleared by + * fsys_hash_init(). */ /** Set to zero when a new node is created. */ - enum filenamenode_flags flags; + enum fsys_namenode_flags flags; /** Valid iff this namenode is in the newconffiles list. */ const char *oldhash; + /** Valid iff the file was unpacked and hashed on this run. */ const char *newhash; struct file_ondisk_id *file_ondisk_id; }; +struct fsys_namenode_list { + struct fsys_namenode_list *next; + struct fsys_namenode *namenode; +}; + +/** + * Queue of fsys_namenode entries. + */ +struct fsys_namenode_queue { + struct fsys_namenode_list *head, **tail; +}; + /** * When we deal with an ‘overridden’ file, every package except the * overriding one is considered to contain the other file instead. Both * files have entries in the filesdb database, and they refer to each other * via these diversion structures. * - * The contested filename's filenamenode has an diversion entry with - * useinstead set to point to the redirected filename's filenamenode; the - * redirected filenamenode has camefrom set to the contested filenamenode. + * The contested filename's fsys_namenode has an diversion entry with + * useinstead set to point to the redirected filename's fsys_namenode; the + * redirected fsys_namenode has camefrom set to the contested fsys_namenode. * Both sides' diversion entries will have pkg set to the package (if any) * which is allowed to use the contended filename. * * Packages that contain either version of the file will all refer to the - * contested filenamenode in their per-file package lists (both in core and - * on disk). References are redirected to the other filenamenode's filename + * contested fsys_namenode in their per-file package lists (both in core and + * on disk). References are redirected to the other fsys_namenode's filename * where appropriate. */ -struct diversion { - struct filenamenode *useinstead; - struct filenamenode *camefrom; +struct fsys_diversion { + struct fsys_namenode *useinstead; + struct fsys_namenode *camefrom; struct pkgset *pkgset; /** The ‘contested’ halves are in this list for easy cleanup. */ - struct diversion *next; + struct fsys_diversion *next; }; -struct fileinlist { - struct fileinlist *next; - struct filenamenode *namenode; +struct fsys_node_pkgs_iter; +struct fsys_node_pkgs_iter * +fsys_node_pkgs_iter_new(struct fsys_namenode *fnn); +struct pkginfo * +fsys_node_pkgs_iter_next(struct fsys_node_pkgs_iter *iter); +void +fsys_node_pkgs_iter_free(struct fsys_node_pkgs_iter *iter); + +void +fsys_hash_init(void); +void +fsys_hash_reset(void); +int +fsys_hash_entries(void); + +struct fsys_hash_iter; +struct fsys_hash_iter * +fsys_hash_iter_new(void); +struct fsys_namenode * +fsys_hash_iter_next(struct fsys_hash_iter *iter); +void +fsys_hash_iter_free(struct fsys_hash_iter *iter); + +struct fsys_namenode * +fsys_hash_find_node(const char *filename, enum fsys_hash_find_flags flags); + +struct fsys_hash_rev_iter { + struct fsys_namenode_list *todo; }; -/** - * Queue of filenamenode entries. - */ -struct filenamenode_queue { - struct fileinlist *head, **tail; -}; - -/** - * Forward filesystem node iterator. - */ -struct fileiterator; - -/** - * Reverse filesystem node iterator. - */ -struct reversefilelistiter { - struct fileinlist *todo; -}; - -/** - * Forward filesystem node package owners iterator. - */ -struct filepackages_iterator; - - -void filesdbinit(void); -void files_db_reset(void); -int fsys_hash_entries(void); - -struct filenamenode *findnamenode(const char *filename, enum fnnflags flags); - -struct fileiterator *files_db_iter_new(void); -struct filenamenode *files_db_iter_next(struct fileiterator *iter); -void files_db_iter_free(struct fileiterator *iter); - -void reversefilelist_init(struct reversefilelistiter *iterptr, struct fileinlist *files); -struct filenamenode *reversefilelist_next(struct reversefilelistiter *iterptr); -void reversefilelist_abort(struct reversefilelistiter *iterptr); - -struct filepackages_iterator *filepackages_iter_new(struct filenamenode *fnn); -struct pkginfo *filepackages_iter_next(struct filepackages_iterator *iter); -void filepackages_iter_free(struct filepackages_iterator *iter); +void +fsys_hash_rev_iter_init(struct fsys_hash_rev_iter *iter, + struct fsys_namenode_list *files); +struct fsys_namenode * +fsys_hash_rev_iter_next(struct fsys_hash_rev_iter *iter); +void +fsys_hash_rev_iter_abort(struct fsys_hash_rev_iter *iter); const char *dpkg_fsys_set_dir(const char *dir); const char *dpkg_fsys_get_dir(void); diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 082732405..c337ee662 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -402,22 +402,22 @@ LIBDPKG_PRIVATE { ensure_diversions; # Filesystem node hash support - filesdbinit; - files_db_reset; + fsys_hash_init; + fsys_hash_reset; fsys_hash_entries; - findnamenode; + fsys_hash_find_node; - files_db_iter_new; - files_db_iter_next; - files_db_iter_free; + fsys_hash_iter_new; + fsys_hash_iter_next; + fsys_hash_iter_free; - reversefilelist_init; - reversefilelist_next; - reversefilelist_abort; + fsys_hash_rev_iter_init; + fsys_hash_rev_iter_next; + fsys_hash_rev_iter_abort; - filepackages_iter_new; - filepackages_iter_next; - filepackages_iter_free; + fsys_node_pkgs_iter_new; + fsys_node_pkgs_iter_next; + fsys_node_pkgs_iter_free; dpkg_fsys_set_dir; dpkg_fsys_get_dir; diff --git a/lib/dpkg/pkg-files.c b/lib/dpkg/pkg-files.c index 349e63d4f..f02213270 100644 --- a/lib/dpkg/pkg-files.c +++ b/lib/dpkg/pkg-files.c @@ -35,7 +35,7 @@ void pkg_files_blank(struct pkginfo *pkg) { - struct fileinlist *current; + struct fsys_namenode_list *current; for (current = pkg->files; current; @@ -63,11 +63,11 @@ pkg_files_blank(struct pkginfo *pkg) pkg->files = NULL; } -struct fileinlist ** -pkg_files_add_file(struct pkginfo *pkg, struct filenamenode *namenode, - struct fileinlist **file_tail) +struct fsys_namenode_list ** +pkg_files_add_file(struct pkginfo *pkg, struct fsys_namenode *namenode, + struct fsys_namenode_list **file_tail) { - struct fileinlist *newent; + struct fsys_namenode_list *newent; struct pkg_list *pkg_node; if (file_tail == NULL) diff --git a/lib/dpkg/pkg-files.h b/lib/dpkg/pkg-files.h index 73770b7dc..bee137a16 100644 --- a/lib/dpkg/pkg-files.h +++ b/lib/dpkg/pkg-files.h @@ -35,9 +35,9 @@ DPKG_BEGIN_DECLS void pkg_files_blank(struct pkginfo *pkg); -struct fileinlist ** -pkg_files_add_file(struct pkginfo *pkg, struct filenamenode *namenode, - struct fileinlist **file_tail); +struct fsys_namenode_list ** +pkg_files_add_file(struct pkginfo *pkg, struct fsys_namenode *namenode, + struct fsys_namenode_list **file_tail); /** @} */ diff --git a/lib/dpkg/t/t-fsys-hash.c b/lib/dpkg/t/t-fsys-hash.c index 8d34d4807..d80dbe899 100644 --- a/lib/dpkg/t/t-fsys-hash.c +++ b/lib/dpkg/t/t-fsys-hash.c @@ -28,20 +28,20 @@ static void test_fsys_nodes(void) { - struct filenamenode *fnn; - struct fileiterator *iter; + struct fsys_namenode *fnn; + struct fsys_hash_iter *iter; const char *name; test_pass(fsys_hash_entries() == 0); - filesdbinit(); + fsys_hash_init(); - fnn = findnamenode("/nonexistent", fnn_nonew); + fnn = fsys_hash_find_node("/nonexistent", FHFF_NONE); test_pass(fnn == NULL); test_pass(fsys_hash_entries() == 0); name = "/test/path/aa"; - fnn = findnamenode(name, fnn_nocopy); + fnn = fsys_hash_find_node(name, FHFF_NOCOPY); test_pass(fnn != NULL); test_pass(fsys_hash_entries() == 1); test_pass(fnn->name == name); @@ -50,7 +50,7 @@ test_fsys_nodes(void) test_pass(fnn->oldhash == NULL); test_str(fnn->newhash, ==, EMPTYHASHFLAG); - fnn = findnamenode("//./test/path/bb", 0); + fnn = fsys_hash_find_node("//./test/path/bb", 0); test_pass(fnn != NULL); test_pass(fsys_hash_entries() == 2); test_str(fnn->name, ==, "/test/path/bb"); @@ -58,7 +58,7 @@ test_fsys_nodes(void) test_pass(fnn->oldhash == NULL); test_str(fnn->newhash, ==, EMPTYHASHFLAG); - fnn = findnamenode("/test/path/cc", 0); + fnn = fsys_hash_find_node("/test/path/cc", 0); test_pass(fnn != NULL); test_pass(fsys_hash_entries() == 3); test_str(fnn->name, ==, "/test/path/cc"); @@ -66,8 +66,8 @@ test_fsys_nodes(void) test_pass(fnn->oldhash == NULL); test_str(fnn->newhash, ==, EMPTYHASHFLAG); - iter = files_db_iter_new(); - while ((fnn = files_db_iter_next(iter))) { + iter = fsys_hash_iter_new(); + while ((fnn = fsys_hash_iter_next(iter))) { if (strcmp(fnn->name, "/test/path/aa") == 0) test_str(fnn->name, ==, "/test/path/aa"); else if (strcmp(fnn->name, "/test/path/bb") == 0) @@ -75,27 +75,27 @@ test_fsys_nodes(void) else if (strcmp(fnn->name, "/test/path/cc") == 0) test_str(fnn->name, ==, "/test/path/cc"); else - test_fail("unknown filenamenode"); + test_fail("unknown fsys_namenode"); } - files_db_iter_free(iter); + fsys_hash_iter_free(iter); - filesdbinit(); + fsys_hash_init(); test_pass(fsys_hash_entries() == 3); - fnn = findnamenode("/test/path/aa", fnn_nonew); + fnn = fsys_hash_find_node("/test/path/aa", FHFF_NONE); test_pass(fnn != NULL); - fnn = findnamenode("/test/path/bb", fnn_nonew); + fnn = fsys_hash_find_node("/test/path/bb", FHFF_NONE); test_pass(fnn != NULL); - fnn = findnamenode("/test/path/cc", fnn_nonew); + fnn = fsys_hash_find_node("/test/path/cc", FHFF_NONE); test_pass(fnn != NULL); test_pass(fsys_hash_entries() == 3); - files_db_reset(); + fsys_hash_reset(); test_pass(fsys_hash_entries() == 0); - fnn = findnamenode("/test/path/aa", fnn_nonew); + fnn = fsys_hash_find_node("/test/path/aa", FHFF_NONE); test_pass(fnn == NULL); - fnn = findnamenode("/test/path/bb", fnn_nonew); + fnn = fsys_hash_find_node("/test/path/bb", FHFF_NONE); test_pass(fnn == NULL); - fnn = findnamenode("/test/path/cc", fnn_nonew); + fnn = fsys_hash_find_node("/test/path/cc", FHFF_NONE); test_pass(fnn == NULL); test_pass(fsys_hash_entries() == 0); } diff --git a/lib/dpkg/t/t-pkg-hash.c b/lib/dpkg/t/t-pkg-hash.c index f45594f15..c6ab20e28 100644 --- a/lib/dpkg/t/t-pkg-hash.c +++ b/lib/dpkg/t/t-pkg-hash.c @@ -135,7 +135,7 @@ test_pkg_hash(void) else if (strcmp(set->name, "pkg-cc") == 0) test_str(set->name, ==, "pkg-cc"); else - test_fail("unknown filenamenode"); + test_fail("unknown fsys_namenode"); } pkg_db_iter_free(iter); @@ -160,7 +160,7 @@ test_pkg_hash(void) } else if (strcmp(pkg->set->name, "pkg-cc") == 0) { test_str(pkg->set->name, ==, "pkg-cc"); } else { - test_fail("unknown filenamenode"); + test_fail("unknown fsys_namenode"); } } pkg_db_iter_free(iter); diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c index f7488ee61..ab9060f66 100644 --- a/lib/dpkg/triglib.c +++ b/lib/dpkg/triglib.c @@ -396,7 +396,7 @@ trk_file_interest_change(const char *trig, struct pkginfo *pkg, struct pkgbin *pkgbin, int signum, enum trig_options opts) { - struct filenamenode *fnn; + struct fsys_namenode *fnn; struct trigfileint **search, *tfi; fnn = trigh.namenode_find(trig, signum <= 0); @@ -545,14 +545,14 @@ ok: void trig_file_activate_byname(const char *trig, struct pkginfo *aw) { - struct filenamenode *fnn = trigh.namenode_find(trig, 1); + struct fsys_namenode *fnn = trigh.namenode_find(trig, 1); if (fnn) trig_file_activate(fnn, aw); } void -trig_file_activate(struct filenamenode *trig, struct pkginfo *aw) +trig_file_activate(struct fsys_namenode *trig, struct pkginfo *aw) { struct trigfileint *tfi; @@ -579,7 +579,7 @@ trig_file_activate_parents(const char *trig, struct pkginfo *aw) } void -trig_path_activate(struct filenamenode *trig, struct pkginfo *aw) +trig_path_activate(struct fsys_namenode *trig, struct pkginfo *aw) { trig_file_activate(trig, aw); trig_file_activate_parents(trigh.namenode_name(trig), aw); @@ -588,7 +588,7 @@ trig_path_activate(struct filenamenode *trig, struct pkginfo *aw) static void trig_path_activate_byname(const char *trig, struct pkginfo *aw) { - struct filenamenode *fnn = trigh.namenode_find(trig, 1); + struct fsys_namenode *fnn = trigh.namenode_find(trig, 1); if (fnn) trig_file_activate(fnn, aw); diff --git a/lib/dpkg/triglib.h b/lib/dpkg/triglib.h index 74b33ccb2..b4c772516 100644 --- a/lib/dpkg/triglib.h +++ b/lib/dpkg/triglib.h @@ -54,7 +54,7 @@ enum trig_options { struct trigfileint { struct pkginfo *pkg; struct pkgbin *pkgbin; - struct filenamenode *fnn; + struct fsys_namenode *fnn; enum trig_options options; struct trigfileint *samefile_next; struct { @@ -71,26 +71,26 @@ struct trig_hooks { void (*enqueue_deferred)(struct pkginfo *pend); void (*transitional_activate)(enum modstatdb_rw cstatus); - struct filenamenode *(*namenode_find)(const char *filename, bool nonew); - struct trigfileint **(*namenode_interested)(struct filenamenode *fnn); + struct fsys_namenode *(*namenode_find)(const char *filename, bool nonew); + struct trigfileint **(*namenode_interested)(struct fsys_namenode *fnn); /** Returns a pointer from nfmalloc. */ - const char *(*namenode_name)(struct filenamenode *fnn); + const char *(*namenode_name)(struct fsys_namenode *fnn); }; #define TRIGHOOKS_DEFINE_NAMENODE_ACCESSORS \ - static struct filenamenode *th_nn_find(const char *name, bool nonew) \ - { return findnamenode(name, nonew ? fnn_nonew : 0); } \ - static struct trigfileint **th_nn_interested(struct filenamenode *fnn) \ + static struct fsys_namenode *th_nn_find(const char *name, bool nonew) \ + { return fsys_hash_find_node(name, nonew ? FHFF_NONE : 0); } \ + static struct trigfileint **th_nn_interested(struct fsys_namenode *fnn) \ { return &fnn->trig_interested; } \ - static const char *th_nn_name(struct filenamenode *fnn) \ + static const char *th_nn_name(struct fsys_namenode *fnn) \ { return fnn->name; } void trig_override_hooks(const struct trig_hooks *hooks); void trig_file_activate_byname(const char *trig, struct pkginfo *aw); -void trig_file_activate(struct filenamenode *trig, struct pkginfo *aw); -void trig_path_activate(struct filenamenode *trig, struct pkginfo *aw); +void trig_file_activate(struct fsys_namenode *trig, struct pkginfo *aw); +void trig_path_activate(struct fsys_namenode *trig, struct pkginfo *aw); bool trig_note_pend_core(struct pkginfo *pend, const char *trig /*not copied!*/); bool trig_note_pend(struct pkginfo *pend, const char *trig /*not copied!*/); diff --git a/src/archives.c b/src/archives.c index 3df6424de..5a6fc0838 100644 --- a/src/archives.c +++ b/src/archives.c @@ -113,11 +113,11 @@ tar_pool_release(void) } } -struct fileinlist * -tar_filenamenode_queue_push(struct filenamenode_queue *queue, - struct filenamenode *namenode) +struct fsys_namenode_list * +tar_fsys_namenode_queue_push(struct fsys_namenode_queue *queue, + struct fsys_namenode *namenode) { - struct fileinlist *node; + struct fsys_namenode_list *node; node = tar_pool_alloc(sizeof(*node)); node->namenode = namenode; @@ -130,9 +130,9 @@ tar_filenamenode_queue_push(struct filenamenode_queue *queue, } static void -tar_filenamenode_queue_pop(struct filenamenode_queue *queue, - struct fileinlist **tail_prev, - struct fileinlist *node) +tar_fsys_namenode_queue_pop(struct fsys_namenode_queue *queue, + struct fsys_namenode_list **tail_prev, + struct fsys_namenode_list *node) { tar_pool_free(node); queue->tail = tail_prev; @@ -148,11 +148,11 @@ tar_filenamenode_queue_pop(struct filenamenode_queue *queue, * shared directories don't stop packages from disappearing). */ bool -filesavespackage(struct fileinlist *file, +filesavespackage(struct fsys_namenode_list *file, struct pkginfo *pkgtobesaved, struct pkginfo *pkgbeinginstalled) { - struct filepackages_iterator *iter; + struct fsys_node_pkgs_iter *iter; struct pkgset *divpkgset; struct pkginfo *thirdpkg; @@ -171,14 +171,14 @@ filesavespackage(struct fileinlist *file, } } /* Is the file in the package being installed? If so then it can't save. */ - if (file->namenode->flags & fnnf_new_inarchive) { + if (file->namenode->flags & FNNF_NEW_INARCHIVE) { debug(dbg_eachfiledetail,"filesavespackage ... in new archive -- no save"); return false; } /* Look for a 3rd package which can take over the file (in case * it's a directory which is shared by many packages. */ - iter = filepackages_iter_new(file->namenode); - while ((thirdpkg = filepackages_iter_next(iter))) { + iter = fsys_node_pkgs_iter_new(file->namenode); + while ((thirdpkg = fsys_node_pkgs_iter_next(iter))) { debug(dbg_eachfiledetail, "filesavespackage ... also in %s", pkg_name(thirdpkg, pnaw_always)); @@ -205,10 +205,10 @@ filesavespackage(struct fileinlist *file, /* We've found a package that can take this file. */ debug(dbg_eachfiledetail, "filesavespackage ... taken -- no save"); - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); return false; } - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); debug(dbg_eachfiledetail, "filesavespackage ... not taken -- save !"); return true; @@ -216,7 +216,7 @@ filesavespackage(struct fileinlist *file, static void md5hash_prev_conffile(struct pkginfo *pkg, char *oldhash, const char *oldname, - struct filenamenode *namenode) + struct fsys_namenode *namenode) { struct pkginfo *otherpkg; struct conffile *conff; @@ -343,13 +343,13 @@ does_replace(struct pkginfo *new_pkg, struct pkgbin *new_pkgbin, static void tarobject_extract(struct tarcontext *tc, struct tar_entry *te, const char *path, struct file_stat *st, - struct filenamenode *namenode) + struct fsys_namenode *namenode) { static struct varbuf hardlinkfn; static int fd; struct dpkg_error err; - struct filenamenode *linknode; + struct fsys_namenode *linknode; char fnamebuf[256]; char fnamenewbuf[256]; char *newhash; @@ -398,7 +398,7 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te, /* Postpone the fsync, to try to avoid massive I/O degradation. */ if (!fc_unsafe_io) - namenode->flags |= fnnf_deferred_fsync; + namenode->flags |= FNNF_DEFERRED_FSYNC; pop_cleanup(ehflag_normaltidy); /* fd = open(path) */ if (close(fd)) @@ -422,10 +422,10 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te, case TAR_FILETYPE_HARDLINK: varbuf_reset(&hardlinkfn); varbuf_add_str(&hardlinkfn, instdir); - linknode = findnamenode(te->linkname, 0); + linknode = fsys_hash_find_node(te->linkname, 0); varbuf_add_str(&hardlinkfn, namenodetouse(linknode, tc->pkg, &tc->pkg->available)->name); - if (linknode->flags & (fnnf_deferred_rename | fnnf_new_conff)) + if (linknode->flags & (FNNF_DEFERRED_RENAME | FNNF_NEW_CONFF)) varbuf_add_str(&hardlinkfn, DPKGNEWEXT); varbuf_end_str(&hardlinkfn); if (link(hardlinkfn.buf, path)) @@ -452,7 +452,7 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te, static void tarobject_hash(struct tarcontext *tc, struct tar_entry *te, - struct filenamenode *namenode) + struct fsys_namenode *namenode) { if (te->type == TAR_FILETYPE_FILE) { struct dpkg_error err; @@ -468,9 +468,9 @@ tarobject_hash(struct tarcontext *tc, struct tar_entry *te, namenode->newhash = newhash; debug(dbg_eachfiledetail, "tarobject file hash=%s", namenode->newhash); } else if (te->type == TAR_FILETYPE_HARDLINK) { - struct filenamenode *linknode; + struct fsys_namenode *linknode; - linknode = findnamenode(te->linkname, 0); + linknode = fsys_hash_find_node(te->linkname, 0); namenode->newhash = linknode->newhash; debug(dbg_eachfiledetail, "tarobject hardlink hash=%s", namenode->newhash); } @@ -529,7 +529,7 @@ static void tarobject_matches(struct tarcontext *tc, const char *fn_old, struct stat *stab, char *oldhash, const char *fn_new, struct tar_entry *te, - struct filenamenode *namenode) + struct fsys_namenode *namenode) { char *linkname; ssize_t linksize; @@ -579,7 +579,7 @@ tarobject_matches(struct tarcontext *tc, /* Fall through. */ case TAR_FILETYPE_FILE: /* Only check metadata for non-conffiles. */ - if (!(namenode->flags & fnnf_new_conff) && + if (!(namenode->flags & FNNF_NEW_CONFF) && !(S_ISREG(stab->st_mode) && te->size == stab->st_size)) break; if (strcmp(oldhash, namenode->newhash) == 0) @@ -665,7 +665,7 @@ tarobject(void *ctx, struct tar_entry *ti) { static struct varbuf conffderefn, symlinkfn; const char *usename; - struct filenamenode *usenode; + struct fsys_namenode *usenode; struct conffile *conff; struct tarcontext *tc = ctx; @@ -676,7 +676,7 @@ tarobject(void *ctx, struct tar_entry *ti) ssize_t r; struct stat stab, stabtmp; struct file_stat nodestat; - struct fileinlist *nifd, **oldnifd; + struct fsys_namenode_list *nifd, **oldnifd; struct pkgset *divpkgset; struct pkginfo *otherpkg; @@ -690,9 +690,9 @@ tarobject(void *ctx, struct tar_entry *ti) * The trailing ‘/’ put on the end of names in tarfiles has already * been stripped by tar_extractor(). */ oldnifd = tc->newfiles_queue->tail; - nifd = tar_filenamenode_queue_push(tc->newfiles_queue, - findnamenode(ti->name, 0)); - nifd->namenode->flags |= fnnf_new_inarchive; + nifd = tar_fsys_namenode_queue_push(tc->newfiles_queue, + fsys_hash_find_node(ti->name, 0)); + nifd->namenode->flags |= FNNF_NEW_INARCHIVE; debug(dbg_eachfile, "tarobject ti->name='%s' mode=%lo owner=%u:%u type=%d(%c)" @@ -735,12 +735,12 @@ tarobject(void *ctx, struct tar_entry *ti) trig_file_activate(usenode, tc->pkg); - if (nifd->namenode->flags & fnnf_new_conff) { + if (nifd->namenode->flags & FNNF_NEW_CONFF) { /* If it's a conffile we have to extract it next to the installed * version (i.e. we do the usual link-following). */ if (conffderef(tc->pkg, &conffderefn, usename)) usename= conffderefn.buf; - debug(dbg_conff, "tarobject fnnf_new_conff deref='%s'", usename); + debug(dbg_conff, "tarobject FNNF_NEW_CONFF deref='%s'", usename); } setupfnamevbs(usename); @@ -807,10 +807,10 @@ tarobject(void *ctx, struct tar_entry *ti) keepexisting = false; refcounting = false; if (!existingdir) { - struct filepackages_iterator *iter; + struct fsys_node_pkgs_iter *iter; - iter = filepackages_iter_new(nifd->namenode); - while ((otherpkg = filepackages_iter_next(iter))) { + iter = fsys_node_pkgs_iter_new(nifd->namenode); + while ((otherpkg = fsys_node_pkgs_iter_next(iter))) { if (otherpkg == tc->pkg) continue; debug(dbg_eachfile, "tarobject ... found in %s", @@ -874,7 +874,7 @@ tarobject(void *ctx, struct tar_entry *ti) /* Is the file an obsolete conffile in the other package * and a conffile in the new package? */ - if ((nifd->namenode->flags & fnnf_new_conff) && + if ((nifd->namenode->flags & FNNF_NEW_CONFF) && !statr && S_ISREG(stab.st_mode)) { for (conff = otherpkg->installed.conffiles; conff; @@ -903,7 +903,7 @@ tarobject(void *ctx, struct tar_entry *ti) pkg_name(otherpkg, pnaw_nonambig), versiondescribe(&otherpkg->installed.version, vdew_nonambig)); otherpkg->clientdata->replacingfilesandsaid = 2; - nifd->namenode->flags &= ~fnnf_new_inarchive; + nifd->namenode->flags &= ~FNNF_NEW_INARCHIVE; keepexisting = true; } else { /* At this point we are replacing something without a Replaces. */ @@ -924,20 +924,20 @@ tarobject(void *ctx, struct tar_entry *ti) } } } - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); } if (keepexisting) { - if (nifd->namenode->flags & fnnf_new_conff) - nifd->namenode->flags |= fnnf_obs_conff; - tar_filenamenode_queue_pop(tc->newfiles_queue, oldnifd, nifd); + if (nifd->namenode->flags & FNNF_NEW_CONFF) + nifd->namenode->flags |= FNNF_OBS_CONFF; + tar_fsys_namenode_queue_pop(tc->newfiles_queue, oldnifd, nifd); tarobject_skip_entry(tc, ti); return 0; } if (filter_should_skip(ti)) { - nifd->namenode->flags &= ~fnnf_new_inarchive; - nifd->namenode->flags |= fnnf_filtered; + nifd->namenode->flags &= ~FNNF_NEW_INARCHIVE; + nifd->namenode->flags |= FNNF_FILTERED; tarobject_skip_entry(tc, ti); return 0; @@ -951,7 +951,7 @@ tarobject(void *ctx, struct tar_entry *ti) if (refcounting) { debug(dbg_eachfiledetail, "tarobject hashing on-disk file '%s', refcounting", fnamevb.buf); - if (nifd->namenode->flags & fnnf_new_conff) { + if (nifd->namenode->flags & FNNF_NEW_CONFF) { md5hash_prev_conffile(tc->pkg, oldhash, fnamenewvb.buf, nifd->namenode); } else if (S_ISREG(stab.st_mode)) { md5hash(tc->pkg, oldhash, fnamevb.buf); @@ -1008,9 +1008,9 @@ tarobject(void *ctx, struct tar_entry *ti) /* First, check to see if it's a conffile. If so we don't install * it now - we leave it in .dpkg-new for --configure to take care of. */ - if (nifd->namenode->flags & fnnf_new_conff) { + if (nifd->namenode->flags & FNNF_NEW_CONFF) { debug(dbg_conffdetail,"tarobject conffile extracted"); - nifd->namenode->flags |= fnnf_elide_other_lists; + nifd->namenode->flags |= FNNF_ELIDE_OTHER_LISTS; return 0; } @@ -1023,7 +1023,7 @@ tarobject(void *ctx, struct tar_entry *ti) if (ti->type == TAR_FILETYPE_DIR || S_ISDIR(stab.st_mode)) { /* One of the two is a directory - can't do atomic install. */ debug(dbg_eachfiledetail,"tarobject directory, nonatomic"); - nifd->namenode->flags |= fnnf_no_atomic_overwrite; + nifd->namenode->flags |= FNNF_NO_ATOMIC_OVERWRITE; if (rename(fnamevb.buf,fnametmpvb.buf)) ohshite(_("unable to move aside '%.255s' to install new version"), ti->name); @@ -1067,7 +1067,7 @@ tarobject(void *ctx, struct tar_entry *ti) if (ti->type == TAR_FILETYPE_FILE || ti->type == TAR_FILETYPE_HARDLINK || ti->type == TAR_FILETYPE_SYMLINK) { - nifd->namenode->flags |= fnnf_deferred_rename; + nifd->namenode->flags |= FNNF_DEFERRED_RENAME; debug(dbg_eachfiledetail, "tarobject done and installation deferred"); } else { @@ -1081,8 +1081,8 @@ tarobject(void *ctx, struct tar_entry *ti) * remove the new file. */ - nifd->namenode->flags |= fnnf_placed_on_disk; - nifd->namenode->flags |= fnnf_elide_other_lists; + nifd->namenode->flags |= FNNF_PLACED_ON_DISK; + nifd->namenode->flags |= FNNF_ELIDE_OTHER_LISTS; debug(dbg_eachfiledetail, "tarobject done and installed"); } @@ -1092,15 +1092,15 @@ tarobject(void *ctx, struct tar_entry *ti) #if defined(SYNC_FILE_RANGE_WAIT_BEFORE) static void -tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg) +tar_writeback_barrier(struct fsys_namenode_list *files, struct pkginfo *pkg) { - struct fileinlist *cfile; + struct fsys_namenode_list *cfile; for (cfile = files; cfile; cfile = cfile->next) { - struct filenamenode *usenode; + struct fsys_namenode *usenode; int fd; - if (!(cfile->namenode->flags & fnnf_deferred_fsync)) + if (!(cfile->namenode->flags & FNNF_DEFERRED_FSYNC)) continue; usenode = namenodetouse(cfile->namenode, pkg, &pkg->available); @@ -1120,30 +1120,30 @@ tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg) } #else static void -tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg) +tar_writeback_barrier(struct fsys_namenode_list *files, struct pkginfo *pkg) { } #endif void -tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg) +tar_deferred_extract(struct fsys_namenode_list *files, struct pkginfo *pkg) { - struct fileinlist *cfile; - struct filenamenode *usenode; + struct fsys_namenode_list *cfile; + struct fsys_namenode *usenode; tar_writeback_barrier(files, pkg); for (cfile = files; cfile; cfile = cfile->next) { debug(dbg_eachfile, "deferred extract of '%.255s'", cfile->namenode->name); - if (!(cfile->namenode->flags & fnnf_deferred_rename)) + if (!(cfile->namenode->flags & FNNF_DEFERRED_RENAME)) continue; usenode = namenodetouse(cfile->namenode, pkg, &pkg->available); setupfnamevbs(usenode->name); - if (cfile->namenode->flags & fnnf_deferred_fsync) { + if (cfile->namenode->flags & FNNF_DEFERRED_FSYNC) { int fd; debug(dbg_eachfiledetail, "deferred extract needs fsync"); @@ -1156,7 +1156,7 @@ tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg) if (close(fd)) ohshite(_("error closing/writing '%.255s'"), fnamenewvb.buf); - cfile->namenode->flags &= ~fnnf_deferred_fsync; + cfile->namenode->flags &= ~FNNF_DEFERRED_FSYNC; } debug(dbg_eachfiledetail, "deferred extract needs rename"); @@ -1165,7 +1165,7 @@ tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg) ohshite(_("unable to install new version of '%.255s'"), cfile->namenode->name); - cfile->namenode->flags &= ~fnnf_deferred_rename; + cfile->namenode->flags &= ~FNNF_DEFERRED_RENAME; /* * CLEANUP: Now the new file is in the destination file, and the @@ -1174,8 +1174,8 @@ tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg) * remove the new file. */ - cfile->namenode->flags |= fnnf_placed_on_disk; - cfile->namenode->flags |= fnnf_elide_other_lists; + cfile->namenode->flags |= FNNF_PLACED_ON_DISK; + cfile->namenode->flags |= FNNF_ELIDE_OTHER_LISTS; debug(dbg_eachfiledetail, "deferred extract done and installed"); } diff --git a/src/archives.h b/src/archives.h index 34d1678cc..19c450c11 100644 --- a/src/archives.h +++ b/src/archives.h @@ -29,8 +29,8 @@ struct tarcontext { int backendpipe; struct pkginfo *pkg; - /** A queue of filenamenode that have been extracted anew. */ - struct filenamenode_queue *newfiles_queue; + /** A queue of fsys_namenode that have been extracted anew. */ + struct fsys_namenode_queue *newfiles_queue; /** Are all “Multi-arch: same” instances about to be in sync? */ bool pkgset_getting_in_sync; }; @@ -72,14 +72,16 @@ void setupfnamevbs(const char *filename); int tarobject(void *ctx, struct tar_entry *ti); int tarfileread(void *ud, char *buf, int len); -void tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg); +void +tar_deferred_extract(struct fsys_namenode_list *files, struct pkginfo *pkg); -struct fileinlist * -tar_filenamenode_queue_push(struct filenamenode_queue *queue, - struct filenamenode *namenode); +struct fsys_namenode_list * +tar_fsys_namenode_queue_push(struct fsys_namenode_queue *queue, + struct fsys_namenode *namenode); -bool filesavespackage(struct fileinlist *, struct pkginfo *, - struct pkginfo *pkgbeinginstalled); +bool +filesavespackage(struct fsys_namenode_list *, struct pkginfo *, + struct pkginfo *pkgbeinginstalled); void check_conflict(struct dependency *dep, struct pkginfo *pkg, const char *pfilename); diff --git a/src/cleanup.c b/src/cleanup.c index cbc690de9..3539fbf31 100644 --- a/src/cleanup.c +++ b/src/cleanup.c @@ -66,7 +66,7 @@ int cleanup_pkg_failed=0, cleanup_conflictor_failed=0; * look for it. */ void cu_installnew(int argc, void **argv) { - struct filenamenode *namenode = argv[0]; + struct fsys_namenode *namenode = argv[0]; struct stat stab; cleanup_pkg_failed++; cleanup_conflictor_failed++; @@ -76,10 +76,10 @@ void cu_installnew(int argc, void **argv) { setupfnamevbs(namenode->name); - if (!(namenode->flags & fnnf_new_conff) && !lstat(fnametmpvb.buf,&stab)) { + if (!(namenode->flags & FNNF_NEW_CONFF) && !lstat(fnametmpvb.buf,&stab)) { /* OK, «pathname».dpkg-tmp exists. Remove «pathname» and * restore «pathname».dpkg-tmp ... */ - if (namenode->flags & fnnf_no_atomic_overwrite) { + if (namenode->flags & FNNF_NO_ATOMIC_OVERWRITE) { /* If we can't do an atomic overwrite we have to delete first any * link to the new version we may have created. */ debug(dbg_eachfiledetail,"cu_installnew restoring nonatomic"); @@ -96,7 +96,7 @@ void cu_installnew(int argc, void **argv) { * atomic rename did nothing, so we make sure to remove the backup. */ else if (unlink(fnametmpvb.buf) && errno != ENOENT) ohshite(_("unable to remove backup copy of '%.250s'"), namenode->name); - } else if (namenode->flags & fnnf_placed_on_disk) { + } else if (namenode->flags & FNNF_PLACED_ON_DISK) { debug(dbg_eachfiledetail,"cu_installnew removing new file"); if (secure_remove(fnamevb.buf) && errno != ENOENT && errno != ENOTDIR) ohshite(_("unable to remove newly-installed version of '%.250s'"), diff --git a/src/configure.c b/src/configure.c index e7237106d..a6d02791c 100644 --- a/src/configure.c +++ b/src/configure.c @@ -374,7 +374,7 @@ deferred_configure_ghost_conffile(struct pkginfo *pkg, struct conffile *conff) static void deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff) { - struct filenamenode *usenode; + struct fsys_namenode *usenode; char currenthash[MD5HASHLEN + 1], newdisthash[MD5HASHLEN + 1]; int useredited, distedited; enum conffopt what; @@ -383,7 +383,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff) char *cdr2rest; int rc; - usenode = namenodetouse(findnamenode(conff->name, fnn_nocopy), + usenode = namenodetouse(fsys_hash_find_node(conff->name, FHFF_NOCOPY), pkg, &pkg->installed); rc = conffderef(pkg, &cdr, usenode->name); diff --git a/src/divertcmd.c b/src/divertcmd.c index 8e7b66eeb..202b77066 100644 --- a/src/divertcmd.c +++ b/src/divertcmd.c @@ -296,7 +296,7 @@ diversion_check_filename(const char *filename) } static const char * -diversion_pkg_name(struct diversion *d) +diversion_pkg_name(struct fsys_diversion *d) { if (d->pkgset == NULL) return ":"; @@ -349,7 +349,7 @@ diversion_current(const char *filename) } static const char * -diversion_describe(struct diversion *d) +diversion_describe(struct fsys_diversion *d) { static struct varbuf str = VARBUF_INIT; const char *pkgname; @@ -376,17 +376,17 @@ divertdb_write(void) { char *dbname; struct atomic_file *file; - struct fileiterator *iter; - struct filenamenode *namenode; + struct fsys_hash_iter *iter; + struct fsys_namenode *namenode; dbname = dpkg_db_get_path(DIVERSIONSFILE); file = atomic_file_new(dbname, ATOMIC_FILE_BACKUP); atomic_file_open(file); - iter = files_db_iter_new(); - while ((namenode = files_db_iter_next(iter))) { - struct diversion *d = namenode->divert; + iter = fsys_hash_iter_new(); + while ((namenode = fsys_hash_iter_next(iter))) { + struct fsys_diversion *d = namenode->divert; if (d == NULL || d->useinstead == NULL) continue; @@ -396,7 +396,7 @@ divertdb_write(void) d->useinstead->name, diversion_pkg_name(d)); } - files_db_iter_free(iter); + fsys_hash_iter_free(iter); atomic_file_sync(file); atomic_file_close(file); @@ -407,11 +407,11 @@ divertdb_write(void) } static bool -diversion_is_essential(struct filenamenode *namenode) +diversion_is_essential(struct fsys_namenode *namenode) { struct pkginfo *pkg; struct pkgiterator *pkg_iter; - struct filepackages_iterator *iter; + struct fsys_node_pkgs_iter *iter; bool essential = false; pkg_iter = pkg_db_iter_new(); @@ -421,23 +421,23 @@ diversion_is_essential(struct filenamenode *namenode) } pkg_db_iter_free(pkg_iter); - iter = filepackages_iter_new(namenode); - while ((pkg = filepackages_iter_next(iter))) { + iter = fsys_node_pkgs_iter_new(namenode); + while ((pkg = fsys_node_pkgs_iter_next(iter))) { if (pkg->installed.essential) { essential = true; break; } } - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); return essential; } static bool -diversion_is_owned_by_self(struct pkgset *set, struct filenamenode *namenode) +diversion_is_owned_by_self(struct pkgset *set, struct fsys_namenode *namenode) { struct pkginfo *pkg; - struct filepackages_iterator *iter; + struct fsys_node_pkgs_iter *iter; bool owned = false; if (set == NULL) @@ -446,14 +446,14 @@ diversion_is_owned_by_self(struct pkgset *set, struct filenamenode *namenode) for (pkg = &set->pkg; pkg; pkg = pkg->arch_next) ensure_packagefiles_available(pkg); - iter = filepackages_iter_new(namenode); - while ((pkg = filepackages_iter_next(iter))) { + iter = fsys_node_pkgs_iter_new(namenode); + while ((pkg = fsys_node_pkgs_iter_next(iter))) { if (pkg->set == set) { owned = true; break; } } - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); return owned; } @@ -463,8 +463,8 @@ diversion_add(const char *const *argv) { const char *filename = argv[0]; struct file file_from, file_to; - struct diversion *contest, *altname; - struct filenamenode *fnn_from, *fnn_to; + struct fsys_diversion *contest, *altname; + struct fsys_namenode *fnn_from, *fnn_to; struct pkgset *pkgset; opt_pkgname_match_any = false; @@ -483,7 +483,7 @@ diversion_add(const char *const *argv) S_ISDIR(file_from.stat.st_mode)) badusage(_("cannot divert directories")); - fnn_from = findnamenode(filename, 0); + fnn_from = fsys_hash_find_node(filename, 0); /* Handle divertto. */ if (opt_divertto == NULL) @@ -494,7 +494,7 @@ diversion_add(const char *const *argv) file_init(&file_to, opt_divertto); - fnn_to = findnamenode(opt_divertto, 0); + fnn_to = fsys_hash_find_node(opt_divertto, 0); /* Handle package name. */ if (opt_pkgname == NULL) @@ -562,12 +562,12 @@ diversion_add(const char *const *argv) } static bool -diversion_is_shared(struct pkgset *set, struct filenamenode *namenode) +diversion_is_shared(struct pkgset *set, struct fsys_namenode *namenode) { const char *archname; struct pkginfo *pkg; struct dpkg_arch *arch; - struct filepackages_iterator *iter; + struct fsys_node_pkgs_iter *iter; bool shared = false; if (set == NULL) @@ -581,14 +581,14 @@ diversion_is_shared(struct pkgset *set, struct filenamenode *namenode) for (pkg = &set->pkg; pkg; pkg = pkg->arch_next) ensure_packagefiles_available(pkg); - iter = filepackages_iter_new(namenode); - while ((pkg = filepackages_iter_next(iter))) { + iter = fsys_node_pkgs_iter_new(namenode); + while ((pkg = fsys_node_pkgs_iter_next(iter))) { if (pkg->set == set && pkg->installed.arch != arch) { shared = true; break; } } - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); return shared; } @@ -597,8 +597,8 @@ static int diversion_remove(const char *const *argv) { const char *filename = argv[0]; - struct filenamenode *namenode; - struct diversion *contest, *altname; + struct fsys_namenode *namenode; + struct fsys_diversion *contest, *altname; struct file file_from, file_to; struct pkgset *pkgset; @@ -609,7 +609,7 @@ diversion_remove(const char *const *argv) diversion_check_filename(filename); - namenode = findnamenode(filename, fnn_nonew); + namenode = fsys_hash_find_node(filename, FHFF_NONE); if (namenode == NULL || namenode->divert == NULL || namenode->divert->useinstead == NULL) { @@ -675,8 +675,8 @@ diversion_remove(const char *const *argv) static int diversion_list(const char *const *argv) { - struct fileiterator *iter; - struct filenamenode *namenode; + struct fsys_hash_iter *iter; + struct fsys_namenode *namenode; struct glob_node *glob_list = NULL; const char *pattern; @@ -686,11 +686,11 @@ diversion_list(const char *const *argv) if (glob_list == NULL) glob_list_prepend(&glob_list, m_strdup("*")); - iter = files_db_iter_new(); - while ((namenode = files_db_iter_next(iter))) { + iter = fsys_hash_iter_new(); + while ((namenode = fsys_hash_iter_next(iter))) { struct glob_node *g; - struct diversion *contest = namenode->divert; - struct diversion *altname; + struct fsys_diversion *contest = namenode->divert; + struct fsys_diversion *altname; const char *pkgname; if (contest == NULL || contest->useinstead == NULL) @@ -709,7 +709,7 @@ diversion_list(const char *const *argv) } } } - files_db_iter_free(iter); + fsys_hash_iter_free(iter); glob_list_free(glob_list); @@ -720,14 +720,14 @@ static int diversion_truename(const char *const *argv) { const char *filename = argv[0]; - struct filenamenode *namenode; + struct fsys_namenode *namenode; if (!filename || argv[1]) badusage(_("--%s needs a single argument"), cipaction->olong); diversion_check_filename(filename); - namenode = findnamenode(filename, fnn_nonew); + namenode = fsys_hash_find_node(filename, FHFF_NONE); /* Print the given name if file is not diverted. */ if (namenode && namenode->divert && namenode->divert->useinstead) @@ -742,14 +742,14 @@ static int diversion_listpackage(const char *const *argv) { const char *filename = argv[0]; - struct filenamenode *namenode; + struct fsys_namenode *namenode; if (!filename || argv[1]) badusage(_("--%s needs a single argument"), cipaction->olong); diversion_check_filename(filename); - namenode = findnamenode(filename, fnn_nonew); + namenode = fsys_hash_find_node(filename, FHFF_NONE); /* Print nothing if file is not diverted. */ if (namenode == NULL || namenode->divert == NULL) @@ -847,7 +847,7 @@ main(int argc, const char * const *argv) setaction(&cmdinfo_add, NULL); modstatdb_open(msdbrw_readonly); - filesdbinit(); + fsys_hash_init(); ensure_diversions(); ret = cipaction->action(argv); diff --git a/src/help.c b/src/help.c index 1859c34d1..f9b8d6b88 100644 --- a/src/help.c +++ b/src/help.c @@ -49,11 +49,11 @@ const char *const statusstrings[]= { [PKG_STAT_INSTALLED] = N_("installed") }; -struct filenamenode * -namenodetouse(struct filenamenode *namenode, struct pkginfo *pkg, +struct fsys_namenode * +namenodetouse(struct fsys_namenode *namenode, struct pkginfo *pkg, struct pkgbin *pkgbin) { - struct filenamenode *fnn; + struct fsys_namenode *fnn; if (!namenode->divert) return namenode; @@ -219,7 +219,7 @@ void clear_istobes(void) { * false otherwise. */ bool -dir_has_conffiles(struct filenamenode *file, struct pkginfo *pkg) +dir_has_conffiles(struct fsys_namenode *file, struct pkginfo *pkg) { struct conffile *conff; size_t namelen; @@ -246,26 +246,26 @@ dir_has_conffiles(struct filenamenode *file, struct pkginfo *pkg) * false otherwise. */ bool -dir_is_used_by_others(struct filenamenode *file, struct pkginfo *pkg) +dir_is_used_by_others(struct fsys_namenode *file, struct pkginfo *pkg) { - struct filepackages_iterator *iter; + struct fsys_node_pkgs_iter *iter; struct pkginfo *other_pkg; debug(dbg_veryverbose, "dir_is_used_by_others '%s' (except %s)", file->name, pkg ? pkg_name(pkg, pnaw_always) : ""); - iter = filepackages_iter_new(file); - while ((other_pkg = filepackages_iter_next(iter))) { + iter = fsys_node_pkgs_iter_new(file); + while ((other_pkg = fsys_node_pkgs_iter_next(iter))) { debug(dbg_veryverbose, "dir_is_used_by_others considering %s ...", pkg_name(other_pkg, pnaw_always)); if (other_pkg == pkg) continue; - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); debug(dbg_veryverbose, "dir_is_used_by_others yes"); return true; } - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); debug(dbg_veryverbose, "dir_is_used_by_others no"); return false; @@ -275,10 +275,10 @@ dir_is_used_by_others(struct filenamenode *file, struct pkginfo *pkg) * Returns true if the file is used by pkg, false otherwise. */ bool -dir_is_used_by_pkg(struct filenamenode *file, struct pkginfo *pkg, - struct fileinlist *list) +dir_is_used_by_pkg(struct fsys_namenode *file, struct pkginfo *pkg, + struct fsys_namenode_list *list) { - struct fileinlist *node; + struct fsys_namenode_list *node; size_t namelen; debug(dbg_veryverbose, "dir_is_used_by_pkg '%s' (by %s)", @@ -310,7 +310,7 @@ dir_is_used_by_pkg(struct filenamenode *file, struct pkginfo *pkg, * @param namenode The namenode for the obsolete conffile. */ void -conffile_mark_obsolete(struct pkginfo *pkg, struct filenamenode *namenode) +conffile_mark_obsolete(struct pkginfo *pkg, struct fsys_namenode *namenode) { struct conffile *conff; @@ -333,11 +333,11 @@ void pkg_conffiles_mark_old(struct pkginfo *pkg) { const struct conffile *conff; - struct filenamenode *namenode; + struct fsys_namenode *namenode; for (conff = pkg->installed.conffiles; conff; conff = conff->next) { - namenode = findnamenode(conff->name, 0); /* XXX */ - namenode->flags |= fnnf_old_conff; + namenode = fsys_hash_find_node(conff->name, 0); /* XXX */ + namenode->flags |= FNNF_OLD_CONFF; if (!namenode->oldhash) namenode->oldhash = conff->hash; debug(dbg_conffdetail, "%s '%s' namenode '%s' flags %o", __func__, diff --git a/src/main.c b/src/main.c index b90e736c2..0932695f1 100644 --- a/src/main.c +++ b/src/main.c @@ -883,11 +883,11 @@ commandfd(const char *const *argv) dpkg_options_parse((const char *const **)&endargs, cmdinfos, printforhelp); if (!cipaction) badusage(_("need an action option")); - filesdbinit(); + fsys_hash_init(); ret |= cipaction->action(endargs); - files_db_reset(); + fsys_hash_reset(); pop_error_context(ehflag_normaltidy); } @@ -929,7 +929,7 @@ int main(int argc, const char *const *argv) { run_status_loggers(&status_loggers); } - filesdbinit(); + fsys_hash_init(); ret = cipaction->action(argv); diff --git a/src/main.h b/src/main.h index ff6d4364b..944be5ea5 100644 --- a/src/main.h +++ b/src/main.h @@ -26,8 +26,8 @@ #include /* These two are defined in . */ -struct fileinlist; -struct filenamenode; +struct fsys_namenode_list; +struct fsys_namenode; enum pkg_istobe { /** Package is to be left in a normal state. */ @@ -281,13 +281,15 @@ bool ignore_depends(struct pkginfo *pkg); bool force_breaks(struct deppossi *possi); bool force_depends(struct deppossi *possi); bool force_conflicts(struct deppossi *possi); -void conffile_mark_obsolete(struct pkginfo *pkg, struct filenamenode *namenode); +void +conffile_mark_obsolete(struct pkginfo *pkg, struct fsys_namenode *namenode); void pkg_conffiles_mark_old(struct pkginfo *pkg); bool find_command(const char *prog); void checkpath(void); -struct filenamenode *namenodetouse(struct filenamenode *namenode, - struct pkginfo *pkg, struct pkgbin *pkgbin); +struct fsys_namenode * +namenodetouse(struct fsys_namenode *namenode, + struct pkginfo *pkg, struct pkgbin *pkgbin); int maintscript_installed(struct pkginfo *pkg, const char *scriptname, const char *desc, ...) DPKG_ATTR_SENTINEL; @@ -307,10 +309,13 @@ int maintscript_postinst(struct pkginfo *pkg, ...) DPKG_ATTR_SENTINEL; void post_postinst_tasks(struct pkginfo *pkg, enum pkgstatus new_status); void clear_istobes(void); -bool dir_is_used_by_others(struct filenamenode *namenode, struct pkginfo *pkg); -bool dir_is_used_by_pkg(struct filenamenode *namenode, struct pkginfo *pkg, - struct fileinlist *list); -bool dir_has_conffiles(struct filenamenode *namenode, struct pkginfo *pkg); +bool +dir_is_used_by_others(struct fsys_namenode *namenode, struct pkginfo *pkg); +bool +dir_is_used_by_pkg(struct fsys_namenode *namenode, struct pkginfo *pkg, + struct fsys_namenode_list *list); +bool +dir_has_conffiles(struct fsys_namenode *namenode, struct pkginfo *pkg); void log_action(const char *action, struct pkginfo *pkg, struct pkgbin *pkgbin); diff --git a/src/querycmd.c b/src/querycmd.c index 0dba74856..3d5284044 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -290,8 +290,10 @@ listpackages(const char *const *argv) return rc; } -static int searchoutput(struct filenamenode *namenode) { - struct filepackages_iterator *iter; +static int +searchoutput(struct fsys_namenode *namenode) +{ + struct fsys_node_pkgs_iter *iter; struct pkginfo *pkg_owner; int found; @@ -313,14 +315,14 @@ static int searchoutput(struct filenamenode *namenode) { } found= 0; - iter = filepackages_iter_new(namenode); - while ((pkg_owner = filepackages_iter_next(iter))) { + iter = fsys_node_pkgs_iter_new(namenode); + while ((pkg_owner = fsys_node_pkgs_iter_next(iter))) { if (found) fputs(", ", stdout); fputs(pkg_name(pkg_owner, pnaw_nonambig), stdout); found++; } - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); if (found) printf(": %s\n",namenode->name); return found + (namenode->divert ? 1 : 0); @@ -329,8 +331,8 @@ static int searchoutput(struct filenamenode *namenode) { static int searchfiles(const char *const *argv) { - struct filenamenode *namenode; - struct fileiterator *iter; + struct fsys_namenode *namenode; + struct fsys_hash_iter *iter; const char *thisarg; int found; int failures = 0; @@ -363,15 +365,15 @@ searchfiles(const char *const *argv) varbuf_end_str(&path); varbuf_trunc(&path, path_trim_slash_slashdot(path.buf)); - namenode = findnamenode(path.buf, 0); + namenode = fsys_hash_find_node(path.buf, 0); found += searchoutput(namenode); } else { - iter = files_db_iter_new(); - while ((namenode = files_db_iter_next(iter)) != NULL) { + iter = fsys_hash_iter_new(); + while ((namenode = fsys_hash_iter_next(iter)) != NULL) { if (fnmatch(thisarg,namenode->name,0)) continue; found+= searchoutput(namenode); } - files_db_iter_free(iter); + fsys_hash_iter_free(iter); } if (!found) { notice(_("no path found matching pattern %s"), thisarg); @@ -474,9 +476,9 @@ static int list_files(const char *const *argv) { const char *thisarg; - struct fileinlist *file; + struct fsys_namenode_list *file; struct pkginfo *pkg; - struct filenamenode *namenode; + struct fsys_namenode *namenode; int failures = 0; if (!*argv) @@ -855,7 +857,7 @@ int main(int argc, const char *const *argv) { if (!cipaction) badusage(_("need an action option")); - filesdbinit(); + fsys_hash_init(); ret = cipaction->action(argv); diff --git a/src/remove.c b/src/remove.c index 01d926387..39584aa85 100644 --- a/src/remove.c +++ b/src/remove.c @@ -164,7 +164,7 @@ void deferred_remove(struct pkginfo *pkg) { " reinstall it before attempting a removal")); ensure_allinstfiles_available(); - filesdbinit(); + fsys_hash_init(); if (f_noact) { printf(_("Would remove or purge %s (%s) ...\n"), @@ -203,9 +203,12 @@ void deferred_remove(struct pkginfo *pkg) { removal_bulk(pkg); } -static void push_leftover(struct fileinlist **leftoverp, - struct filenamenode *namenode) { - struct fileinlist *newentry; +static void +push_leftover(struct fsys_namenode_list **leftoverp, + struct fsys_namenode *namenode) +{ + struct fsys_namenode_list *newentry; + newentry = nfmalloc(sizeof(*newentry)); newentry->next= *leftoverp; newentry->namenode= namenode; @@ -229,17 +232,17 @@ removal_bulk_remove_file(const char *filename, const char *filetype) } static bool -removal_bulk_file_is_shared(struct pkginfo *pkg, struct filenamenode *namenode) +removal_bulk_file_is_shared(struct pkginfo *pkg, struct fsys_namenode *namenode) { - struct filepackages_iterator *iter; + struct fsys_node_pkgs_iter *iter; struct pkginfo *otherpkg; bool shared = false; if (pkgset_installed_instances(pkg->set) <= 1) return false; - iter = filepackages_iter_new(namenode); - while ((otherpkg = filepackages_iter_next(iter))) { + iter = fsys_node_pkgs_iter_new(namenode); + while ((otherpkg = fsys_node_pkgs_iter_next(iter))) { if (otherpkg == pkg) continue; if (otherpkg->set != pkg->set) @@ -250,7 +253,7 @@ removal_bulk_file_is_shared(struct pkginfo *pkg, struct filenamenode *namenode) shared = true; break; } - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); return shared; } @@ -258,9 +261,9 @@ removal_bulk_file_is_shared(struct pkginfo *pkg, struct filenamenode *namenode) static void removal_bulk_remove_files(struct pkginfo *pkg) { - struct reversefilelistiter rev_iter; - struct fileinlist *leftover; - struct filenamenode *namenode; + struct fsys_hash_rev_iter rev_iter; + struct fsys_namenode_list *leftover; + struct fsys_namenode *namenode; static struct varbuf fnvb; struct varbuf_state fnvb_state; struct stat stab; @@ -269,10 +272,10 @@ removal_bulk_remove_files(struct pkginfo *pkg) modstatdb_note(pkg); push_checkpoint(~ehflag_bombout, ehflag_normaltidy); - reversefilelist_init(&rev_iter, pkg->files); + fsys_hash_rev_iter_init(&rev_iter, pkg->files); leftover = NULL; - while ((namenode = reversefilelist_next(&rev_iter))) { - struct filenamenode *usenode; + while ((namenode = fsys_hash_rev_iter_next(&rev_iter))) { + struct fsys_namenode *usenode; bool is_dir; debug(dbg_eachfile, "removal_bulk '%s' flags=%o", @@ -295,7 +298,7 @@ removal_bulk_remove_files(struct pkginfo *pkg) continue; /* Non-shared conffiles are kept. */ - if (namenode->flags & fnnf_old_conff) { + if (namenode->flags & FNNF_OLD_CONFF) { push_leftover(&leftover, namenode); continue; } @@ -380,9 +383,9 @@ removal_bulk_remove_files(struct pkginfo *pkg) } static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) { - struct reversefilelistiter rev_iter; - struct fileinlist *leftover; - struct filenamenode *namenode; + struct fsys_hash_rev_iter rev_iter; + struct fsys_namenode_list *leftover; + struct fsys_namenode *namenode; static struct varbuf fnvb; struct stat stab; @@ -392,14 +395,14 @@ static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) { modstatdb_note(pkg); push_checkpoint(~ehflag_bombout, ehflag_normaltidy); - reversefilelist_init(&rev_iter, pkg->files); + fsys_hash_rev_iter_init(&rev_iter, pkg->files); leftover = NULL; - while ((namenode = reversefilelist_next(&rev_iter))) { - struct filenamenode *usenode; + while ((namenode = fsys_hash_rev_iter_next(&rev_iter))) { + struct fsys_namenode *usenode; debug(dbg_eachfile, "removal_bulk '%s' flags=%o", namenode->name, namenode->flags); - if (namenode->flags & fnnf_old_conff) { + if (namenode->flags & FNNF_OLD_CONFF) { /* This can only happen if removal_bulk_remove_configfiles() got * interrupted half way. */ debug(dbg_eachfiledetail, "removal_bulk expecting only left over dirs, " @@ -477,7 +480,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) { int conffnameused, conffbasenamelen; char *conffbasename; struct conffile *conff, **lconffp; - struct fileinlist *searchfile; + struct fsys_namenode_list *searchfile; DIR *dsd; struct dirent *de; char *p; @@ -525,7 +528,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) { modstatdb_note(pkg); for (conff= pkg->installed.conffiles; conff; conff= conff->next) { - struct filenamenode *namenode, *usenode; + struct fsys_namenode *namenode, *usenode; static struct varbuf fnvb, removevb; struct varbuf_state removevb_state; @@ -540,7 +543,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) { if (rc == -1) continue; - namenode = findnamenode(conff->name, 0); + namenode = fsys_hash_find_node(conff->name, 0); usenode = namenodetouse(namenode, pkg, &pkg->installed); trig_path_activate(usenode, pkg); @@ -609,7 +612,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) { /* Remove the conffiles from the file list file. */ write_filelist_except(pkg, &pkg->installed, pkg->files, - fnnf_old_conff); + FNNF_OLD_CONFF); pkg->installed.conffiles = NULL; modstatdb_note(pkg); diff --git a/src/statcmd.c b/src/statcmd.c index 741b50000..4a6af8675 100644 --- a/src/statcmd.c +++ b/src/statcmd.c @@ -153,9 +153,9 @@ statdb_node_new(const char *user, const char *group, const char *mode) static struct file_stat ** statdb_node_find(const char *filename) { - struct filenamenode *file; + struct fsys_namenode *file; - file = findnamenode(filename, 0); + file = fsys_hash_find_node(filename, 0); return &file->statoverride; } @@ -163,9 +163,9 @@ statdb_node_find(const char *filename) static int statdb_node_remove(const char *filename) { - struct filenamenode *file; + struct fsys_namenode *file; - file = findnamenode(filename, fnn_nonew); + file = fsys_hash_find_node(filename, FHFF_NONE); if (!file || !file->statoverride) return 0; @@ -188,7 +188,7 @@ statdb_node_apply(const char *filename, struct file_stat *filestat) } static void -statdb_node_print(FILE *out, struct filenamenode *file) +statdb_node_print(FILE *out, struct fsys_namenode *file) { struct file_stat *filestat = file->statoverride; struct passwd *pw; @@ -221,17 +221,17 @@ statdb_write(void) { char *dbname; struct atomic_file *dbfile; - struct fileiterator *iter; - struct filenamenode *file; + struct fsys_hash_iter *iter; + struct fsys_namenode *file; dbname = dpkg_db_get_path(STATOVERRIDEFILE); dbfile = atomic_file_new(dbname, ATOMIC_FILE_BACKUP); atomic_file_open(dbfile); - iter = files_db_iter_new(); - while ((file = files_db_iter_next(iter))) + iter = fsys_hash_iter_new(); + while ((file = fsys_hash_iter_next(iter))) statdb_node_print(dbfile->fp, file); - files_db_iter_free(iter); + fsys_hash_iter_free(iter); atomic_file_sync(dbfile); atomic_file_close(dbfile); @@ -333,8 +333,8 @@ statoverride_remove(const char *const *argv) static int statoverride_list(const char *const *argv) { - struct fileiterator *iter; - struct filenamenode *file; + struct fsys_hash_iter *iter; + struct fsys_namenode *file; const char *thisarg; struct glob_node *glob_list = NULL; int ret = 1; @@ -347,8 +347,8 @@ statoverride_list(const char *const *argv) if (glob_list == NULL) glob_list_prepend(&glob_list, m_strdup("*")); - iter = files_db_iter_new(); - while ((file = files_db_iter_next(iter))) { + iter = fsys_hash_iter_new(); + while ((file = fsys_hash_iter_next(iter))) { struct glob_node *g; for (g = glob_list; g; g = g->next) { @@ -359,7 +359,7 @@ statoverride_list(const char *const *argv) } } } - files_db_iter_free(iter); + fsys_hash_iter_free(iter); glob_list_free(glob_list); @@ -397,7 +397,7 @@ main(int argc, const char *const *argv) if (!cipaction) badusage(_("need an action option")); - filesdbinit(); + fsys_hash_init(); ensure_statoverrides(STATDB_PARSE_LAX); ret = cipaction->action(argv); diff --git a/src/trigcmd.c b/src/trigcmd.c index bc0d2f9a2..af8119c87 100644 --- a/src/trigcmd.c +++ b/src/trigcmd.c @@ -229,7 +229,7 @@ main(int argc, const char *const *argv) badusage(_("illegal awaited package name '%.250s': %.250s"), bypackage, badname); - filesdbinit(); + fsys_hash_init(); activate = argv[0]; badname = trig_name_is_illegal(activate); diff --git a/src/unpack.c b/src/unpack.c index 3459b93c4..ceb17a2c3 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -322,7 +322,7 @@ pkg_deconfigure_others(struct pkginfo *pkg) */ static void deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles, - struct filenamenode_queue *newconffiles) + struct fsys_namenode_queue *newconffiles) { FILE *conff; char conffilenamebuf[MAXCONFFILENAME]; @@ -338,9 +338,9 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles, while (fgets(conffilenamebuf, MAXCONFFILENAME - 2, conff)) { struct pkginfo *otherpkg; - struct filepackages_iterator *iter; - struct filenamenode *namenode; - struct fileinlist *newconff; + struct fsys_node_pkgs_iter *iter; + struct fsys_namenode *namenode; + struct fsys_namenode_list *newconff; struct conffile *searchconff; char *p; @@ -356,9 +356,9 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles, continue; *p = '\0'; - namenode = findnamenode(conffilenamebuf, 0); + namenode = fsys_hash_find_node(conffilenamebuf, 0); namenode->oldhash = NEWCONFFILEFLAG; - newconff = tar_filenamenode_queue_push(newconffiles, namenode); + newconff = tar_fsys_namenode_queue_push(newconffiles, namenode); /* * Let's see if any packages have this file. @@ -377,8 +377,8 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles, */ searchconff = NULL; - iter = filepackages_iter_new(newconff->namenode); - while ((otherpkg = filepackages_iter_next(iter))) { + iter = fsys_node_pkgs_iter_new(newconff->namenode); + while ((otherpkg = fsys_node_pkgs_iter_next(iter))) { debug(dbg_conffdetail, "process_archive conffile '%s' in package %s - conff ?", newconff->namenode->name, pkg_name(otherpkg, pnaw_always)); @@ -399,7 +399,7 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles, break; } } - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); if (searchconff) { /* We don't copy ‘obsolete’; it's not obsolete in the new package. */ @@ -408,7 +408,7 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles, debug(dbg_conff, "process_archive conffile '%s' no package, no hash", newconff->namenode->name); } - newconff->namenode->flags |= fnnf_new_conff; + newconff->namenode->flags |= FNNF_NEW_CONFF; } if (ferror(conff)) @@ -556,20 +556,20 @@ pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest) static void pkg_remove_old_files(struct pkginfo *pkg, - struct filenamenode_queue *newfiles_queue, - struct filenamenode_queue *newconffiles) + struct fsys_namenode_queue *newfiles_queue, + struct fsys_namenode_queue *newconffiles) { - struct reversefilelistiter rev_iter; - struct filenamenode *namenode; + struct fsys_hash_rev_iter rev_iter; + struct fsys_namenode *namenode; struct stat stab, oldfs; - reversefilelist_init(&rev_iter, pkg->files); + fsys_hash_rev_iter_init(&rev_iter, pkg->files); - while ((namenode = reversefilelist_next(&rev_iter))) { - struct filenamenode *usenode; + while ((namenode = fsys_hash_rev_iter_next(&rev_iter))) { + struct fsys_namenode *usenode; - if ((namenode->flags & fnnf_new_conff) || - (namenode->flags & fnnf_new_inarchive)) + if ((namenode->flags & FNNF_NEW_CONFF) || + (namenode->flags & FNNF_NEW_INARCHIVE)) continue; usenode = namenodetouse(namenode, pkg, &pkg->installed); @@ -601,13 +601,13 @@ pkg_remove_old_files(struct pkginfo *pkg, if (rmdir(fnamevb.buf)) { warning(_("unable to delete old directory '%.250s': %s"), namenode->name, strerror(errno)); - } else if ((namenode->flags & fnnf_old_conff)) { + } else if ((namenode->flags & FNNF_OLD_CONFF)) { warning(_("old conffile '%.250s' was an empty directory " "(and has now been deleted)"), namenode->name); } } else { - struct fileinlist *sameas = NULL; - struct fileinlist *cfile; + struct fsys_namenode_list *sameas = NULL; + struct fsys_namenode_list *cfile; static struct file_ondisk_id empty_ondisk_id; struct varbuf cfilename = VARBUF_INIT; @@ -634,7 +634,7 @@ pkg_remove_old_files(struct pkginfo *pkg, for (cfile = newfiles_queue->head; cfile; cfile = cfile->next) { /* If the file has been filtered then treat it as if it didn't exist * on the file system. */ - if (cfile->namenode->flags & fnnf_filtered) + if (cfile->namenode->flags & FNNF_FILTERED) continue; if (cfile->namenode->file_ondisk_id == NULL) { @@ -678,9 +678,9 @@ pkg_remove_old_files(struct pkginfo *pkg, varbuf_destroy(&cfilename); - if ((namenode->flags & fnnf_old_conff)) { + if ((namenode->flags & FNNF_OLD_CONFF)) { if (sameas) { - if (sameas->namenode->flags & fnnf_new_conff) { + if (sameas->namenode->flags & FNNF_NEW_CONFF) { if (strcmp(sameas->namenode->oldhash, NEWCONFFILEFLAG) == 0) { sameas->namenode->oldhash = namenode->oldhash; debug(dbg_eachfile, "process_archive: old conff %s " @@ -695,9 +695,9 @@ pkg_remove_old_files(struct pkginfo *pkg, } else { debug(dbg_eachfile, "process_archive: old conff %s " "is disappearing", namenode->name); - namenode->flags |= fnnf_obs_conff; - tar_filenamenode_queue_push(newconffiles, namenode); - tar_filenamenode_queue_push(newfiles_queue, namenode); + namenode->flags |= FNNF_OBS_CONFF; + tar_fsys_namenode_queue_push(newconffiles, namenode); + tar_fsys_namenode_queue_push(newfiles_queue, namenode); } continue; } @@ -716,13 +716,13 @@ pkg_remove_old_files(struct pkginfo *pkg, } static void -pkg_update_fields(struct pkginfo *pkg, struct filenamenode_queue *newconffiles) +pkg_update_fields(struct pkginfo *pkg, struct fsys_namenode_queue *newconffiles) { struct dependency *newdeplist, **newdeplistlastp; struct dependency *newdep, *dep; struct deppossi **newpossilastp, *possi, *newpossi; struct conffile **iconffileslastp, *newiconff; - struct fileinlist *cfile; + struct fsys_namenode_list *cfile; /* The dependencies are the most difficult. We have to build * a whole new forward dependency tree. At least the reverse @@ -787,7 +787,7 @@ pkg_update_fields(struct pkginfo *pkg, struct filenamenode_queue *newconffiles) newiconff->next = NULL; newiconff->name = nfstrsave(cfile->namenode->name); newiconff->hash = nfstrsave(cfile->namenode->oldhash); - newiconff->obsolete = !!(cfile->namenode->flags & fnnf_obs_conff); + newiconff->obsolete = !!(cfile->namenode->flags & FNNF_OBS_CONFF); *iconffileslastp = newiconff; iconffileslastp = &newiconff->next; } @@ -838,7 +838,7 @@ pkg_disappear_others(struct pkginfo *pkg) { struct pkgiterator *iter; struct pkginfo *otherpkg; - struct fileinlist *cfile; + struct fsys_namenode_list *cfile; struct deppossi *pdep; struct dependency *providecheck; struct varbuf depprobwhy = VARBUF_INIT; @@ -968,16 +968,16 @@ pkgset_getting_in_sync(struct pkginfo *pkg) } static void -pkg_remove_files_from_others(struct pkginfo *pkg, struct fileinlist *newfileslist) +pkg_remove_files_from_others(struct pkginfo *pkg, struct fsys_namenode_list *newfileslist) { - struct fileinlist *cfile; + struct fsys_namenode_list *cfile; struct pkginfo *otherpkg; for (cfile = newfileslist; cfile; cfile = cfile->next) { - struct filepackages_iterator *iter; + struct fsys_node_pkgs_iter *iter; struct pkgset *divpkgset; - if (!(cfile->namenode->flags & fnnf_elide_other_lists)) + if (!(cfile->namenode->flags & FNNF_ELIDE_OTHER_LISTS)) continue; if (cfile->namenode->divert && cfile->namenode->divert->useinstead) { @@ -998,8 +998,8 @@ pkg_remove_files_from_others(struct pkginfo *pkg, struct fileinlist *newfileslis cfile->namenode->name); } - iter = filepackages_iter_new(cfile->namenode); - while ((otherpkg = filepackages_iter_next(iter))) { + iter = fsys_node_pkgs_iter_new(cfile->namenode); + while ((otherpkg = fsys_node_pkgs_iter_next(iter))) { debug(dbg_eachfiledetail, "process_archive ... found in %s", pkg_name(otherpkg, pnaw_always)); @@ -1013,7 +1013,7 @@ pkg_remove_files_from_others(struct pkginfo *pkg, struct fileinlist *newfileslis continue; } - if (cfile->namenode->flags & fnnf_new_conff) + if (cfile->namenode->flags & FNNF_NEW_CONFF) conffile_mark_obsolete(otherpkg, cfile->namenode); /* If !files_list_valid then it's one of the disappeared packages above @@ -1026,23 +1026,23 @@ pkg_remove_files_from_others(struct pkginfo *pkg, struct fileinlist *newfileslis * (and any others in the same package) and then mark the package * as requiring a reread. */ write_filelist_except(otherpkg, &otherpkg->installed, - otherpkg->files, fnnf_elide_other_lists); + otherpkg->files, FNNF_ELIDE_OTHER_LISTS); debug(dbg_veryverbose, "process_archive overwrote from %s", pkg_name(otherpkg, pnaw_always)); } - filepackages_iter_free(iter); + fsys_node_pkgs_iter_free(iter); } } static void -pkg_remove_backup_files(struct pkginfo *pkg, struct fileinlist *newfileslist) +pkg_remove_backup_files(struct pkginfo *pkg, struct fsys_namenode_list *newfileslist) { - struct fileinlist *cfile; + struct fsys_namenode_list *cfile; for (cfile = newfileslist; cfile; cfile = cfile->next) { - struct filenamenode *usenode; + struct fsys_namenode *usenode; - if (cfile->namenode->flags & fnnf_new_conff) + if (cfile->namenode->flags & FNNF_NEW_CONFF) continue; usenode = namenodetouse(cfile->namenode, pkg, &pkg->installed); @@ -1087,7 +1087,7 @@ void process_archive(const char *filename) { char *cidirrest; char *psize; const char *pfilename; - struct filenamenode_queue newconffiles, newfiles_queue; + struct fsys_namenode_queue newconffiles, newfiles_queue; struct stat stab; cleanup_pkg_failed= cleanup_conflictor_failed= 0; @@ -1193,7 +1193,7 @@ void process_archive(const char *filename) { pkg_check_depcon(pkg, pfilename); ensure_allinstfiles_available(); - filesdbinit(); + fsys_hash_init(); trig_file_interests_ensure(); printf(_("Preparing to unpack %s ...\n"), pfilename); diff --git a/src/verify.c b/src/verify.c index 6067fb1ac..4190981f7 100644 --- a/src/verify.c +++ b/src/verify.c @@ -45,7 +45,7 @@ struct verify_checks { enum verify_result md5sum; }; -typedef void verify_output_func(struct filenamenode *, struct verify_checks *); +typedef void verify_output_func(struct fsys_namenode *, struct verify_checks *); static int verify_result_rpm(enum verify_result result, int check) @@ -62,7 +62,7 @@ verify_result_rpm(enum verify_result result, int check) } static void -verify_output_rpm(struct filenamenode *namenode, struct verify_checks *checks) +verify_output_rpm(struct fsys_namenode *namenode, struct verify_checks *checks) { char result[9]; int attr; @@ -71,7 +71,7 @@ verify_output_rpm(struct filenamenode *namenode, struct verify_checks *checks) result[2] = verify_result_rpm(checks->md5sum, '5'); - if (namenode->flags & fnnf_old_conff) + if (namenode->flags & FNNF_OLD_CONFF) attr = 'c'; else attr = ' '; @@ -95,7 +95,7 @@ verify_set_output(const char *name) static void verify_package(struct pkginfo *pkg) { - struct fileinlist *file; + struct fsys_namenode_list *file; struct varbuf filename = VARBUF_INIT; ensure_packagefiles_available(pkg); @@ -104,7 +104,7 @@ verify_package(struct pkginfo *pkg) for (file = pkg->files; file; file = file->next) { struct verify_checks checks; - struct filenamenode *fnn; + struct fsys_namenode *fnn; char hash[MD5HASHLEN + 1]; int failures = 0; -- cgit v1.2.3 From 31eb544919a46c6170ac39f5eebd17ba6d48d508 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 21 Nov 2018 03:44:15 +0100 Subject: libdpkg: Rename pkg_db symbols to pkg_hash These are handling a package hash, and db seems to imply some kind of on-disk storage. Rename the pkgiterator too to pkg_hash_iter to make it consistent. --- debian/changelog | 1 + dselect/pkglist.cc | 10 ++--- lib/dpkg/db-ctrl-upgrade.c | 2 +- lib/dpkg/db-fsys-divert.c | 2 +- lib/dpkg/db-fsys-files.c | 4 +- lib/dpkg/dbmodify.c | 2 +- lib/dpkg/dpkg-db.h | 43 +++++++++++++------- lib/dpkg/dump.c | 2 +- lib/dpkg/fields.c | 6 +-- lib/dpkg/libdpkg.map | 26 ++++++------ lib/dpkg/parse.c | 16 ++++---- lib/dpkg/pkg-array.c | 12 +++--- lib/dpkg/pkg-array.h | 2 +- lib/dpkg/pkg-hash.c | 40 +++++++++---------- lib/dpkg/pkg-spec.c | 14 +++---- lib/dpkg/pkg-spec.h | 2 +- lib/dpkg/t/t-pkg-hash.c | 98 +++++++++++++++++++++++----------------------- lib/dpkg/t/t-pkg-show.c | 2 +- lib/dpkg/trignote.c | 2 +- src/depcon.c | 8 ++-- src/divertcmd.c | 12 +++--- src/enquiry.c | 32 +++++++-------- src/help.c | 8 ++-- src/main.c | 8 ++-- src/packages.c | 8 ++-- src/querycmd.c | 4 +- src/select.c | 10 ++--- src/trigproc.c | 24 ++++++------ src/unpack.c | 8 ++-- src/verify.c | 8 ++-- 30 files changed, 215 insertions(+), 201 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index af1ba3c9c..04d98a183 100644 --- a/debian/changelog +++ b/debian/changelog @@ -114,6 +114,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium - libdpkg, dpkg: Rename r variables to fnn. - libdpkg: Rename ret variable to next. - libdpkg: Cleanup fsys module symbol names. + - libdpkg: Rename pkg_db symbols to pkg_hash. * Build system: - get-version: Use a format string with printf. - run-script: Use $() instead of deprecated ``. diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc index ced7487d6..9882802bb 100644 --- a/dselect/pkglist.cc +++ b/dselect/pkglist.cc @@ -365,7 +365,7 @@ void packagelist::sortmakeheads() { void packagelist::initialsetup() { debug(dbg_general, "packagelist[%p]::initialsetup()", this); - int allpackages = pkg_db_count_pkg(); + int allpackages = pkg_hash_count_pkg(); datatable= new struct perpackagestate[allpackages]; nallocated= allpackages+150; // will realloc if necessary, so 150 not critical @@ -390,13 +390,13 @@ void packagelist::finalsetup() { packagelist::packagelist(keybindings *kb) : baselist(kb) { // nonrecursive initialsetup(); - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *pkg; nitems = 0; - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter))) { struct perpackagestate *state= &datatable[nitems]; state->pkg= pkg; if (pkg->status == PKG_STAT_NOTINSTALLED && @@ -426,7 +426,7 @@ packagelist::packagelist(keybindings *kb) : baselist(kb) { table[nitems]= state; nitems++; } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); if (!nitems) ohshit(_("there are no packages")); diff --git a/lib/dpkg/db-ctrl-upgrade.c b/lib/dpkg/db-ctrl-upgrade.c index 1770ecaeb..9b6d735cc 100644 --- a/lib/dpkg/db-ctrl-upgrade.c +++ b/lib/dpkg/db-ctrl-upgrade.c @@ -114,7 +114,7 @@ pkg_infodb_link_multiarch_files(void) if (strchr(pkgname.buf, ':')) continue; - set = pkg_db_find_set(pkgname.buf); + set = pkg_hash_find_set(pkgname.buf); for (pkg = &set->pkg; pkg; pkg = pkg->arch_next) if (pkg->status != PKG_STAT_NOTINSTALLED) break; diff --git a/lib/dpkg/db-fsys-divert.c b/lib/dpkg/db-fsys-divert.c index 985ed1bbe..bf0b7ff5a 100644 --- a/lib/dpkg/db-fsys-divert.c +++ b/lib/dpkg/db-fsys-divert.c @@ -113,7 +113,7 @@ ensure_diversions(void) fgets_must(linebuf, sizeof(linebuf), file, diversionsname); oicontest->pkgset = strcmp(linebuf, ":") ? - pkg_db_find_set(linebuf) : NULL; + pkg_hash_find_set(linebuf) : NULL; oialtname->pkgset = oicontest->pkgset; if (oialtname->camefrom->divert || diff --git a/lib/dpkg/db-fsys-files.c b/lib/dpkg/db-fsys-files.c index c944d5339..ffd26cee2 100644 --- a/lib/dpkg/db-fsys-files.c +++ b/lib/dpkg/db-fsys-files.c @@ -252,13 +252,13 @@ void ensure_allinstfiles_available(void) { if (allpackagesdone) return; if (saidread < PKG_FILESDB_LOAD_DONE) { - int max = pkg_db_count_pkg(); + int max = pkg_hash_count_pkg(); saidread = PKG_FILESDB_LOAD_INPROGRESS; progress_init(&progress, _("(Reading database ... "), max); } - pkg_array_init_from_db(&array); + pkg_array_init_from_hash(&array); pkg_files_optimize_load(&array); diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c index 7351f3d00..f29c6745f 100644 --- a/lib/dpkg/dbmodify.c +++ b/lib/dpkg/dbmodify.c @@ -367,7 +367,7 @@ void modstatdb_shutdown(void) { break; } - pkg_db_reset(); + pkg_hash_reset(); modstatdb_done(); } diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index 6ea525657..3e9158def 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -294,21 +294,34 @@ void pkg_blank(struct pkginfo *pp); void pkgbin_blank(struct pkgbin *pkgbin); bool pkg_is_informative(struct pkginfo *pkg, struct pkgbin *info); -struct pkgset *pkg_db_find_set(const char *name); -struct pkginfo *pkg_db_get_singleton(struct pkgset *set); -struct pkginfo *pkg_db_find_singleton(const char *name); -struct pkginfo *pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch); -struct pkginfo *pkg_db_find_pkg(const char *name, const struct dpkg_arch *arch); -int pkg_db_count_set(void); -int pkg_db_count_pkg(void); -void pkg_db_reset(void); - -struct pkgiterator *pkg_db_iter_new(void); -struct pkgset *pkg_db_iter_next_set(struct pkgiterator *iter); -struct pkginfo *pkg_db_iter_next_pkg(struct pkgiterator *iter); -void pkg_db_iter_free(struct pkgiterator *iter); - -void pkg_db_report(FILE *); +struct pkgset * +pkg_hash_find_set(const char *name); +struct pkginfo * +pkg_hash_get_singleton(struct pkgset *set); +struct pkginfo * +pkg_hash_find_singleton(const char *name); +struct pkginfo * +pkg_hash_get_pkg(struct pkgset *set, const struct dpkg_arch *arch); +struct pkginfo * +pkg_hash_find_pkg(const char *name, const struct dpkg_arch *arch); +int +pkg_hash_count_set(void); +int +pkg_hash_count_pkg(void); +void +pkg_hash_reset(void); + +struct pkg_hash_iter * +pkg_hash_iter_new(void); +struct pkgset * +pkg_hash_iter_next_set(struct pkg_hash_iter *iter); +struct pkginfo * +pkg_hash_iter_next_pkg(struct pkg_hash_iter *iter); +void +pkg_hash_iter_free(struct pkg_hash_iter *iter); + +void +pkg_hash_report(FILE *); /*** from parse.c ***/ diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c index c400ae307..c58a4d59a 100644 --- a/lib/dpkg/dump.c +++ b/lib/dpkg/dump.c @@ -510,7 +510,7 @@ writedb_records(FILE *fp, const char *filename, enum writedb_flags flags) if (setvbuf(fp, writebuf, _IOFBF, sizeof(writebuf))) ohshite(_("unable to set buffering on %s database file"), which); - pkg_array_init_from_db(&array); + pkg_array_init_from_hash(&array); pkg_array_sort(&array, pkg_sorter_by_nonambig_name_arch); for (i = 0; i < array.n_pkgs; i++) { diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c index 39044e2a5..1389e6ebc 100644 --- a/lib/dpkg/fields.c +++ b/lib/dpkg/fields.c @@ -104,8 +104,8 @@ f_name(struct pkginfo *pkg, struct pkgbin *pkgbin, e = pkg_name_is_illegal(value); if (e != NULL) parse_error(ps, _("invalid package name (%.250s)"), e); - /* We use the new name, as pkg_db_find_set() may have done a tolower for us. */ - pkg->set->name = pkg_db_find_set(value)->name; + /* We use the new name, as pkg_hash_find_set() may have done a tolower for us. */ + pkg->set->name = pkg_hash_find_set(value)->name; } void @@ -440,7 +440,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin, fip->name, depname.buf, emsg); dop = nfmalloc(sizeof(*dop)); dop->up= dyp; - dop->ed = pkg_db_find_set(depname.buf); + dop->ed = pkg_hash_find_set(depname.buf); dop->next= NULL; *ldopp= dop; ldopp= &dop->next; /* Don't link this (which is after all only ‘new_pkg’ from diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index c337ee662..fe4e299ee 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -304,7 +304,7 @@ LIBDPKG_PRIVATE { pkg_list_prepend; # Package array handling - pkg_array_init_from_db; + pkg_array_init_from_hash; pkg_array_init_from_names; pkg_array_foreach; pkg_array_sort; @@ -317,6 +317,18 @@ LIBDPKG_PRIVATE { pkg_queue_push; pkg_queue_pop; + # Package in-core database functions + pkg_hash_find_set; + pkg_hash_find_singleton; + pkg_hash_find_pkg; + pkg_hash_count_set; + pkg_hash_count_pkg; + pkg_hash_reset; + pkg_hash_iter_new; + pkg_hash_iter_next_set; + pkg_hash_iter_next_pkg; + pkg_hash_iter_free; + # Package field handling fieldinfos; # XXX variable, do not export find_field_info; @@ -340,18 +352,6 @@ LIBDPKG_PRIVATE { pkg_spec_iter_next_pkg; pkg_spec_iter_destroy; - # Package in-core database functions - pkg_db_find_set; - pkg_db_find_singleton; - pkg_db_find_pkg; - pkg_db_count_set; - pkg_db_count_pkg; - pkg_db_reset; - pkg_db_iter_new; - pkg_db_iter_next_set; - pkg_db_iter_next_pkg; - pkg_db_iter_free; - # Dependency and Conflict functions pkg_virtual_deppossi_satisfied; deparchsatisfied; diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index 14d6192f5..8d1195694 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -342,7 +342,7 @@ parse_find_set_slot(struct parsedb_state *ps, struct pkgset *set; struct pkginfo *pkg; - set = pkg_db_find_set(new_pkg->set->name); + set = pkg_hash_find_set(new_pkg->set->name); /* Sanity checks: verify that the db is in a consistent state. */ @@ -405,9 +405,9 @@ parse_find_pkg_slot(struct parsedb_state *ps, * possible architecture switch, for example from native to all. */ if (pkgset_installed_instances(db_set) == 1 && new_pkgbin->multiarch != PKG_MULTIARCH_SAME) - return pkg_db_get_singleton(db_set); + return pkg_hash_get_singleton(db_set); else - return pkg_db_get_pkg(db_set, new_pkgbin->arch); + return pkg_hash_get_pkg(db_set, new_pkgbin->arch); } else { bool selection = false; @@ -427,20 +427,20 @@ parse_find_pkg_slot(struct parsedb_state *ps, /* If we are parsing the status file, use a slot per arch. */ if (ps->type == pdb_file_status) - return pkg_db_get_pkg(db_set, new_pkgbin->arch); + return pkg_hash_get_pkg(db_set, new_pkgbin->arch); /* If we are doing an update, from the log or a new package, then * handle cross-grades. */ if (pkgset_installed_instances(db_set) == 1) { - db_pkg = pkg_db_get_singleton(db_set); + db_pkg = pkg_hash_get_singleton(db_set); if (db_pkg->installed.multiarch == PKG_MULTIARCH_SAME && new_pkgbin->multiarch == PKG_MULTIARCH_SAME) - return pkg_db_get_pkg(db_set, new_pkgbin->arch); + return pkg_hash_get_pkg(db_set, new_pkgbin->arch); else return db_pkg; } else { - return pkg_db_get_pkg(db_set, new_pkgbin->arch); + return pkg_hash_get_pkg(db_set, new_pkgbin->arch); } } } @@ -490,7 +490,7 @@ pkg_parse_copy(struct parsedb_state *ps, pkg_name(ta->aw, pnaw_always), pkgbin_name(src_pkg, src_pkgbin, pnaw_always)); ta->aw = dst_pkg; - /* ->othertrigaw_head is updated by trig_note_aw in *(pkg_db_find()) + /* ->othertrigaw_head is updated by trig_note_aw in *(pkg_hash_find()) * rather than in dst_pkg. */ } } else if (!(ps->flags & pdb_ignore_archives)) { diff --git a/lib/dpkg/pkg-array.c b/lib/dpkg/pkg-array.c index cf5c34d3f..0ce285e92 100644 --- a/lib/dpkg/pkg-array.c +++ b/lib/dpkg/pkg-array.c @@ -59,19 +59,19 @@ pkg_array_init_from_names(struct pkg_array *a, pkg_mapper_func pkg_mapper, * @param a The array to initialize. */ void -pkg_array_init_from_db(struct pkg_array *a) +pkg_array_init_from_hash(struct pkg_array *a) { - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *pkg; int i; - a->n_pkgs = pkg_db_count_pkg(); + a->n_pkgs = pkg_hash_count_pkg(); a->pkgs = m_malloc(sizeof(a->pkgs[0]) * a->n_pkgs); - iter = pkg_db_iter_new(); - for (i = 0; (pkg = pkg_db_iter_next_pkg(iter)); i++) + iter = pkg_hash_iter_new(); + for (i = 0; (pkg = pkg_hash_iter_next_pkg(iter)); i++) a->pkgs[i] = pkg; - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); if (i != a->n_pkgs) internerr("inconsistent state in pkg array: i=%d != npkgs=%d", diff --git a/lib/dpkg/pkg-array.h b/lib/dpkg/pkg-array.h index 858b4fe46..f9ea385b6 100644 --- a/lib/dpkg/pkg-array.h +++ b/lib/dpkg/pkg-array.h @@ -44,7 +44,7 @@ typedef struct pkginfo *pkg_mapper_func(const char *name); typedef void pkg_array_visitor_func(struct pkg_array *a, struct pkginfo *pkg, void *pkg_data); -void pkg_array_init_from_db(struct pkg_array *a); +void pkg_array_init_from_hash(struct pkg_array *a); void pkg_array_init_from_names(struct pkg_array *a, pkg_mapper_func *pkg_mapper, const char **pkg_names); void pkg_array_foreach(struct pkg_array *a, pkg_array_visitor_func *pkg_visitor, diff --git a/lib/dpkg/pkg-hash.c b/lib/dpkg/pkg-hash.c index 398c20607..e7de951b0 100644 --- a/lib/dpkg/pkg-hash.c +++ b/lib/dpkg/pkg-hash.c @@ -60,7 +60,7 @@ static int npkg, nset; * @return The package set. */ struct pkgset * -pkg_db_find_set(const char *inname) +pkg_hash_find_set(const char *inname) { struct pkgset **setp, *new_set; char *name = m_strdup(inname), *p; @@ -104,7 +104,7 @@ pkg_db_find_set(const char *inname) * @return The singleton package instance. */ struct pkginfo * -pkg_db_get_singleton(struct pkgset *set) +pkg_hash_get_singleton(struct pkgset *set) { struct pkginfo *pkg; @@ -138,13 +138,13 @@ pkg_db_get_singleton(struct pkgset *set) * @return The package instance. */ struct pkginfo * -pkg_db_find_singleton(const char *name) +pkg_hash_find_singleton(const char *name) { struct pkgset *set; struct pkginfo *pkg; - set = pkg_db_find_set(name); - pkg = pkg_db_get_singleton(set); + set = pkg_hash_find_set(name); + pkg = pkg_hash_get_singleton(set); if (pkg == NULL) ohshit(_("ambiguous package name '%s' with more " "than one installed instance"), set->name); @@ -166,7 +166,7 @@ pkg_db_find_singleton(const char *name) * @return The package instance. */ struct pkginfo * -pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch) +pkg_hash_get_pkg(struct pkgset *set, const struct dpkg_arch *arch) { struct pkginfo *pkg, **pkgp; @@ -218,13 +218,13 @@ pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch) * @return The package instance. */ struct pkginfo * -pkg_db_find_pkg(const char *name, const struct dpkg_arch *arch) +pkg_hash_find_pkg(const char *name, const struct dpkg_arch *arch) { struct pkgset *set; struct pkginfo *pkg; - set = pkg_db_find_set(name); - pkg = pkg_db_get_pkg(set, arch); + set = pkg_hash_find_set(name); + pkg = pkg_hash_get_pkg(set, arch); return pkg; } @@ -235,7 +235,7 @@ pkg_db_find_pkg(const char *name, const struct dpkg_arch *arch) * @return The number of package sets. */ int -pkg_db_count_set(void) +pkg_hash_count_set(void) { return nset; } @@ -246,12 +246,12 @@ pkg_db_count_set(void) * @return The number of package instances. */ int -pkg_db_count_pkg(void) +pkg_hash_count_pkg(void) { return npkg; } -struct pkgiterator { +struct pkg_hash_iter { struct pkginfo *pkg; int nbinn; }; @@ -263,10 +263,10 @@ struct pkgiterator { * * @return The iterator. */ -struct pkgiterator * -pkg_db_iter_new(void) +struct pkg_hash_iter * +pkg_hash_iter_new(void) { - struct pkgiterator *iter; + struct pkg_hash_iter *iter; iter = m_malloc(sizeof(*iter)); iter->pkg = NULL; @@ -285,7 +285,7 @@ pkg_db_iter_new(void) * @return A package set. */ struct pkgset * -pkg_db_iter_next_set(struct pkgiterator *iter) +pkg_hash_iter_next_set(struct pkg_hash_iter *iter) { struct pkgset *set; @@ -320,7 +320,7 @@ pkg_db_iter_next_set(struct pkgiterator *iter) * @return A package instance. */ struct pkginfo * -pkg_db_iter_next_pkg(struct pkgiterator *iter) +pkg_hash_iter_next_pkg(struct pkg_hash_iter *iter) { struct pkginfo *pkg; @@ -349,13 +349,13 @@ pkg_db_iter_next_pkg(struct pkgiterator *iter) * @name iter The iterator. */ void -pkg_db_iter_free(struct pkgiterator *iter) +pkg_hash_iter_free(struct pkg_hash_iter *iter) { free(iter); } void -pkg_db_reset(void) +pkg_hash_reset(void) { int i; @@ -367,7 +367,7 @@ pkg_db_reset(void) } void -pkg_db_report(FILE *file) +pkg_hash_report(FILE *file) { int i, c; struct pkgset *pkg; diff --git a/lib/dpkg/pkg-spec.c b/lib/dpkg/pkg-spec.c index 9b4d0da31..3e3f59fa0 100644 --- a/lib/dpkg/pkg-spec.c +++ b/lib/dpkg/pkg-spec.c @@ -97,7 +97,7 @@ pkg_spec_is_illegal(struct pkg_spec *ps) if (!ps->arch_is_pattern && ps->flags & PKG_SPEC_ARCH_SINGLE) { struct pkgset *set; - set = pkg_db_find_set(ps->name); + set = pkg_hash_find_set(ps->name); /* Single instancing only applies with no architecture. */ if (ps->arch->type == DPKG_ARCH_NONE && @@ -195,9 +195,9 @@ static struct pkginfo * pkg_spec_get_pkg(struct pkg_spec *ps) { if (ps->arch->type == DPKG_ARCH_NONE) - return pkg_db_find_singleton(ps->name); + return pkg_hash_find_singleton(ps->name); else - return pkg_db_find_pkg(ps->name, ps->arch); + return pkg_hash_find_pkg(ps->name, ps->arch); } struct pkginfo * @@ -245,9 +245,9 @@ void pkg_spec_iter_init(struct pkg_spec *ps) { if (ps->name_is_pattern) - ps->pkg_iter = pkg_db_iter_new(); + ps->pkg_iter = pkg_hash_iter_new(); else - ps->pkg_next = &pkg_db_find_set(ps->name)->pkg; + ps->pkg_next = &pkg_hash_find_set(ps->name)->pkg; } static struct pkginfo * @@ -255,7 +255,7 @@ pkg_spec_iter_next_pkgname(struct pkg_spec *ps) { struct pkginfo *pkg; - while ((pkg = pkg_db_iter_next_pkg(ps->pkg_iter))) { + while ((pkg = pkg_hash_iter_next_pkg(ps->pkg_iter))) { if (pkg_spec_match_pkg(ps, pkg, &pkg->installed)) return pkg; } @@ -290,7 +290,7 @@ pkg_spec_iter_next_pkg(struct pkg_spec *ps) void pkg_spec_iter_destroy(struct pkg_spec *ps) { - pkg_db_iter_free(ps->pkg_iter); + pkg_hash_iter_free(ps->pkg_iter); pkg_spec_iter_blank(ps); } diff --git a/lib/dpkg/pkg-spec.h b/lib/dpkg/pkg-spec.h index 956b7fe3c..964f0d982 100644 --- a/lib/dpkg/pkg-spec.h +++ b/lib/dpkg/pkg-spec.h @@ -60,7 +60,7 @@ struct pkg_spec { bool arch_is_pattern; /** Used for the pkg_db iterator. */ - struct pkgiterator *pkg_iter; + struct pkg_hash_iter *pkg_iter; /** Used for the pkgset iterator. */ struct pkginfo *pkg_next; }; diff --git a/lib/dpkg/t/t-pkg-hash.c b/lib/dpkg/t/t-pkg-hash.c index c6ab20e28..72185a2f1 100644 --- a/lib/dpkg/t/t-pkg-hash.c +++ b/lib/dpkg/t/t-pkg-hash.c @@ -32,102 +32,102 @@ test_pkg_hash(void) struct dpkg_arch *arch; struct pkgset *set; struct pkginfo *pkg; - struct pkgiterator *iter; + struct pkg_hash_iter *iter; int pkginstance; - test_pass(pkg_db_count_set() == 0); - test_pass(pkg_db_count_pkg() == 0); + test_pass(pkg_hash_count_set() == 0); + test_pass(pkg_hash_count_pkg() == 0); - set = pkg_db_find_set("pkg-aa"); + set = pkg_hash_find_set("pkg-aa"); test_pass(set != NULL); test_str(set->name, ==, "pkg-aa"); - test_pass(pkg_db_count_set() == 1); - test_pass(pkg_db_count_pkg() == 1); + test_pass(pkg_hash_count_set() == 1); + test_pass(pkg_hash_count_pkg() == 1); - set = pkg_db_find_set("pkg-aa"); + set = pkg_hash_find_set("pkg-aa"); test_pass(set != NULL); test_str(set->name, ==, "pkg-aa"); - test_pass(pkg_db_count_set() == 1); - test_pass(pkg_db_count_pkg() == 1); + test_pass(pkg_hash_count_set() == 1); + test_pass(pkg_hash_count_pkg() == 1); - set = pkg_db_find_set("Pkg-AA"); + set = pkg_hash_find_set("Pkg-AA"); test_pass(set != NULL); test_str(set->name, ==, "pkg-aa"); - test_pass(pkg_db_count_set() == 1); - test_pass(pkg_db_count_pkg() == 1); + test_pass(pkg_hash_count_set() == 1); + test_pass(pkg_hash_count_pkg() == 1); - set = pkg_db_find_set("pkg-bb"); + set = pkg_hash_find_set("pkg-bb"); pkg_set_status(&set->pkg, PKG_STAT_INSTALLED); test_pass(set != NULL); test_str(set->name, ==, "pkg-bb"); - test_pass(pkg_db_count_set() == 2); - test_pass(pkg_db_count_pkg() == 2); + test_pass(pkg_hash_count_set() == 2); + test_pass(pkg_hash_count_pkg() == 2); - set = pkg_db_find_set("pkg-cc"); + set = pkg_hash_find_set("pkg-cc"); test_pass(set != NULL); test_str(set->name, ==, "pkg-cc"); - test_pass(pkg_db_count_set() == 3); - test_pass(pkg_db_count_pkg() == 3); + test_pass(pkg_hash_count_set() == 3); + test_pass(pkg_hash_count_pkg() == 3); arch = dpkg_arch_find("arch-xx"); - pkg = pkg_db_find_pkg("pkg-aa", arch); + pkg = pkg_hash_find_pkg("pkg-aa", arch); pkg_set_status(pkg, PKG_STAT_INSTALLED); test_pass(pkg != NULL); test_str(pkg->set->name, ==, "pkg-aa"); test_str(pkg->installed.arch->name, ==, "arch-xx"); test_str(pkg->available.arch->name, ==, "arch-xx"); - test_pass(pkg_db_count_set() == 3); - test_pass(pkg_db_count_pkg() == 3); + test_pass(pkg_hash_count_set() == 3); + test_pass(pkg_hash_count_pkg() == 3); arch = dpkg_arch_find("arch-yy"); - pkg = pkg_db_find_pkg("pkg-aa", arch); + pkg = pkg_hash_find_pkg("pkg-aa", arch); test_pass(pkg != NULL); test_str(pkg->set->name, ==, "pkg-aa"); test_str(pkg->installed.arch->name, ==, "arch-yy"); test_str(pkg->available.arch->name, ==, "arch-yy"); - test_pass(pkg_db_count_set() == 3); - test_pass(pkg_db_count_pkg() == 4); + test_pass(pkg_hash_count_set() == 3); + test_pass(pkg_hash_count_pkg() == 4); arch = dpkg_arch_find("arch-zz"); - pkg = pkg_db_find_pkg("pkg-aa", arch); + pkg = pkg_hash_find_pkg("pkg-aa", arch); pkg_set_status(pkg, PKG_STAT_UNPACKED); test_pass(pkg != NULL); test_str(pkg->set->name, ==, "pkg-aa"); test_str(pkg->installed.arch->name, ==, "arch-zz"); test_str(pkg->available.arch->name, ==, "arch-zz"); - test_pass(pkg_db_count_set() == 3); - test_pass(pkg_db_count_pkg() == 5); + test_pass(pkg_hash_count_set() == 3); + test_pass(pkg_hash_count_pkg() == 5); arch = dpkg_arch_find("arch-xx"); - pkg = pkg_db_find_pkg("pkg-aa", arch); + pkg = pkg_hash_find_pkg("pkg-aa", arch); test_pass(pkg != NULL); test_str(pkg->set->name, ==, "pkg-aa"); test_str(pkg->installed.arch->name, ==, "arch-xx"); test_str(pkg->available.arch->name, ==, "arch-xx"); - test_pass(pkg_db_count_set() == 3); - test_pass(pkg_db_count_pkg() == 5); + test_pass(pkg_hash_count_set() == 3); + test_pass(pkg_hash_count_pkg() == 5); - set = pkg_db_find_set("pkg-aa"); + set = pkg_hash_find_set("pkg-aa"); test_str(set->name, ==, "pkg-aa"); - pkg = pkg_db_get_singleton(set); + pkg = pkg_hash_get_singleton(set); test_pass(pkg == NULL); - test_pass(pkg_db_count_set() == 3); - test_pass(pkg_db_count_pkg() == 5); + test_pass(pkg_hash_count_set() == 3); + test_pass(pkg_hash_count_pkg() == 5); - pkg = pkg_db_find_singleton("pkg-bb"); + pkg = pkg_hash_find_singleton("pkg-bb"); test_pass(pkg != NULL); test_str(pkg->set->name, ==, "pkg-bb"); - test_pass(pkg_db_count_set() == 3); - test_pass(pkg_db_count_pkg() == 5); + test_pass(pkg_hash_count_set() == 3); + test_pass(pkg_hash_count_pkg() == 5); - pkg = pkg_db_find_singleton("pkg-cc"); + pkg = pkg_hash_find_singleton("pkg-cc"); test_pass(pkg != NULL); test_str(pkg->set->name, ==, "pkg-cc"); - test_pass(pkg_db_count_set() == 3); - test_pass(pkg_db_count_pkg() == 5); + test_pass(pkg_hash_count_set() == 3); + test_pass(pkg_hash_count_pkg() == 5); - iter = pkg_db_iter_new(); - while ((set = pkg_db_iter_next_set(iter))) { + iter = pkg_hash_iter_new(); + while ((set = pkg_hash_iter_next_set(iter))) { if (strcmp(set->name, "pkg-aa") == 0) test_str(set->name, ==, "pkg-aa"); else if (strcmp(set->name, "pkg-bb") == 0) @@ -137,11 +137,11 @@ test_pkg_hash(void) else test_fail("unknown fsys_namenode"); } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); pkginstance = 0; - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter))) { pkginstance++; if (strcmp(pkg->set->name, "pkg-aa") == 0) { struct pkgbin *pkgbin = &pkg->installed; @@ -163,11 +163,11 @@ test_pkg_hash(void) test_fail("unknown fsys_namenode"); } } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); - pkg_db_reset(); - test_pass(pkg_db_count_set() == 0); - test_pass(pkg_db_count_pkg() == 0); + pkg_hash_reset(); + test_pass(pkg_hash_count_set() == 0); + test_pass(pkg_hash_count_pkg() == 0); } TEST_ENTRY(test) diff --git a/lib/dpkg/t/t-pkg-show.c b/lib/dpkg/t/t-pkg-show.c index f5a978e81..0f6ece061 100644 --- a/lib/dpkg/t/t-pkg-show.c +++ b/lib/dpkg/t/t-pkg-show.c @@ -35,7 +35,7 @@ test_pkg_show_name(void) arch = dpkg_arch_find("arch"); test_pass(arch); - pkg = pkg_db_find_pkg("test", arch); + pkg = pkg_hash_find_pkg("test", arch); test_pass(pkg); test_str(pkg->set->name, ==, "test"); test_pass(pkg->installed.arch->type == DPKG_ARCH_UNKNOWN); diff --git a/lib/dpkg/trignote.c b/lib/dpkg/trignote.c index 1029a030e..957e80859 100644 --- a/lib/dpkg/trignote.c +++ b/lib/dpkg/trignote.c @@ -76,7 +76,7 @@ trig_note_pend(struct pkginfo *pend, const char *trig) /* * Note: This is called also from fields.c where *aw is a temporary - * but pend is from pkg_db_find()! + * but pend is from pkg_hash_find()! * * @retval true For done. * @retval false For already noted. diff --git a/src/depcon.c b/src/depcon.c index 071a67b06..593edfb8c 100644 --- a/src/depcon.c +++ b/src/depcon.c @@ -224,16 +224,16 @@ findbreakcyclerecursive(struct pkginfo *pkg, struct cyclesofarlink *sofar) bool findbreakcycle(struct pkginfo *pkg) { - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *tpkg; /* Clear the visited flag of all packages before we traverse them. */ - iter = pkg_db_iter_new(); - while ((tpkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while ((tpkg = pkg_hash_iter_next_pkg(iter))) { ensure_package_clientdata(tpkg); tpkg->clientdata->color = PKG_CYCLE_WHITE; } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); return findbreakcyclerecursive(pkg, NULL); } diff --git a/src/divertcmd.c b/src/divertcmd.c index 202b77066..61b382f0e 100644 --- a/src/divertcmd.c +++ b/src/divertcmd.c @@ -410,16 +410,16 @@ static bool diversion_is_essential(struct fsys_namenode *namenode) { struct pkginfo *pkg; - struct pkgiterator *pkg_iter; + struct pkg_hash_iter *pkg_iter; struct fsys_node_pkgs_iter *iter; bool essential = false; - pkg_iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(pkg_iter))) { + pkg_iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(pkg_iter))) { if (pkg->installed.essential) ensure_packagefiles_available(pkg); } - pkg_db_iter_free(pkg_iter); + pkg_hash_iter_free(pkg_iter); iter = fsys_node_pkgs_iter_new(namenode); while ((pkg = fsys_node_pkgs_iter_next(iter))) { @@ -500,7 +500,7 @@ diversion_add(const char *const *argv) if (opt_pkgname == NULL) pkgset = NULL; else - pkgset = pkg_db_find_set(opt_pkgname); + pkgset = pkg_hash_find_set(opt_pkgname); /* Check we are not stomping over an existing diversion. */ if (fnn_from->divert || fnn_to->divert) { @@ -622,7 +622,7 @@ diversion_remove(const char *const *argv) if (opt_pkgname == NULL) pkgset = NULL; else - pkgset = pkg_db_find_set(opt_pkgname); + pkgset = pkg_hash_find_set(opt_pkgname); contest = namenode->divert; altname = contest->useinstead->divert; diff --git a/src/enquiry.c b/src/enquiry.c index 632322faa..dd7069eb8 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -198,7 +198,7 @@ audit(const char *const *argv) modstatdb_open(msdbrw_readonly); if (!*argv) - pkg_array_init_from_db(&array); + pkg_array_init_from_hash(&array); else pkg_array_init_from_names(&array, pkg_array_mapper, (const char **)argv); @@ -273,7 +273,7 @@ unpackchk(const char *const *argv) { int totalcount, sects; struct sectionentry *sectionentries, *se, **sep; - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *pkg; const char *thissect; char buf[20]; @@ -287,8 +287,8 @@ unpackchk(const char *const *argv) totalcount= 0; sectionentries = NULL; sects= 0; - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter))) { if (!yettobeunpacked(pkg, &thissect)) continue; for (se= sectionentries; se && strcasecmp(thissect,se->name); se= se->next); if (!se) { @@ -304,27 +304,27 @@ unpackchk(const char *const *argv) } se->count++; totalcount++; } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); if (totalcount == 0) return 0; if (totalcount <= 12) { - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter))) { if (!yettobeunpacked(pkg, NULL)) continue; describebriefly(pkg); } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); } else if (sects <= 12) { for (se= sectionentries; se; se= se->next) { sprintf(buf,"%d",se->count); printf(_(" %d in %s: "),se->count,se->name); width= 70-strlen(se->name)-strlen(buf); while (width > 59) { putchar(' '); width--; } - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter))) { const char *pkgname; if (!yettobeunpacked(pkg,&thissect)) continue; @@ -335,7 +335,7 @@ unpackchk(const char *const *argv) if (width < 4) { printf(" ..."); break; } printf(" %s", pkgname); } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); putchar('\n'); } } else { @@ -369,7 +369,7 @@ assert_version_support(const char *const *argv, modstatdb_open(msdbrw_readonly); - pkg = pkg_db_find_singleton("dpkg"); + pkg = pkg_hash_find_singleton("dpkg"); switch (pkg->status) { case PKG_STAT_INSTALLED: case PKG_STAT_TRIGGERSPENDING: @@ -458,7 +458,7 @@ predeppackage(const char *const *argv) { static struct varbuf vb; - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *pkg = NULL, *startpkg, *trypkg; struct dependency *dep; struct deppossi *possi, *provider; @@ -471,8 +471,8 @@ predeppackage(const char *const *argv) clear_istobes(); dep = NULL; - iter = pkg_db_iter_new(); - while (!dep && (pkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while (!dep && (pkg = pkg_hash_iter_next_pkg(iter))) { /* Ignore packages user doesn't want. */ if (pkg->want != PKG_WANT_INSTALL) continue; @@ -490,7 +490,7 @@ predeppackage(const char *const *argv) pkg->clientdata->istobe = PKG_ISTOBE_NORMAL; /* If dep is NULL we go and get the next package. */ } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); if (!dep) return 1; /* Not found. */ diff --git a/src/help.c b/src/help.c index f9b8d6b88..f168e8374 100644 --- a/src/help.c +++ b/src/help.c @@ -202,16 +202,16 @@ force_conflicts(struct deppossi *possi) } void clear_istobes(void) { - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *pkg; - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter)) != NULL) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter)) != NULL) { ensure_package_clientdata(pkg); pkg->clientdata->istobe = PKG_ISTOBE_NORMAL; pkg->clientdata->replacingfilesandsaid= 0; } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); } /* diff --git a/src/main.c b/src/main.c index 0932695f1..a6b225c51 100644 --- a/src/main.c +++ b/src/main.c @@ -560,7 +560,7 @@ arch_remove(const char *const *argv) { const char *archname = *argv++; struct dpkg_arch *arch; - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *pkg; if (archname == NULL || *argv) @@ -575,8 +575,8 @@ arch_remove(const char *const *argv) } /* Check if it's safe to remove the architecture from the db. */ - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter))) { if (pkg->status < PKG_STAT_HALFINSTALLED) continue; if (pkg->installed.arch == arch) { @@ -589,7 +589,7 @@ arch_remove(const char *const *argv) break; } } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); dpkg_arch_unmark(arch); dpkg_arch_save_list(); diff --git a/src/packages.c b/src/packages.c index 55b56569e..bc93c7c89 100644 --- a/src/packages.c +++ b/src/packages.c @@ -72,11 +72,11 @@ enqueue_package_mark_seen(struct pkginfo *pkg) static void enqueue_pending(void) { - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *pkg; - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter)) != NULL) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter)) != NULL) { switch (cipaction->arg_int) { case act_configure: if (!(pkg->status == PKG_STAT_UNPACKED || @@ -108,7 +108,7 @@ enqueue_pending(void) } enqueue_package(pkg); } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); } static void diff --git a/src/querycmd.c b/src/querycmd.c index 3d5284044..6ee555e4e 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -260,7 +260,7 @@ listpackages(const char *const *argv) else modstatdb_open(msdbrw_readonly | msdbrw_available_readonly); - pkg_array_init_from_db(&array); + pkg_array_init_from_hash(&array); pkg_array_sort(&array, pkg_sorter_by_nonambig_name_arch); memset(&fmt, 0, sizeof(fmt)); @@ -571,7 +571,7 @@ showpackages(const char *const *argv) else modstatdb_open(msdbrw_readonly | msdbrw_available_readonly); - pkg_array_init_from_db(&array); + pkg_array_init_from_hash(&array); pkg_array_sort(&array, pkg_sorter_by_nonambig_name_arch); if (!*argv) { diff --git a/src/select.c b/src/select.c index 3eae4cbcf..a49d6c33b 100644 --- a/src/select.c +++ b/src/select.c @@ -67,7 +67,7 @@ getselections(const char *const *argv) modstatdb_open(msdbrw_readonly); - pkg_array_init_from_db(&array); + pkg_array_init_from_hash(&array); pkg_array_sort(&array, pkg_sorter_by_nonambig_name_arch); if (!*argv) { @@ -212,7 +212,7 @@ int clearselections(const char *const *argv) { enum modstatdb_rw msdbflags; - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *pkg; if (*argv) @@ -226,12 +226,12 @@ clearselections(const char *const *argv) modstatdb_open(msdbflags); pkg_infodb_upgrade(); - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter))) { if (!pkg->installed.essential) pkg_set_want(pkg, PKG_WANT_DEINSTALL); } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); modstatdb_shutdown(); diff --git a/src/trigproc.c b/src/trigproc.c index 174683348..59e30d143 100644 --- a/src/trigproc.c +++ b/src/trigproc.c @@ -122,11 +122,11 @@ trigproc_enqueue_deferred(struct pkginfo *pend) void trigproc_populate_deferred(void) { - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *pkg; - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter))) { if (!pkg->trigpend_head) continue; @@ -139,7 +139,7 @@ trigproc_populate_deferred(void) trigproc_enqueue_deferred(pkg); } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); } void @@ -256,15 +256,15 @@ trigproc_new_cyclenode(struct pkginfo *processing_now) struct trigcyclenode *tcn; struct trigcycleperpkg *tcpp; struct pkginfo *pkg; - struct pkgiterator *iter; + struct pkg_hash_iter *iter; tcn = nfmalloc(sizeof(*tcn)); tcn->pkgs = NULL; tcn->next = NULL; tcn->then_processed = processing_now; - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter))) { if (!pkg->trigpend_head) continue; tcpp = nfmalloc(sizeof(*tcpp)); @@ -273,7 +273,7 @@ trigproc_new_cyclenode(struct pkginfo *processing_now) tcpp->next = tcn->pkgs; tcn->pkgs = tcpp; } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); return tcn; } @@ -515,11 +515,11 @@ transitional_interest_callback(const char *trig, struct pkginfo *pkg, static void trig_transitional_activate(enum modstatdb_rw cstatus) { - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *pkg; - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter))) { + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter))) { if (pkg->status <= PKG_STAT_HALFINSTALLED) continue; debug(dbg_triggersdetail, "trig_transitional_activate %s %s", @@ -546,7 +546,7 @@ trig_transitional_activate(enum modstatdb_rw cstatus) else pkg_set_status(pkg, PKG_STAT_INSTALLED); } - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); if (cstatus >= msdbrw_write) { modstatdb_checkpoint(); diff --git a/src/unpack.c b/src/unpack.c index ceb17a2c3..e8b06d289 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -836,15 +836,15 @@ pkg_disappear(struct pkginfo *pkg, struct pkginfo *infavour) static void pkg_disappear_others(struct pkginfo *pkg) { - struct pkgiterator *iter; + struct pkg_hash_iter *iter; struct pkginfo *otherpkg; struct fsys_namenode_list *cfile; struct deppossi *pdep; struct dependency *providecheck; struct varbuf depprobwhy = VARBUF_INIT; - iter = pkg_db_iter_new(); - while ((otherpkg = pkg_db_iter_next_pkg(iter)) != NULL) { + iter = pkg_hash_iter_new(); + while ((otherpkg = pkg_hash_iter_next_pkg(iter)) != NULL) { ensure_package_clientdata(otherpkg); if (otherpkg == pkg || @@ -939,7 +939,7 @@ pkg_disappear_others(struct pkginfo *pkg) * what can we do ? It has to be run this late. */ pkg_disappear(otherpkg, pkg); } /* while (otherpkg= ... */ - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); } /** diff --git a/src/verify.c b/src/verify.c index 4190981f7..9b6e18ad4 100644 --- a/src/verify.c +++ b/src/verify.c @@ -147,12 +147,12 @@ verify(const char *const *argv) ensure_diversions(); if (!*argv) { - struct pkgiterator *iter; + struct pkg_hash_iter *iter; - iter = pkg_db_iter_new(); - while ((pkg = pkg_db_iter_next_pkg(iter))) + iter = pkg_hash_iter_new(); + while ((pkg = pkg_hash_iter_next_pkg(iter))) verify_package(pkg); - pkg_db_iter_free(iter); + pkg_hash_iter_free(iter); } else { const char *thisarg; -- cgit v1.2.3 From 23cfdbf1054a3c9fdef741cdc5f6769b3fd57413 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 17 Nov 2018 05:27:49 +0100 Subject: libdpkg: Add new warning printer setter function This will make it possible for library users to specify alternative warning printers. Prompted-by: Julian Andres Klode --- debian/changelog | 2 ++ lib/dpkg/libdpkg.map | 2 ++ lib/dpkg/report.c | 22 +++++++++++++++++++--- lib/dpkg/report.h | 5 +++++ 4 files changed, 28 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 04d98a183..e4c4d2cbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -115,6 +115,8 @@ dpkg (1.19.3) UNRELEASED; urgency=medium - libdpkg: Rename ret variable to next. - libdpkg: Cleanup fsys module symbol names. - libdpkg: Rename pkg_db symbols to pkg_hash. + - libdpkg: Add new warning printer setter function. + Prompted by Julian Andres Klode . * Build system: - get-version: Use a format string with printf. - run-script: Use $() instead of deprecated ``. diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index fe4e299ee..359418992 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -55,6 +55,8 @@ LIBDPKG_PRIVATE { do_internerr; dpkg_set_report_piped_mode; dpkg_set_report_buffer; + dpkg_warning_printer; + dpkg_set_warning_printer; warning_get_count; warningv; warning; diff --git a/lib/dpkg/report.c b/lib/dpkg/report.c index 58df60006..f7763b362 100644 --- a/lib/dpkg/report.c +++ b/lib/dpkg/report.c @@ -51,6 +51,24 @@ dpkg_set_report_buffer(FILE *fp) setvbuf(fp, NULL, piped_mode, 0); } +void +dpkg_warning_printer(const char *msg, void *data) +{ + fprintf(stderr, "%s%s:%s %s%s:%s %s\n", + color_get(COLOR_PROG), dpkg_get_progname(), color_reset(), + color_get(COLOR_WARN), _("warning"), color_reset(), msg); +} + +static dpkg_warning_printer_func *warning_printer_func = dpkg_warning_printer; +static void *warning_printer_data; + +void +dpkg_set_warning_printer(dpkg_warning_printer_func *printer, void *data) +{ + warning_printer_func = printer; + warning_printer_data = data; +} + static int warn_count = 0; int @@ -67,9 +85,7 @@ warningv(const char *fmt, va_list args) warn_count++; m_vasprintf(&buf, fmt, args); - fprintf(stderr, "%s%s:%s %s%s:%s %s\n", - color_get(COLOR_PROG), dpkg_get_progname(), color_reset(), - color_get(COLOR_WARN), _("warning"), color_reset(), buf); + warning_printer_func(buf, warning_printer_data); free(buf); } diff --git a/lib/dpkg/report.h b/lib/dpkg/report.h index 4cadc7fe3..862a8429a 100644 --- a/lib/dpkg/report.h +++ b/lib/dpkg/report.h @@ -38,6 +38,11 @@ DPKG_BEGIN_DECLS void dpkg_set_report_piped_mode(int mode); void dpkg_set_report_buffer(FILE *fp); +typedef void dpkg_warning_printer_func(const char *msg, void *data); + +void dpkg_warning_printer(const char *msg, void *data); +void dpkg_set_warning_printer(dpkg_warning_printer_func *printer, void *data); + int warning_get_count(void); void warningv(const char *fmt, va_list args) DPKG_ATTR_VPRINTF(1); void warning(const char *fmt, ...) DPKG_ATTR_PRINTF(1); -- cgit v1.2.3 From 8190e63fa0442c036092cf8eb1269733bedef498 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 30 Jan 2017 03:04:07 +0100 Subject: libdpkg: Add new DPKG_ERROR_OBJECT macro --- debian/changelog | 1 + lib/dpkg/error.h | 2 ++ 2 files changed, 3 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index e4c4d2cbe..71bf15826 100644 --- a/debian/changelog +++ b/debian/changelog @@ -117,6 +117,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium - libdpkg: Rename pkg_db symbols to pkg_hash. - libdpkg: Add new warning printer setter function. Prompted by Julian Andres Klode . + - libdpkg: Add new DPKG_ERROR_OBJECT macro. * Build system: - get-version: Use a format string with printf. - run-script: Use $() instead of deprecated ``. diff --git a/lib/dpkg/error.h b/lib/dpkg/error.h index da06e028d..299a6235d 100644 --- a/lib/dpkg/error.h +++ b/lib/dpkg/error.h @@ -46,6 +46,8 @@ struct dpkg_error { #define DPKG_ERROR_INIT { DPKG_MSG_NONE, 0, NULL } +#define DPKG_ERROR_OBJECT (struct dpkg_error)DPKG_ERROR_INIT + int dpkg_put_warn(struct dpkg_error *err, const char *fmt, ...) DPKG_ATTR_PRINTF(2); int dpkg_put_error(struct dpkg_error *err, const char *fmt, ...) -- cgit v1.2.3 From 0118b3c7052327f657b9a05cd0b8988775b24a42 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 30 Jan 2017 03:04:07 +0100 Subject: libdpkg: Add proper tar error handling This makes the tar extractor track and report back parse errors, so that we can give more descriptive messages. --- debian/changelog | 3 ++ lib/dpkg/t/c-tarextract.c | 28 ++++++++++------- lib/dpkg/tarfn.c | 80 ++++++++++++++++++++++++++--------------------- lib/dpkg/tarfn.h | 24 +++++++++++--- src/archives.c | 10 +++--- src/archives.h | 6 ++-- src/unpack.c | 18 ++++++----- 7 files changed, 104 insertions(+), 65 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 71bf15826..0cb18d8ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,9 @@ dpkg (1.19.3) UNRELEASED; urgency=medium end up trying to process triggers with yet unsatisifiable dependencies. Closes: #810724, #854478, #911620 * dpkg: Fix --help output, to clarify which arguments are optional. + * libdpkg: Add proper tar error handling. This makes the tar extractor + track and report back parse errors, so that we can give more descriptive + messages. * Perl modules: - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056 Thanks to Chris Lamb for initial test cases. diff --git a/lib/dpkg/t/c-tarextract.c b/lib/dpkg/t/c-tarextract.c index 4781c0237..34f3d08fa 100644 --- a/lib/dpkg/t/c-tarextract.c +++ b/lib/dpkg/t/c-tarextract.c @@ -42,16 +42,17 @@ struct tar_context { }; static int -tar_read(void *ctx, char *buffer, int size) +tar_read(struct tar_archive *tar, char *buffer, int size) { - struct tar_context *tc = ctx; + struct tar_context *tc = tar->ctx; return fd_read(tc->tar_fd, buffer, size); } static int -tar_object_skip(struct tar_context *tc, struct tar_entry *te) +tar_object_skip(struct tar_archive *tar, struct tar_entry *te) { + struct tar_context *tc = tar->ctx; off_t size; size = (te->size + TARBLKSZ - 1) / TARBLKSZ * TARBLKSZ; @@ -62,7 +63,7 @@ tar_object_skip(struct tar_context *tc, struct tar_entry *te) } static int -tar_object(void *ctx, struct tar_entry *te) +tar_object(struct tar_archive *tar, struct tar_entry *te) { printf("%s mode=%o time=%ld.%.9d uid=%d gid=%d", te->name, te->stat.mode, te->mtime, 0, te->stat.uid, te->stat.gid); @@ -74,7 +75,7 @@ tar_object(void *ctx, struct tar_entry *te) switch (te->type) { case TAR_FILETYPE_FILE0: case TAR_FILETYPE_FILE: - tar_object_skip(ctx, te); + tar_object_skip(tar, te); printf(" type=file size=%jd", (intmax_t)te->size); break; case TAR_FILETYPE_HARDLINK: @@ -116,7 +117,8 @@ struct tar_operations tar_ops = { int main(int argc, char **argv) { - struct tar_context ctx; + struct tar_archive tar; + struct tar_context tar_ctx; const char *tar_name = argv[1]; setvbuf(stdout, NULL, _IOLBF, 0); @@ -124,18 +126,22 @@ main(int argc, char **argv) push_error_context(); if (tar_name) { - ctx.tar_fd = open(tar_name, O_RDONLY); - if (ctx.tar_fd < 0) + tar_ctx.tar_fd = open(tar_name, O_RDONLY); + if (tar_ctx.tar_fd < 0) ohshite("cannot open file '%s'", tar_name); } else { - ctx.tar_fd = STDIN_FILENO; + tar_ctx.tar_fd = STDIN_FILENO; } - if (tar_extractor(&ctx, &tar_ops)) + tar.err = DPKG_ERROR_OBJECT; + tar.ctx = &tar_ctx; + tar.ops = &tar_ops; + + if (tar_extractor(&tar)) ohshite("extracting tar"); if (tar_name) - close(ctx.tar_fd); + close(tar_ctx.tar_fd); pop_error_context(ehflag_normaltidy); diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c index 16005e6f8..8e3b6e545 100644 --- a/lib/dpkg/tarfn.c +++ b/lib/dpkg/tarfn.c @@ -38,6 +38,8 @@ #include #include +#include +#include #include #define TAR_MAGIC_USTAR "ustar\0" "00" @@ -121,7 +123,7 @@ tar_atol8(const char *s, size_t size) if (s < end) return tar_ret_errno(EINVAL, 0); - return n; + return tar_ret_errno(0, n); } /** @@ -162,7 +164,7 @@ tar_atol256(const char *s, size_t size, intmax_t min, uintmax_t max) c = *s++; } - return n; + return tar_ret_errno(0, n); } static uintmax_t @@ -272,7 +274,7 @@ tar_header_checksum(struct tar_header *h) } static int -tar_header_decode(struct tar_header *h, struct tar_entry *d) +tar_header_decode(struct tar_header *h, struct tar_entry *d, struct dpkg_error *err) { long checksum; @@ -299,7 +301,11 @@ tar_header_decode(struct tar_header *h, struct tar_entry *d) /* Even though off_t is signed, we use an unsigned parser here because * negative offsets are not allowed. */ d->size = TAR_ATOUL(h->size, off_t); + if (errno) + return dpkg_put_errno(err, _("invalid tar header size field")); d->mtime = TAR_ATOSL(h->mtime, time_t); + if (errno) + return dpkg_put_errno(err, _("invalid tar header mtime field")); if (d->type == TAR_FILETYPE_CHARDEV || d->type == TAR_FILETYPE_BLOCKDEV) d->dev = makedev(TAR_ATOUL(h->devmajor, dev_t), @@ -312,19 +318,25 @@ tar_header_decode(struct tar_header *h, struct tar_entry *d) else d->stat.uname = NULL; d->stat.uid = TAR_ATOUL(h->uid, uid_t); + if (errno) + return dpkg_put_errno(err, _("invalid tar header uid field")); if (*h->group) d->stat.gname = m_strndup(h->group, sizeof(h->group)); else d->stat.gname = NULL; d->stat.gid = TAR_ATOUL(h->gid, gid_t); + if (errno) + return dpkg_put_errno(err, _("invalid tar header gid field")); checksum = tar_atol8(h->checksum, sizeof(h->checksum)); - - /* Check for parse errors. */ if (errno) - return 0; - return tar_header_checksum(h) == checksum; + return dpkg_put_errno(err, _("invalid tar header checksum field")); + + if (tar_header_checksum(h) != checksum) + return dpkg_put_error(err, _("invalid tar header checksum")); + + return 0; } /** @@ -339,8 +351,7 @@ tar_header_decode(struct tar_header *h, struct tar_entry *d) * bogus name or link. */ static int -tar_gnu_long(void *ctx, const struct tar_operations *ops, struct tar_entry *te, - char **longp) +tar_gnu_long(struct tar_archive *tar, struct tar_entry *te, char **longp) { char buf[TARBLKSZ]; char *bp; @@ -353,14 +364,15 @@ tar_gnu_long(void *ctx, const struct tar_operations *ops, struct tar_entry *te, for (long_read = te->size; long_read > 0; long_read -= TARBLKSZ) { int copysize; - status = ops->read(ctx, buf, TARBLKSZ); + status = tar->ops->read(tar, buf, TARBLKSZ); if (status == TARBLKSZ) status = 0; else { /* Read partial header record? */ if (status > 0) { errno = 0; - status = -1; + status = dpkg_put_error(&tar->err, + _("partially read tar header")); } /* If we didn't get TARBLKSZ bytes read, punt. */ @@ -427,7 +439,7 @@ tar_entry_update_from_system(struct tar_entry *te) } int -tar_extractor(void *ctx, const struct tar_operations *ops) +tar_extractor(struct tar_archive *tar) { int status; char buffer[TARBLKSZ]; @@ -445,18 +457,13 @@ tar_extractor(void *ctx, const struct tar_operations *ops) h.stat.uname = NULL; h.stat.gname = NULL; - while ((status = ops->read(ctx, buffer, TARBLKSZ)) == TARBLKSZ) { + while ((status = tar->ops->read(tar, buffer, TARBLKSZ)) == TARBLKSZ) { int name_len; - if (!tar_header_decode((struct tar_header *)buffer, &h)) { + if (tar_header_decode((struct tar_header *)buffer, &h, &tar->err) < 0) { if (h.name[0] == '\0') { - /* End of tape. */ + /* End Of Tape. */ status = 0; - } else { - /* Indicates broken tarfile: - * “Header checksum error”. */ - errno = 0; - status = -1; } tar_entry_destroy(&h); break; @@ -474,9 +481,9 @@ tar_extractor(void *ctx, const struct tar_operations *ops) } if (h.name[0] == '\0') { - /* Indicates broken tarfile: “Bad header data”. */ + status = dpkg_put_error(&tar->err, + _("invalid tar header with empty name field")); errno = 0; - status = -1; tar_entry_destroy(&h); break; } @@ -487,7 +494,7 @@ tar_extractor(void *ctx, const struct tar_operations *ops) case TAR_FILETYPE_FILE: /* Compatibility with pre-ANSI ustar. */ if (h.name[name_len - 1] != '/') { - status = ops->extract_file(ctx, &h); + status = tar->ops->extract_file(tar, &h); break; } /* Else, fall through. */ @@ -495,10 +502,10 @@ tar_extractor(void *ctx, const struct tar_operations *ops) if (h.name[name_len - 1] == '/') { h.name[name_len - 1] = '\0'; } - status = ops->mkdir(ctx, &h); + status = tar->ops->mkdir(tar, &h); break; case TAR_FILETYPE_HARDLINK: - status = ops->link(ctx, &h); + status = tar->ops->link(tar, &h); break; case TAR_FILETYPE_SYMLINK: symlink_node = m_malloc(sizeof(*symlink_node)); @@ -515,18 +522,19 @@ tar_extractor(void *ctx, const struct tar_operations *ops) case TAR_FILETYPE_CHARDEV: case TAR_FILETYPE_BLOCKDEV: case TAR_FILETYPE_FIFO: - status = ops->mknod(ctx, &h); + status = tar->ops->mknod(tar, &h); break; case TAR_FILETYPE_GNU_LONGLINK: - status = tar_gnu_long(ctx, ops, &h, &next_long_link); + status = tar_gnu_long(tar, &h, &next_long_link); break; case TAR_FILETYPE_GNU_LONGNAME: - status = tar_gnu_long(ctx, ops, &h, &next_long_name); + status = tar_gnu_long(tar, &h, &next_long_name); break; default: - /* Indicates broken tarfile: “Bad header field”. */ + status = dpkg_put_error(&tar->err, + _("unknown tar header type '%c'"), + h.type); errno = 0; - status = -1; } tar_entry_destroy(&h); if (status != 0) @@ -537,7 +545,7 @@ tar_extractor(void *ctx, const struct tar_operations *ops) while (symlink_head) { symlink_node = symlink_head->next; if (status == 0) - status = ops->symlink(ctx, &symlink_head->h); + status = tar->ops->symlink(tar, &symlink_head->h); tar_entry_destroy(&symlink_head->h); free(symlink_head); symlink_head = symlink_node; @@ -548,11 +556,11 @@ tar_extractor(void *ctx, const struct tar_operations *ops) free(next_long_link); if (status > 0) { - /* Indicates broken tarfile: “Read partial header record”. */ + status = dpkg_put_error(&tar->err, + _("partially read tar header")); errno = 0; - return -1; - } else { - /* Return whatever I/O function returned. */ - return status; } + + /* Return whatever I/O function returned. */ + return status; } diff --git a/lib/dpkg/tarfn.h b/lib/dpkg/tarfn.h index 37269de02..06685a720 100644 --- a/lib/dpkg/tarfn.h +++ b/lib/dpkg/tarfn.h @@ -26,6 +26,7 @@ #include +#include #include /** @@ -58,7 +59,7 @@ enum tar_filetype { }; struct tar_entry { - /** Tar archive format. */ + /** Tar entry format. */ enum tar_format format; /** File type. */ enum tar_filetype type; @@ -76,8 +77,10 @@ struct tar_entry { struct file_stat stat; }; -typedef int tar_read_func(void *ctx, char *buffer, int length); -typedef int tar_make_func(void *ctx, struct tar_entry *h); +struct tar_archive; + +typedef int tar_read_func(struct tar_archive *tar, char *buffer, int length); +typedef int tar_make_func(struct tar_archive *tar, struct tar_entry *h); struct tar_operations { tar_read_func *read; @@ -89,6 +92,18 @@ struct tar_operations { tar_make_func *mknod; }; +struct tar_archive { + /* Global tar archive error. */ + struct dpkg_error err; + + /** Tar archive format. */ + enum tar_format format; + + /* Operation functions and context. */ + const struct tar_operations *ops; + void *ctx; +}; + uintmax_t tar_atoul(const char *s, size_t size, uintmax_t max); intmax_t @@ -97,7 +112,8 @@ tar_atosl(const char *s, size_t size, intmax_t min, intmax_t max); void tar_entry_update_from_system(struct tar_entry *te); -int tar_extractor(void *ctx, const struct tar_operations *ops); +int +tar_extractor(struct tar_archive *tar); /** @} */ diff --git a/src/archives.c b/src/archives.c index 5a6fc0838..ab93551b8 100644 --- a/src/archives.c +++ b/src/archives.c @@ -264,8 +264,10 @@ void cu_pathname(int argc, void **argv) { path_remove_tree((char*)(argv[0])); } -int tarfileread(void *ud, char *buf, int len) { - struct tarcontext *tc= (struct tarcontext*)ud; +int +tarfileread(struct tar_archive *tar, char *buf, int len) +{ + struct tarcontext *tc = (struct tarcontext *)tar->ctx; int r; r = fd_read(tc->backendpipe, buf, len); @@ -661,14 +663,14 @@ linktosameexistingdir(const struct tar_entry *ti, const char *fname, } int -tarobject(void *ctx, struct tar_entry *ti) +tarobject(struct tar_archive *tar, struct tar_entry *ti) { static struct varbuf conffderefn, symlinkfn; const char *usename; struct fsys_namenode *usenode; struct conffile *conff; - struct tarcontext *tc = ctx; + struct tarcontext *tc = tar->ctx; bool existingdir, keepexisting; bool refcounting; char oldhash[MD5HASHLEN + 1]; diff --git a/src/archives.h b/src/archives.h index 19c450c11..2ceab9b1b 100644 --- a/src/archives.h +++ b/src/archives.h @@ -70,8 +70,10 @@ void ok_prermdeconfigure(int argc, void **argv); void setupfnamevbs(const char *filename); -int tarobject(void *ctx, struct tar_entry *ti); -int tarfileread(void *ud, char *buf, int len); +int +tarobject(struct tar_archive *tar, struct tar_entry *ti); +int +tarfileread(struct tar_archive *tar, char *buf, int len); void tar_deferred_extract(struct fsys_namenode_list *files, struct pkginfo *pkg); diff --git a/src/unpack.c b/src/unpack.c index e8b06d289..ad1e05f56 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -1077,6 +1077,7 @@ void process_archive(const char *filename) { static enum pkgstatus oldversionstatus; static struct tarcontext tc; + struct tar_archive tar; struct dpkg_error err; enum parsedbflags parsedb_flags; int rc; @@ -1431,14 +1432,15 @@ void process_archive(const char *filename) { tc.backendpipe= p1[0]; tc.pkgset_getting_in_sync = pkgset_getting_in_sync(pkg); - rc = tar_extractor(&tc, &tf); - if (rc) { - if (errno) { - ohshite(_("error reading dpkg-deb tar output")); - } else { - ohshit(_("corrupted filesystem tarfile - corrupted package archive")); - } - } + /* Setup the tar archive. */ + tar.err = DPKG_ERROR_OBJECT; + tar.ctx = &tc; + tar.ops = &tf; + + rc = tar_extractor(&tar); + if (rc) + dpkg_error_print(&tar.err, + _("corrupted filesystem tarfile in package archive")); if (fd_skip(p1[0], -1, &err) < 0) ohshit(_("cannot zap possible trailing zeros from dpkg-deb: %s"), err.str); close(p1[0]); -- cgit v1.2.3 From 683d5a21fb749d49873d04639732a69a3b41f59b Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 29 Nov 2018 01:28:32 +0100 Subject: libdpkg: Detect unsupported tar entry types to give better error messages We know what we do not support, let's detect and give better diagnostics so that users get even less confused. --- debian/changelog | 1 + lib/dpkg/tarfn.c | 23 +++++++++++++++++++++++ lib/dpkg/tarfn.h | 9 +++++++++ 3 files changed, 33 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 0cb18d8ed..f65ac0f9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium * libdpkg: Add proper tar error handling. This makes the tar extractor track and report back parse errors, so that we can give more descriptive messages. + * libdpkg: Detect unsupported tar entry types to give better error messages. * Perl modules: - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056 Thanks to Chris Lamb for initial test cases. diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c index 8e3b6e545..afcce0ee5 100644 --- a/lib/dpkg/tarfn.c +++ b/lib/dpkg/tarfn.c @@ -530,6 +530,29 @@ tar_extractor(struct tar_archive *tar) case TAR_FILETYPE_GNU_LONGNAME: status = tar_gnu_long(tar, &h, &next_long_name); break; + case TAR_FILETYPE_GNU_VOLUME: + case TAR_FILETYPE_GNU_MULTIVOL: + case TAR_FILETYPE_GNU_SPARSE: + case TAR_FILETYPE_GNU_DUMPDIR: + status = dpkg_put_error(&tar->err, + _("unsupported GNU tar header type '%c'"), + h.type); + errno = 0; + break; + case TAR_FILETYPE_SOLARIS_EXTENDED: + case TAR_FILETYPE_SOLARIS_ACL: + status = dpkg_put_error(&tar->err, + _("unsupported Solaris tar header type '%c'"), + h.type); + errno = 0; + break; + case TAR_FILETYPE_PAX_GLOBAL: + case TAR_FILETYPE_PAX_EXTENDED: + status = dpkg_put_error(&tar->err, + _("unsupported PAX tar header type '%c'"), + h.type); + errno = 0; + break; default: status = dpkg_put_error(&tar->err, _("unknown tar header type '%c'"), diff --git a/lib/dpkg/tarfn.h b/lib/dpkg/tarfn.h index 06685a720..0302fb8a9 100644 --- a/lib/dpkg/tarfn.h +++ b/lib/dpkg/tarfn.h @@ -54,8 +54,17 @@ enum tar_filetype { TAR_FILETYPE_BLOCKDEV = '4', TAR_FILETYPE_DIR = '5', TAR_FILETYPE_FIFO = '6', + TAR_FILETYPE_CONTIG = '7', TAR_FILETYPE_GNU_LONGLINK = 'K', TAR_FILETYPE_GNU_LONGNAME = 'L', + TAR_FILETYPE_GNU_VOLUME = 'V', + TAR_FILETYPE_GNU_MULTIVOL = 'M', + TAR_FILETYPE_GNU_DUMPDIR = 'D', + TAR_FILETYPE_GNU_SPARSE = 'S', + TAR_FILETYPE_PAX_GLOBAL = 'g', + TAR_FILETYPE_PAX_EXTENDED = 'x', + TAR_FILETYPE_SOLARIS_EXTENDED = 'X', + TAR_FILETYPE_SOLARIS_ACL = 'A', }; struct tar_entry { -- cgit v1.2.3 From 46136dbf6811efdb1383940a04fd4575afada65f Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 31 Dec 2018 19:27:16 +0100 Subject: libdpkg: Add new db-fsys:Files and db-fsys:Last-Modified virtual fields MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will make it possible to access the filesystem entries per package from anything that queries the database, such as «dpkg-query --show». --- debian/changelog | 1 + lib/dpkg/db-ctrl-format.c | 2 +- lib/dpkg/db-ctrl.h | 2 +- lib/dpkg/pkg-format.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++ man/dpkg-query.man | 8 +++++++ 5 files changed, 69 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index f65ac0f9c..36fb657ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium track and report back parse errors, so that we can give more descriptive messages. * libdpkg: Detect unsupported tar entry types to give better error messages. + * libdpkg: Add new db-fsys:Files and db-fsys:Last-Modified virtual fields. * Perl modules: - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056 Thanks to Chris Lamb for initial test cases. diff --git a/lib/dpkg/db-ctrl-format.c b/lib/dpkg/db-ctrl-format.c index 256c7b7e4..a545ec5e7 100644 --- a/lib/dpkg/db-ctrl-format.c +++ b/lib/dpkg/db-ctrl-format.c @@ -125,7 +125,7 @@ pkg_infodb_get_dir(void) } const char * -pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin, +pkg_infodb_get_file(const struct pkginfo *pkg, const struct pkgbin *pkgbin, const char *filetype) { static struct varbuf vb; diff --git a/lib/dpkg/db-ctrl.h b/lib/dpkg/db-ctrl.h index 57f67e022..e4dccd285 100644 --- a/lib/dpkg/db-ctrl.h +++ b/lib/dpkg/db-ctrl.h @@ -38,7 +38,7 @@ bool pkg_infodb_is_upgrading(void); void pkg_infodb_upgrade(void); const char *pkg_infodb_get_dir(void); -const char *pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin, +const char *pkg_infodb_get_file(const struct pkginfo *pkg, const struct pkgbin *pkgbin, const char *filetype); const char *pkg_infodb_reset_dir(void); bool pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin, diff --git a/lib/dpkg/pkg-format.c b/lib/dpkg/pkg-format.c index aa2372a64..1985df068 100644 --- a/lib/dpkg/pkg-format.c +++ b/lib/dpkg/pkg-format.c @@ -22,16 +22,22 @@ #include #include +#include +#include + #include #include #include #include #include +#include #include #include #include #include +#include +#include #include #include #include @@ -278,6 +284,56 @@ virt_synopsis(struct varbuf *vb, varbuf_add_buf(vb, desc, len); } +static void +virt_fsys_last_modified(struct varbuf *vb, + const struct pkginfo *pkg, const struct pkgbin *pkgbin, + enum fwriteflags flags, const struct fieldinfo *fip) +{ + const char *listfile; + struct stat st; + + if (pkg->status == PKG_STAT_NOTINSTALLED) + return; + + listfile = pkg_infodb_get_file(pkg, pkgbin, LISTFILE); + + if (stat(listfile, &st) < 0) { + if (errno == ENOENT) + return; + + ohshite(_("cannot get package %s filesystem last modification time"), + pkgbin_name_const(pkg, pkgbin, pnaw_nonambig)); + } + + varbuf_printf(vb, "%ld", st.st_mtime); +} + +static void +virt_fsys_files(struct varbuf *vb, + const struct pkginfo *pkg, const struct pkgbin *pkgbin, + enum fwriteflags flags, const struct fieldinfo *fip) +{ + struct fsys_namenode_list *node; + + /* XXX: This cast is so wrong on so many levels, but the alternatives + * are apparently worse. We might need to end up removing the const + * from the arguments. + * + * Ideally loading the entire fsys db would be cheaper, and stored + * in a single file, so we could do it unconditionally, before any + * formatting. */ + ensure_packagefiles_available((struct pkginfo *)pkg); + + if (!pkg->files_list_valid) + return; + + for (node = pkg->files; node; node = node->next) { + varbuf_add_char(vb, ' '); + varbuf_add_str(vb, node->namenode->name); + varbuf_add_char(vb, '\n'); + } +} + static void virt_source_package(struct varbuf *vb, const struct pkginfo *pkg, const struct pkgbin *pkgbin, @@ -324,6 +380,8 @@ static const struct fieldinfo virtinfos[] = { { FIELD("db:Status-Want"), NULL, virt_status_want }, { FIELD("db:Status-Status"), NULL, virt_status_status }, { FIELD("db:Status-Eflag"), NULL, virt_status_eflag }, + { FIELD("db-fsys:Files"), NULL, virt_fsys_files }, + { FIELD("db-fsys:Last-Modified"), NULL, virt_fsys_last_modified }, { FIELD("source:Package"), NULL, virt_source_package }, { FIELD("source:Version"), NULL, virt_source_version }, { FIELD("source:Upstream-Version"), NULL, virt_source_upstream_version }, diff --git a/man/dpkg-query.man b/man/dpkg-query.man index 9963bd671..de14b9afe 100644 --- a/man/dpkg-query.man +++ b/man/dpkg-query.man @@ -282,6 +282,14 @@ It contains the package status word, part of the Status field It contains the package status error flag, part of the Status field (since dpkg 1.17.11). .TP +.B db-fsys:Files +It contains the list of the package filesystem entries separated by newlines +(since dpkg 1.19.3). +.TP +.B db-fsys:Last\-Modified +It contains the timestamp in seconds of the last time the package filesystem +entries were modified (since dpkg 1.19.3). +.TP .B source:Package It contains the source package name for this binary package (since dpkg 1.16.2). -- cgit v1.2.3 From 41bc12bd8d518653aa4564d22fea675717391798 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 1 Feb 2019 03:57:54 +0100 Subject: dpkg: Clarify error on unknown system user/group in statoverride database Closes: #920880 --- debian/changelog | 2 ++ lib/dpkg/db-fsys-override.c | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 8134a20a5..3d844527b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium --force-all for now. * dpkg, dpkg-statoverride: Add new option --refuse-security-mac to control SELinux. See #811037. + * dpkg: Clarify error on unknown system user/group in statoverride database. + Closes: #920880 * Documentation: - start-stop-daemon(1): Document behavior of --pidfile security checks. Closes: #921557 diff --git a/lib/dpkg/db-fsys-override.c b/lib/dpkg/db-fsys-override.c index 981bd1891..e079c5ffb 100644 --- a/lib/dpkg/db-fsys-override.c +++ b/lib/dpkg/db-fsys-override.c @@ -208,8 +208,9 @@ ensure_statoverrides(enum statdb_parse_flags flags) fso->uname = NULL; if (fso->uid == (uid_t)-1 && !(flags & STATDB_PARSE_LAX)) - ohshit(_("unknown user '%s' in statoverride file"), - thisline); + ohshit(_("unknown system user '%s' in statoverride file; the system user got removed\n" + "before the override, which is most probably a packaging bug, to recover you\n" + "can remove the override manually with %s"), thisline, DPKGSTAT); /* Move to the next bit */ thisline = ptr + 1; @@ -229,8 +230,9 @@ ensure_statoverrides(enum statdb_parse_flags flags) fso->gname = NULL; if (fso->gid == (gid_t)-1 && !(flags & STATDB_PARSE_LAX)) - ohshit(_("unknown group '%s' in statoverride file"), - thisline); + ohshit(_("unknown system group '%s' in statoverride file; the system group got removed\n" + "before the override, which is most probably a packaging bug, to recover you\n" + "can remove the override manually with %s"), thisline, DPKGSTAT); /* Move to the next bit */ thisline = ptr + 1; -- cgit v1.2.3 From 2f3d0546617f510a0e9a976d897fd1cd91408d12 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 23 Feb 2019 04:52:18 +0100 Subject: libdpkg: New benchmark programs and infrastructure These are intended to be used to check performance improvements in the libdpkg implementation. --- debian/changelog | 1 + lib/dpkg/Makefile.am | 1 + lib/dpkg/fsys-hash.c | 39 +++++++++++++++++++++++ lib/dpkg/fsys.h | 4 +++ lib/dpkg/perf.h | 71 ++++++++++++++++++++++++++++++++++++++++++ lib/dpkg/pkg-hash.c | 15 +++++++-- lib/dpkg/t/.gitignore | 5 +++ lib/dpkg/t/Makefile.am | 7 +++++ lib/dpkg/t/b-fsys-hash.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/dpkg/t/b-pkg-hash.c | 65 +++++++++++++++++++++++++++++++++++++++ 10 files changed, 286 insertions(+), 2 deletions(-) create mode 100644 lib/dpkg/perf.h create mode 100644 lib/dpkg/t/b-fsys-hash.c create mode 100644 lib/dpkg/t/b-pkg-hash.c (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 90edb01b0..c73e7012f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium - dpkg: Switch force options from individual variables to bit fields. - dpkg: Switch from a char to an enum to track the force options types. - dpkg: Switch to set the default force option from the forceinfos array. + - libdpkg: New benchmark programs and infrastructure. * Build system: - Check whether this dist is a release, based only on the version format. This will avoid having to do a two staged release to get a proper perl diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index a2828af4b..3a3bd64b4 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -86,6 +86,7 @@ libdpkg_la_SOURCES = \ parsehelp.c \ path.c \ path-remove.c \ + perf.h \ pkg.c \ pkg-array.c \ pkg-files.c \ diff --git a/lib/dpkg/fsys-hash.c b/lib/dpkg/fsys-hash.c index cb173bb9a..88ec47e4a 100644 --- a/lib/dpkg/fsys-hash.c +++ b/lib/dpkg/fsys-hash.c @@ -127,6 +127,45 @@ fsys_hash_find_node(const char *name, enum fsys_hash_find_flags flags) return newnode; } +void +fsys_hash_report(FILE *file) +{ + struct fsys_namenode *node; + int i, c; + int *freq; + int empty = 0, used = 0, collided = 0; + + freq = m_malloc(sizeof(freq[0]) * nfiles + 1); + for (i = 0; i <= nfiles; i++) + freq[i] = 0; + for (i = 0; i < BINS; i++) { + for (c = 0, node = bins[i]; node; c++, node = node->next); + fprintf(file, "fsys-hash: bin %5d has %7d\n", i, c); + if (c == 0) + empty++; + else if (c == 1) + used++; + else { + used++; + collided++; + } + freq[c]++; + } + for (i = nfiles; i > 0 && freq[i] == 0; i--); + while (i >= 0) { + fprintf(file, "fsys-hash: size %7d occurs %5d times\n", + i, freq[i]); + i--; + } + fprintf(file, "fsys-hash: bins empty %d\n", empty); + fprintf(file, "fsys-hash: bins used %d (collided %d)\n", used, + collided); + + m_output(file, ""); + + free(freq); +} + /* * Forward iterator. */ diff --git a/lib/dpkg/fsys.h b/lib/dpkg/fsys.h index 67fce2ad2..8b9107472 100644 --- a/lib/dpkg/fsys.h +++ b/lib/dpkg/fsys.h @@ -22,6 +22,8 @@ #ifndef LIBDPKG_FSYS_H #define LIBDPKG_FSYS_H +#include + #include /* @@ -167,6 +169,8 @@ void fsys_hash_init(void); void fsys_hash_reset(void); +void +fsys_hash_report(FILE *file); int fsys_hash_entries(void); diff --git a/lib/dpkg/perf.h b/lib/dpkg/perf.h new file mode 100644 index 000000000..c7d9301a8 --- /dev/null +++ b/lib/dpkg/perf.h @@ -0,0 +1,71 @@ +/* + * libdpkg - Debian packaging suite library routines + * perf.h - performance testing support + * + * Copyright © 2009-2019 Guillem Jover + * + * This 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 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 dpkg; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef LIBDPKG_PERF_H +#define LIBDPKG_PERF_H + +#include +#include + +#include +#include + +struct perf_slot { + struct timespec t_ini, t_end; +}; + +static inline void +perf_ts_sub(struct timespec *a, struct timespec *b, struct timespec *res) +{ + res->tv_sec = a->tv_sec - b->tv_sec; + res->tv_nsec = a->tv_nsec - b->tv_nsec; + if (res->tv_nsec < 0) { + res->tv_sec--; + res->tv_nsec += 1000000000; + } +} + +static void +perf_ts_mark_print(const char *str) +{ + struct timespec ts; + + clock_gettime(CLOCK_MONOTONIC, &ts); + + printf("%lu.%.9lu: %s\n", ts.tv_sec, ts.tv_nsec, str); +} + +static void +perf_ts_slot_print(struct perf_slot *ps, const char *str) +{ + struct timespec t_res; + + perf_ts_sub(&ps->t_end, &ps->t_ini, &t_res); + + printf("%lu.%.9lu: %s (%lu.%.9lu sec)\n", + ps->t_end.tv_sec, ps->t_end.tv_nsec, + str, t_res.tv_sec, t_res.tv_nsec); +} + +#define perf_ts_slot_start(ps) clock_gettime(CLOCK_MONOTONIC, &((ps)->t_ini)) +#define perf_ts_slot_stop(ps) clock_gettime(CLOCK_MONOTONIC, &((ps)->t_end)) + +#endif diff --git a/lib/dpkg/pkg-hash.c b/lib/dpkg/pkg-hash.c index e7de951b0..34b2f5b23 100644 --- a/lib/dpkg/pkg-hash.c +++ b/lib/dpkg/pkg-hash.c @@ -372,20 +372,31 @@ pkg_hash_report(FILE *file) int i, c; struct pkgset *pkg; int *freq; + int empty = 0, used = 0, collided = 0; freq = m_malloc(sizeof(int) * nset + 1); for (i = 0; i <= nset; i++) freq[i] = 0; for (i=0; inext); - fprintf(file,"bin %5d has %7d\n",i,c); + fprintf(file, "pkg-hash: bin %5d has %7d\n", i, c); + if (c == 0) + empty++; + else if (c == 1) + used++; + else { + used++; + collided++; + } freq[c]++; } for (i = nset; i > 0 && freq[i] == 0; i--); while (i >= 0) { - fprintf(file, "size %7d occurs %5d times\n", i, freq[i]); + fprintf(file, "pkg-hash: size %7d occurs %5d times\n", i, freq[i]); i--; } + fprintf(file, "pkg-hash: bins empty %d\n", empty); + fprintf(file, "pkg-hash: bins used %d (collided %d)\n", used, collided); m_output(file, ""); diff --git a/lib/dpkg/t/.gitignore b/lib/dpkg/t/.gitignore index 5b019c86e..b711dbee7 100644 --- a/lib/dpkg/t/.gitignore +++ b/lib/dpkg/t/.gitignore @@ -1,6 +1,11 @@ +# Benchmarks +b-fsys-hash +b-pkg-hash +# Compiled helpers c-tarextract c-treewalk c-trigdeferred +# Testsuite t-ar t-arch t-buffer diff --git a/lib/dpkg/t/Makefile.am b/lib/dpkg/t/Makefile.am index 83c96f329..ab9ce3b4b 100644 --- a/lib/dpkg/t/Makefile.am +++ b/lib/dpkg/t/Makefile.am @@ -60,8 +60,15 @@ test_scripts = \ t-trigdeferred.t \ $(nil) +BENCHMARK_LDADD_FLAGS = -lrt $(LDADD) + +b_fsys_hash_LDADD = $(BENCHMARK_LDADD_FLAGS) +b_pkg_hash_LDADD = $(BENCHMARK_LDADD_FLAGS) + check_PROGRAMS = \ $(test_programs) \ + b-fsys-hash \ + b-pkg-hash \ c-tarextract \ c-treewalk \ c-trigdeferred \ diff --git a/lib/dpkg/t/b-fsys-hash.c b/lib/dpkg/t/b-fsys-hash.c new file mode 100644 index 000000000..373cfc7c6 --- /dev/null +++ b/lib/dpkg/t/b-fsys-hash.c @@ -0,0 +1,80 @@ +/* + * dpkg - main program for package management + * b-fsys-hash.c - test fsys database load and hash performance + * + * Copyright © 2009-2019 Guillem Jover + * + * This 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 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 dpkg; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include + +static const char *admindir; + +int +main(int argc, const char *const *argv) +{ + struct perf_slot ps; + + push_error_context(); + setvbuf(stdout, NULL, _IONBF, 0); + + admindir = dpkg_db_set_dir(admindir); + + perf_ts_mark_print("init"); + + perf_ts_slot_start(&ps); + fsys_hash_init(); + perf_ts_slot_stop(&ps); + + perf_ts_slot_print(&ps, "fsys_hash_init"); + + perf_ts_slot_start(&ps); + modstatdb_open(msdbrw_readonly | msdbrw_available_readonly); + perf_ts_slot_stop(&ps); + + perf_ts_slot_print(&ps, "modstatdb_init"); + + perf_ts_slot_start(&ps); + ensure_allinstfiles_available_quiet(); + perf_ts_slot_stop(&ps); + + perf_ts_slot_print(&ps, "load .list"); + + pkg_hash_report(stdout); + fsys_hash_report(stdout); + + modstatdb_shutdown(); + pop_error_context(ehflag_normaltidy); + + perf_ts_mark_print("shutdown"); + + return 0; +} diff --git a/lib/dpkg/t/b-pkg-hash.c b/lib/dpkg/t/b-pkg-hash.c new file mode 100644 index 000000000..74e26af7b --- /dev/null +++ b/lib/dpkg/t/b-pkg-hash.c @@ -0,0 +1,65 @@ +/* + * dpkg - main program for package management + * b-pkg-hash.c - test pkg database load and hash performance + * + * Copyright © 2009-2019 Guillem Jover + * + * This 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 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 dpkg; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +static const char *admindir; + +int +main(int argc, const char *const *argv) +{ + struct perf_slot ps; + + push_error_context(); + setvbuf(stdout, NULL, _IONBF, 0); + + admindir = dpkg_db_set_dir(admindir); + + perf_ts_mark_print("init"); + + perf_ts_slot_start(&ps); + modstatdb_open(msdbrw_readonly | msdbrw_available_readonly); + perf_ts_slot_stop(&ps); + + perf_ts_slot_print(&ps, "modstatdb_init"); + + pkg_hash_report(stdout); + + modstatdb_shutdown(); + pop_error_context(ehflag_normaltidy); + + perf_ts_mark_print("shutdown"); + + return 0; +} -- cgit v1.2.3 From 81f3c2f460915cfb5f85c4d536b822cf402bb44d Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 23 Feb 2019 04:55:32 +0100 Subject: libdpkg: Add new dpkg_error_move() function --- debian/changelog | 1 + lib/dpkg/error.c | 9 +++++++++ lib/dpkg/error.h | 1 + lib/dpkg/libdpkg.map | 1 + 4 files changed, 12 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index c73e7012f..fc3c98946 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium - dpkg: Switch from a char to an enum to track the force options types. - dpkg: Switch to set the default force option from the forceinfos array. - libdpkg: New benchmark programs and infrastructure. + - libdpkg: Add new dpkg_error_move() function. * Build system: - Check whether this dist is a release, based only on the version format. This will avoid having to do a two staged release to get a proper perl diff --git a/lib/dpkg/error.c b/lib/dpkg/error.c index ecbf35fba..0e88d399a 100644 --- a/lib/dpkg/error.c +++ b/lib/dpkg/error.c @@ -105,6 +105,15 @@ dpkg_error_print(struct dpkg_error *err, const char *fmt, ...) free(str); } +void +dpkg_error_move(struct dpkg_error *dst, struct dpkg_error *src) +{ + dst->type = src->type; + src->type = DPKG_MSG_NONE; + dst->str = src->str; + src->str = NULL; +} + void dpkg_error_destroy(struct dpkg_error *err) { diff --git a/lib/dpkg/error.h b/lib/dpkg/error.h index 299a6235d..31f8e4e8f 100644 --- a/lib/dpkg/error.h +++ b/lib/dpkg/error.h @@ -58,6 +58,7 @@ int dpkg_put_errno(struct dpkg_error *err, const char *fmt, ...) void dpkg_error_print(struct dpkg_error *err, const char *fmt, ...) DPKG_ATTR_PRINTF(2); +void dpkg_error_move(struct dpkg_error *dst, struct dpkg_error *src); void dpkg_error_destroy(struct dpkg_error *err); /** @} */ diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 359418992..13728403f 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -5,6 +5,7 @@ global: dpkg_put_error; dpkg_put_errno; dpkg_error_print; + dpkg_error_move; dpkg_error_destroy; # Charset and string functions -- cgit v1.2.3 From 2385d08c1f67e48de86fc0daa504fef572c99e28 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 27 Jan 2019 05:06:38 +0100 Subject: libdpkg: Add new dpkg_has_error() function --- debian/changelog | 1 + lib/dpkg/error.c | 6 ++++++ lib/dpkg/error.h | 4 ++++ lib/dpkg/libdpkg.map | 1 + 4 files changed, 12 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index fc3c98946..39aaa0e68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium - dpkg: Switch to set the default force option from the forceinfos array. - libdpkg: New benchmark programs and infrastructure. - libdpkg: Add new dpkg_error_move() function. + - libdpkg: Add new dpkg_has_error() function. * Build system: - Check whether this dist is a release, based only on the version format. This will avoid having to do a two staged release to get a proper perl diff --git a/lib/dpkg/error.c b/lib/dpkg/error.c index 0e88d399a..025c558ac 100644 --- a/lib/dpkg/error.c +++ b/lib/dpkg/error.c @@ -45,6 +45,12 @@ dpkg_error_set(struct dpkg_error *err, enum dpkg_msg_type type, int syserrno, err->str = str.buf; } +bool +dpkg_has_error(struct dpkg_error *err) +{ + return err != NULL && err->type != DPKG_MSG_NONE; +} + int dpkg_put_warn(struct dpkg_error *err, const char *fmt, ...) { diff --git a/lib/dpkg/error.h b/lib/dpkg/error.h index 31f8e4e8f..9fd7ead21 100644 --- a/lib/dpkg/error.h +++ b/lib/dpkg/error.h @@ -21,6 +21,8 @@ #ifndef LIBDPKG_ERROR_H #define LIBDPKG_ERROR_H +#include + #include DPKG_BEGIN_DECLS @@ -48,6 +50,8 @@ struct dpkg_error { #define DPKG_ERROR_OBJECT (struct dpkg_error)DPKG_ERROR_INIT +bool dpkg_has_error(struct dpkg_error *err); + int dpkg_put_warn(struct dpkg_error *err, const char *fmt, ...) DPKG_ATTR_PRINTF(2); int dpkg_put_error(struct dpkg_error *err, const char *fmt, ...) diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 13728403f..e30052b0d 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -1,6 +1,7 @@ LIBDPKG_0 { global: # Error reporting + dpkg_has_error; dpkg_put_warn; dpkg_put_error; dpkg_put_errno; -- cgit v1.2.3 From 578df67043f8beff11cbaa119003031184e163ac Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 23 Feb 2019 04:55:47 +0100 Subject: libdpkg: Move status names from parse errors to arguments Although package states are very unlikely to change their names, it's just better to use a single canonical place to store their values. This also makes sure no translator will accidentally translate these names. --- debian/changelog | 1 + lib/dpkg/parse.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 39aaa0e68..ad55eea6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium - libdpkg: New benchmark programs and infrastructure. - libdpkg: Add new dpkg_error_move() function. - libdpkg: Add new dpkg_has_error() function. + - libdpkg: Move status names from parse errors to arguments. * Build system: - Check whether this dist is a release, based only on the version format. This will avoid having to do a two staged release to get a proper perl diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index 8d1195694..b5e38dd14 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -257,7 +257,8 @@ pkg_parse_verify(struct parsedb_state *ps, pkg_status_name(pkg)); else if (pkg->status == PKG_STAT_TRIGGERSAWAITED && !pkg->trigaw.head) parse_error(ps, - _("package has status triggers-awaited but no triggers awaited")); + _("package has status %s but no triggers awaited"), + pkg_status_name(pkg)); if (pkg->trigpend_head && !(pkg->status == PKG_STAT_TRIGGERSPENDING || @@ -267,8 +268,8 @@ pkg_parse_verify(struct parsedb_state *ps, pkg_status_name(pkg)); else if (pkg->status == PKG_STAT_TRIGGERSPENDING && !pkg->trigpend_head) parse_error(ps, - _("package has status triggers-pending but no triggers " - "pending")); + _("package has status %s but no triggers pending"), + pkg_status_name(pkg)); /* FIXME: There was a bug that could make a not-installed package have * conffiles, so we check for them here and remove them (rather than @@ -277,8 +278,8 @@ pkg_parse_verify(struct parsedb_state *ps, pkg->status == PKG_STAT_NOTINSTALLED && pkgbin->conffiles) { parse_warn(ps, - _("Package which in state not-installed has conffiles, " - "forgetting them")); + _("package has status %s and has conffiles, forgetting them"), + pkg_status_name(pkg)); pkgbin->conffiles = NULL; } -- cgit v1.2.3 From 4dfa2cb392e442938a7a4fcb90a46826f90abb2e Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 22 Feb 2019 09:47:43 +0100 Subject: libdpkg: Clarify field names in error and warning messages Move all field names to be format arguments so that these do not get accidentally translated. Use fip->name instead of hardcoding the field name. Always refer to the field names as "'%s' field". Use the proper field names instead of descriptions. And capitalize their names. --- debian/changelog | 1 + lib/dpkg/fields.c | 43 ++++++++++++++++++++++--------------------- lib/dpkg/parse.c | 28 +++++++++++++++------------- lib/dpkg/parsehelp.c | 8 ++++---- 4 files changed, 42 insertions(+), 38 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index ad55eea6f..a0f88a3df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium -maxdepth 1. Thanks to Ralf Treinen . Closes: #922799 * dpkg-genbuildinfo: Add support for a new Build-Tainted-By field in .buildinfo files. Suggested by Alexander E. Patrakov . + * libdpkg: Clarify field names in error and warning messages. * Perl modules: - Dpkg::Vendor::Debian: Add support for merged-usr-via-symlinks tainted tag. Suggested by Alexander E. Patrakov . diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c index 1389e6ebc..63f9441bd 100644 --- a/lib/dpkg/fields.c +++ b/lib/dpkg/fields.c @@ -103,7 +103,7 @@ f_name(struct pkginfo *pkg, struct pkgbin *pkgbin, e = pkg_name_is_illegal(value); if (e != NULL) - parse_error(ps, _("invalid package name (%.250s)"), e); + parse_error(ps, _("invalid package name in '%s' field: %s"), fip->name, e); /* We use the new name, as pkg_hash_find_set() may have done a tolower for us. */ pkg->set->name = pkg_hash_find_set(value)->name; } @@ -118,10 +118,10 @@ f_archives(struct pkginfo *pkg, struct pkgbin *pkgbin, int allowextend; if (!*value) - parse_error(ps, _("empty archive details field '%s'"), fip->name); + parse_error(ps, _("empty archive details '%s' field"), fip->name); if (!(ps->flags & pdb_recordavailable)) parse_error(ps, - _("archive details field '%s' not allowed in status file"), + _("archive details '%s' field not allowed in status file"), fip->name); allowextend = !pkg->archives; fdpp = &pkg->archives; @@ -136,7 +136,7 @@ f_archives(struct pkginfo *pkg, struct pkgbin *pkgbin, if (!fdp) { if (!allowextend) parse_error(ps, - _("too many values in archive details field '%s' " + _("too many values in archive details '%s' field " "(compared to others)"), fip->name); fdp = nfmalloc(sizeof(*fdp)); fdp->next= NULL; @@ -151,7 +151,7 @@ f_archives(struct pkginfo *pkg, struct pkgbin *pkgbin, } if (*fdpp) parse_error(ps, - _("too few values in archive details field '%s' " + _("too few values in archive details '%s' field " "(compared to others)"), fip->name); } @@ -201,8 +201,8 @@ f_architecture(struct pkginfo *pkg, struct pkgbin *pkgbin, { pkgbin->arch = dpkg_arch_find(value); if (pkgbin->arch->type == DPKG_ARCH_ILLEGAL) - parse_warn(ps, _("'%s' is not a valid architecture name: %s"), - value, dpkg_arch_name_is_illegal(value)); + parse_warn(ps, _("'%s' is not a valid architecture name in '%s' field: %s"), + value, fip->name, dpkg_arch_name_is_illegal(value)); } void @@ -243,7 +243,7 @@ f_status(struct pkginfo *pkg, struct pkgbin *pkgbin, if (ps->flags & pdb_rejectstatus) parse_error(ps, _("value for '%s' field not allowed in this context"), - "Status"); + fip->name); if (ps->flags & pdb_recordavailable) return; @@ -261,8 +261,8 @@ f_version(struct pkginfo *pkg, struct pkgbin *pkgbin, const char *value, const struct fieldinfo *fip) { parse_db_version(ps, &pkgbin->version, value, - _("error in '%s' field string '%.250s'"), - "Version", value); + _("'%s' field value '%.250s'"), + fip->name, value); } void @@ -294,13 +294,13 @@ f_configversion(struct pkginfo *pkg, struct pkgbin *pkgbin, if (ps->flags & pdb_rejectstatus) parse_error(ps, _("value for '%s' field not allowed in this context"), - "Config-Version"); + fip->name); if (ps->flags & pdb_recordavailable) return; parse_db_version(ps, &pkg->configversion, value, - _("error in '%s' field string '%.250s'"), - "Config-Version", value); + _("'%s' field value '%.250s'"), + fip->name, value); } @@ -348,8 +348,8 @@ f_conffiles(struct pkginfo *pkg, struct pkgbin *pkgbin, if (c == '\n') continue; if (c != ' ') parse_error(ps, - _("value for '%s' has line starting with non-space '%c'"), - "Conffiles", c); + _("value for '%s' field has line starting with non-space '%c'"), + fip->name, c); for (endent = value; (c = *endent) != '\0' && c != '\n'; endent++) ; conffvalue_lastword(value, endent, endent, &hashstart, &hashlen, &endfn, @@ -365,7 +365,8 @@ f_conffiles(struct pkginfo *pkg, struct pkgbin *pkgbin, namelen= (int)(endfn-value); if (namelen <= 0) parse_error(ps, - _("root or null directory is listed as a conffile")); + _("root or empty directory listed as a conffile in '%s' field"), + fip->name); newptr = nfmalloc(namelen+2); newptr[0]= '/'; memcpy(newptr+1,value,namelen); @@ -540,7 +541,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin, if ((dop->verrel != DPKG_RELATION_EQ) && (fip->integer == dep_provides)) parse_warn(ps, _("only exact versions may be used for '%s' field"), - "Provides"); + fip->name); if (!c_isspace(*p) && !c_isalnum(*p)) { parse_warn(ps, @@ -596,8 +597,8 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin, fip->integer == dep_breaks || fip->integer == dep_provides || fip->integer == dep_replaces) - parse_error(ps, - _("alternatives ('|') not allowed in %s field"), fip->name); + parse_error(ps, _("alternatives ('|') not allowed in '%s' field"), + fip->name); p++; while (c_isspace(*p)) p++; @@ -656,7 +657,7 @@ f_trigpend(struct pkginfo *pend, struct pkgbin *pkgbin, if (ps->flags & pdb_rejectstatus) parse_error(ps, _("value for '%s' field not allowed in this context"), - "Triggers-Pending"); + fip->name); while ((word = scan_word(&value))) { emsg = trig_name_is_illegal(word); @@ -681,7 +682,7 @@ f_trigaw(struct pkginfo *aw, struct pkgbin *pkgbin, if (ps->flags & pdb_rejectstatus) parse_error(ps, _("value for '%s' field not allowed in this context"), - "Triggers-Awaited"); + fip->name); while ((word = scan_word(&value))) { struct dpkg_error err; diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index b5e38dd14..a2663cf5f 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -177,7 +177,7 @@ pkg_parse_verify(struct parsedb_state *ps, struct dependency *dep; struct deppossi *dop; - parse_must_have_field(ps, pkg->set->name, "package name"); + parse_must_have_field(ps, pkg->set->name, "Package"); /* XXX: We need to check for status != PKG_STAT_HALFINSTALLED as while * unpacking an unselected package, it will not have yet all data in @@ -186,9 +186,9 @@ pkg_parse_verify(struct parsedb_state *ps, if ((ps->flags & pdb_recordavailable) || (pkg->status != PKG_STAT_NOTINSTALLED && pkg->status != PKG_STAT_HALFINSTALLED)) { - parse_ensure_have_field(ps, &pkgbin->description, "description"); - parse_ensure_have_field(ps, &pkgbin->maintainer, "maintainer"); - parse_must_have_field(ps, pkgbin->version.version, "version"); + parse_ensure_have_field(ps, &pkgbin->description, "Description"); + parse_ensure_have_field(ps, &pkgbin->maintainer, "Maintainer"); + parse_must_have_field(ps, pkgbin->version.version, "Version"); } /* XXX: Versions before dpkg 1.10.19 did not preserve the Architecture @@ -200,9 +200,9 @@ pkg_parse_verify(struct parsedb_state *ps, * is in such a state that it make sense), so that it can be used safely * on string comparisons and the like. */ if (pkgbin->arch->type == DPKG_ARCH_NONE) - parse_warn(ps, _("missing %s"), "architecture"); + parse_warn(ps, _("missing '%s' field"), "Architecture"); else if (pkgbin->arch->type == DPKG_ARCH_EMPTY) - parse_warn(ps, _("empty value for %s"), "architecture"); + parse_warn(ps, _("empty value for '%s' field"), "Architecture"); } /* Mark missing architectures as empty, to distinguish these from * unused slots in the db. */ @@ -211,12 +211,12 @@ pkg_parse_verify(struct parsedb_state *ps, if (pkgbin->arch->type == DPKG_ARCH_EMPTY && pkgbin->multiarch == PKG_MULTIARCH_SAME) - parse_error(ps, _("package has field '%s' but is missing architecture"), + parse_error(ps, _("package has '%s' field but is missing architecture"), "Multi-Arch: same"); if (pkgbin->arch->type == DPKG_ARCH_ALL && pkgbin->multiarch == PKG_MULTIARCH_SAME) - parse_error(ps, _("package has field '%s' but is architecture all"), - "Multi-Arch: same"); + parse_error(ps, _("package has '%s' field but is architecture '%s'"), + "Multi-Arch: same", "all"); /* Generate the cached fully qualified package name representation. */ pkgbin->pkgname_archqual = pkgbin_name_archqual(pkg, pkgbin); @@ -241,7 +241,8 @@ pkg_parse_verify(struct parsedb_state *ps, pkg->status == PKG_STAT_NOTINSTALLED || pkg->status == PKG_STAT_TRIGGERSPENDING) parse_error(ps, - _("Config-Version for package with inappropriate Status")); + _("'%s' field present for package with inappropriate '%s' field"), + "Config-Version", "Status"); } else { if (pkg->status == PKG_STAT_INSTALLED || pkg->status == PKG_STAT_TRIGGERSPENDING) @@ -420,11 +421,12 @@ parse_find_pkg_slot(struct parsedb_state *ps, /* Verify we don't allow something that will mess up the db. */ if (pkgset_installed_instances(db_set) > 1 && !selection && new_pkgbin->multiarch != PKG_MULTIARCH_SAME) - ohshit(_("%s %s (Multi-Arch: %s) is not co-installable with " - "%s which has multiple installed instances"), + ohshit(_("package %s (%s) with field '%s: %s' is not co-installable " + "with %s which has multiple installed instances"), pkgbin_name(new_pkg, new_pkgbin, pnaw_always), versiondescribe(&new_pkgbin->version, vdew_nonambig), - multiarchinfos[new_pkgbin->multiarch].name, db_set->name); + "Multi-Arch", multiarchinfos[new_pkgbin->multiarch].name, + db_set->name); /* If we are parsing the status file, use a slot per arch. */ if (ps->type == pdb_file_status) diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c index 453077fd9..caba83afb 100644 --- a/lib/dpkg/parsehelp.c +++ b/lib/dpkg/parsehelp.c @@ -296,9 +296,9 @@ parse_must_have_field(struct parsedb_state *ps, const char *value, const char *what) { if (!value) - parse_error(ps, _("missing %s"), what); + parse_error(ps, _("missing '%s' field"), what); else if (!*value) - parse_error(ps, _("empty value for %s"), what); + parse_error(ps, _("empty value for '%s' field"), what); } void @@ -308,9 +308,9 @@ parse_ensure_have_field(struct parsedb_state *ps, static const char empty[] = ""; if (!*value) { - parse_warn(ps, _("missing %s"), what); + parse_warn(ps, _("missing '%s' field"), what); *value = empty; } else if (!**value) { - parse_warn(ps, _("empty value for %s"), what); + parse_warn(ps, _("empty value for '%s' field"), what); } } -- cgit v1.2.3 From 80b9ae537f0d1d1c1f4dbb7f046c434618ee6363 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 23 Feb 2019 04:55:59 +0100 Subject: libdpkg: Optimize error handling Move the error reporting outside the involved functions so that we do not need to call gettext if there is no error, which has a significant performance cost. --- debian/changelog | 3 +++ lib/dpkg/fields.c | 63 +++++++++++++++++++++++++++++++--------------------- lib/dpkg/parse.c | 1 + lib/dpkg/parsedump.h | 14 +++++++++--- lib/dpkg/parsehelp.c | 47 +++++++++++++++++++++++++-------------- 5 files changed, 83 insertions(+), 45 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index a0f88a3df..670266e9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ dpkg (1.19.5) UNRELEASED; urgency=medium * dpkg-genbuildinfo: Add support for a new Build-Tainted-By field in .buildinfo files. Suggested by Alexander E. Patrakov . * libdpkg: Clarify field names in error and warning messages. + * libdpkg: Optimize error handling. Move the error reporting outside the + involved functions so that we do not need to call gettext if there is no + error, which has a significant performance cost. * Perl modules: - Dpkg::Vendor::Debian: Add support for merged-usr-via-symlinks tainted tag. Suggested by Alexander E. Patrakov . diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c index 63f9441bd..a2e5ef81c 100644 --- a/lib/dpkg/fields.c +++ b/lib/dpkg/fields.c @@ -62,20 +62,22 @@ enum parse_nv_flags { */ static int parse_nv(struct parsedb_state *ps, enum parse_nv_flags flags, - const char **strp, const struct namevalue *nv_head, const char *what) + const char **strp, const struct namevalue *nv_head) { const char *str_start = *strp, *str_end; const struct namevalue *nv; int value; + dpkg_error_destroy(&ps->err); + if (str_start[0] == '\0') - parse_error(ps, _("%s is missing"), what); + return dpkg_put_error(&ps->err, _("is missing a value")); nv = namevalue_find_by_name(nv_head, str_start); if (nv == NULL) { /* We got no match, skip further string validation. */ if (!(flags & PARSE_NV_FALLBACK)) - parse_error(ps, _("'%.50s' is not allowed for %s"), str_start, what); + return dpkg_put_error(&ps->err, _("has invalid value '%.50s'"), str_start); str_end = NULL; value = -1; @@ -87,7 +89,7 @@ parse_nv(struct parsedb_state *ps, enum parse_nv_flags flags, } if (!(flags & PARSE_NV_NEXT) && str_is_set(str_end)) - parse_error(ps, _("junk after %s"), what); + return dpkg_put_error(&ps->err, _("has trailing junk")); *strp = str_end; @@ -174,8 +176,11 @@ f_boolean(struct pkginfo *pkg, struct pkgbin *pkgbin, if (!*value) return; - boolean = parse_nv(ps, PARSE_NV_LAST, &value, booleaninfos, - _("yes/no in boolean field")); + boolean = parse_nv(ps, PARSE_NV_LAST, &value, booleaninfos); + if (dpkg_has_error(&ps->err)) + parse_error(ps, _("boolean (yes/no) '%s' field: %s"), + fip->name, ps->err.str); + STRUCTFIELD(pkgbin, fip->integer, bool) = boolean; } @@ -189,8 +194,10 @@ f_multiarch(struct pkginfo *pkg, struct pkgbin *pkgbin, if (!*value) return; - multiarch = parse_nv(ps, PARSE_NV_LAST, &value, multiarchinfos, - _("foreign/allowed/same/no in quadstate field")); + multiarch = parse_nv(ps, PARSE_NV_LAST, &value, multiarchinfos); + if (dpkg_has_error(&ps->err)) + parse_error(ps, _("quadstate (foreign/allowed/same/no) '%s' field: %s"), + fip->name, ps->err.str); STRUCTFIELD(pkgbin, fip->integer, int) = multiarch; } @@ -225,7 +232,9 @@ f_priority(struct pkginfo *pkg, struct pkgbin *pkgbin, if (!*value) return; priority = parse_nv(ps, PARSE_NV_LAST | PARSE_NV_FALLBACK, &str, - priorityinfos, _("word in 'Priority' field")); + priorityinfos); + if (dpkg_has_error(&ps->err)) + parse_error(ps, _("word in '%s' field: %s"), fip->name, ps->err.str); if (str == NULL) { pkg->priority = PKG_PRIO_OTHER; @@ -247,12 +256,18 @@ f_status(struct pkginfo *pkg, struct pkgbin *pkgbin, if (ps->flags & pdb_recordavailable) return; - pkg->want = parse_nv(ps, PARSE_NV_NEXT, &value, wantinfos, - _("first (want) word in 'Status' field")); - pkg->eflag = parse_nv(ps, PARSE_NV_NEXT, &value, eflaginfos, - _("second (error) word in 'Status' field")); - pkg->status = parse_nv(ps, PARSE_NV_LAST, &value, statusinfos, - _("third (status) word in 'Status' field")); + pkg->want = parse_nv(ps, PARSE_NV_NEXT, &value, wantinfos); + if (dpkg_has_error(&ps->err)) + parse_error(ps, _("first (want) word in '%s' field: %s"), + fip->name, ps->err.str); + pkg->eflag = parse_nv(ps, PARSE_NV_NEXT, &value, eflaginfos); + if (dpkg_has_error(&ps->err)) + parse_error(ps, _("second (error) word in '%s' field: %s"), + fip->name, ps->err.str); + pkg->status = parse_nv(ps, PARSE_NV_LAST, &value, statusinfos); + if (dpkg_has_error(&ps->err)) + parse_error(ps, _("third (status) word in '%s' field: %s"), + fip->name, ps->err.str); } void @@ -260,9 +275,8 @@ f_version(struct pkginfo *pkg, struct pkgbin *pkgbin, struct parsedb_state *ps, const char *value, const struct fieldinfo *fip) { - parse_db_version(ps, &pkgbin->version, value, - _("'%s' field value '%.250s'"), - fip->name, value); + if (parse_db_version(ps, &pkgbin->version, value) < 0) + parse_problem(ps, _("'%s' field value '%.250s'"), fip->name, value); } void @@ -298,10 +312,8 @@ f_configversion(struct pkginfo *pkg, struct pkgbin *pkgbin, if (ps->flags & pdb_recordavailable) return; - parse_db_version(ps, &pkg->configversion, value, - _("'%s' field value '%.250s'"), - fip->name, value); - + if (parse_db_version(ps, &pkg->configversion, value) < 0) + parse_problem(ps, _("'%s' field value '%.250s'"), fip->name, value); } /* @@ -578,9 +590,10 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin, varbuf_reset(&version); varbuf_add_buf(&version, versionstart, versionlength); varbuf_end_str(&version); - parse_db_version(ps, &dop->version, version.buf, - _("'%s' field, reference to '%.255s': " - "error in version"), fip->name, depname.buf); + if (parse_db_version(ps, &dop->version, version.buf) < 0) + parse_problem(ps, + _("'%s' field, reference to '%.255s': version '%s'"), + fip->name, depname.buf, version.buf); p++; while (c_isspace(*p)) p++; diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index a2663cf5f..2a96e7e46 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -529,6 +529,7 @@ parsedb_new(const char *filename, int fd, enum parsedbflags flags) struct parsedb_state *ps; ps = m_malloc(sizeof(*ps)); + ps->err = DPKG_ERROR_OBJECT; ps->filename = filename; ps->type = parse_get_type(ps, flags); ps->flags = flags; diff --git a/lib/dpkg/parsedump.h b/lib/dpkg/parsedump.h index 2a857c47d..8e9a71056 100644 --- a/lib/dpkg/parsedump.h +++ b/lib/dpkg/parsedump.h @@ -25,6 +25,8 @@ #include +#include + /** * @defgroup parsedump In-core package database parsing and reading * @ingroup dpkg-public @@ -46,6 +48,7 @@ enum parsedbtype { struct parsedb_state { enum parsedbtype type; enum parsedbflags flags; + struct dpkg_error err; struct pkginfo *pkg; struct pkgbin *pkgbin; char *data; @@ -135,14 +138,19 @@ struct fieldinfo { size_t integer; }; -void parse_db_version(struct parsedb_state *ps, - struct dpkg_version *version, const char *value, - const char *fmt, ...) DPKG_ATTR_PRINTF(4); +int +parse_db_version(struct parsedb_state *ps, + struct dpkg_version *version, const char *value) + DPKG_ATTR_REQRET; void parse_error(struct parsedb_state *ps, const char *fmt, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(2); void parse_warn(struct parsedb_state *ps, const char *fmt, ...) DPKG_ATTR_PRINTF(2); +void +parse_problem(struct parsedb_state *ps, const char *fmt, ...) + DPKG_ATTR_PRINTF(2); + void parse_must_have_field(struct parsedb_state *ps, const char *value, const char *what); void parse_ensure_have_field(struct parsedb_state *ps, diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c index caba83afb..a9095f1f4 100644 --- a/lib/dpkg/parsehelp.c +++ b/lib/dpkg/parsehelp.c @@ -77,6 +77,24 @@ parse_warn(struct parsedb_state *ps, const char *fmt, ...) va_end(args); } +void +parse_problem(struct parsedb_state *ps, const char *fmt, ...) +{ + va_list args; + char *str; + + va_start(args, fmt); + m_vasprintf(&str, parse_error_msg(ps, fmt), args); + va_end(args); + + if (ps->err.type == DPKG_MSG_WARN) + warning("%s: %s", str, ps->err.str); + else + ohshit("%s: %s", str, ps->err.str); + + free(str); +} + const struct fieldinfo * find_field_info(const struct fieldinfo *fields, const char *fieldname) { @@ -266,29 +284,24 @@ parseversion(struct dpkg_version *rversion, const char *string, * @param ps The parsedb state. * @param version The version to parse into. * @param value The version string to parse from. - * @param fmt The error format string. + * + * @retval 0 On success, and err is reset. + * @retval -1 On failure, and err is set accordingly. */ -void +int parse_db_version(struct parsedb_state *ps, struct dpkg_version *version, - const char *value, const char *fmt, ...) + const char *value) { - struct dpkg_error err; - va_list args; - char buf[1000]; + dpkg_error_destroy(&ps->err); - if (parseversion(version, value, &err) == 0) - return; + if (parseversion(version, value, &ps->err) == 0) + return 0; - va_start(args, fmt); - vsnprintf(buf, sizeof(buf), fmt, args); - va_end(args); - - if (err.type == DPKG_MSG_WARN && (ps->flags & pdb_lax_version_parser)) - parse_warn(ps, "%s: %.250s", buf, err.str); - else - parse_error(ps, "%s: %.250s", buf, err.str); + /* If not in lax mode, turn everything into an error. */ + if (!(ps->flags & pdb_lax_version_parser)) + ps->err.type = DPKG_MSG_ERROR; - dpkg_error_destroy(&err); + return -1; } void -- cgit v1.2.3 From 3a017177110da9f54668b614f78aeb98bf73796d Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 23 Feb 2019 04:56:14 +0100 Subject: libdpkg: Merge nicknames table into fieldinfos The current code first does a lookup to see if the fieldname is in the nicknames table, if found fixes up the fieldname to the new alias, and then always does a lookup for the normalized name in fieldinfos table. This penalizes the common case (i.e. non-obsolete fieldnames) substantially. Also moving the nicknames into the fieldinfos table will allow to print correct fieldnames on error as those are not mangled any more, and to provide new wrapper parse functions that print warnings for the obsolete fieldnames. --- debian/changelog | 2 ++ lib/dpkg/parse.c | 29 +++++++---------------------- lib/dpkg/parsedump.h | 8 -------- 3 files changed, 9 insertions(+), 30 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 670266e9a..a33d3c7b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium * libdpkg: Optimize error handling. Move the error reporting outside the involved functions so that we do not need to call gettext if there is no error, which has a significant performance cost. + * libdpkg: Merge nicknames table into fieldinfos, to stop penalizing the + lookup of non-obsolete fieldnames. * Perl modules: - Dpkg::Vendor::Debian: Add support for merged-usr-via-symlinks tainted tag. Suggested by Alexander E. Patrakov . diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index 2a96e7e46..b5e8a37c7 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -64,7 +64,6 @@ const struct fieldinfo fieldinfos[]= { { FIELD("Multi-Arch"), f_multiarch, w_multiarch, PKGIFPOFF(multiarch) }, { FIELD("Source"), f_charfield, w_charfield, PKGIFPOFF(source) }, { FIELD("Version"), f_version, w_version, PKGIFPOFF(version) }, - { FIELD("Revision"), f_revision, w_null }, { FIELD("Config-Version"), f_configversion, w_configversion }, { FIELD("Replaces"), f_dependency, w_dependency, dep_replaces }, { FIELD("Provides"), f_dependency, w_dependency, dep_provides }, @@ -84,17 +83,13 @@ const struct fieldinfo fieldinfos[]= { { FIELD("Triggers-Pending"), f_trigpend, w_trigpend }, { FIELD("Triggers-Awaited"), f_trigaw, w_trigaw }, /* Note that aliases are added to the nicknames table. */ - { NULL } -}; - -static const struct nickname nicknames[] = { - /* Note: Capitalization of these strings is important. */ - { NICK("Recommended"), .canon = "Recommends" }, - { NICK("Optional"), .canon = "Suggests" }, - { NICK("Class"), .canon = "Priority" }, - { NICK("Package-Revision"), .canon = "Revision" }, - { NICK("Package_Revision"), .canon = "Revision" }, - { .nick = NULL } + { FIELD("Revision"), f_revision, w_null }, + { FIELD("Recommended"), f_dependency, w_null }, + { FIELD("Optional"), f_dependency, w_null }, + { FIELD("Class"), f_priority, w_null }, + { FIELD("Package-Revision"), f_revision, w_null }, + { FIELD("Package_Revision"), f_revision, w_null }, + { NULL } }; /** @@ -116,19 +111,9 @@ pkg_parse_field(struct parsedb_state *ps, struct field_state *fs, void *parse_obj) { struct pkg_parse_object *pkg_obj = parse_obj; - const struct nickname *nick; const struct fieldinfo *fip; int *ip; - for (nick = nicknames; nick->nick; nick++) - if (nick->nicklen == (size_t)fs->fieldlen && - strncasecmp(nick->nick, fs->fieldstart, fs->fieldlen) == 0) - break; - if (nick->nick) { - fs->fieldstart = nick->canon; - fs->fieldlen = strlen(fs->fieldstart); - } - for (fip = fieldinfos, ip = fs->fieldencountered; fip->name; fip++, ip++) if (fip->namelen == (size_t)fs->fieldlen && strncasecmp(fip->name, fs->fieldstart, fs->fieldlen) == 0) diff --git a/lib/dpkg/parsedump.h b/lib/dpkg/parsedump.h index 8e9a71056..ea29ff317 100644 --- a/lib/dpkg/parsedump.h +++ b/lib/dpkg/parsedump.h @@ -158,14 +158,6 @@ void parse_ensure_have_field(struct parsedb_state *ps, #define MSDOS_EOF_CHAR '\032' /* ^Z */ -#define NICK(name) .nick = name, .nicklen = sizeof(name) - 1 - -struct nickname { - const char *nick; - const char *canon; - size_t nicklen; -}; - extern const struct fieldinfo fieldinfos[]; /** @} */ -- cgit v1.2.3 From 3828a82cb4c4d42a6b18d6d59f30a09dcbc65aa4 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 23 Feb 2019 04:56:30 +0100 Subject: libdpkg: Print a more accurate warning for Revision nicknames Now that we do not use a nickname mapping anymore, the field struct contains the actual field name matched, so we can report it correctly instead of listing all possible altrnatives, and then missing some. --- debian/changelog | 1 + lib/dpkg/fields.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index a33d3c7b2..9437a33f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium error, which has a significant performance cost. * libdpkg: Merge nicknames table into fieldinfos, to stop penalizing the lookup of non-obsolete fieldnames. + * libdpkg: Print a more accurate warning for Revision nicknames. * Perl modules: - Dpkg::Vendor::Debian: Add support for merged-usr-via-symlinks tainted tag. Suggested by Alexander E. Patrakov . diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c index a2e5ef81c..8294149b9 100644 --- a/lib/dpkg/fields.c +++ b/lib/dpkg/fields.c @@ -286,9 +286,7 @@ f_revision(struct pkginfo *pkg, struct pkgbin *pkgbin, { char *newversion; - parse_warn(ps, - _("obsolete '%s' or '%s' field used"), - "Revision", "Package-Revision"); + parse_warn(ps, _("obsolete '%s' field used"), fip->name); if (!*value) return; if (str_is_set(pkgbin->version.revision)) { newversion = nfmalloc(strlen(pkgbin->version.version) + -- cgit v1.2.3 From 039e85a87777a660e7b8b8e9f87dd4d8640e2a4a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 30 Jan 2019 03:53:44 +0100 Subject: libdpkg: Increase the pkg-hash bins size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We use a number that is close to the amount of packages currently present in a Debian suite, so that installed and available packages do not add tons of collisions. The memory usage is «BINS * sizeof(void *)», so it will be 256 KiB on 32-bit systems and 512 KiB on 64-bit systems. Update the code comment to reflect the above. --- debian/changelog | 2 ++ lib/dpkg/pkg-hash.c | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 9437a33f5..f40d92008 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium * libdpkg: Merge nicknames table into fieldinfos, to stop penalizing the lookup of non-obsolete fieldnames. * libdpkg: Print a more accurate warning for Revision nicknames. + * libdpkg: Increase the pkg-hash bins size to 65521, to improve hash table + performance at the cost of a bit more memory usage. * Perl modules: - Dpkg::Vendor::Debian: Add support for merged-usr-via-symlinks tainted tag. Suggested by Alexander E. Patrakov . diff --git a/lib/dpkg/pkg-hash.c b/lib/dpkg/pkg-hash.c index 34b2f5b23..18d642eef 100644 --- a/lib/dpkg/pkg-hash.c +++ b/lib/dpkg/pkg-hash.c @@ -34,11 +34,16 @@ #include #include -/* This must always be a prime for optimal performance. - * With 4093 buckets, we glean a 20% speedup, for 8191 buckets - * we get 23%. The nominal increase in memory usage is a mere - * sizeof(void *) * 8191 (i.e. less than 32 KiB on 32bit systems). */ -#define BINS 8191 +/* + * This must always be a prime for optimal performance. + * + * We use a number that is close to the amount of packages currently present + * in a Debian suite, so that installed and available packages do not add + * tons of collisions. + * + * The memory usage is «BINS * sizeof(void *)». + */ +#define BINS 65521 static struct pkgset *bins[BINS]; static int npkg, nset; -- cgit v1.2.3 From b9665196413beb1577df1ee06591befb9e6bc143 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 1 Feb 2019 03:38:54 +0100 Subject: libdpkg: Fix unit test for file_slurp() We should compare only the memory being used, and file_slurp() does not guarantee NUL-terminating the varbuf. Closes: #920974 Diagnosed-by: Frank Schaefer --- debian/changelog | 3 +++ lib/dpkg/t/t-file.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index f40d92008..c8ca1b00c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,9 @@ dpkg (1.19.5) UNRELEASED; urgency=medium - Remove trailing whitespace from changelog. - Remove Origin and Bugs fields from control file. - Include a bug-script to report on tainted merged-usr-via-symlinks. + * Test suite: + - libdpkg: Fix unit test for file_slurp(). Closes: #920974 + Diagnosed by Frank Schaefer . [ Updated programs translations ] * German (Sven Joachim). diff --git a/lib/dpkg/t/t-file.c b/lib/dpkg/t/t-file.c index db900a5e3..ca68eaefe 100644 --- a/lib/dpkg/t/t-file.c +++ b/lib/dpkg/t/t-file.c @@ -80,7 +80,7 @@ test_file_slurp(void) test_pass(file_slurp(test_file, &vb, &err) == 0); test_pass(vb.used == strlen(ref_data)); - test_str(vb.buf, ==, ref_data); + test_mem(vb.buf, ==, ref_data, min(vb.used, strlen(ref_data))); test_pass(err.syserrno == 0); test_pass(err.type == DPKG_MSG_NONE); varbuf_destroy(&vb); -- cgit v1.2.3 From 3528fe345c66dc8cb8a591594dfa53d57b366499 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 7 Feb 2019 22:36:11 +0100 Subject: libdpkg: Use va_arg copy instead of the original on a vasprintf() call We need to do that, as we might try to use args again when constructing the error message into the emergency buffer, which would get garbage instead. --- debian/changelog | 1 + lib/dpkg/ehandle.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index c8ca1b00c..e8ba19d75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium - libdpkg: Add new dpkg_error_move() function. - libdpkg: Add new dpkg_has_error() function. - libdpkg: Move status names from parse errors to arguments. + - libdpkg: Use va_arg copy instead of the original on a vasprintf() call. * Build system: - Check whether this dist is a release, based only on the version format. This will avoid having to do a two staged release to get a proper perl diff --git a/lib/dpkg/ehandle.c b/lib/dpkg/ehandle.c index 81ce47e31..e525db003 100644 --- a/lib/dpkg/ehandle.c +++ b/lib/dpkg/ehandle.c @@ -190,7 +190,7 @@ error_context_errmsg_format(const char *fmt, va_list args) int rc; va_copy(args_copy, args); - rc = vasprintf(&errmsg, fmt, args); + rc = vasprintf(&errmsg, fmt, args_copy); va_end(args_copy); /* If the message was constructed successfully, at least we have some -- cgit v1.2.3 From 5973aa2f9079545739fa52ecdf1577676313d6fa Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 15 Feb 2019 04:13:39 +0100 Subject: libdpkg: Include in pager.c Closes: #922212 Reported-by: Y --- debian/changelog | 2 ++ lib/dpkg/pager.c | 1 + 2 files changed, 3 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index e8ba19d75..29e6c0983 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium - libdpkg: Add new dpkg_has_error() function. - libdpkg: Move status names from parse errors to arguments. - libdpkg: Use va_arg copy instead of the original on a vasprintf() call. + - libdpkg: Include in pager.c. + Reported by Y . Closes: #922212 * Build system: - Check whether this dist is a release, based only on the version format. This will avoid having to do a two staged release to get a proper perl diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c index b0e54101e..4eab2f09e 100644 --- a/lib/dpkg/pager.c +++ b/lib/dpkg/pager.c @@ -25,6 +25,7 @@ #include #include +#include #include #include -- cgit v1.2.3 From 12dc155b63be057af5a1c6330106e496aeae3ee4 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 18 Feb 2019 03:53:16 +0100 Subject: libdpkg: Use pkg_set_want() instead of a direct assignment --- debian/changelog | 1 + lib/dpkg/parse.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 29e6c0983..7d69fbaed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium - libdpkg: Use va_arg copy instead of the original on a vasprintf() call. - libdpkg: Include in pager.c. Reported by Y . Closes: #922212 + - libdpkg: Use pkg_set_want() instead of a direct assignment. * Build system: - Check whether this dist is a release, based only on the version format. This will avoid having to do a two staged release to get a proper perl diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index b5e8a37c7..863e42644 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -291,7 +291,7 @@ pkg_parse_verify(struct parsedb_state *ps, pkg->eflag == PKG_EFLAG_OK && pkg->want == PKG_WANT_INSTALL && pkgbin->arch->type == DPKG_ARCH_EMPTY) - pkg->want = PKG_WANT_UNKNOWN; + pkg_set_want(pkg, PKG_WANT_UNKNOWN); } struct pkgcount { -- cgit v1.2.3 From 813024b95f3087fe018f73867ea30ad2a83321e5 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 18 Feb 2019 03:53:36 +0100 Subject: libdpkg: Blank packages that are not-installed with unknown selection Versions before 1.13.10 did not properly clear the Origin and Bugs fields, so there might still be entries with these fields that are not getting garbage collected properly. Make sure to blank these package entries so that they get forgotten on the next database dump. Closes: #922410 --- debian/changelog | 2 ++ lib/dpkg/parse.c | 11 +++++++++++ 2 files changed, 13 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 7d69fbaed..e40d7f93f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium * libdpkg: Print a more accurate warning for Revision nicknames. * libdpkg: Increase the pkg-hash bins size to 65521, to improve hash table performance at the cost of a bit more memory usage. + * libdpkg: Blank packages that are not-installed with unknown selection. + Closes: #922410 * Perl modules: - Dpkg::Vendor::Debian: Add support for merged-usr-via-symlinks tainted tag. Suggested by Alexander E. Patrakov . diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index 863e42644..f7979b8e5 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -292,6 +292,17 @@ pkg_parse_verify(struct parsedb_state *ps, pkg->want == PKG_WANT_INSTALL && pkgbin->arch->type == DPKG_ARCH_EMPTY) pkg_set_want(pkg, PKG_WANT_UNKNOWN); + + /* XXX: Versions before dpkg 1.13.10 did not blank the Origin and Bugs + * fields, so there can be packages that should be garbage collected but + * are lingering around. Blank them to make sure we will forget all about + * them on the next database dump. */ + if (!(ps->flags & pdb_recordavailable) && + pkg->status == PKG_STAT_NOTINSTALLED && + pkg->eflag == PKG_EFLAG_OK && + pkg->want == PKG_WANT_UNKNOWN) { + pkgbin_blank(pkgbin); + } } struct pkgcount { -- cgit v1.2.3 From ec3c37f87362cdecbae409b6d24f3c99b09ae0b5 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 23 Feb 2019 04:56:42 +0100 Subject: libdpkg, dpkg: Print the dpkg database directory on access errors There were several error messages involving the dpkg database, that were ambiguous by referring to it as "dpkg status area", instead of printing the affected pathname. The historical reason for not being more explicit has been to keep the user a bit under the dark, because this has been an internal database storage, and only those in the known would go there to edit it by hand and similar. This is a bit pointless though, because the Internet is full of references to those directories, and other error messages just print them anyway. In addition, for users that want to diagnose what is the problem this is not helpful, and the directory might have been changed at build or run time with one of the options. Closes: #883700 --- debian/changelog | 2 ++ lib/dpkg/dbmodify.c | 23 +++++++++++++++-------- lib/dpkg/file.c | 13 +++++++------ lib/dpkg/file.h | 4 ++-- lib/dpkg/trigdeferred.c | 5 +++-- src/update.c | 10 +++++++--- 6 files changed, 36 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index e40d7f93f..d864d06d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium performance at the cost of a bit more memory usage. * libdpkg: Blank packages that are not-installed with unknown selection. Closes: #922410 + * libdpkg, dpkg: Print the dpkg database directory on access errors. + Closes: #883700 * Perl modules: - Dpkg::Vendor::Debian: Add support for merged-usr-via-symlinks tainted tag. Suggested by Alexander E. Patrakov . diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c index f29c6745f..557dc0eae 100644 --- a/lib/dpkg/dbmodify.c +++ b/lib/dpkg/dbmodify.c @@ -197,7 +197,8 @@ modstatdb_is_locked(void) if (dblockfd == -1) { lockfd = open(lockfile, O_RDONLY); if (lockfd == -1) - ohshite(_("unable to open lock file %s for testing"), lockfile); + ohshite(_("unable to check lock file for dpkg database directory %s"), + dpkg_db_get_dir()); } else { lockfd = dblockfd; } @@ -224,7 +225,8 @@ modstatdb_can_lock(void) if (errno == EACCES || errno == EPERM) return false; else - ohshite(_("unable to open/create frontend lockfile")); + ohshite(_("unable to open/create dpkg frontend lock for directory %s"), + dpkg_db_get_dir()); } } else { frontendlockfd = -1; @@ -235,7 +237,8 @@ modstatdb_can_lock(void) if (errno == EACCES || errno == EPERM) return false; else - ohshite(_("unable to open/create status database lockfile")); + ohshite(_("unable to open/create dpkg database lock file for directory %s"), + dpkg_db_get_dir()); } return true; @@ -245,12 +248,14 @@ void modstatdb_lock(void) { if (!modstatdb_can_lock()) - ohshit(_("you do not have permission to lock the dpkg status database")); + ohshit(_("you do not have permission to lock the dpkg database directory %s"), + dpkg_db_get_dir()); if (frontendlockfd != -1) file_lock(&frontendlockfd, FILE_LOCK_NOWAIT, frontendlockfile, - _("dpkg frontend")); - file_lock(&dblockfd, FILE_LOCK_NOWAIT, lockfile, _("dpkg status database")); + _("dpkg frontend lock")); + file_lock(&dblockfd, FILE_LOCK_NOWAIT, lockfile, + _("dpkg database lock")); } void @@ -282,9 +287,11 @@ modstatdb_open(enum modstatdb_rw readwritereq) case msdbrw_write: case msdbrw_writeifposs: if (access(dpkg_db_get_dir(), W_OK)) { if (errno != EACCES) - ohshite(_("unable to access dpkg status area")); + ohshite(_("unable to access the dpkg database directory %s"), + dpkg_db_get_dir()); else if (readwritereq == msdbrw_write) - ohshit(_("operation requires read/write access to dpkg status area")); + ohshit(_("required read/write access to the dpkg database directory %s"), + dpkg_db_get_dir()); cstatus= msdbrw_readonly; } else { modstatdb_lock(); diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index a949bd49e..614d969e3 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -118,26 +118,27 @@ file_lock_setup(struct flock *fl, short type) * Unlock a previously locked file. */ void -file_unlock(int lockfd, const char *lock_desc) +file_unlock(int lockfd, const char *lockfile, const char *lockdesc) { struct flock fl; if (lockfd < 0) - internerr("lock fd is %d < 0", lockfd); + internerr("%s (%s) fd is %d < 0", lockdesc, lockfile, lockfd); file_lock_setup(&fl, F_UNLCK); if (fcntl(lockfd, F_SETLK, &fl) == -1) - ohshite(_("unable to unlock %s"), lock_desc); + ohshite(_("unable to unlock %s"), lockdesc); } static void file_unlock_cleanup(int argc, void **argv) { int lockfd = *(int *)argv[0]; - const char *lock_desc = argv[1]; + const char *lockfile = argv[1]; + const char *lockdesc = argv[2]; - file_unlock(lockfd, lock_desc); + file_unlock(lockfd, lockfile, lockdesc); } /** @@ -194,7 +195,7 @@ file_lock(int *lockfd, enum file_lock_flags flags, const char *filename, ohshite(_("unable to lock %s"), desc); } - push_cleanup(file_unlock_cleanup, ~0, 2, lockfd, desc); + push_cleanup(file_unlock_cleanup, ~0, 3, lockfd, filename, desc); } void diff --git a/lib/dpkg/file.h b/lib/dpkg/file.h index 0f46cc07b..ead11c73a 100644 --- a/lib/dpkg/file.h +++ b/lib/dpkg/file.h @@ -60,8 +60,8 @@ enum file_lock_flags { bool file_is_locked(int lockfd, const char *filename); void file_lock(int *lockfd, enum file_lock_flags flags, const char *filename, - const char *desc); -void file_unlock(int fd, const char *desc); + const char *filedesc); +void file_unlock(int fd, const char *filename, const char *filedesc); void file_show(const char *filename); /** @} */ diff --git a/lib/dpkg/trigdeferred.c b/lib/dpkg/trigdeferred.c index 12677ddc9..b9b028f73 100644 --- a/lib/dpkg/trigdeferred.c +++ b/lib/dpkg/trigdeferred.c @@ -83,13 +83,14 @@ trigdef_update_start(enum trigdef_update_flags uf) if (lock_fd == -1) { if (!(errno == ENOENT && (uf & TDUF_NO_LOCK_OK))) ohshite(_("unable to open/create " - "triggers lockfile '%.250s'"), + "triggers lock file '%.250s'"), fn.buf); return TDUS_ERROR_NO_DIR; } } - file_lock(&lock_fd, FILE_LOCK_WAIT, fn.buf, _("triggers area")); + file_lock(&lock_fd, FILE_LOCK_WAIT, fn.buf, + _("triggers database lock")); } constructfn(&fn, triggersdir, TRIGGERSDEFERREDFILE); diff --git a/src/update.c b/src/update.c index fed9b22c9..313f09de9 100644 --- a/src/update.c +++ b/src/update.c @@ -59,11 +59,15 @@ updateavailable(const char *const *argv) } if (!f_noact) { - if (access(dpkg_db_get_dir(), W_OK)) { + const char *dbdir = dpkg_db_get_dir(); + + if (access(dbdir, W_OK)) { if (errno != EACCES) - ohshite(_("unable to access dpkg status area for bulk available update")); + ohshite(_("unable to access dpkg database directory '%s' for bulk available update"), + dbdir); else - ohshit(_("bulk available update requires write access to dpkg status area")); + ohshit(_("required write access to dpkg database directory '%s' for bulk available update"), + dbdir); } modstatdb_lock(); } -- cgit v1.2.3 From 1a04039d113972bae94225d31a4186b03e675c6e Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 22 Feb 2019 03:12:40 +0100 Subject: libdpkg: Fix typos --- lib/dpkg/dbmodify.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c index 557dc0eae..3d77270fb 100644 --- a/lib/dpkg/dbmodify.c +++ b/lib/dpkg/dbmodify.c @@ -335,7 +335,7 @@ void modstatdb_checkpoint(void) { int i; if (cstatus < msdbrw_write) - internerr("modstatdb status '%d' is not writtable", cstatus); + internerr("modstatdb status '%d' is not writable", cstatus); writedb(statusfile, wdb_must_sync); @@ -383,7 +383,7 @@ static void modstatdb_note_core(struct pkginfo *pkg) { if (cstatus < msdbrw_write) - internerr("modstatdb status '%d' is not writtable", cstatus); + internerr("modstatdb status '%d' is not writable", cstatus); varbuf_reset(&uvb); varbufrecord(&uvb, pkg, &pkg->installed); -- cgit v1.2.3 From 3391b1f3d9f5e7ce9e08ec635350fc383187e685 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 6 Mar 2019 03:52:10 +0100 Subject: libdpkg: Add a new TAR_FORMAT_UNKNOWN enum value This will make it possible to have a value denoting an unknown format, when we initialize the tar_entry or tar_archive structs. --- debian/changelog | 1 + lib/dpkg/tarfn.h | 1 + 2 files changed, 2 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index d9313e4c1..07c381ae5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ dpkg (1.19.6) UNRELEASED; urgency=medium [ Guillem Jover ] + * libdpkg: Add a new TAR_FORMAT_UNKNOWN enum value. * Packaging: - Update usertags. - Install a lintian profile for dpkg based on the debian profile, so that diff --git a/lib/dpkg/tarfn.h b/lib/dpkg/tarfn.h index 0302fb8a9..38ab9a9fe 100644 --- a/lib/dpkg/tarfn.h +++ b/lib/dpkg/tarfn.h @@ -38,6 +38,7 @@ #define TARBLKSZ 512 enum tar_format { + TAR_FORMAT_UNKNOWN, TAR_FORMAT_OLD, TAR_FORMAT_GNU, TAR_FORMAT_USTAR, -- cgit v1.2.3 From 04b6b5bb2def5e361ae54d44664602fbeacb4398 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 6 Mar 2019 03:52:10 +0100 Subject: libdpkg: Set tar_entry to zero on tar_entry_destroy() When we are destroying a tar_entry we need to zero the struct, otherwise we will end up freeing already freed memory and crashing. --- debian/changelog | 2 ++ lib/dpkg/tarfn.c | 2 ++ 2 files changed, 4 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 07c381ae5..e600badcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ dpkg (1.19.6) UNRELEASED; urgency=medium [ Guillem Jover ] * libdpkg: Add a new TAR_FORMAT_UNKNOWN enum value. + * libdpkg: Set tar_entry to zero on tar_entry_destroy(), to avoid double + free()s and the subsequent crashes. * Packaging: - Update usertags. - Install a lintian profile for dpkg based on the debian profile, so that diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c index afcce0ee5..757e0e323 100644 --- a/lib/dpkg/tarfn.c +++ b/lib/dpkg/tarfn.c @@ -408,6 +408,8 @@ tar_entry_destroy(struct tar_entry *te) free(te->linkname); free(te->stat.uname); free(te->stat.gname); + + memset(te, 0, sizeof(*te)); } struct tar_symlink_entry { -- cgit v1.2.3 From a1f9ccf08ddc99e4e3f1ead01abb6a8d8d506b3a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 6 Mar 2019 03:52:10 +0100 Subject: libdpkg: Handle non end-of-tape errors from tar_header_decode() We need to assign a status value in the non end-of-tape branch, otherwise we are using an uninitialized value, which might be anything, and could end up making the code proceed even if the archive is damaged/broken, etc. --- debian/changelog | 1 + lib/dpkg/tarfn.c | 2 ++ 2 files changed, 3 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index e600badcd..43153c343 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ dpkg (1.19.6) UNRELEASED; urgency=medium * libdpkg: Add a new TAR_FORMAT_UNKNOWN enum value. * libdpkg: Set tar_entry to zero on tar_entry_destroy(), to avoid double free()s and the subsequent crashes. + * libdpkg: Handle non end-of-tape errors from tar_header_decode(). * Packaging: - Update usertags. - Install a lintian profile for dpkg based on the debian profile, so that diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c index 757e0e323..7ccdae389 100644 --- a/lib/dpkg/tarfn.c +++ b/lib/dpkg/tarfn.c @@ -466,6 +466,8 @@ tar_extractor(struct tar_archive *tar) if (h.name[0] == '\0') { /* End Of Tape. */ status = 0; + } else { + status = -1; } tar_entry_destroy(&h); break; -- cgit v1.2.3 From dcd19c7820e0294245837ee9e8beec9244ea3b2d Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 6 Mar 2019 03:52:10 +0100 Subject: libdpkg: Use ERANGE instead of EINVAL for tar_atol8() out-of-range error We should use the correct errno value, otherwise the error string makes little sense, and ends up being very confusing. --- debian/changelog | 1 + lib/dpkg/t/t-tar.c | 8 ++++---- lib/dpkg/tarfn.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 43153c343..3346afa9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dpkg (1.19.6) UNRELEASED; urgency=medium * libdpkg: Set tar_entry to zero on tar_entry_destroy(), to avoid double free()s and the subsequent crashes. * libdpkg: Handle non end-of-tape errors from tar_header_decode(). + * libdpkg: Use ERANGE instead of EINVAL for tar_atol8() out-of-range error. * Packaging: - Update usertags. - Install a lintian profile for dpkg based on the debian profile, so that diff --git a/lib/dpkg/t/t-tar.c b/lib/dpkg/t/t-tar.c index 8417ed306..6fa217de5 100644 --- a/lib/dpkg/t/t-tar.c +++ b/lib/dpkg/t/t-tar.c @@ -72,22 +72,22 @@ test_tar_atol8(void) errno = 0; u = tar_atoul(" 11111aaa ", 12, UINTMAX_MAX); test_pass(u == 0); - test_pass(errno == EINVAL); + test_pass(errno == ERANGE); errno = 0; u = tar_atoul(" 8 ", 12, UINTMAX_MAX); test_pass(u == 0); - test_pass(errno == EINVAL); + test_pass(errno == ERANGE); errno = 0; u = tar_atoul(" 18 ", 12, UINTMAX_MAX); test_pass(u == 0); - test_pass(errno == EINVAL); + test_pass(errno == ERANGE); errno = 0; u = tar_atoul(" aa ", 12, UINTMAX_MAX); test_pass(u == 0); - test_pass(errno == EINVAL); + test_pass(errno == ERANGE); } static void diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c index 7ccdae389..a0821f217 100644 --- a/lib/dpkg/tarfn.c +++ b/lib/dpkg/tarfn.c @@ -110,7 +110,7 @@ tar_atol8(const char *s, size_t size) if (*s == '\0' || *s == ' ') break; if (*s < '0' || *s > '7') - return tar_ret_errno(EINVAL, 0); + return tar_ret_errno(ERANGE, 0); n = (n * 010) + (*s++ - '0'); } -- cgit v1.2.3 From 463ed9a7becbe509948620d9c1138e40c711c45c Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 2 Mar 2019 18:13:14 +0100 Subject: libdpkg: Do not generate a backup file for the available database This file contains information only valid as long as the downloaded sources are also available. So it is closer to a cache than a database, and as such, there is no need for an uncompressed backup, which can take quite some space. Closes: #343578 --- debian/changelog | 4 ++++ lib/dpkg/dump.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 240d07d32..9f7105a7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ dpkg (1.20.0) UNRELEASED; urgency=medium + [ Guillem Jover ] + * libdpkg: Do not generate a backup file for the available database. + Closes: #343578 + [ Updated man pages translations ] * German (Helge Kreutzmann). Closes: #931135 diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c index c58a4d59a..48f0beb03 100644 --- a/lib/dpkg/dump.c +++ b/lib/dpkg/dump.c @@ -538,8 +538,12 @@ void writedb(const char *filename, enum writedb_flags flags) { struct atomic_file *file; + enum atomic_file_flags atomic_flags = ATOMIC_FILE_BACKUP; - file = atomic_file_new(filename, ATOMIC_FILE_BACKUP); + if (flags & wdb_dump_available) + atomic_flags = 0; + + file = atomic_file_new(filename, atomic_flags); atomic_file_open(file); writedb_records(file->fp, filename, flags); -- cgit v1.2.3 From 8b0806e8df366f0b0b29c74b4856bbfcda632ed6 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 23 Jun 2019 01:04:22 +0200 Subject: libdpkg: Clarify lock contender error message Print the PID of the lock contender, switch the tense to past as the lock might not be locked anymore by the time we finish, and add a warning explaining that removing the lock file is never the correct solution. --- debian/changelog | 3 +++ lib/dpkg/file.c | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 206c0e6cf..ff6e3cdb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,9 @@ dpkg (1.20.0) UNRELEASED; urgency=medium to specify multiple packages. Closes: #926669 Based on a patch by Frank Schaefer . * perl: Remove support for versioned GnuPG 2 program and packages. + * libdpkg: Clarify lock contender error message. Print the PID of the lock + contender, and add a warning explaining that removing the lock file is + never the correct solution. * Perl modules: - Dpkg::Source::Package: Verify original tarball signatures at build time. * Documentation: diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index 614d969e3..ceda51047 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -189,10 +189,23 @@ file_lock(int *lockfd, enum file_lock_flags flags, const char *filename, lock_cmd = F_SETLK; if (fcntl(*lockfd, lock_cmd, &fl) == -1) { - if (errno == EACCES || errno == EAGAIN) - ohshit(_("%s is locked by another process"), desc); - else + const char *warnmsg; + + if (errno != EACCES && errno != EAGAIN) ohshite(_("unable to lock %s"), desc); + + warnmsg = _("Note: removing the lock file is always wrong, " + "and can end up damaging the\n" + "locked area and the entire system. " + "See ."); + + file_lock_setup(&fl, F_WRLCK); + if (fcntl(*lockfd, F_GETLK, &fl) == -1) + ohshit(_("%s was locked by another process\n%s"), + desc, warnmsg); + + ohshit(_("%s was locked by another process with pid %d\n%s"), + desc, fl.l_pid, warnmsg); } push_cleanup(file_unlock_cleanup, ~0, 3, lockfd, filename, desc); -- cgit v1.2.3 From 94886592cafa0bfbed76b8ab58814f657074d236 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 29 Aug 2019 01:32:15 +0200 Subject: libdpkg: Use the variable instead of a type as sizeof() argument This is more future proof, and in this particular case it was tripping over cppcheck and emitting a false positive for constArgument. Warned-by: cppcheck --- debian/changelog | 1 + lib/dpkg/command.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index b6b08c655..4af8bc1c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium - Dpkg::OpenPGP: Make it possible to verify detached signatures. - Dpkg::OpenPGP: Add support for importing an OpenPGP key into a keyring. - Dpkg::BuildFlags: Remove unused hash keys. + - libdpkg: Use the variable instead of a type as sizeof() argument. * Build system: - Bump minimal Perl version to 5.24.1. - Add a serial versioning to the m4 files. diff --git a/lib/dpkg/command.c b/lib/dpkg/command.c index c8b8ae5af..ab89d4b9b 100644 --- a/lib/dpkg/command.c +++ b/lib/dpkg/command.c @@ -51,7 +51,7 @@ command_init(struct command *cmd, const char *filename, const char *name) cmd->name = name; cmd->argc = 0; cmd->argv_size = 10; - cmd->argv = m_malloc(cmd->argv_size * sizeof(const char *)); + cmd->argv = m_malloc(cmd->argv_size * sizeof(cmd->argv[0])); cmd->argv[0] = NULL; } @@ -85,7 +85,7 @@ command_grow_argv(struct command *cmd, int need) return; cmd->argv_size = (cmd->argv_size + need) * 2; - cmd->argv = m_realloc(cmd->argv, cmd->argv_size * sizeof(const char *)); + cmd->argv = m_realloc(cmd->argv, cmd->argv_size * sizeof(cmd->argv[0])); } /** -- cgit v1.2.3 From 45f004ea979e12dea12043558629efe5aa377bf2 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 29 Aug 2019 01:33:41 +0200 Subject: libdpkg: Use the totalwritten variable for a consistency check The variable was written to but never used. Warned-by: cppcheck --- debian/changelog | 1 + lib/dpkg/buffer.c | 2 ++ 2 files changed, 3 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 4af8bc1c7..01621e89c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium - Dpkg::OpenPGP: Add support for importing an OpenPGP key into a keyring. - Dpkg::BuildFlags: Remove unused hash keys. - libdpkg: Use the variable instead of a type as sizeof() argument. + - libdpkg: Use the totalwritten variable for a consistency check. * Build system: - Bump minimal Perl version to 5.24.1. - Add a serial versioning to the m4 files. diff --git a/lib/dpkg/buffer.c b/lib/dpkg/buffer.c index 0af4da2b4..a4d6527d7 100644 --- a/lib/dpkg/buffer.c +++ b/lib/dpkg/buffer.c @@ -225,6 +225,8 @@ buffer_copy(struct buffer_data *read_data, if (bytesread < 0 || byteswritten < 0) return -1; + if (totalread != totalwritten) + return -1; if (limit > 0) return dpkg_put_error(err, _("unexpected end of file or stream")); -- cgit v1.2.3 From 15af35e78ad21a4a52a0ea22a689da93ccbf1e0a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 2 Sep 2019 13:00:40 +0200 Subject: libdpkg: Add new C locale switch over support This will make it possible to select either the current locale or a specified one, currently only C is selectable. We use this because the uselocale(3) POSIX API is recent, and the system might not have it available, so we might need to fallback to use setlocale(3) instead, which even though is not thread-safe, it's better than nothing. --- configure.ac | 1 + debian/changelog | 1 + dpkg-deb/main.c | 1 + dpkg-split/main.c | 1 + dselect/main.cc | 1 + lib/dpkg/i18n.c | 42 ++++++++++++++++++++++++++++++++++++++++++ lib/dpkg/i18n.h | 8 ++++++++ lib/dpkg/libdpkg.map | 1 + src/divertcmd.c | 1 + src/main.c | 1 + src/querycmd.c | 1 + src/statcmd.c | 1 + src/trigcmd.c | 1 + 13 files changed, 61 insertions(+) (limited to 'lib') diff --git a/configure.ac b/configure.ac index 171a85e58..bb51ed0e7 100644 --- a/configure.ac +++ b/configure.ac @@ -182,6 +182,7 @@ AC_CHECK_FUNCS([\ fallocate \ posix_fallocate \ posix_fadvise \ + uselocale \ ]) AS_IF([test "x$build_dselect" = "xyes"], [ diff --git a/debian/changelog b/debian/changelog index eb0f4da81..904ce31d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium - dselect: Reduce scope of variable, to avoid it being unused in a branch. - dpkg-deb: Fold two adjacent if conditionals into a single one. - dpkg: Initialize flagdeppossi in check_conflict(). + - libdpkg: Add new C locale switch over support. * Build system: - Bump minimal Perl version to 5.24.1. - Add a serial versioning to the m4 files. diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c index 52e9ce67d..3420e44b7 100644 --- a/dpkg-deb/main.c +++ b/dpkg-deb/main.c @@ -252,6 +252,7 @@ int main(int argc, const char *const *argv) { ret = cipaction->action(argv); dpkg_program_done(); + dpkg_locales_done(); return ret; } diff --git a/dpkg-split/main.c b/dpkg-split/main.c index bcc1dc7b6..e807329a3 100644 --- a/dpkg-split/main.c +++ b/dpkg-split/main.c @@ -173,6 +173,7 @@ int main(int argc, const char *const *argv) { m_output(stderr, _("")); dpkg_program_done(); + dpkg_locales_done(); return ret; } diff --git a/dselect/main.cc b/dselect/main.cc index e634e7447..32b53cbb0 100644 --- a/dselect/main.cc +++ b/dselect/main.cc @@ -532,6 +532,7 @@ main(int, const char *const *argv) cursesoff(); dpkg_program_done(); + dpkg_locales_done(); return(0); } diff --git a/lib/dpkg/i18n.c b/lib/dpkg/i18n.c index 147c5756e..495270003 100644 --- a/lib/dpkg/i18n.c +++ b/lib/dpkg/i18n.c @@ -23,6 +23,10 @@ #include +#ifdef HAVE_USELOCALE +static locale_t dpkg_C_locale; +#endif + void dpkg_locales_init(const char *package) { @@ -30,6 +34,10 @@ dpkg_locales_init(const char *package) bindtextdomain(package, LOCALEDIR); textdomain(package); +#ifdef HAVE_USELOCALE + dpkg_C_locale = newlocale(LC_ALL_MASK, "C", (locale_t)0); +#endif + #if defined(__APPLE__) && defined(__MACH__) /* * On Mac OS X, the libintl code needs to call into the CoreFoundation @@ -44,3 +52,37 @@ dpkg_locales_init(const char *package) gettext(""); #endif } + +void +dpkg_locales_done(void) +{ +#ifdef HAVE_USELOCALE + freelocale(dpkg_C_locale); + dpkg_C_locale = (locale_t)0; +#endif +} + +struct dpkg_locale +dpkg_locale_switch_C(void) +{ + struct dpkg_locale loc; + +#ifdef HAVE_USELOCALE + loc.oldloc = uselocale(dpkg_C_locale); +#else + loc.oldloc = setlocale(LC_ALL, NULL); + setlocale(LC_ALL, "C"); +#endif + + return loc; +} + +void +dpkg_locale_switch_back(struct dpkg_locale loc) +{ +#ifdef HAVE_USELOCALE + uselocale(loc.oldloc); +#else + setlocale(LC_ALL, loc.oldloc); +#endif +} diff --git a/lib/dpkg/i18n.h b/lib/dpkg/i18n.h index e92158f15..f574433a2 100644 --- a/lib/dpkg/i18n.h +++ b/lib/dpkg/i18n.h @@ -43,6 +43,14 @@ DPKG_BEGIN_DECLS #define C_(ctxt, str) pgettext(ctxt, str) void dpkg_locales_init(const char *package); +void dpkg_locales_done(void); + +struct dpkg_locale { + void *oldloc; +}; + +struct dpkg_locale dpkg_locale_switch_C(void); +void dpkg_locale_switch_back(struct dpkg_locale loc); /** @} */ diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index e30052b0d..9dd699358 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -11,6 +11,7 @@ global: # Charset and string functions dpkg_locales_init; + dpkg_locales_done; # Program name dpkg_set_progname; diff --git a/src/divertcmd.c b/src/divertcmd.c index 61b382f0e..dfc1c9033 100644 --- a/src/divertcmd.c +++ b/src/divertcmd.c @@ -855,6 +855,7 @@ main(int argc, const char * const *argv) modstatdb_shutdown(); dpkg_program_done(); + dpkg_locales_done(); return ret; } diff --git a/src/main.c b/src/main.c index 2bb0a22ae..0cc8759af 100644 --- a/src/main.c +++ b/src/main.c @@ -783,6 +783,7 @@ int main(int argc, const char *const *argv) { free_invoke_hooks(&post_invoke_hooks); dpkg_program_done(); + dpkg_locales_done(); return reportbroken_retexitstatus(ret); } diff --git a/src/querycmd.c b/src/querycmd.c index 6ee555e4e..472d87f79 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -862,6 +862,7 @@ int main(int argc, const char *const *argv) { ret = cipaction->action(argv); dpkg_program_done(); + dpkg_locales_done(); return !!ret; } diff --git a/src/statcmd.c b/src/statcmd.c index 33a426abb..2507b31be 100644 --- a/src/statcmd.c +++ b/src/statcmd.c @@ -422,6 +422,7 @@ main(int argc, const char *const *argv) ret = cipaction->action(argv); dpkg_program_done(); + dpkg_locales_done(); return ret; } diff --git a/src/trigcmd.c b/src/trigcmd.c index af8119c87..7c547a3bf 100644 --- a/src/trigcmd.c +++ b/src/trigcmd.c @@ -251,6 +251,7 @@ main(int argc, const char *const *argv) } dpkg_program_done(); + dpkg_locales_done(); return 0; } -- cgit v1.2.3 From 935072fed354c9ddd0704a552be1f6996bfccc10 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 2 Sep 2019 13:00:40 +0200 Subject: libdpkg: Add new versiondescribe_c() to force a C locale In some contexts we need output in the C locale, such as log files. We add a new versiondescribe_c() that wraps the locale-dependant versiondescribe() function and switches to the C locale and back to the previous one before returning. --- debian/changelog | 1 + lib/dpkg/dpkg-db.h | 2 ++ lib/dpkg/libdpkg.map | 1 + lib/dpkg/parsehelp.c | 14 ++++++++++++++ 4 files changed, 18 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 904ce31d3..e89b28849 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium - dpkg-deb: Fold two adjacent if conditionals into a single one. - dpkg: Initialize flagdeppossi in check_conflict(). - libdpkg: Add new C locale switch over support. + - libdpkg: Add new versiondescribe_c() to force a C locale. * Build system: - Bump minimal Perl version to 5.24.1. - Add a serial versioning to the m4 files. diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index 3e9158def..10de6d3e2 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -392,6 +392,8 @@ int parseversion(struct dpkg_version *version, const char *, struct dpkg_error *err); const char *versiondescribe(const struct dpkg_version *, enum versiondisplayepochwhen); +const char *versiondescribe_c(const struct dpkg_version *version, + enum versiondisplayepochwhen vdew); enum pkg_name_arch_when { /** Never display arch. */ diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 9dd699358..953944752 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -256,6 +256,7 @@ LIBDPKG_PRIVATE { dpkg_version_compare; dpkg_version_relate; versiondescribe; + versiondescribe_c; parseversion; # Architecture database diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c index a9095f1f4..34247269e 100644 --- a/lib/dpkg/parsehelp.c +++ b/lib/dpkg/parsehelp.c @@ -188,6 +188,20 @@ const char *versiondescribe return vb->buf; } +const char * +versiondescribe_c(const struct dpkg_version *version, + enum versiondisplayepochwhen vdew) +{ + struct dpkg_locale oldloc; + const char *str; + + oldloc = dpkg_locale_switch_C(); + str = versiondescribe(version, vdew); + dpkg_locale_switch_back(oldloc); + + return str; +} + /** * Parse a version string and check for invalid syntax. * -- cgit v1.2.3 From 3bc743fdc134a1eb5e7b14c122beda5f77d683b6 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 2 Sep 2019 13:03:31 +0200 Subject: libdpkg, dpkg: Use new versiondescribe_c() for non-localizable call sites The output on log files must not be localized. Reported-by: Julien Cristau --- debian/changelog | 3 +++ lib/dpkg/dbmodify.c | 2 +- src/archives.c | 6 +++--- src/enquiry.c | 4 ++-- src/help.c | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index e89b28849..93751ff7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,9 @@ dpkg (1.20.0) UNRELEASED; urgency=medium versioning, as volatile.debian.org was decommissioned some time ago. * dpkg-genchanges, dpkg-mergechangelogs: Match ~deb also as a backport marker in versions. Closes: #934980 + * libdpkg, dpkg: Use new versiondescribe_c() for non-localizable call sites, + such as when writing to a log, which should not be localized. + Reported by Julien Cristau . * Perl modules: - Dpkg::Source::Package: Verify original tarball signatures at build time. - Dpkg::BuildFlags: Add new unset() method. diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c index 3d77270fb..763293170 100644 --- a/lib/dpkg/dbmodify.c +++ b/lib/dpkg/dbmodify.c @@ -452,7 +452,7 @@ void modstatdb_note(struct pkginfo *pkg) { if (pkg->status_dirty) { log_message("status %s %s %s", pkg_status_name(pkg), pkg_name(pkg, pnaw_always), - versiondescribe(&pkg->installed.version, vdew_nonambig)); + versiondescribe_c(&pkg->installed.version, vdew_nonambig)); statusfd_send("status: %s: %s", pkg_name(pkg, pnaw_nonambig), pkg_status_name(pkg)); diff --git a/src/archives.c b/src/archives.c index 84cc10f2a..1f2c9df5d 100644 --- a/src/archives.c +++ b/src/archives.c @@ -323,12 +323,12 @@ does_replace(struct pkginfo *new_pkg, struct pkgbin *new_pkgbin, debug(dbg_depcon,"does_replace new=%s old=%s (%s)", pkgbin_name(new_pkg, new_pkgbin, pnaw_always), pkgbin_name(old_pkg, old_pkgbin, pnaw_always), - versiondescribe(&old_pkgbin->version, vdew_always)); + versiondescribe_c(&old_pkgbin->version, vdew_always)); for (dep = new_pkgbin->depends; dep; dep = dep->next) { if (dep->type != dep_replaces || dep->list->ed != old_pkg->set) continue; debug(dbg_depcondetail,"does_replace ... found old, version %s", - versiondescribe(&dep->list->version,vdew_always)); + versiondescribe_c(&dep->list->version,vdew_always)); if (!versionsatisfied(old_pkgbin, dep->list)) continue; /* The test below can only trigger if dep_replaces start having @@ -828,7 +828,7 @@ tarobject(struct tar_archive *tar, struct tar_entry *ti) refcounting = true; debug(dbg_eachfiledetail, "tarobject ... shared with %s %s (syncing=%d)", pkg_name(otherpkg, pnaw_always), - versiondescribe(&otherpkg->installed.version, vdew_nonambig), + versiondescribe_c(&otherpkg->installed.version, vdew_nonambig), tc->pkgset_getting_in_sync); continue; } diff --git a/src/enquiry.c b/src/enquiry.c index dd7069eb8..4c67dffa7 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -742,8 +742,8 @@ cmpversions(const char *const *argv) } rc = dpkg_version_compare(&a, &b); debug(dbg_general, "cmpversions a='%s' b='%s' r=%d", - versiondescribe(&a,vdew_always), - versiondescribe(&b,vdew_always), + versiondescribe_c(&a,vdew_always), + versiondescribe_c(&b,vdew_always), rc); if (rc > 0) return rip->if_greater; diff --git a/src/help.c b/src/help.c index 382b3638c..f8f8a8070 100644 --- a/src/help.c +++ b/src/help.c @@ -349,8 +349,8 @@ void log_action(const char *action, struct pkginfo *pkg, struct pkgbin *pkgbin) { log_message("%s %s %s %s", action, pkgbin_name(pkg, pkgbin, pnaw_always), - versiondescribe(&pkg->installed.version, vdew_nonambig), - versiondescribe(&pkg->available.version, vdew_nonambig)); + versiondescribe_c(&pkg->installed.version, vdew_nonambig), + versiondescribe_c(&pkg->available.version, vdew_nonambig)); statusfd_send("processing: %s: %s", action, pkgbin_name(pkg, pkgbin, pnaw_nonambig)); } -- cgit v1.2.3 From 032da9675c087abab819d0346765b874e8daf685 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 2 Oct 2019 04:13:19 +0200 Subject: libdpkg: Use p instead of name in dpkg_arch_name_is_illegal() We assign name to p, which we operate on everywhere in this function except for the first check which we still perform on name. This confuses at least cppcheck, and it's in any case inconsistent. Warned-by: cppcheck Fixes: nullPointerRedundantCheck --- debian/changelog | 1 + lib/dpkg/arch.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 07ce962c9..5991d84b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium - libdpkg: Add new C locale switch over support. - libdpkg: Add new versiondescribe_c() to force a C locale. - dselect: Make baselist::draw_column_*() col arguments const. + - libdpkg: Use p instead of name in dpkg_arch_name_is_illegal(). * Build system: - Bump minimal Perl version to 5.24.1. - Add a serial versioning to the m4 files. diff --git a/lib/dpkg/arch.c b/lib/dpkg/arch.c index 83c6579f1..96f261704 100644 --- a/lib/dpkg/arch.c +++ b/lib/dpkg/arch.c @@ -58,7 +58,7 @@ dpkg_arch_name_is_illegal(const char *name) static char buf[150]; const char *p = name; - if (name == NULL) + if (p == NULL) internerr("arch name argument is NULL"); if (!*p) return _("may not be empty string"); -- cgit v1.2.3 From 5aae5e10375d5956d639eaf23a49b842bf109b17 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 3 Nov 2019 00:00:18 +0100 Subject: libdpkg: Add missing symbols to the version map Several of these are used by the test suite. --- debian/changelog | 1 + lib/dpkg/libdpkg.map | 7 +++++++ 2 files changed, 8 insertions(+) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index 30aac0626..b66d3c00f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium - libdpkg: Use p instead of name in dpkg_arch_name_is_illegal(). - dpkg: Remove redudant condition for sourcefile in updateavailable(). - dpkg, update-alternatives: Make variables static. + - libdpkg: Add missing symbols to the version map. * Build system: - Bump minimal Perl version to 5.24.1. - Add a serial versioning to the m4 files. diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 953944752..dc58738ea 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -140,6 +140,7 @@ LIBDPKG_PRIVATE { dir_sync_path_parent; dir_sync_contents; + treenode_get_name; treenode_get_mode; treenode_get_virtname; treenode_get_pathname; @@ -147,9 +148,11 @@ LIBDPKG_PRIVATE { treewalk_node; treewalk_next; treewalk_close; + treewalk; file_copy_perms; file_show; + file_slurp; atomic_file_new; atomic_file_open; @@ -192,6 +195,7 @@ LIBDPKG_PRIVATE { pager_get_exec; pager_spawn; pager_reap; + pager_enable; setcloexec; @@ -327,6 +331,7 @@ LIBDPKG_PRIVATE { pkg_hash_find_set; pkg_hash_find_singleton; pkg_hash_find_pkg; + pkg_hash_get_singleton; pkg_hash_count_set; pkg_hash_count_pkg; pkg_hash_reset; @@ -336,6 +341,7 @@ LIBDPKG_PRIVATE { pkg_hash_iter_free; # Package field handling + booleaninfos; # XXX variable, do not export fieldinfos; # XXX variable, do not export find_field_info; find_arbfield_info; @@ -412,6 +418,7 @@ LIBDPKG_PRIVATE { fsys_hash_reset; fsys_hash_entries; fsys_hash_find_node; + fsys_hash_report; fsys_hash_iter_new; fsys_hash_iter_next; -- cgit v1.2.3 From 956272322b1a54a4fc8c539ac4000add8dfb6007 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 4 Mar 2019 23:00:18 +0100 Subject: dpkg-query: Try to use the description from the available file if not installed When we have been requested to load the available file, and that contains a description for a package that is not installed, we should use that instead of printing the confusing string stating that the description is not available. Closes: #43573 --- debian/changelog | 2 ++ lib/dpkg/libdpkg.map | 1 + lib/dpkg/pkg-show.c | 33 +++++++++++++++++++++++++++++++++ lib/dpkg/pkg-show.h | 2 ++ src/querycmd.c | 4 ++-- 5 files changed, 40 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/debian/changelog b/debian/changelog index b66d3c00f..2fa7c28f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium * libdpkg, dpkg: Use new versiondescribe_c() for non-localizable call sites, such as when writing to a log, which should not be localized. Reported by Julien Cristau . + * dpkg-query: Try to use the package synopsis from the available file if + not installed. Closes: #43573 * Perl modules: - Dpkg::Source::Package: Verify original tarball signatures at build time. - Dpkg::BuildFlags: Add new unset() method. diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index dc58738ea..33297a8bf 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -300,6 +300,7 @@ LIBDPKG_PRIVATE { pkg_name_const; pkg_source_version; pkgbin_synopsis; + pkg_synopsis; pkg_abbrev_want; pkg_abbrev_status; pkg_abbrev_eflag; diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c index 569cbf5c2..67e5af404 100644 --- a/lib/dpkg/pkg-show.c +++ b/lib/dpkg/pkg-show.c @@ -223,6 +223,39 @@ pkgbin_synopsis(const struct pkginfo *pkg, const struct pkgbin *pkgbin, int *len return pdesc; } +/** + * Return a string representation of the package synopsis. + * + * The returned string must not be freed, and it's permanently allocated so + * can be used as long as the non-freeing memory pool has not been freed. + * + * It will try to use the installed version, otherwise it will fallback to + * use the available version. + * + * The package synopsis is the short description, but it is not NUL terminated, + * so the output len argument should be used to limit the string length. + * + * @param pkg The package to consider. + * @param[out] len The length of the synopsis string within the description. + * + * @return The string representation. + */ +const char * +pkg_synopsis(const struct pkginfo *pkg, int *len) +{ + const char *pdesc; + + pdesc = pkg->installed.description; + if (!pdesc) + pdesc = pkg->available.description; + if (!pdesc) + pdesc = _("(no description available)"); + + *len = strcspn(pdesc, "\n"); + + return pdesc; +} + /** * Return a character abbreviated representation of the package want status. * diff --git a/lib/dpkg/pkg-show.h b/lib/dpkg/pkg-show.h index 9ef0ed459..4ac3f5d65 100644 --- a/lib/dpkg/pkg-show.h +++ b/lib/dpkg/pkg-show.h @@ -36,6 +36,8 @@ int pkg_sorter_by_nonambig_name_arch(const void *a, const void *b); const char *pkgbin_synopsis(const struct pkginfo *pkg, const struct pkgbin *pkgbin, int *len_ret); +const char * +pkg_synopsis(const struct pkginfo *pkg, int *len_ret); int pkg_abbrev_want(const struct pkginfo *pkg); int pkg_abbrev_status(const struct pkginfo *pkg); int pkg_abbrev_eflag(const struct pkginfo *pkg); diff --git a/src/querycmd.c b/src/querycmd.c index 472d87f79..eba5e53ef 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -142,7 +142,7 @@ list_format_init(struct list_format *fmt, struct pkg_array *array) vlen = str_width(versiondescribe(&array->pkgs[i]->installed.version, vdew_nonambig)); alen = str_width(dpkg_arch_describe(array->pkgs[i]->installed.arch)); - pkgbin_synopsis(array->pkgs[i], &array->pkgs[i]->installed, &dlen); + pkg_synopsis(array->pkgs[i], &dlen); if (plen > fmt->nw) fmt->nw = plen; @@ -232,7 +232,7 @@ pkg_array_list_item(struct pkg_array *array, struct pkginfo *pkg, void *pkg_data list_format_init(fmt, array); list_format_print_header(fmt); - pdesc = pkgbin_synopsis(pkg, &pkg->installed, &l); + pdesc = pkg_synopsis(pkg, &l); l = min(l, fmt->dw); list_format_print(fmt, -- cgit v1.2.3