diff --git a/example/udf1.c b/example/udf1.c index 40c8fbf4..a51e6468 100644 --- a/example/udf1.c +++ b/example/udf1.c @@ -1,5 +1,5 @@ /* - $Id: udf1.c,v 1.9 2005/10/29 14:52:47 rocky Exp $ + $Id: udf1.c,v 1.10 2005/10/30 05:43:01 rocky Exp $ Copyright (C) 2005 Rocky Bernstein @@ -56,9 +56,10 @@ print_file_info(const udf_file_t *p_udf_file) time_t mod_time = udf_get_modification_time(p_udf_file); udf_file_entry_t udf_fe; if (udf_get_file_entry(p_udf_file, &udf_fe)) { - char perms[11]="invalid"; /* Print directory attributes*/ - printf("%s ", udf_get_posix_filemode_str (p_udf_file, perms)); + char psz_mode[11]="invalid"; + printf("%s ", udf_mode_string(udf_get_posix_filemode(p_udf_file), + psz_mode)); } printf("%s %s", udf_get_filename(p_udf_file), ctime(&mod_time)); diff --git a/include/cdio/ecma_167.h b/include/cdio/ecma_167.h index e7c3d6c8..85ebb420 100644 --- a/include/cdio/ecma_167.h +++ b/include/cdio/ecma_167.h @@ -625,21 +625,33 @@ typedef struct udf_icbtag_s udf_icbtag_t; #define ICBTAG_STRATEGY_TYPE_3 0x0003 #define ICBTAG_STRATEGY_TYPE_4 0x0004 -/** File Type (ECMA 167r3 4/14.6.6) */ -#define ICBTAG_FILE_TYPE_UNDEF 0x00 -#define ICBTAG_FILE_TYPE_USE 0x01 -#define ICBTAG_FILE_TYPE_PIE 0x02 -#define ICBTAG_FILE_TYPE_IE 0x03 -#define ICBTAG_FILE_TYPE_DIRECTORY 0x04 -#define ICBTAG_FILE_TYPE_REGULAR 0x05 -#define ICBTAG_FILE_TYPE_BLOCK 0x06 -#define ICBTAG_FILE_TYPE_CHAR 0x07 -#define ICBTAG_FILE_TYPE_EA 0x08 -#define ICBTAG_FILE_TYPE_FIFO 0x09 -#define ICBTAG_FILE_TYPE_SOCKET 0x0A -#define ICBTAG_FILE_TYPE_TE 0x0B -#define ICBTAG_FILE_TYPE_SYMLINK 0x0C -#define ICBTAG_FILE_TYPE_STREAMDIR 0x0D +/** File Type (ECMA 167r3 4/14.6.6) + + Imagine the below enum values as #define'd values rather than + distinct values of an enum. +*/ +typedef enum { + ICBTAG_FILE_TYPE_UNDEF = 0x00, + ICBTAG_FILE_TYPE_USE = 0x01, + ICBTAG_FILE_TYPE_PIE = 0x02, + ICBTAG_FILE_TYPE_IE = 0x03, + ICBTAG_FILE_TYPE_DIRECTORY = 0x04, + ICBTAG_FILE_TYPE_REGULAR = 0x05, + ICBTAG_FILE_TYPE_BLOCK = 0x06, + ICBTAG_FILE_TYPE_CHAR = 0x07, + ICBTAG_FILE_TYPE_EA = 0x08, + ICBTAG_FILE_TYPE_FIFO = 0x09, + ICBTAG_FILE_TYPE_SOCKET = 0x0A, + ICBTAG_FILE_TYPE_TE = 0x0B, + ICBTAG_FILE_TYPE_SYMLINK = 0x0C, + ICBTAG_FILE_TYPE_STREAMDIR = 0x0D +} icbtag_file_type_enum_t; + +/** This variable is trickery to force the above enum symbol values to + be recorded in debug symbol tables. It is used to allow one refer + to above enumeration values in a debugger and debugger + expressions */ +extern icbtag_file_type_enum_t debug_icbtag_file_type_enum; /** Flags (ECMA 167r3 4/14.6.8) */ #define ICBTAG_FLAG_AD_MASK 0x0007 diff --git a/include/cdio/udf.h b/include/cdio/udf.h index 273f830e..24ec57fa 100644 --- a/include/cdio/udf.h +++ b/include/cdio/udf.h @@ -1,5 +1,5 @@ /* - $Id: udf.h,v 1.13 2005/10/29 14:43:50 rocky Exp $ + $Id: udf.h,v 1.14 2005/10/30 05:43:01 rocky Exp $ Copyright (C) 2005 Rocky Bernstein This program is free software; you can redistribute it and/or modify @@ -31,6 +31,8 @@ #include #include +#include + typedef uint16_t partition_num_t; /* FIXME: these probably don't go here. */ @@ -122,11 +124,6 @@ extern "C" { bool b_any_partition, partition_num_t i_partition); - /*! - Returns a string which interprets the extended attribute permissions - */ - const char *udf_get_attr_str(udf_Uint32_t permissions, char perms[]); - /*! Return the file id descriptor of the given file. */ @@ -145,10 +142,9 @@ extern "C" { /*out*/ udf_file_entry_t *p_udf_fe); /*! - Returns a POSIX filemode string for a given p_udf_file. + Returns a POSIX mode for a given p_udf_file. */ - const char *udf_get_posix_filemode_str(const udf_file_t *p_udf_file, - char perms[]); + mode_t udf_get_posix_filemode(const udf_file_t *p_udf_file); /*! Return the next subdirectory. @@ -175,6 +171,44 @@ extern "C" { */ bool udf_is_dir(const udf_file_t *p_udf_file); + /*! udf_mode_string - fill in string STR with an ls-style ASCII + representation of the st_mode field of file stats block STATP. + 10 characters are stored in STR; no terminating null is added. + The characters stored in STR are: + + 0 File type. 'd' for directory, 'c' for character + special, 'b' for block special, 'm' for multiplex, + 'l' for symbolic link, 's' for socket, 'p' for fifo, + '-' for regular, '?' for any other file type + + 1 'r' if the owner may read, '-' otherwise. + + 2 'w' if the owner may write, '-' otherwise. + + 3 'x' if the owner may execute, 's' if the file is + set-user-id, '-' otherwise. + 'S' if the file is set-user-id, but the execute + bit isn't set. + + 4 'r' if group members may read, '-' otherwise. + + 5 'w' if group members may write, '-' otherwise. + + 6 'x' if group members may execute, 's' if the file is + set-group-id, '-' otherwise. + 'S' if it is set-group-id but not executable. + + 7 'r' if any user may read, '-' otherwise. + + 8 'w' if any user may write, '-' otherwise. + + 9 'x' if any user may execute, 't' if the file is "sticky" + (will be retained in swap space after execution), '-' + otherwise. + 'T' if the file is sticky but not executable. */ + + char *udf_mode_string (mode_t mode, char *str); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/lib/udf/Makefile.am b/lib/udf/Makefile.am index 160cc06c..61e1c3c9 100644 --- a/lib/udf/Makefile.am +++ b/lib/udf/Makefile.am @@ -34,7 +34,7 @@ noinst_HEADERS = udf_private.h lib_LTLIBRARIES = libudf.la -libudf_la_SOURCES = udf.c udf_fs.c udf_time.c +libudf_la_SOURCES = udf.c udf_fs.c udf_time.c filemode.c libudf_la_LIBADD = @LIBCDIO_LIBS@ diff --git a/lib/udf/filemode.c b/lib/udf/filemode.c new file mode 100644 index 00000000..82009548 --- /dev/null +++ b/lib/udf/filemode.c @@ -0,0 +1,283 @@ +/* filemode.c -- make a string describing file modes + Copyright (C) 2005 Rocky Bernstein + Copyright (C) 1985, 1990, 1993, 1998-2000 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#if HAVE_CONFIG_H +# include +#endif + +#include + +#if !S_IRUSR +# if S_IREAD +# define S_IRUSR S_IREAD +# else +# define S_IRUSR 00400 +# endif +#endif + +#if !S_IWUSR +# if S_IWRITE +# define S_IWUSR S_IWRITE +# else +# define S_IWUSR 00200 +# endif +#endif + +#if !S_IXUSR +# if S_IEXEC +# define S_IXUSR S_IEXEC +# else +# define S_IXUSR 00100 +# endif +#endif + +#if !S_IRGRP +# define S_IRGRP (S_IRUSR >> 3) +#endif +#if !S_IWGRP +# define S_IWGRP (S_IWUSR >> 3) +#endif +#if !S_IXGRP +# define S_IXGRP (S_IXUSR >> 3) +#endif +#if !S_IROTH +# define S_IROTH (S_IRUSR >> 6) +#endif +#if !S_IWOTH +# define S_IWOTH (S_IWUSR >> 6) +#endif +#if !S_IXOTH +# define S_IXOTH (S_IXUSR >> 6) +#endif + +#ifdef STAT_MACROS_BROKEN +# undef S_ISBLK +# undef S_ISCHR +# undef S_ISDIR +# undef S_ISFIFO +# undef S_ISLNK +# undef S_ISMPB +# undef S_ISMPC +# undef S_ISNWK +# undef S_ISREG +# undef S_ISSOCK +#endif /* STAT_MACROS_BROKEN. */ + +#if !defined S_ISBLK && defined S_IFBLK +# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) +#endif +#if !defined S_ISCHR && defined S_IFCHR +# define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) +#endif +#if !defined S_ISDIR && defined S_IFDIR +# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#endif +#if !defined S_ISREG && defined S_IFREG +# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#endif +#if !defined S_ISFIFO && defined S_IFIFO +# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) +#endif +#if !defined S_ISLNK && defined S_IFLNK +# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) +#endif +#if !defined S_ISSOCK && defined S_IFSOCK +# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) +#endif +#if !defined S_ISMPB && defined S_IFMPB /* V7 */ +# define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB) +# define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC) +#endif +#if !defined S_ISNWK && defined S_IFNWK /* HP/UX */ +# define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK) +#endif +#if !defined S_ISDOOR && defined S_IFDOOR /* Solaris 2.5 and up */ +# define S_ISDOOR(m) (((m) & S_IFMT) == S_IFDOOR) +#endif +#if !defined S_ISCTG && defined S_IFCTG /* MassComp */ +# define S_ISCTG(m) (((m) & S_IFMT) == S_IFCTG) +#endif + + + +/* Set the 's' and 't' flags in file attributes string CHARS, + according to the file mode BITS. */ + +static void +setst (mode_t bits, char *chars) +{ +#ifdef S_ISUID + if (bits & S_ISUID) + { + if (chars[3] != 'x') + /* Set-uid, but not executable by owner. */ + chars[3] = 'S'; + else + chars[3] = 's'; + } +#endif +#ifdef S_ISGID + if (bits & S_ISGID) + { + if (chars[6] != 'x') + /* Set-gid, but not executable by group. */ + chars[6] = 'S'; + else + chars[6] = 's'; + } +#endif +#ifdef S_ISVTX + if (bits & S_ISVTX) + { + if (chars[9] != 'x') + /* Sticky, but not executable by others. */ + chars[9] = 'T'; + else + chars[9] = 't'; + } +#endif +} + +/* Return a character indicating the type of file described by + file mode BITS: + 'd' for directories + 'D' for doors + 'b' for block special files + 'c' for character special files + 'n' for network special files + 'm' for multiplexor files + 'M' for an off-line (regular) file + 'l' for symbolic links + 's' for sockets + 'p' for fifos + 'C' for contigous data files + '-' for regular files + '?' for any other file type. */ + +static char +ftypelet (mode_t bits) +{ +#ifdef S_ISBLK + if (S_ISBLK (bits)) + return 'b'; +#endif + if (S_ISCHR (bits)) + return 'c'; + if (S_ISDIR (bits)) + return 'd'; + if (S_ISREG (bits)) + return '-'; +#ifdef S_ISFIFO + if (S_ISFIFO (bits)) + return 'p'; +#endif +#ifdef S_ISLNK + if (S_ISLNK (bits)) + return 'l'; +#endif +#ifdef S_ISSOCK + if (S_ISSOCK (bits)) + return 's'; +#endif +#ifdef S_ISMPC + if (S_ISMPC (bits)) + return 'm'; +#endif +#ifdef S_ISNWK + if (S_ISNWK (bits)) + return 'n'; +#endif +#ifdef S_ISDOOR + if (S_ISDOOR (bits)) + return 'D'; +#endif +#ifdef S_ISCTG + if (S_ISCTG (bits)) + return 'C'; +#endif + + /* The following two tests are for Cray DMF (Data Migration + Facility), which is a HSM file system. A migrated file has a + `st_dm_mode' that is different from the normal `st_mode', so any + tests for migrated files should use the former. */ + +#ifdef S_ISOFD + if (S_ISOFD (bits)) + /* off line, with data */ + return 'M'; +#endif +#ifdef S_ISOFL + /* off line, with no data */ + if (S_ISOFL (bits)) + return 'M'; +#endif + return '?'; +} + +/*! udf_mode_string - fill in string STR with an ls-style ASCII + representation of the st_mode field of file stats block STATP. + 10 characters are stored in STR; no terminating null is added. + The characters stored in STR are: + + 0 File type. 'd' for directory, 'c' for character + special, 'b' for block special, 'm' for multiplex, + 'l' for symbolic link, 's' for socket, 'p' for fifo, + '-' for regular, '?' for any other file type + + 1 'r' if the owner may read, '-' otherwise. + + 2 'w' if the owner may write, '-' otherwise. + + 3 'x' if the owner may execute, 's' if the file is + set-user-id, '-' otherwise. + 'S' if the file is set-user-id, but the execute + bit isn't set. + + 4 'r' if group members may read, '-' otherwise. + + 5 'w' if group members may write, '-' otherwise. + + 6 'x' if group members may execute, 's' if the file is + set-group-id, '-' otherwise. + 'S' if it is set-group-id but not executable. + + 7 'r' if any user may read, '-' otherwise. + + 8 'w' if any user may write, '-' otherwise. + + 9 'x' if any user may execute, 't' if the file is "sticky" + (will be retained in swap space after execution), '-' + otherwise. + 'T' if the file is sticky but not executable. */ + +char * +udf_mode_string (mode_t mode, char *str) +{ + str[0] = ftypelet (mode); + str[1] = mode & S_IRUSR ? 'r' : '-'; + str[2] = mode & S_IWUSR ? 'w' : '-'; + str[3] = mode & S_IXUSR ? 'x' : '-'; + str[4] = mode & S_IRGRP ? 'r' : '-'; + str[5] = mode & S_IWGRP ? 'w' : '-'; + str[6] = mode & S_IXGRP ? 'x' : '-'; + str[7] = mode & S_IROTH ? 'r' : '-'; + str[8] = mode & S_IWOTH ? 'w' : '-'; + str[9] = mode & S_IXOTH ? 'x' : '-'; + setst (mode, str); + return str; +} diff --git a/lib/udf/libudf.sym b/lib/udf/libudf.sym index c3a5a94f..7dca536a 100644 --- a/lib/udf/libudf.sym +++ b/lib/udf/libudf.sym @@ -1,6 +1,7 @@ debug_ecma_167_enums1 debug_ecma_167_timezone_enum debug_file_characteristics +debug_icbtag_file_type_enum debug_tagid debug_udf_enums1 VSD_STD_ID_BEA01 @@ -15,7 +16,7 @@ udf_get_file_entry udf_get_fileid_descriptor udf_get_filename udf_get_part_number -udf_get_posix_filemode_str +udf_get_posix_filemode udf_get_next udf_get_sub udf_is_dir diff --git a/lib/udf/udf.c b/lib/udf/udf.c index 80ebc4a7..336738ae 100644 --- a/lib/udf/udf.c +++ b/lib/udf/udf.c @@ -1,5 +1,5 @@ /* - $Id: udf.c,v 1.5 2005/10/29 14:52:47 rocky Exp $ + $Id: udf.c,v 1.6 2005/10/30 05:43:01 rocky Exp $ Copyright (C) 2005 Rocky Bernstein @@ -26,6 +26,10 @@ # include #endif +#ifdef HAVE_SYS_STAT_H +# include +#endif + /** The below variables are trickery to force enum symbol values to be recorded in debug symbol tables. They are used to allow one to refer to the enumeration value names in the typedefs above in a debugger @@ -34,31 +38,67 @@ tag_id_t debug_tagid; file_characteristics_t debug_file_characteristics; udf_enum1_t debug_udf_enum1; +icbtag_file_type_enum_t debug_icbtag_file_type_enum; ecma_167_enum1_t ecma167_enum1; ecma_167_timezone_enum_t debug_ecma_167_timezone_enum; /*! - Returns a string which interpreting the extended attribute permissions + Returns POSIX mode bitstring for a given file. */ -const char * -udf_get_attr_str(udf_Uint32_t permissions, char *result) +mode_t +udf_get_posix_filemode(const udf_file_t *p_udf_file) { - uint32_t i_perms = uint32_from_le(permissions); + udf_file_entry_t udf_fe; + mode_t mode = 0; - result[ 0] = (i_perms & FE_PERM_U_READ) ? 'r' : '-'; - result[ 1] = (i_perms & FE_PERM_U_WRITE) ? 'w' : '-'; - result[ 2] = (i_perms & FE_PERM_U_EXEC) ? 'x' : '-'; + if (udf_get_file_entry(p_udf_file, &udf_fe)) { + uint16_t i_flags; + uint32_t i_perms; - result[ 3] = (i_perms & FE_PERM_G_READ) ? 'r' : '-'; - result[ 4] = (i_perms & FE_PERM_G_WRITE) ? 'w' : '-'; - result[ 5] = (i_perms & FE_PERM_G_EXEC) ? 'x' : '-'; + i_perms = uint32_from_le(udf_fe.permissions); + i_flags = uint16_from_le(udf_fe.icb_tag.flags); - result[ 6] = (i_perms & FE_PERM_O_READ) ? 'r' : '-'; - result[ 7] = (i_perms & FE_PERM_O_WRITE) ? 'w' : '-'; - result[ 8] = (i_perms & FE_PERM_O_EXEC) ? 'x' : '-'; + if (i_perms & FE_PERM_U_READ) mode |= S_IRUSR; + if (i_perms & FE_PERM_U_WRITE) mode |= S_IWUSR; + if (i_perms & FE_PERM_U_EXEC) mode |= S_IXUSR; + + if (i_perms & FE_PERM_G_READ) mode |= S_IRGRP; + if (i_perms & FE_PERM_G_WRITE) mode |= S_IWGRP; + if (i_perms & FE_PERM_G_EXEC) mode |= S_IXGRP; + + if (i_perms & FE_PERM_O_READ) mode |= S_IROTH; + if (i_perms & FE_PERM_O_WRITE) mode |= S_IWOTH; + if (i_perms & FE_PERM_O_EXEC) mode |= S_IXOTH; - result[ 9] = '\0'; - return result; + switch (udf_fe.icb_tag.file_type) { + case ICBTAG_FILE_TYPE_DIRECTORY: + mode |= S_IFDIR; + break; + case ICBTAG_FILE_TYPE_REGULAR: + mode |= S_IFREG; + break; + case ICBTAG_FILE_TYPE_SYMLINK: + mode |= S_IFLNK; + break; + case ICBTAG_FILE_TYPE_CHAR: + mode |= S_IFCHR; + break; + case ICBTAG_FILE_TYPE_SOCKET: + mode |= S_IFSOCK; + break; + case ICBTAG_FILE_TYPE_BLOCK: + mode |= S_IFBLK; + break; + default: ; + }; + + if (i_flags & ICBTAG_FLAG_SETUID) mode |= S_ISUID; + if (i_flags & ICBTAG_FLAG_SETGID) mode |= S_ISGID; + if (i_flags & ICBTAG_FLAG_STICKY) mode |= S_ISVTX; + } + + return mode; + } const char * @@ -68,29 +108,6 @@ udf_get_filename(const udf_file_t *p_udf_file) return p_udf_file->psz_name; } -/*! - Returns a POSIX filemode string for a given p_udf_file. -*/ -const char * -udf_get_posix_filemode_str(const udf_file_t *p_udf_file, char perms[]) -{ - udf_file_entry_t udf_fe; - - if (p_udf_file->b_dir) { - perms[0] = 'd'; - } else { - perms[0] = '-'; - } - - if (udf_get_file_entry(p_udf_file, &udf_fe)) { - /* Print directory attributes*/ - udf_get_attr_str (udf_fe.permissions, &perms[1]); - return perms; - } - return ""; -} - - bool udf_get_file_entry(const udf_file_t *p_udf_file, /*out*/ udf_file_entry_t *p_udf_fe)