pool/file
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=248

Browse Source
This commit is contained in:
Dr. Werner Fink 2022-07-13 11:20:26 +00:00 committed by Git OBS Bridge
parent 5d3f41f433
commit 40611154d8
3 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
file-f042050f.patch Normal file
View File

@ -0,0 +1,61 @@
From f042050f59bfc037677871c4d1037c33273f5213 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 4 Jul 2022 22:30:51 +0000
Subject: [PATCH] mbrlen(NULL, is not portable; revert to using memset to
initialize the state.
---
src/file.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git src/file.c src/file.c
index af9be0f0..8b4f14c2 100644
--- src/file.c
+++ src/file.c
|@@ -32,7 +32,7 @@
| #include "file.h"
|
| #ifndef lint
|-FILE_RCSID("@(#)$File: file.c,v 1.198 2022/07/04 20:16:29 christos Exp $")
|+FILE_RCSID("@(#)$File: file.c,v 1.199 2022/07/04 22:30:51 christos Exp $")
| #endif /* lint */
|
| #include "magic.h"
@@ -575,14 +575,14 @@ fname_print(const char *inname)
size_t bytesconsumed;
- (void)mbrlen(NULL, 0, &state);
+ (void)memset(&state, 0, sizeof(state));
while (n > 0) {
bytesconsumed = mbrtowc(&nextchar, inname, n, &state);
if (bytesconsumed == CAST(size_t, -1) ||
bytesconsumed == CAST(size_t, -2)) {
nextchar = *inname++;
n--;
- (void)mbrlen(NULL, 0, &state);
+ (void)memset(&state, 0, sizeof(state));
file_octal(CAST(unsigned char, nextchar));
continue;
}
@@ -654,7 +654,7 @@ file_mbswidth(struct magic_set *ms, const char *s)
mbstate_t state;
wchar_t nextchar;
- (void)mbrlen(NULL, 0, &state);
+ (void)memset(&state, 0, sizeof(state));
n = strlen(s);
while (n > 0) {
@@ -663,7 +663,7 @@ file_mbswidth(struct magic_set *ms, const char *s)
bytesconsumed == CAST(size_t, -2)) {
nextchar = *s;
bytesconsumed = 1;
- (void)mbrlen(NULL, 0, &state);
+ (void)memset(&state, 0, sizeof(state));
width += 4;
} else {
width += ((ms->flags & MAGIC_RAW) != 0
--
2.35.3

1
file.changes
View File

@ -4,6 +4,7 @@ Wed Jul 13 11:01:16 UTC 2022 - Dr. Werner Fink <werner@suse.de>
- Add upstream patches to fix boo#1201350
* file-7e59d342.patch
* file-c80065fe.patch
* file-f042050f.patch
-------------------------------------------------------------------
Mon Jun 13 08:45:48 UTC 2022 - Dr. Werner Fink <werner@suse.de>

2
file.spec
View File

@ -65,6 +65,7 @@ Patch39: file-5.28-btrfs-image.dif
# Upstream commits as patches
Patch42: file-c80065fe.patch
Patch43: file-7e59d342.patch
Patch44: file-f042050f.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
@ -110,6 +111,7 @@ to develop applications that require the magic "file" interface.
%setup -q -n file-%{version}
%patch42 -p0
%patch43 -p0
%patch44 -p0
%patch1 -p0 -b .misc
%patch4 -p0 -b .conf
%patch5 -p0 -b .tex