From 5678298f7dc8e0d4394e477a1a64d734e65a3ef0 Mon Sep 17 00:00:00 2001
From: Michael Straube <straubem@gmx.de>
Date: Sat, 25 Mar 2017 21:36:50 +0100
Subject: Ignore comments in INSTALL files (FS#51916)
If a comment in an INSTALL file contains the name of a valid
INSTALL file function but the function itself is not present,
pacman tries to execute that function. That leads to an error.
Ignore comments in the grep function in libalpm/trans.c to
avoid such errors.
Signed-off-by: Michael Straube <straubem@gmx.de>
Signed-off-by: Allan McRae <allan@archlinux.org>
---
lib/libalpm/trans.c | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'lib')
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 60114882..7689079b 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -305,6 +305,7 @@ void _alpm_trans_free(alpm_trans_t *trans)
static int grep(const char *fn, const char *needle)
{
FILE *fp;
+ char *ptr;
if((fp = fopen(fn, "r")) == NULL) {
return 0;
@@ -314,6 +315,9 @@ static int grep(const char *fn, const char *needle)
if(safe_fgets(line, sizeof(line), fp) == NULL) {
continue;
}
+ if((ptr = strchr(line, '#')) != NULL) {
+ *ptr = '\0';
+ }
/* TODO: this will not work if the search string
* ends up being split across line reads */
if(strstr(line, needle)) {
--
cgit v1.2.3-70-g09d2