Initial commit
This commit is contained in:
+39
@@ -0,0 +1,39 @@
|
||||
From 126dfefb5fddf411ad0a1316209e9c1b47abfcd2 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 9 Feb 2022 17:30:16 -0800
|
||||
Subject: [PATCH] man: Move local variable declaration to function scope
|
||||
|
||||
There is a clang bug [1] unearthed here, so help clang by re-arranging
|
||||
code without changing the logic, until its fixed in clang
|
||||
|
||||
[1] https://github.com/llvm/llvm-project/issues/53692
|
||||
|
||||
Upstream-Status: Inappropriate [Inappropriate: Clang bug]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
---
|
||||
src/man.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/man.c b/src/man.c
|
||||
index f16fae8..333df03 100644
|
||||
--- a/src/man.c
|
||||
+++ b/src/man.c
|
||||
@@ -352,7 +352,7 @@ static void init_html_pager (void)
|
||||
static error_t parse_opt (int key, char *arg, struct argp_state *state)
|
||||
{
|
||||
static bool apropos, whatis; /* retain values between calls */
|
||||
-
|
||||
+ char *s;
|
||||
/* Please keep these keys in the same order as in options above. */
|
||||
switch (key) {
|
||||
case 'C':
|
||||
@@ -384,7 +384,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
|
||||
case OPT_WARNINGS:
|
||||
#ifdef NROFF_WARNINGS
|
||||
{
|
||||
- char *s = xstrdup
|
||||
+ s = xstrdup
|
||||
(arg ? arg : default_roff_warnings);
|
||||
const char *warning;
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
d man man 0755 /var/cache/man none
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
The first line of man_db.conf will be replaced by package name. And it causes
|
||||
multilib install file conflict. Remove the line to avoid the issue.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
|
||||
diff --git a/src/man_db.conf.in b/src/man_db.conf.in
|
||||
index bc8bb7e..04cfb31 100644
|
||||
--- a/src/man_db.conf.in
|
||||
+++ b/src/man_db.conf.in
|
||||
@@ -1,4 +1,3 @@
|
||||
-# @config_file_basename@
|
||||
#
|
||||
# This file is used by the man-db package to configure the man and cat paths.
|
||||
# It is also used to provide a manpath for those without one by examining
|
||||
Reference in New Issue
Block a user