diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 00:38:22 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 00:38:22 +0200 |
| commit | 0ed2cd4f34189ec303dfac5a30de0abae0decba8 (patch) | |
| tree | 7a8d08d25ca7c81daa9d6cd65fd4f633fd676b41 /src/input/vcd/libcdio | |
| parent | 6081bc9a06ee97333769f77a9e5c18a15afb29da (diff) | |
| parent | 3dd7d925c2feb7868a49e7a1a0b953a5aab233f0 (diff) | |
| download | xine-lib-0ed2cd4f34189ec303dfac5a30de0abae0decba8.tar.gz xine-lib-0ed2cd4f34189ec303dfac5a30de0abae0decba8.tar.bz2 | |
Merge changes happened in 1.1 development.
Diffstat (limited to 'src/input/vcd/libcdio')
| -rw-r--r-- | src/input/vcd/libcdio/.hgignore (renamed from src/input/vcd/libcdio/.cvsignore) | 0 | ||||
| -rw-r--r-- | src/input/vcd/libcdio/MSWindows/.hgignore (renamed from src/input/vcd/libcdio/MSWindows/.cvsignore) | 0 | ||||
| -rw-r--r-- | src/input/vcd/libcdio/cdio/.hgignore (renamed from src/input/vcd/libcdio/cdio/.cvsignore) | 0 | ||||
| -rw-r--r-- | src/input/vcd/libcdio/image/.hgignore (renamed from src/input/vcd/libcdio/image/.cvsignore) | 0 | ||||
| -rw-r--r-- | src/input/vcd/libcdio/iso9660_fs.c | 8 |
5 files changed, 3 insertions, 5 deletions
diff --git a/src/input/vcd/libcdio/.cvsignore b/src/input/vcd/libcdio/.hgignore index 7d926a554..7d926a554 100644 --- a/src/input/vcd/libcdio/.cvsignore +++ b/src/input/vcd/libcdio/.hgignore diff --git a/src/input/vcd/libcdio/MSWindows/.cvsignore b/src/input/vcd/libcdio/MSWindows/.hgignore index 282522db0..282522db0 100644 --- a/src/input/vcd/libcdio/MSWindows/.cvsignore +++ b/src/input/vcd/libcdio/MSWindows/.hgignore diff --git a/src/input/vcd/libcdio/cdio/.cvsignore b/src/input/vcd/libcdio/cdio/.hgignore index 282522db0..282522db0 100644 --- a/src/input/vcd/libcdio/cdio/.cvsignore +++ b/src/input/vcd/libcdio/cdio/.hgignore diff --git a/src/input/vcd/libcdio/image/.cvsignore b/src/input/vcd/libcdio/image/.hgignore index 282522db0..282522db0 100644 --- a/src/input/vcd/libcdio/image/.cvsignore +++ b/src/input/vcd/libcdio/image/.hgignore diff --git a/src/input/vcd/libcdio/iso9660_fs.c b/src/input/vcd/libcdio/iso9660_fs.c index 0a2de8fa1..fff12cd7c 100644 --- a/src/input/vcd/libcdio/iso9660_fs.c +++ b/src/input/vcd/libcdio/iso9660_fs.c @@ -1,5 +1,5 @@ /* - $Id: iso9660_fs.c,v 1.6 2006/09/28 08:19:14 dgp85 Exp $ + $Id: iso9660_fs.c,v 1.7 2006/12/08 16:26:10 mshopf Exp $ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> @@ -51,7 +51,7 @@ #include <stdio.h> -static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.6 2006/09/28 08:19:14 dgp85 Exp $"; +static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.7 2006/12/08 16:26:10 mshopf Exp $"; /* Implementation of iso9660_t type */ struct _iso9660 { @@ -1200,9 +1200,7 @@ find_fs_lsn_recurse (CdIo *p_cdio, const char pathname[], lsn_t lsn) char _fullname[4096] = { 0, }; char *filename = (char *) statbuf->filename; - snprintf (_fullname, sizeof (_fullname), "%s%s", pathname, filename); - - strncat (_fullname, "/", sizeof (_fullname)); + snprintf (_fullname, sizeof (_fullname), "%s%s/", pathname, filename); if (statbuf->type == _STAT_DIR && strcmp ((char *) statbuf->filename, ".") |