diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-13 22:10:37 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-13 22:10:37 +0200 |
| commit | 0464eec0a8086cca0b5138d5ac3c24be24b4ddeb (patch) | |
| tree | e31398cae8c6445be1b7f31bdfe94e4b2151005c | |
| parent | 743d7c6c187de958ae10552d291b2397bfd68c39 (diff) | |
| download | xine-lib-0464eec0a8086cca0b5138d5ac3c24be24b4ddeb.tar.gz xine-lib-0464eec0a8086cca0b5138d5ac3c24be24b4ddeb.tar.bz2 | |
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.
| -rw-r--r-- | contrib/libxdg-basedir/Makefile.am | 2 | ||||
| -rw-r--r-- | contrib/libxdg-basedir/basedir.c | 1 | ||||
| -rw-r--r-- | contrib/libxdg-basedir/diff_from_libxdg-basedir_0.1.2.patch | 11 |
3 files changed, 14 insertions, 0 deletions
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 */ |