claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Correct Rock-Ridge directory/link listing.

Browse Source 
{cd,iso}-info --no-rock-ridge works (and with rock-ridge too)
test/*.right: output is now what I guess it's should be
This commit is contained in:
rocky
2005-02-20 16:21:06 +00:00
parent 25f560b5cf
commit 3d97c7ded6
14 changed files with 192 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cd-info.c,v 1.116 2005/02/20 10:21:01 rocky Exp $
$Id: cd-info.c,v 1.117 2005/02/20 16:21:06 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -600,7 +600,7 @@ print_iso9660_recurse (CdIo_t *p_cdio, const char pathname[],
char _fullname[4096] = { 0, };
char translated_name[MAX_ISONAME+1];
if (yep != p_statbuf->b_rock) {
if (yep != p_statbuf->b_rock || 1 == opts.no_rock_ridge) {
iso9660_name_translate_ext(psz_iso_name, translated_name,
i_joliet_level);
}
@@ -616,8 +616,8 @@ print_iso9660_recurse (CdIo_t *p_cdio, const char pathname[],
&& strcmp (psz_iso_name, ".."))
_cdio_list_append (p_dirlist, strdup (_fullname));
print_fs_attrs(p_statbuf, opts.no_rock_ridge, fs & CDIO_FS_ANAL_XA,
translated_name, psz_iso_name);
print_fs_attrs(p_statbuf, 0 == opts.no_rock_ridge, fs & CDIO_FS_ANAL_XA,
psz_iso_name, translated_name);
}
_cdio_list_free (p_entlist, true);

4
src/iso-info.c
View File

@@ -1,5 +1,5 @@
/*
$Id: iso-info.c,v 1.25 2005/02/20 10:21:01 rocky Exp $
$Id: iso-info.c,v 1.26 2005/02/20 16:21:06 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -203,7 +203,7 @@ print_iso9660_recurse (iso9660_t *p_iso, const char pathname[])
char _fullname[4096] = { 0, };
char translated_name[MAX_ISONAME+1];
if (yep != p_statbuf->b_rock) {
if (yep != p_statbuf->b_rock || 1 == opts.no_rock_ridge) {
iso9660_name_translate_ext(iso_name, translated_name, i_joliet_level);
snprintf (_fullname, sizeof (_fullname), "%s%s", pathname,
translated_name);

11
src/util.c
View File

@@ -1,5 +1,5 @@
/*
$Id: util.c,v 1.39 2005/02/20 10:34:45 rocky Exp $
$Id: util.c,v 1.40 2005/02/20 16:21:06 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -460,10 +460,11 @@ print_fs_attrs(iso9660_stat_t *p_statbuf, bool b_rock, bool b_xa,
char date_str[30];
if (yep == p_statbuf->b_rock && b_rock) {
report (stdout, " %s %d %d [LSN %6lu] %9u",
iso9660_get_rock_attr_str (p_statbuf->st_mode),
p_statbuf->st_uid,
p_statbuf->st_gid,
report (stdout, " %s %d %d %d [LSN %6lu] %9u",
iso9660_get_rock_attr_str (p_statbuf->st_mode),
p_statbuf->st_nlinks,
p_statbuf->st_uid,
p_statbuf->st_gid,
(long unsigned int) p_statbuf->lsn,
(unsigned int) p_statbuf->size);