haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-12 06:40:08 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
d1494deec257e85a72c54c623d0d43fc58eacf10
haikuports/sys-apps/coreutils/patches/coreutils-9.3.patchset
PulkoMandy d47920e1e9 coreutils: fix error message printed by stty
2023-06-30 20:25:36 +02:00

744 lines
23 KiB
Plaintext
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
From 8c27218d12e50d29143ee4478a649ab49ead6149 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 32cfb48..50ddd73 100644
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -23,6 +23,9 @@
#ifndef _GNU_SOURCE
# define _GNU_SOURCE 1
#endif
+#ifndef __USE_GNU
+# define __USE_GNU 1
+#endif
#include <fnmatch.h>
--
2.37.3
From 85c5da8a71d0e1257bbb4f035172ddfb94ffb1e3 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 80e6713..3b47607 100644
--- a/lib/arpa_inet.in.h
+++ b/lib/arpa_inet.in.h
@@ -78,7 +78,7 @@
For more details, see the POSIX:2008 specification
<https://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_ntop.html>. */
-# if @REPLACE_INET_NTOP@
+# if 1
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef inet_ntop
# define inet_ntop rpl_inet_ntop
--
2.37.3
From 1474c5e6e8dfce8e7e9970b9c57d87e065d0ec49 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 688f0fb..e007e73 100644
--- a/lib/mknod.c
+++ b/lib/mknod.c
@@ -18,6 +18,7 @@
#include <config.h>
+#include <unistd.h>
#include <sys/stat.h>
#include <errno.h>
--
2.37.3
From 93de6ff9a879ab474397e516b04f3688864c44e7 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 6d38481..80648a1 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -1089,7 +1089,8 @@ read_file_system_list (bool need_fs_type)
return mount_list;
- free_then_fail: _GL_UNUSED_LABEL;
+ #ifndef __HAIKU__
+free_then_fail: _GL_UNUSED_LABEL;
{
int saved_errno = errno;
*mtail = NULL;
@@ -1104,6 +1105,7 @@ read_file_system_list (bool need_fs_type)
errno = saved_errno;
return NULL;
}
+#endif
}
/* Free a mount entry as returned from read_file_system_list (). */
--
2.37.3
From f77b2c1593a5845be6c584200405c0dd40b10f81 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 9ef0252..6c453cf 100644
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -30,8 +30,10 @@ extern "C" {
/* Define __USE_GNU to declare GNU extensions that violate the
POSIX name space rules. */
#ifdef _GNU_SOURCE
+#ifndef __USE_GNU
# define __USE_GNU 1
#endif
+#endif
#ifdef _REGEX_LARGE_OFFSETS
diff --git a/lib/string.in.h b/lib/string.in.h
index b6bf432..123822f 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -37,6 +37,9 @@
#define _GL_ALREADY_INCLUDING_STRING_H
/* The include_next requires a split double-inclusion guard. */
+#ifndef __USE_GNU
+#define __USE_GNU
+#endif
#@INCLUDE_NEXT@ @NEXT_STRING_H@
#undef _GL_ALREADY_INCLUDING_STRING_H
--
2.37.3
From 9c008dffc70a06fd44a8b02a699c07268f7dc45e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 f26504c..63091a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1158,8 +1158,8 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__EXEEXT_1 = src/arch$(EXEEXT) src/coreutils$(EXEEXT) \
src/hostname$(EXEEXT)
-am__EXEEXT_2 = src/chroot$(EXEEXT) src/df$(EXEEXT) src/hostid$(EXEEXT) \
- src/libstdbuf.so$(EXEEXT) src/nice$(EXEEXT) src/pinky$(EXEEXT) \
+am__EXEEXT_2 = src/chroot$(EXEEXT) src/df$(EXEEXT) \
+ src/libstdbuf.so$(EXEEXT) \
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) \
@@ -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
-build_if_possible__progs = src/chroot src/df src/hostid \
+build_if_possible__progs = src/chroot src/df \
src/libstdbuf.so src/nice src/pinky src/stdbuf src/stty \
src/timeout src/uptime src/users src/who
default__progs = src/[ src/b2sum src/base64 src/base32 src/basenc \
--
2.37.3
From fa32a4ac99ec0d27d279114a0416cd4852460ebe Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 6 Feb 2015 20:24:12 +0000
Subject: import Haiku changes, fix warnings.
diff --git a/INSTALL b/INSTALL
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’.
- 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
Specifying the System Type
==========================
diff --git a/lib/localcharset.c b/lib/localcharset.c
index 7ed9c95..ca6d890 100644
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -41,6 +41,13 @@
# ifndef OS2
# define OS2
# endif
+
+# if defined __HAIKU__
+ /* To avoid the troubles of installing a separate file in the same
+ directory as the DLL and of retrieving the DLL's directory at
+ runtime, simply inline the aliases here. */
+ cp = "UTF-8" "\0";
+# endif
#endif
#if !defined WINDOWS_NATIVE
diff --git a/src/copy.c b/src/copy.c
index 13d9332..af94f6b 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -18,6 +18,7 @@
#include <config.h>
#include <stdio.h>
+#include <unistd.h>
#include <assert.h>
#include <sys/ioctl.h>
#include <sys/types.h>
@@ -69,6 +70,10 @@
# define USE_XATTR false
#endif
+#if (defined(__BEOS__) || defined(__HAIKU__))
+# include <fs_attr.h>
+#endif
+
#if USE_XATTR
# include <attr/error_context.h>
# include <attr/libattr.h>
@@ -697,6 +702,92 @@ is_ancestor (const struct stat *sb, const struct dir_list *ancestors)
return false;
}
+
+static int
+copy_attributes(int fromFd, int toFd)
+{
+ struct dirent *dirent;
+ char buffer[65536];
+
+ DIR *attributes = fs_fopen_attr_dir(fromFd);
+ if (attributes == NULL)
+ return errno == B_UNSUPPORTED ? 0 : -1;
+
+ while ((dirent = fs_read_attr_dir(attributes)) != NULL) {
+ struct stat stat;
+ off_t pos = 0;
+ int attrFromFD = fs_fopen_attr(fromFd, dirent->d_name, 0, O_RDONLY);
+ int attrToFD;
+
+ if (attrFromFD < 0)
+ continue;
+
+ if (fstat(attrFromFD, &stat) != 0) {
+ close(attrFromFD);
+ continue;
+ }
+
+ attrToFD = fs_fopen_attr(toFd, dirent->d_name, stat.st_type,
+ O_WRONLY | O_TRUNC | O_CREAT);
+ if (attrToFD < 0) {
+ close(attrFromFD);
+ continue;
+ }
+
+ while (true) {
+ ssize_t bytesRead, bytesWritten;
+
+ bytesRead = read_pos(attrFromFD, pos, buffer, sizeof(buffer));
+ if (bytesRead < 0) {
+ fprintf(stderr, "error reading attribute '%s'", dirent->d_name);
+ break;
+ }
+
+ bytesWritten = write_pos(attrToFD, pos, buffer, bytesRead);
+ if (bytesWritten != bytesRead) {
+ fprintf(stderr, "error writing attribute '%s'", dirent->d_name);
+ break;
+ }
+
+ pos += bytesWritten;
+ stat.st_size -= bytesWritten;
+
+ if (stat.st_size <= 0)
+ break;
+ }
+ close(attrToFD);
+ close(attrFromFD);
+ }
+
+ fs_close_attr_dir(attributes);
+ return 0;
+}
+
+
+static int
+copy_attributes_by_name(const char *from, const char *to, int resolveLinks)
+{
+ int fromFd, toFd, result;
+
+ fromFd = open(from, O_RDONLY | (resolveLinks ? 0 : O_NOTRAVERSE));
+ if (fromFd < 0)
+ return -1;
+
+ toFd = open(to, O_RDONLY | (resolveLinks ? 0 : O_NOTRAVERSE));
+ if (toFd < 0) {
+ close(fromFd);
+ return -1;
+ }
+
+ result = copy_attributes(fromFd, toFd);
+
+ close(fromFd);
+ close(toFd);
+
+ return result;
+}
+
+
static bool
errno_unsupported (int err)
{
@@ -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;
}
+
+ if (x->ignore_attributes == 0
+ && copy_attributes_by_name(src_name_in, dst_name_in, true) != 0)
+ fprintf(stderr, "%s: could not copy attributes\n", src_name_in);
/* For cp's -H option, dereference command line arguments, but do not
dereference symlinks that are found via recursive traversal. */
@@ -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
+ && copy_attributes(source_desc, dest_desc) != 0)
+ fprintf(stderr, "%s: could not copy attributes\n", src_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;
+ if (x->ignore_attributes == 0
+ && copy_attributes_by_name (earlier_file, dst_name,
+ false) != 0)
+ error (0, errno, "cannot copy attributes from %s\n",
+ earlier_file);
+
return true;
}
}
@@ -3177,6 +3283,11 @@ skip:
preserving owner/group is a potential security problem. */
}
}
+
+ if (x->ignore_attributes == 0
+ && copy_attributes_by_name(src_name, dst_name, false) != 0)
+ fprintf(stderr, "%s: could not copy attributes\n", src_name);
+
}
else
{
diff --git a/src/copy.h b/src/copy.h
index ea5023c..f84c3e0 100644
--- a/src/copy.h
+++ b/src/copy.h
@@ -202,6 +202,9 @@ struct cp_options
must be false. */
bool require_preserve;
+ /* If nonzero, attributes will be ignored when copying. */
+ int ignore_attributes;
+
/* If true, attempt to preserve the SELinux security context, too.
Set this only if the kernel is SELinux enabled. */
bool preserve_security_context;
diff --git a/src/cp.c b/src/cp.c
index 488770a..4251400 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -61,6 +61,7 @@ struct dir_attr
enum
{
ATTRIBUTES_ONLY_OPTION = CHAR_MAX + 1,
+ IGNORE_ATTRIBUTES,
COPY_CONTENTS_OPTION,
DEBUG_OPTION,
NO_PRESERVE_ATTRIBUTES_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'},
@@ -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\
+ --ignore-attributes do not copy attributes\n\
-i, --interactive prompt before overwrite (overrides a previous -n\
\n\
option)\n\
@@ -838,6 +841,7 @@ cp_option_init (struct cp_options *x)
x->data_copy_required = true;
x->require_preserve = false;
x->recursive = false;
+ x->ignore_attributes = false;
x->sparse_mode = SPARSE_AUTO;
x->symbolic_link = false;
x->set_mode = false;
@@ -1043,6 +1047,10 @@ main (int argc, char **argv)
x.dereference = DEREF_COMMAND_LINE_ARGUMENTS;
break;
+ case IGNORE_ATTRIBUTES:
+ x.ignore_attributes = true;
+ break;
+
case 'i':
x.interactive = I_ASK_USER;
break;
diff --git a/src/dircolors.h b/src/dircolors.h
index 88f6a6b..0e71dce 100644
--- a/src/dircolors.h
+++ b/src/dircolors.h
@@ -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,
- 'O','T','H','E','R','_','W','R','I','T','A','B','L','E',' ','3','4',';','4','2',' ','#',' ','d','i','r',' ','t','h','a','t',' ','i','s',' ','o','t','h','e','r','-','w','r','i','t','a','b','l','e',' ','(','o','+','w',')',' ','a','n','d',' ','n','o','t',' ','s','t','i','c','k','y',0,
+ 'O','T','H','E','R','_','W','R','I','T','A','B','L','E',' ','3','4',';','4','3',' ','#',' ','d','i','r',' ','t','h','a','t',' ','i','s',' ','o','t','h','e','r','-','w','r','i','t','a','b','l','e',' ','(','o','+','w',')',' ','a','n','d',' ','n','o','t',' ','s','t','i','c','k','y',0,
'S','T','I','C','K','Y',' ','3','7',';','4','4',' ','#',' ','d','i','r',' ','w','i','t','h',' ','t','h','e',' ','s','t','i','c','k','y',' ','b','i','t',' ','s','e','t',' ','(','+','t',')',' ','a','n','d',' ','n','o','t',' ','o','t','h','e','r','-','w','r','i','t','a','b','l','e',0,
'#',' ','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 262e1b5..9441659 100644
--- a/src/dircolors.hin
+++ b/src/dircolors.hin
@@ -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)
-OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
+OTHER_WRITABLE 34;43 # dir that is other-writable (o+w) and not sticky
STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
# This is for files with execute permission:
diff --git a/src/ls.c b/src/ls.c
index 71d94fd..9e4fb98 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -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;
+#if defined(__HAIKU__) /* Default to show UTF8 chars in Haiku terminal. */
+#define QMARK_FUNNY_CHARS_TTY 0
+#else
+#define QMARK_FUNNY_CHARS_TTY 1
+#endif
/* Quoting options for file and dir name output. */
@@ -4447,6 +4452,7 @@ print_long_format (const struct fileinfo *f)
p = buf;
}
+#if !defined(__HAIKU__)
if (f->stat_ok
&& (S_ISCHR (f->stat.st_mode) || S_ISBLK (f->stat.st_mode)))
{
@@ -4462,6 +4468,7 @@ print_long_format (const struct fileinfo *f)
umaxtostr (minor (f->stat.st_rdev), minorbuf));
}
else
+#endif
{
char hbuf[LONGEST_HUMAN_READABLE + 1];
char const *size =
diff --git a/src/mv.c b/src/mv.c
index fc2bf77..b5eeb66 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -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 */
+ x->ignore_attributes = false;
x->require_preserve_context = false;
x->preserve_xattr = true;
x->require_preserve_xattr = false;
diff --git a/src/remove.c b/src/remove.c
index e1da19e..81cf9c8 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -219,7 +219,7 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir,
wp_errno = errno;
}
- if (write_protected || x->interactive == RMI_ALWAYS)
+ if (write_protected || errno || x->interactive == RMI_ALWAYS)
{
if (0 <= write_protected && dirent_type == DT_UNKNOWN)
{
diff --git a/src/uname.c b/src/uname.c
index 921a881..10cfedb 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -44,6 +44,10 @@
# endif
#endif
+#ifdef __HAIKU__
+# include <OS.h>
+#endif
+
#include "system.h"
#include "die.h"
#include "error.h"
@@ -341,6 +345,30 @@ main (int argc, char **argv)
element = processor;
}
#endif
+
+#ifdef __HAIKU__
+ {
+ cpu_topology_node_info root;
+ uint32 count = 1;
+ status_t error = get_cpu_topology_info(&root, &count);
+ if (error != B_OK || count < 1)
+ element = "unknown";
+ else {
+ switch (root.data.root.platform) {
+ case B_CPU_x86:
+ element = "x86";
+ break;
+ case B_CPU_x86_64:
+ element = "x86_64";
+ break;
+ default:
+ element = "other";
+ break;
+ }
+ }
+ }
+#endif
+
if (! (toprint == UINT_MAX && element == unknown))
print_element (element);
}
--
2.37.3
From 4e2fcb246b9ae5a417af873f938d6f4a954ab0b1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 1 Nov 2021 21:08:55 +0100
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 af94f6b..480da37 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -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);
- if (0 < err)
+ if (err != 0 && err != -1)
{
char *a_src_name = NULL;
@@ -2237,7 +2237,7 @@ create_hard_link (char const *src_name, int src_dirfd, char const *src_relname,
free (a_src_name);
return false;
}
- if (err < 0 && verbose)
+ if (err == -1 && verbose)
printf (_("removed %s\n"), quoteaf (dst_name));
return true;
}
@@ -3146,7 +3146,7 @@ skip:
int err = force_symlinkat (src_name, dst_dirfd, dst_relname,
x->unlink_dest_after_failed_open, -1);
- if (0 < err)
+ if (err != 0 && err != -1)
{
error (0, err, _("cannot create symbolic link %s to %s"),
quoteaf_n (0, dst_name), quoteaf_n (1, src_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);
- if (0 < symlink_err && x->update && !new_dst && S_ISLNK (dst_sb.st_mode)
+ if (symlink_err != 0 && symlink_err != -1 && x->update && !new_dst
+ && S_ISLNK (dst_sb.st_mode)
&& dst_sb.st_size == strlen (src_link_val))
{
/* See if the destination is already the desired symlink.
@@ -3250,7 +3251,7 @@ skip:
}
}
free (src_link_val);
- if (0 < symlink_err)
+ if (symlink_err != 0 && symlink_err != -1)
{
error (0, symlink_err, _("cannot create symbolic link %s"),
quoteaf (dst_name));
diff --git a/src/ln.c b/src/ln.c
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)
/* Link SOURCE to DESTDIR_FD + DEST_BASE atomically. DESTDIR_FD is
the directory containing DEST_BASE. Return 0 if successful, a
- positive errno value on failure, and -1 if an atomic link cannot be
+ errno value on failure, and -1 if an atomic link cannot be
done. This handles the common case where the destination does not
already exist and -r is not specified. */
@@ -185,7 +185,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
char *backup_base = NULL;
char *rel_source = NULL;
int nofollow_flag = logical ? 0 : AT_SYMLINK_NOFOLLOW;
- if (link_errno < 0)
+ if (link_errno == -1)
link_errno = atomic_link (source, destdir_fd, dest_base);
/* Get SOURCE_STATS if later code will need it, if only for sharper
@@ -272,7 +272,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
}
}
- if (link_errno < 0 || link_errno == EEXIST)
+ if (link_errno == -1 || link_errno == EEXIST)
{
if (interactive)
{
@@ -338,7 +338,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
required removing the destination first. */
}
- if (link_errno <= 0)
+ if (link_errno == 0 || link_errno == -1)
{
/* Right after creating a hard link, do this: (note dest name and
source_stats, which are also the just-linked-destinations stats) */
@@ -393,7 +393,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
free (backup_base);
free (rel_source);
- return link_errno <= 0;
+ return link_errno == 0 || link_errno == -1;
fail:
free (rel_source);
--
2.37.3
From 466cdffa0a76ea5acebc9167c9bb7a10dd04969e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 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_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--)
+ while (this && n--)
{
entries += IS_USER_PROCESS (this);
if (UT_TYPE_BOOT_TIME (this))
@@ -181,7 +181,11 @@ uptime (char const *filename, int options)
#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
+ ;
+#else
die (EXIT_FAILURE, errno, "%s", quotef (filename));
+#endif
#endif
print_uptime (n_users, utmp_buf);
--
2.37.3
From 94a6b6e0d965407db1e8335749ebf8a8938ec701 Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Fri, 30 Jun 2023 20:14:30 +0200
Subject: stty: fix sign extension in check_speed
Ou speed_t is only 8 bits, and is unsigned, so there is no sign
expansion. So, if you set a speed_t to -1, it is converted to 255 and
doesn't compare equal to -1.
diff --git a/src/stty.c b/src/stty.c
index 607a4e7..3bc0143 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -2088,7 +2088,7 @@ display_all (struct termios *mode, char const *device_name)
static void
check_speed (struct termios *mode)
{
- if (last_ibaud != -1 && last_obaud != -1)
+ if (last_ibaud != (speed_t)-1 && last_obaud != (speed_t)-1)
{
if (cfgetispeed (mode) != last_ibaud
|| cfgetospeed (mode) != last_obaud)
--
2.37.3
Reference in New Issue View Git Blame Copy Permalink