diff --git a/sys-apps/coreutils/coreutils-9.1.recipe b/sys-apps/coreutils/coreutils-9.3.recipe similarity index 98% rename from sys-apps/coreutils/coreutils-9.1.recipe rename to sys-apps/coreutils/coreutils-9.3.recipe index 8655e010d..67de7557d 100644 --- a/sys-apps/coreutils/coreutils-9.1.recipe +++ b/sys-apps/coreutils/coreutils-9.3.recipe @@ -20,7 +20,7 @@ LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://ftpmirror.gnu.org/coreutils/coreutils-$portVersion.tar.xz https://ftp.gnu.org/gnu/coreutils/coreutils-$portVersion.tar.xz" -CHECKSUM_SHA256="61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423" +CHECKSUM_SHA256="adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa" PATCHES="coreutils-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -276,7 +276,8 @@ PATCH() BUILD() { export CPPFLAGS=-Dst_birthtim=st_crtim - FORCE_UNSAFE_CONFIGURE=1 runConfigure --omit-dirs binDir ./configure \ + FORCE_UNSAFE_CONFIGURE=1 gnulib_cv_have_boot_time=yes \ + runConfigure --omit-dirs binDir ./configure \ --bindir=$commandBinDir \ --without-included-regex \ --disable-rpath --with-gnu-ld \ diff --git a/sys-apps/coreutils/patches/coreutils-9.1.patchset b/sys-apps/coreutils/patches/coreutils-9.3.patchset similarity index 83% rename from sys-apps/coreutils/patches/coreutils-9.1.patchset rename to sys-apps/coreutils/patches/coreutils-9.3.patchset index 858c7517f..8679763a1 100644 --- a/sys-apps/coreutils/patches/coreutils-9.1.patchset +++ b/sys-apps/coreutils/patches/coreutils-9.3.patchset @@ -1,11 +1,11 @@ -From e5e1815a0af4280c4d2176e9ba95efb5e32e2cae Mon Sep 17 00:00:00 2001 +From 43034aff86264576c851188e3293fe2629080faf Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 13 May 2014 17:18:52 +0000 Subject: define __USE_GNU for wempcpy diff --git a/lib/fnmatch.c b/lib/fnmatch.c -index b33a127..a84975d 100644 +index 32cfb48..50ddd73 100644 --- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -23,6 +23,9 @@ @@ -19,17 +19,17 @@ index b33a127..a84975d 100644 #include -- -2.30.2 +2.37.3 -From 7be9386aca21161cfe5b9ea969b7043aa3d7b582 Mon Sep 17 00:00:00 2001 +From f798f2ebc9bfe8a141fcb51bb484c389cd78c11f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 13 May 2014 17:22:10 +0000 Subject: force declaration of rpl_inet_ntop diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h -index f5d7db2..96399e2 100644 +index 80e6713..3b47607 100644 --- a/lib/arpa_inet.in.h +++ b/lib/arpa_inet.in.h @@ -78,7 +78,7 @@ @@ -42,17 +42,17 @@ index f5d7db2..96399e2 100644 # undef inet_ntop # define inet_ntop rpl_inet_ntop -- -2.30.2 +2.37.3 -From 4cb50474e898d22a044c7558e9305eec934404ac Mon Sep 17 00:00:00 2001 +From ea43cb0c3573e5519b4320c8273f9a896b7eb611 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 13 May 2014 17:32:36 +0000 Subject: Haiku defines mknod in unistd.h diff --git a/lib/mknod.c b/lib/mknod.c -index 3627ee3..56d7866 100644 +index 688f0fb..e007e73 100644 --- a/lib/mknod.c +++ b/lib/mknod.c @@ -18,6 +18,7 @@ @@ -64,17 +64,17 @@ index 3627ee3..56d7866 100644 #include -- -2.30.2 +2.37.3 -From a412c27a91c895540e340a05f147fbdbbdc5965d Mon Sep 17 00:00:00 2001 +From d8847e4f6c96f0cbc14b865a6f02ae5cce4e4e7d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 13 May 2014 17:35:25 +0000 Subject: protect the label, not used on Haiku diff --git a/lib/mountlist.c b/lib/mountlist.c -index fac5c45..1c2812a 100644 +index 6d38481..80648a1 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -1089,7 +1089,8 @@ read_file_system_list (bool need_fs_type) @@ -96,17 +96,17 @@ index fac5c45..1c2812a 100644 /* Free a mount entry as returned from read_file_system_list (). */ -- -2.30.2 +2.37.3 -From 408e4290cd364356e97edf9304a5cf238a5a61da Mon Sep 17 00:00:00 2001 +From 013d89850468348be5edab7acb09a26305277dd9 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 15 May 2014 15:40:32 +0000 Subject: strchrnul needs __USE_GNU on Haiku diff --git a/lib/regex.h b/lib/regex.h -index a7e0bd0..691334a 100644 +index 9ef0252..6c453cf 100644 --- a/lib/regex.h +++ b/lib/regex.h @@ -30,8 +30,10 @@ extern "C" { @@ -121,7 +121,7 @@ index a7e0bd0..691334a 100644 #ifdef _REGEX_LARGE_OFFSETS diff --git a/lib/string.in.h b/lib/string.in.h -index c943294..26f556b 100644 +index b6bf432..123822f 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -37,6 +37,9 @@ @@ -135,20 +135,20 @@ index c943294..26f556b 100644 #undef _GL_ALREADY_INCLUDING_STRING_H -- -2.30.2 +2.37.3 -From 70f9f980cb41d00f338d9968b3221503918f4edf Mon Sep 17 00:00:00 2001 +From a38548237701b354121565c32eba03d98f707d7e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 15 May 2014 20:13:58 +0000 Subject: don't build hostid, nice, users, who diff --git a/Makefile.in b/Makefile.in -index 6011805..fb6146d 100644 +index f26504c..63091a2 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -1145,8 +1145,8 @@ CONFIG_CLEAN_FILES = +@@ -1158,8 +1158,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__EXEEXT_1 = src/arch$(EXEEXT) src/coreutils$(EXEEXT) \ src/hostname$(EXEEXT) @@ -159,7 +159,7 @@ index 6011805..fb6146d 100644 src/stdbuf$(EXEEXT) src/stty$(EXEEXT) src/timeout$(EXEEXT) \ src/uptime$(EXEEXT) src/users$(EXEEXT) src/who$(EXEEXT) am__EXEEXT_3 = src/[$(EXEEXT) src/b2sum$(EXEEXT) src/base64$(EXEEXT) \ -@@ -6589,7 +6589,7 @@ WARN_ON_USE_H = $(top_srcdir)/lib/warn-on-use.h +@@ -6742,7 +6742,7 @@ WARN_ON_USE_H = $(top_srcdir)/lib/warn-on-use.h # FIXME: once lib/ and gnulib-tests/ are also converted, hoist to Makefile.am AM_CFLAGS = $(WERROR_CFLAGS) no_install__progs = src/arch src/coreutils src/hostname @@ -169,26 +169,26 @@ index 6011805..fb6146d 100644 src/timeout src/uptime src/users src/who default__progs = src/[ src/b2sum src/base64 src/base32 src/basenc \ -- -2.30.2 +2.37.3 -From 4024d54f8c1bf10cb4bc8819ff2dec64ec5ba4d3 Mon Sep 17 00:00:00 2001 +From 1d7f7bef64a1d062efa6ab38acdb0bb879d1d08b Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 6 Feb 2015 20:24:12 +0000 Subject: import Haiku changes, fix warnings. diff --git a/INSTALL b/INSTALL -index e82fd21..771315d 100644 +index 6e3904a..a44e797 100644 --- a/INSTALL +++ b/INSTALL @@ -245,10 +245,10 @@ directory contains several dysfunctional programs; working variants of - these programs are available in '/usr/bin'. So, if you need '/usr/ucb' - in your 'PATH', put it _after_ '/usr/bin'. + these programs are available in ‘/usr/bin’. So, if you need ‘/usr/ucb’ + in your ‘PATH’, put it _after_ ‘/usr/bin’. -- On Haiku, software installed for all users goes in '/boot/common', -+ On Haiku, software installed for all users goes in '/boot/system', - not '/usr/local'. It is recommended to use the following options: +- On Haiku, software installed for all users goes in ‘/boot/common’, ++ On Haiku, software installed for all users goes in ‘/boot/system’, + not ‘/usr/local’. It is recommended to use the following options: - ./configure --prefix=/boot/common + ./configure --prefix=/boot/system @@ -196,7 +196,7 @@ index e82fd21..771315d 100644 Specifying the System Type ========================== diff --git a/lib/localcharset.c b/lib/localcharset.c -index 17a4a1e..1fbd2d3 100644 +index 7ed9c95..ca6d890 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -41,6 +41,13 @@ @@ -214,7 +214,7 @@ index 17a4a1e..1fbd2d3 100644 #if !defined WINDOWS_NATIVE diff --git a/src/copy.c b/src/copy.c -index b15d919..2b1549a 100644 +index 13d9332..af94f6b 100644 --- a/src/copy.c +++ b/src/copy.c @@ -18,6 +18,7 @@ @@ -236,7 +236,7 @@ index b15d919..2b1549a 100644 #if USE_XATTR # include # include -@@ -601,6 +606,92 @@ is_ancestor (const struct stat *sb, const struct dir_list *ancestors) +@@ -697,6 +702,92 @@ is_ancestor (const struct stat *sb, const struct dir_list *ancestors) return false; } @@ -329,7 +329,7 @@ index b15d919..2b1549a 100644 static bool errno_unsupported (int err) { -@@ -744,6 +835,10 @@ copy_dir (char const *src_name_in, char const *dst_name_in, +@@ -840,6 +931,10 @@ copy_dir (char const *src_name_in, char const *dst_name_in, error (0, errno, _("cannot access %s"), quoteaf (src_name_in)); return false; } @@ -340,9 +340,9 @@ index b15d919..2b1549a 100644 /* For cp's -H option, dereference command line arguments, but do not dereference symlinks that are found via recursive traversal. */ -@@ -1447,6 +1542,11 @@ copy_reg (char const *src_name, char const *dst_name, - return_val = false; - } +@@ -1533,6 +1628,11 @@ copy_reg (char const *src_name, char const *dst_name, + return_val = false; + goto close_src_and_dst_desc; } + + if (x->ignore_attributes == 0 @@ -350,9 +350,9 @@ index b15d919..2b1549a 100644 + fprintf(stderr, "%s: could not copy attributes\n", src_name); + - close_src_and_dst_desc: - if (close (dest_desc) < 0) -@@ -2468,6 +2568,12 @@ copy_internal (char const *src_name, char const *dst_name, + /* If extra permissions needed for copy_xattr didn't happen (e.g., + due to umask) chmod to add them temporarily; if that fails give +@@ -2747,6 +2847,12 @@ skip: true, x->verbose, dereference)) goto un_backup; @@ -365,7 +365,7 @@ index b15d919..2b1549a 100644 return true; } } -@@ -2900,6 +3006,11 @@ copy_internal (char const *src_name, char const *dst_name, +@@ -3177,6 +3283,11 @@ skip: preserving owner/group is a potential security problem. */ } } @@ -378,10 +378,10 @@ index b15d919..2b1549a 100644 else { diff --git a/src/copy.h b/src/copy.h -index 1f1de86..f8365cf 100644 +index ea5023c..f84c3e0 100644 --- a/src/copy.h +++ b/src/copy.h -@@ -189,6 +189,9 @@ struct cp_options +@@ -202,6 +202,9 @@ struct cp_options must be false. */ bool require_preserve; @@ -392,7 +392,7 @@ index 1f1de86..f8365cf 100644 Set this only if the kernel is SELinux enabled. */ bool preserve_security_context; diff --git a/src/cp.c b/src/cp.c -index 0f44b35..31f5764 100644 +index 488770a..4251400 100644 --- a/src/cp.c +++ b/src/cp.c @@ -61,6 +61,7 @@ struct dir_attr @@ -401,17 +401,17 @@ index 0f44b35..31f5764 100644 ATTRIBUTES_ONLY_OPTION = CHAR_MAX + 1, + IGNORE_ATTRIBUTES, COPY_CONTENTS_OPTION, + DEBUG_OPTION, NO_PRESERVE_ATTRIBUTES_OPTION, - PARENTS_OPTION, -@@ -109,6 +110,7 @@ static struct option const long_opts[] = - {"copy-contents", no_argument, NULL, COPY_CONTENTS_OPTION}, +@@ -121,6 +122,7 @@ static struct option const long_opts[] = + {"debug", no_argument, NULL, DEBUG_OPTION}, {"dereference", no_argument, NULL, 'L'}, {"force", no_argument, NULL, 'f'}, + {"ignore-attributes", no_argument, NULL, IGNORE_ATTRIBUTES}, {"interactive", no_argument, NULL, 'i'}, {"link", no_argument, NULL, 'l'}, {"no-clobber", no_argument, NULL, 'n'}, -@@ -167,6 +169,7 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\ +@@ -182,6 +184,7 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\ -f, --force if an existing destination file cannot be\n\ opened, remove it and try again (this option\n\ is ignored when the -n option is also used)\n\ @@ -419,7 +419,7 @@ index 0f44b35..31f5764 100644 -i, --interactive prompt before overwrite (overrides a previous -n\ \n\ option)\n\ -@@ -812,6 +815,7 @@ cp_option_init (struct cp_options *x) +@@ -838,6 +841,7 @@ cp_option_init (struct cp_options *x) x->data_copy_required = true; x->require_preserve = false; x->recursive = false; @@ -427,7 +427,7 @@ index 0f44b35..31f5764 100644 x->sparse_mode = SPARSE_AUTO; x->symbolic_link = false; x->set_mode = false; -@@ -1013,6 +1017,10 @@ main (int argc, char **argv) +@@ -1043,6 +1047,10 @@ main (int argc, char **argv) x.dereference = DEREF_COMMAND_LINE_ARGUMENTS; break; @@ -439,10 +439,10 @@ index 0f44b35..31f5764 100644 x.interactive = I_ASK_USER; break; diff --git a/src/dircolors.h b/src/dircolors.h -index abe1a1f..1972483 100644 +index 88f6a6b..0e71dce 100644 --- a/src/dircolors.h +++ b/src/dircolors.h -@@ -64,7 +64,7 @@ static char const G_line[] = +@@ -71,7 +71,7 @@ static char const G_line[] = 'S','E','T','G','I','D',' ','3','0',';','4','3',' ','#',' ','f','i','l','e',' ','t','h','a','t',' ','i','s',' ','s','e','t','g','i','d',' ','(','g','+','s',')',0, 'C','A','P','A','B','I','L','I','T','Y',' ','0','0',' ','#',' ','f','i','l','e',' ','w','i','t','h',' ','c','a','p','a','b','i','l','i','t','y',' ','(','v','e','r','y',' ','e','x','p','e','n','s','i','v','e',' ','t','o',' ','l','o','o','k','u','p',')',0, 'S','T','I','C','K','Y','_','O','T','H','E','R','_','W','R','I','T','A','B','L','E',' ','3','0',';','4','2',' ','#',' ','d','i','r',' ','t','h','a','t',' ','i','s',' ','s','t','i','c','k','y',' ','a','n','d',' ','o','t','h','e','r','-','w','r','i','t','a','b','l','e',' ','(','+','t',',','o','+','w',')',0, @@ -452,10 +452,10 @@ index abe1a1f..1972483 100644 '#',' ','T','h','i','s',' ','i','s',' ','f','o','r',' ','f','i','l','e','s',' ','w','i','t','h',' ','e','x','e','c','u','t','e',' ','p','e','r','m','i','s','s','i','o','n',':',0, 'E','X','E','C',' ','0','1',';','3','2',0, diff --git a/src/dircolors.hin b/src/dircolors.hin -index f117359..e189948 100644 +index 262e1b5..9441659 100644 --- a/src/dircolors.hin +++ b/src/dircolors.hin -@@ -67,7 +67,7 @@ SETUID 37;41 # file that is setuid (u+s) +@@ -74,7 +74,7 @@ SETUID 37;41 # file that is setuid (u+s) SETGID 30;43 # file that is setgid (g+s) CAPABILITY 00 # file with capability (very expensive to lookup) STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) @@ -465,10 +465,10 @@ index f117359..e189948 100644 # This is for files with execute permission: diff --git a/src/ls.c b/src/ls.c -index d15a103..de10484 100644 +index 71d94fd..9e4fb98 100644 --- a/src/ls.c +++ b/src/ls.c -@@ -719,6 +719,11 @@ static struct ignore_pattern *hide_patterns; +@@ -720,6 +720,11 @@ static struct ignore_pattern *hide_patterns; want to mess up the terminal if control chars get sent to it, and some quoting methods pass through control chars as-is. */ static bool qmark_funny_chars; @@ -480,7 +480,7 @@ index d15a103..de10484 100644 /* Quoting options for file and dir name output. */ -@@ -4400,6 +4405,7 @@ print_long_format (const struct fileinfo *f) +@@ -4447,6 +4452,7 @@ print_long_format (const struct fileinfo *f) p = buf; } @@ -488,7 +488,7 @@ index d15a103..de10484 100644 if (f->stat_ok && (S_ISCHR (f->stat.st_mode) || S_ISBLK (f->stat.st_mode))) { -@@ -4415,6 +4421,7 @@ print_long_format (const struct fileinfo *f) +@@ -4462,6 +4468,7 @@ print_long_format (const struct fileinfo *f) umaxtostr (minor (f->stat.st_rdev), minorbuf)); } else @@ -497,10 +497,10 @@ index d15a103..de10484 100644 char hbuf[LONGEST_HUMAN_READABLE + 1]; char const *size = diff --git a/src/mv.c b/src/mv.c -index 53b9c13..8d8c7be 100644 +index fc2bf77..b5eeb66 100644 --- a/src/mv.c +++ b/src/mv.c -@@ -127,6 +127,7 @@ cp_option_init (struct cp_options *x) +@@ -142,6 +142,7 @@ cp_option_init (struct cp_options *x) x->reduce_diagnostics = false; x->data_copy_required = true; x->require_preserve = false; /* FIXME: maybe make this an option */ @@ -509,10 +509,10 @@ index 53b9c13..8d8c7be 100644 x->preserve_xattr = true; x->require_preserve_xattr = false; diff --git a/src/remove.c b/src/remove.c -index b5d1ea8..f3b3a6b 100644 +index e1da19e..81cf9c8 100644 --- a/src/remove.c +++ b/src/remove.c -@@ -215,7 +215,7 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir, +@@ -219,7 +219,7 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir, wp_errno = errno; } @@ -522,7 +522,7 @@ index b5d1ea8..f3b3a6b 100644 if (0 <= write_protected && dirent_type == DT_UNKNOWN) { diff --git a/src/uname.c b/src/uname.c -index 385674f..cdb9e81 100644 +index 921a881..10cfedb 100644 --- a/src/uname.c +++ b/src/uname.c @@ -44,6 +44,10 @@ @@ -568,29 +568,10 @@ index 385674f..cdb9e81 100644 print_element (element); } -- -2.30.2 +2.37.3 -From 01549c096a5b86c11402f63e616a5195cc9509ec Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 21 Oct 2021 20:28:22 +0200 -Subject: config.h is required for stdint.h - - -diff --git a/src/crctab.c b/src/crctab.c -index 20a1e41..fdf2fdf 100644 ---- a/src/crctab.c -+++ b/src/crctab.c -@@ -1,3 +1,4 @@ -+#include - #include - - uint_fast32_t const crctab[8][256] = { --- -2.30.2 - - -From 98f0505371e0b0e9626897ec20c4a4a097224659 Mon Sep 17 00:00:00 2001 +From b159ee4f9f2c2102632fce389cdf17e39b64e68e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 1 Nov 2021 21:08:55 +0100 Subject: ln: handle negative errno @@ -598,10 +579,10 @@ Subject: ln: handle negative errno explicit check for -1 which is a special value in this code. diff --git a/src/copy.c b/src/copy.c -index 2b1549a..74cda27 100644 +index af94f6b..480da37 100644 --- a/src/copy.c +++ b/src/copy.c -@@ -1966,7 +1966,7 @@ create_hard_link (char const *src_name, int src_dirfd, char const *src_relname, +@@ -2225,7 +2225,7 @@ create_hard_link (char const *src_name, int src_dirfd, char const *src_relname, int err = force_linkat (src_dirfd, src_relname, dst_dirfd, dst_relname, dereference ? AT_SYMLINK_FOLLOW : 0, replace, -1); @@ -610,7 +591,7 @@ index 2b1549a..74cda27 100644 { char *a_src_name = NULL; -@@ -1978,7 +1978,7 @@ create_hard_link (char const *src_name, int src_dirfd, char const *src_relname, +@@ -2237,7 +2237,7 @@ create_hard_link (char const *src_name, int src_dirfd, char const *src_relname, free (a_src_name); return false; } @@ -619,7 +600,7 @@ index 2b1549a..74cda27 100644 printf (_("removed %s\n"), quoteaf (dst_name)); return true; } -@@ -2869,7 +2869,7 @@ copy_internal (char const *src_name, char const *dst_name, +@@ -3146,7 +3146,7 @@ skip: int err = force_symlinkat (src_name, dst_dirfd, dst_relname, x->unlink_dest_after_failed_open, -1); @@ -628,7 +609,7 @@ index 2b1549a..74cda27 100644 { error (0, err, _("cannot create symbolic link %s to %s"), quoteaf_n (0, dst_name), quoteaf_n (1, src_name)); -@@ -2956,7 +2956,8 @@ copy_internal (char const *src_name, char const *dst_name, +@@ -3233,7 +3233,8 @@ skip: int symlink_err = force_symlinkat (src_link_val, dst_dirfd, dst_relname, x->unlink_dest_after_failed_open, -1); @@ -638,7 +619,7 @@ index 2b1549a..74cda27 100644 && dst_sb.st_size == strlen (src_link_val)) { /* See if the destination is already the desired symlink. -@@ -2973,7 +2974,7 @@ copy_internal (char const *src_name, char const *dst_name, +@@ -3250,7 +3251,7 @@ skip: } } free (src_link_val); @@ -648,7 +629,7 @@ index 2b1549a..74cda27 100644 error (0, symlink_err, _("cannot create symbolic link %s"), quoteaf (dst_name)); diff --git a/src/ln.c b/src/ln.c -index bb46958..4cfa36e 100644 +index 1c3307c..653db04 100644 --- a/src/ln.c +++ b/src/ln.c @@ -154,7 +154,7 @@ convert_abs_rel (char const *from, char const *target) @@ -697,21 +678,21 @@ index bb46958..4cfa36e 100644 fail: free (rel_source); -- -2.30.2 +2.37.3 -From 37f12fc0ac8373632c58616302cb989fae7f28f8 Mon Sep 17 00:00:00 2001 +From 2febaf9bff542af24f6b7945dbf4f9337a67a873 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 16 Nov 2021 10:22:30 +0100 Subject: uptime: make utmp error not critical diff --git a/src/uptime.c b/src/uptime.c -index 1adacaa..711ea60 100644 +index 061b85c..8b94aa2 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -105,7 +105,7 @@ print_uptime (size_t n, const STRUCT_UTMP *this) - #if HAVE_UTMPX_H || HAVE_UTMP_H + #if HAVE_STRUCT_UTMP_UT_TYPE || HAVE_STRUCT_UTMPX_UT_TYPE /* Loop through all the utmp entries we just read and count up the valid ones, also in the process possibly gleaning boottime. */ - while (n--) @@ -721,7 +702,7 @@ index 1adacaa..711ea60 100644 if (UT_TYPE_BOOT_TIME (this)) @@ -181,7 +181,11 @@ uptime (char const *filename, int options) - #if HAVE_UTMPX_H || HAVE_UTMP_H + #if HAVE_STRUCT_UTMP_UT_TYPE || HAVE_STRUCT_UTMPX_UT_TYPE if (read_utmp (filename, &n_users, &utmp_buf, options) != 0) +#if HAVE_OS_H + ; @@ -732,5 +713,5 @@ index 1adacaa..711ea60 100644 print_uptime (n_users, utmp_buf); -- -2.30.2 +2.37.3