From 0464eec0a8086cca0b5138d5ac3c24be24b4ddeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 13 Apr 2007 22:10:37 +0200 Subject: Fix an off-by-one mistake in libxdg-basedir that caused /usr/share to become /usr/sharee. Also add a diff from the original sources and add it to the distribution. --- contrib/libxdg-basedir/Makefile.am | 2 ++ contrib/libxdg-basedir/basedir.c | 1 + contrib/libxdg-basedir/diff_from_libxdg-basedir_0.1.2.patch | 11 +++++++++++ 3 files changed, 14 insertions(+) create mode 100644 contrib/libxdg-basedir/diff_from_libxdg-basedir_0.1.2.patch diff --git a/contrib/libxdg-basedir/Makefile.am b/contrib/libxdg-basedir/Makefile.am index 68f09b0a9..20a2e272f 100644 --- a/contrib/libxdg-basedir/Makefile.am +++ b/contrib/libxdg-basedir/Makefile.am @@ -4,3 +4,5 @@ endif libxdg_basedir_la_SOURCES = basedir.c basedir.h libxdg_basedir_la_CFLAGS = $(VISIBILITY_FLAG) + +EXTRA_DIST = diff_from_libxdg-basedir_0.1.2.patch diff --git a/contrib/libxdg-basedir/basedir.c b/contrib/libxdg-basedir/basedir.c index 942e07ba8..b0782efa2 100644 --- a/contrib/libxdg-basedir/basedir.c +++ b/contrib/libxdg-basedir/basedir.c @@ -209,6 +209,7 @@ static char** xdgSplitPath(const char* string) #endif itemlist[i][k] = string[j]; } + itemlist[i][k] = 0; /* move to next string */ string += j; if (*string == PATH_SEPARATOR_CHAR) string++; /* skip seperator */ diff --git a/contrib/libxdg-basedir/diff_from_libxdg-basedir_0.1.2.patch b/contrib/libxdg-basedir/diff_from_libxdg-basedir_0.1.2.patch new file mode 100644 index 000000000..5a7e69fdc --- /dev/null +++ b/contrib/libxdg-basedir/diff_from_libxdg-basedir_0.1.2.patch @@ -0,0 +1,11 @@ +diff -r fe43a4a573b2 contrib/libxdg-basedir/basedir.c +--- a/contrib/libxdg-basedir/basedir.c Fri Apr 13 22:04:05 2007 +0200 ++++ b/contrib/libxdg-basedir/basedir.c Fri Apr 13 22:05:25 2007 +0200 +@@ -209,6 +209,7 @@ static char** xdgSplitPath(const char* s + #endif + itemlist[i][k] = string[j]; + } ++ itemlist[i][k] = 0; + /* move to next string */ + string += j; + if (*string == PATH_SEPARATOR_CHAR) string++; /* skip seperator */ -- cgit v1.2.3