From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 10 Feb 2017 08:59:59 +0000 (+0100)
Subject: libopkg: strip trailing white space in conffile specification
X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=commitdiff_plain;h=a48345d37184638c7c518e5f51c4bed2f9274fcb

libopkg: strip trailing white space in conffile specification

The conffile entries in package control lines may have trailing white space,
causing opkg to fail looking up the file paths.

Trim white space to avoid this error.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c
index 74a2ce1..e68c813 100644
--- a/libopkg/opkg_install.c
+++ b/libopkg/opkg_install.c
@@ -274,6 +274,7 @@ unpack_pkg_control_files(pkg_t *pkg)
      while (1) {
 	  char *cf_name;
 	  char *cf_name_in_dest;
+	  int i;
 
 	  cf_name = file_read_line_alloc(conffiles_file);
 	  if (cf_name == NULL) {
@@ -282,6 +283,12 @@ unpack_pkg_control_files(pkg_t *pkg)
 	  if (cf_name[0] == '\0') {
 	       continue;
 	  }
+	  for (i = strlen(cf_name) - 1;
+	       (i >= 0) && (cf_name[i] == ' ' || cf_name[i] == '\t');
+	       i--
+	  ) {
+	       cf_name[i] = '\0';
+	  }
 
 	  /* Prepend dest->root_dir to conffile name.
 	     Take pains to avoid multiple slashes. */