4d11848a21
The patch added in commit c78b65c4f1 was
bogus: it adds some code conditionally on HAVE_CANONICALIZE_FILE_NAME
being undefined, but there is nothing that defines
HAVE_CANONICALIZE_FILE_NAME if canonicalize_file_name() is already
provided by the C library.
This commit fixes that by adding the appropriate autoconf check.
Fixes:
http://autobuild.buildroot.net/results/4f0eb2af09c92ff4cd7448211ffda432754d4e60/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
63 lines
1.6 KiB
Diff
63 lines
1.6 KiB
Diff
From 85863c9e051fe59add4e47dbfcb37072234f0110 Mon Sep 17 00:00:00 2001
|
|
From: Matt Weber <matthew.weber@rockwellcollins.com>
|
|
Date: Mon, 1 May 2017 19:55:07 -0500
|
|
Subject: [PATCH] musl compat canonicalize_file_name()
|
|
|
|
Adds an inline equivalent of canonicalize_file_name
|
|
using realpath().
|
|
|
|
Bug report (origin of this patch):
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=99944
|
|
|
|
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
|
|
---
|
|
configure.ac | 2 ++
|
|
src/libqmi-glib/qmi-utils.h | 18 ++++++++++++++++++
|
|
2 files changed, 20 insertions(+)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 162d5ae..9cb82fd 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -80,6 +80,8 @@ AC_SUBST(GLIB_LIBS)
|
|
GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
|
|
AC_SUBST(GLIB_MKENUMS)
|
|
|
|
+AC_CHECK_FUNCS([canonicalize_file_name])
|
|
+
|
|
dnl qmi-firmware-update is optional, enabled by default
|
|
AC_ARG_ENABLE([firmware-update],
|
|
AS_HELP_STRING([--enable-firmware-update],
|
|
diff --git a/src/libqmi-glib/qmi-utils.h b/src/libqmi-glib/qmi-utils.h
|
|
index 4fd5199..4869da5 100644
|
|
--- a/src/libqmi-glib/qmi-utils.h
|
|
+++ b/src/libqmi-glib/qmi-utils.h
|
|
@@ -29,6 +29,24 @@
|
|
#error "Only <libqmi-glib.h> can be included directly."
|
|
#endif
|
|
|
|
+#ifndef HAVE_CANONICALIZE_FILE_NAME
|
|
+#include <limits.h>
|
|
+#include <string.h>
|
|
+#include <stdlib.h>
|
|
+#include <stdio.h>
|
|
+static char * canonicalize_file_name(const char *path)
|
|
+{
|
|
+ char buf[PATH_MAX] = { };
|
|
+
|
|
+ snprintf(buf, sizeof(buf) - 1, "%s", path);
|
|
+
|
|
+ if (!realpath(path, buf))
|
|
+ return NULL;
|
|
+
|
|
+ return strdup(buf);
|
|
+}
|
|
+#endif
|
|
+
|
|
#include <glib.h>
|
|
|
|
G_BEGIN_DECLS
|
|
--
|
|
2.7.4
|
|
|