| From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 |
| From: Florian Festi <ffesti@redhat.com> |
| Date: Thu, 16 Mar 2023 19:05:04 +0100 |
| Subject: [PATCH] Fix compiler error on clang |
| |
| Turns out variable declarations are not allowed after a label, even in |
| C99. And while some compilers don't seem to care others do. |
| |
| Moving the declaration of mayopen to the start of the function to avoid |
| this problem. |
| |
| Resolves: #2435 |
| Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] |
| Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| --- |
| lib/fsm.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/lib/fsm.c b/lib/fsm.c |
| index 5671ac642d..183293edb0 100644 |
| --- a/lib/fsm.c |
| +++ b/lib/fsm.c |
| @@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, |
| int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; |
| int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; |
| int firstlinkfile = -1; |
| + int mayopen = 0; |
| char *tid = NULL; |
| struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); |
| struct filedata_s *firstlink = NULL; |
| @@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, |
| |
| setmeta: |
| /* Special files require path-based ops */ |
| - int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); |
| + mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); |
| if (!rc && fd == -1 && mayopen) { |
| int flags = O_RDONLY; |
| /* Only follow safe symlinks, and never on temporary files */ |