diff --git a/.bzrignore b/.bzrignore index 79c4be0..0516e92 100644 --- a/.bzrignore +++ b/.bzrignore @@ -35,3 +35,5 @@ demo/isocat demo/isomodify demo/isoms demo/isogrow +doc/html +doc/doxygen.conf diff --git a/Makefile.am b/Makefile.am index 6081787..f16896c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,8 +51,7 @@ libisofs_libisofs_la_SOURCES = \ libisofs/iso1999.c \ libisofs/data_source.c libinclude_HEADERS = \ - libisofs/libisofs.h \ - libisofs/error.h + libisofs/libisofs.h ## ========================================================================= ## @@ -138,7 +137,23 @@ test_test_SOURCES = \ ## ========================================================================= ## ## Build documentation (You need Doxygen for this to work) -## TODO!! + +docdir = $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION) + +doc: doc/html + +doc/html: doc/doxygen.conf + $(RM) -r doc/html; \ + doxygen doc/doxygen.conf; + +install-data-local: + if [ -d doc/html ]; then \ + $(mkinstalldirs) $(docdir)/html; \ + $(INSTALL_DATA) doc/html/* $(docdir)/html; \ + fi + +uninstall-local: + rm -rf $(docdir) ## ========================================================================= ## @@ -149,6 +164,8 @@ nodist_pkgconfig_DATA = \ EXTRA_DIST = \ libisofs-5.pc.in \ version.h.in \ + doc/doxygen.conf.in \ + doc/Tutorial \ README \ AUTHORS \ COPYRIGHT \ @@ -156,5 +173,6 @@ EXTRA_DIST = \ NEWS \ INSTALL \ TODO \ - ChangeLog + ChangeLog \ + Roadmap diff --git a/Roadmap b/Roadmap index 21b90bf..0630af4 100644 --- a/Roadmap +++ b/Roadmap @@ -1,46 +1,31 @@ +>>>>>>>>>> RELEASE 0.6.1 (development) >>>>>>>>>>>>>>>>>>>>> + - Review error severities +- Prepare API for stability and compatibility check +- Documentation + +>>>>>>>>>> RELEASE 0.6.2 (stable) >>>>>>>>>>>>>>>>>>>>>>>>>> + +- Intensive testing and bug fixing - Improves to public tree -> Expose node extended info. Always compile it. (little memory cost) - -> Review builder / tree / node relation - OK -> Add low level functions to create nodes. + -> Review builder / tree / node relation -> Optimize storage of children in node? -> Inode object? ->>>>>>>>>> RELEASE CANDIDATE >>>>>>>>>>>>>>>>> - -- Intensive bug fix -- xorriso must work with libisofs version - ->>>>>>>>>> RELEASE (0.6.0? 1.0.0?) >>>>>>>>>>>>> - -- No stable API yet. -- Release will be branched and maintained for bug fixes - ->>>>> NEXT DEVELOPMENT CICLE +>>>>>>>>>> RELEASE 0.6.3 (development) >>>>>>>>>>>>>>>>>>>>> - Expose Builder and Streams - Implement filters: compression, encryption... +- Consider some kind of plugin system for Builders, Filesystems and Filters. - Update Java bindings ->>>>>>>>>>> RELEASE (0.6.1? 1.0.1?) >>>>>>>>>>>>> +>>>>>>>>>>> ...... -- API not stable yet, but from here changes must be minimized. -- Release will be branched and maintained for bug fixes - ->>>>> NEXT DEVELOPMENT CICLE +>>>>>>>>>>> RELEASE 1.0.0 (stable) >>>>>>>>>>>>>>>>>>>>>>>>>> - UDF - HFS ->>>>>>>>> - -???? - ->>>>>>>>>> RELEASE (1.0.0? 2.0.0?) >>>>>>>>>>>>>>>>> - -- From here API stability guaranted. We must preserve both source and binary -compatibility at least until 2.0.0 (3.0.0) - - diff --git a/TODO b/TODO index e6528aa..bad313f 100644 --- a/TODO +++ b/TODO @@ -6,8 +6,6 @@ TODO ==== #00001 (node.h) -> consider adding new timestamps to IsoTreeNode -OK #00002 (node.h) -> handle deletion of each kind of node -OK #00003 make error.h header public #00004 (libisofs.h) -> Add a get_mime_type() function. #00005 (node.c) -> optimize iso_dir_iter_take. #00006 (libisofs.h) -> define more replace values when adding a node to a dir @@ -27,7 +25,6 @@ OK #00003 make error.h header public #00020 (fs_image.c) -> handle RR info in Joliet tree #00021 (fs_image.c) -> handle RR info in ISO 9660:1999 tree #00022 (joliet.c) -> support relaxed constraints in joliet filenames -#00023 (libisofs.h) -> let different default file and dir mode for iso reading #00024 (libisofs.h) -> option to convert names to lower case for iso reading #00025 (libisofs.h) -> support for merging old image files #00026 (libisofs.h) -> add support for "hidden" bootable images. @@ -36,6 +33,3 @@ OK #00003 make error.h header public FIXME ===== -OK #00001 (iso1999.c) -> Mangle ISO 9660:1999 names -OK #00002 (joliet.c) -> Mangle Joliet names - diff --git a/configure.ac b/configure.ac index 2c3a6bf..c011c42 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,7 @@ AC_SYS_LARGEFILE AC_FUNC_FSEEKO AC_CHECK_FUNC([fseeko]) if test ! $ac_cv_func_fseeko; then - AC_ERROR([Libisofs requires largefile support.]) + AC_MSG_ERROR([Libisofs requires largefile support.]) fi AC_PROG_LIBTOOL @@ -142,6 +142,7 @@ fi AC_CONFIG_FILES([ Makefile + doc/doxygen.conf version.h libisofs-5.pc ]) diff --git a/demo/tree.c b/demo/tree.c index af289c8..6dddbb9 100644 --- a/demo/tree.c +++ b/demo/tree.c @@ -49,20 +49,20 @@ print_dir(IsoDir *dir, int level) iso_dir_get_children(dir, &iter); while (iso_dir_iter_next(iter, &node) == 1) { - if (iso_node_get_type(node) == LIBISO_DIR) { + if (ISO_NODE_IS_DIR(node)) { printf("%s+[D] ", sp); print_permissions(iso_node_get_permissions(node)); printf(" %s\n", iso_node_get_name(node)); - print_dir((IsoDir*)node, level+1); - } else if (iso_node_get_type(node) == LIBISO_FILE) { + print_dir(ISO_DIR(node), level+1); + } else if (ISO_NODE_IS_FILE(node)) { printf("%s-[F] ", sp); print_permissions(iso_node_get_permissions(node)); printf(" %s\n", iso_node_get_name(node) ); - } else if (iso_node_get_type(node) == LIBISO_SYMLINK) { + } else if (ISO_NODE_IS_SYMLINK(node)) { printf("%s-[L] ", sp); print_permissions(iso_node_get_permissions(node)); printf(" %s -> %s \n", iso_node_get_name(node), - iso_symlink_get_dest((IsoSymlink*)node) ); + iso_symlink_get_dest(ISO_SYMLINK(node)) ); } else { printf("%s-[C] ", sp); print_permissions(iso_node_get_permissions(node)); diff --git a/doc/Tutorial b/doc/Tutorial old mode 100644 new mode 100755 index ba74df2..7a1f93c --- a/doc/Tutorial +++ b/doc/Tutorial @@ -17,8 +17,8 @@ Contents: 1.2 Image context 1.3 Error reporting 2. Creating an image - 2.1 Image context - 2.2 Image tree manipulation + 2.1 Image tree manipulation + 2.2 Set the write options 2.3 Obtaining a burn_source 3. Image growing and multisession 4. Bootable images @@ -29,6 +29,7 @@ Contents: 1. Introduction ------------------------------------------------------------------------------- +[TODO some lines about refcounts] ------------------------------------------------------------------------------- 1.1. Library initialization @@ -64,17 +65,19 @@ contexts at a time. In libisofs error reporting is done in two ways: with the return value of the functions and with the message queue. -Error codes are negative numbers, defined in private header "error.h". An +Error codes are negative numbers, defined in "libisofs.h" header. An error code is associated with a given severity, either "DEBUG", "UPDATE", "NOTE", "HINT", "WARNING", "SORRY", "FAILURE" and "FATAL". For the meaning of each severity take a look at private header "libiso_msgs.h". Errors reported by function return value are always "FAILURE" or "FATAL". Other kind -of errors are only reported with the message queue. +of errors are only reported with the message queue. You can get the severity +of any error message with ISO_ERR_SEV() macro [TODO: we need a function to +translate error severity to string] First of all, most libisofs functions return an integer. If such integer is a negative number, it means the function has returned an error. The error code -and its severity is encoded in the return value (take a look at error.h private -header). +and its severity is encoded in the return value (take a look at error codes in +libisofs.h header). Additionally, libisofs reports most of its errors in a message queue. Error messages on that queue can be printed directly to stderr or programmatically @@ -96,3 +99,128 @@ given image context. You can get the identifier of each IsoImage with the and that way distinguish what image has issued the message. +------------------------------------------------------------------------------- +2. Creating an Image +------------------------------------------------------------------------------- + +An image is built from a set of files that you want to store together in an +ISO-9660 volume. + +[TODO] + +[explain volume properties] + +phases [TODO]: + +* Obtain the image context. +* Prepare the iso tree with the files you want to add to image. +* Select the options for image generation. +* Get the burn_source used to actually write the image. + + +------------------------------------------------------------------------------- +2.1 Image tree manipulation + +libisofs maintains in memory a file tree (usually called the iso tree), that +represents the files and directories that will be written later to image. You +are allowed to make whatever changes you want to that tree, just like you do +to any "real" filesystem, before actually write it to image. + +Unlike other ISO-9660 mastering tools, you have full control over the file +hierarchy that will be written to image, via the libisofs API. You can add +new files, create any file in image, change its name, attributes, etc The iso +tree behaves just like any other POSIX filesystem. + +The root of the iso tree is created automatically when the IsoImage is +allocated, and you can't replace it. To get a reference to it you can use the +function: + + iso_image_get_root() + +* Iso tree objects + +Each file in the image or iso tree is represented by an IsoNode instance. In +the same way a POSIX filesystem has several file types (regular files, +directories, symlinks...), the IsoNode has several subtypes: + + IsoNode + | + --------------------------------- + | | | | + IsoDir IsoFile IsoSymlink IsoSpecial + +where + + - IsoDir represents a directory + - IsoFile represents a regular file + - IsoSymlink represents a symbolic linke + - IsoSpecial represents any other POSIX file, i.e. block and character + devices, FIFOs, sockets. + +You can obtain the concrete type of an IsoNode with the iso_node_get_type() +function. + +Many libisofs functions take or return an IsoNode. Many others, however, +require an specific type. You can safety cast any subtype to an IsoNode +object. In the same way, after ensuring you are dealing with the correct +subtype, you can downcast a given IsoNode to the specific subtype. + + IsoDir *dir; + IsoNode *node; + + node = (IsoNode*) dir; + + if (iso_node_get_type(node) == LIBISO_DIR) { + dir = (IsoDir*) node; + ... + } + +* Adding files to the image + +Files can be added to the image or iso tree either as new files or as files +"imported" from the filesystem. + +In the first case, files are created directly on the image. They do not +correspond to any file in the filesystem. + +[...explain this kind of functions...] + +On the other side, you can add local files to the image, either with the + + iso_tree_add_node() + +or with + + iso_tree_add_dir_rec(). + +The first is intended to add a single file, while the last can be used to add, +recursively, a full directory (see below for details). + +It is important to note that libisofs doesn't store any kind of link between +the IsoNode and the filesystem file it was created from. The above functions +just initialize a newly created IsoNode with the attributes of a given file in +the filesystem. After that, you can move the original file, change its +attributes or even delete it. The IsoNode in the image tree remains with the +original attributes. One exception to this rule are the contents of a regular +file. Libisofs does not make any copy of those contents until they're actually +written to image. Thus, you shouldn't modify, move or delete regular files +after adding them to the IsoImage. + + +* Recursive directory addition. + +[TODO] + +* Operations on iso tree + +[TODO briefly explain how to add node, change attributes, ...] + + + +------------------------------------------------------------------------------- +2.2 Set the write options + + + + + diff --git a/doc/doxygen.conf.in b/doc/doxygen.conf.in new file mode 100644 index 0000000..fe1864f --- /dev/null +++ b/doc/doxygen.conf.in @@ -0,0 +1,1298 @@ +# Doxyfile 1.5.3 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file that +# follow. The default is UTF-8 which is also the encoding used for all text before +# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into +# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list +# of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = @PACKAGE_NAME@ + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = @PACKAGE_VERSION@ + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, +# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, +# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, +# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = @top_srcdir@ + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = YES + +# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# will output the detailed description near the top, like JavaDoc. +# If set to NO, the detailed description appears after the member +# documentation. + +DETAILS_AT_TOP = YES + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = YES + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes +# will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = YES + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be extracted +# and appear in the documentation as a namespace called 'anonymous_namespace{file}', +# where file will be replaced with the base name of the file that contains the anonymous +# namespace. By default anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from the +# version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = YES + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text " + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = libisofs \ + doc + +# This tag can be used to specify the character encoding of the source files that +# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default +# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. +# See http://www.gnu.org/software/libiconv for the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py + +FILE_PATTERNS = libisofs.h \ + comments + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the output. +# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, +# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = test + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH +# then you must also enable this option. If you don't then doxygen will produce +# a warning and turn it on anyway + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = YES + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = NO + +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentstion. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = OB \ + OTK \ + _ + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = doc/html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 200 + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = letter + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = DOXYGEN + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to +# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to +# specify the directory where the mscgen tool resides. If left empty the tool is assumed to +# be found in the default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = NO + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the number +# of direct children of the root node in a graph is already larger than +# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, which results in a white background. +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO diff --git a/libisofs/buffer.c b/libisofs/buffer.c index 8618ad6..c59bad1 100644 --- a/libisofs/buffer.c +++ b/libisofs/buffer.c @@ -17,7 +17,6 @@ */ #include "buffer.h" -#include "error.h" #include "libburn/libburn.h" #include "ecma119.h" diff --git a/libisofs/builder.c b/libisofs/builder.c index 615fb27..9dbea87 100644 --- a/libisofs/builder.c +++ b/libisofs/builder.c @@ -7,7 +7,6 @@ */ #include "builder.h" -#include "error.h" #include "node.h" #include "fsource.h" diff --git a/libisofs/data_source.c b/libisofs/data_source.c index 7510a89..98515c6 100644 --- a/libisofs/data_source.c +++ b/libisofs/data_source.c @@ -7,7 +7,6 @@ */ #include "libisofs.h" -#include "error.h" #include "util.h" #include diff --git a/libisofs/ecma119.c b/libisofs/ecma119.c index aa34a07..3fff055 100644 --- a/libisofs/ecma119.c +++ b/libisofs/ecma119.c @@ -13,7 +13,6 @@ #include "iso1999.h" #include "eltorito.h" #include "ecma119_tree.h" -#include "error.h" #include "filesrc.h" #include "image.h" #include "writer.h" diff --git a/libisofs/ecma119_tree.c b/libisofs/ecma119_tree.c index a93ef79..943fa0a 100644 --- a/libisofs/ecma119_tree.c +++ b/libisofs/ecma119_tree.c @@ -8,7 +8,6 @@ #include "ecma119_tree.h" #include "ecma119.h" -#include "error.h" #include "node.h" #include "util.h" #include "filesrc.h" diff --git a/libisofs/eltorito.c b/libisofs/eltorito.c index 2bf50a7..8b0c9dd 100644 --- a/libisofs/eltorito.c +++ b/libisofs/eltorito.c @@ -8,7 +8,6 @@ #include "eltorito.h" #include "stream.h" -#include "error.h" #include "fsource.h" #include "filesrc.h" #include "image.h" diff --git a/libisofs/filesrc.c b/libisofs/filesrc.c index 879ab70..989445f 100644 --- a/libisofs/filesrc.c +++ b/libisofs/filesrc.c @@ -7,7 +7,6 @@ */ #include "filesrc.h" -#include "error.h" #include "node.h" #include "util.h" #include "writer.h" diff --git a/libisofs/fs_image.c b/libisofs/fs_image.c index 15716a1..1e123fb 100644 --- a/libisofs/fs_image.c +++ b/libisofs/fs_image.c @@ -12,7 +12,6 @@ */ #include "libisofs.h" -#include "error.h" #include "ecma119.h" #include "messages.h" #include "rockridge.h" @@ -67,8 +66,8 @@ struct iso_read_opts uid_t uid; /**< Default uid when no RR */ gid_t gid; /**< Default uid when no RR */ - mode_t mode; /**< Default mode when no RR (only permissions) */ - /* TODO #00023 : let different default file and dir mode for iso reading */ + mode_t dir_mode; /**< Default mode when no RR (only permissions) */ + mode_t file_mode; /* TODO #00024 : option to convert names to lower case for iso reading */ /** @@ -115,7 +114,8 @@ typedef struct uid_t uid; /**< Default uid when no RR */ gid_t gid; /**< Default uid when no RR */ - mode_t mode; /**< Default mode when no RR (only permissions) */ + mode_t dir_mode; /**< Default mode when no RR (only permissions) */ + mode_t file_mode; int msgid; @@ -1064,13 +1064,13 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent, } else { /* RR extensions are not read / used */ - atts.st_mode = fsdata->mode; atts.st_gid = fsdata->gid; atts.st_uid = fsdata->uid; - if (record->flags[0] & 0x02) - atts.st_mode |= S_IFDIR; - else - atts.st_mode |= S_IFREG; + if (record->flags[0] & 0x02) { + atts.st_mode = S_IFDIR | fsdata->dir_mode; + } else { + atts.st_mode = S_IFREG | fsdata->file_mode; + } } /* @@ -1723,7 +1723,8 @@ int iso_image_filesystem_new(IsoDataSource *src, struct iso_read_opts *opts, /* fill data from opts */ data->gid = opts->gid; data->uid = opts->uid; - data->mode = opts->mode & ~S_IFMT; + data->file_mode = opts->file_mode & ~S_IFMT; + data->dir_mode = opts->dir_mode & ~S_IFMT; data->msgid = msgid; setlocale(LC_CTYPE, ""); @@ -2453,7 +2454,8 @@ int iso_read_opts_new(IsoReadOpts **opts, int profile) return ISO_OUT_OF_MEM; } - ropts->mode = 0555; + ropts->file_mode = 0444; + ropts->dir_mode = 0555; *opts = ropts; return ISO_SUCCESS; } @@ -2531,12 +2533,14 @@ int iso_read_opts_set_default_gid(IsoReadOpts *opts, gid_t gid) return ISO_SUCCESS; } -int iso_read_opts_set_default_permissions(IsoReadOpts *opts, mode_t perm) +int iso_read_opts_set_default_permissions(IsoReadOpts *opts, mode_t file_perm, + mode_t dir_perm) { if (opts == NULL) { return ISO_NULL_POINTER; } - opts->mode = perm; + opts->file_mode = file_perm; + opts->dir_mode = dir_perm; return ISO_SUCCESS; } diff --git a/libisofs/fs_local.c b/libisofs/fs_local.c index 90f9c0d..e9a28b7 100644 --- a/libisofs/fs_local.c +++ b/libisofs/fs_local.c @@ -11,7 +11,6 @@ */ #include "fsource.h" -#include "error.h" #include "util.h" #include diff --git a/libisofs/image.c b/libisofs/image.c index 0f85290..0792483 100644 --- a/libisofs/image.c +++ b/libisofs/image.c @@ -8,7 +8,6 @@ #include "libisofs.h" #include "image.h" -#include "error.h" #include "node.h" #include "messages.h" #include "eltorito.h" @@ -92,11 +91,19 @@ void iso_image_ref(IsoImage *image) void iso_image_unref(IsoImage *image) { if (--image->refcount == 0) { + int nexcl; + /* we need to free the image */ if (image->user_data != NULL) { /* free attached data */ image->user_data_free(image->user_data); } + + for (nexcl = 0; nexcl < image->nexcludes; ++nexcl) { + free(image->excludes[nexcl]); + } + free(image->excludes); + iso_node_unref((IsoNode*)image->root); iso_node_builder_unref(image->builder); iso_filesystem_unref(image->fs); diff --git a/libisofs/image.h b/libisofs/image.h index aae7bc2..b86aca1 100644 --- a/libisofs/image.h +++ b/libisofs/image.h @@ -77,10 +77,10 @@ struct Iso_Image int ignore_special; /** - * Files to exclude - * TODO add wildcard support + * Files to exclude. Wildcard support is included. */ char** excludes; + int nexcludes; /** * if the dir already contains a node with the same name, whether to diff --git a/libisofs/iso1999.c b/libisofs/iso1999.c index 92da386..827d5ad 100644 --- a/libisofs/iso1999.c +++ b/libisofs/iso1999.c @@ -9,7 +9,6 @@ #include "iso1999.h" #include "messages.h" #include "writer.h" -#include "error.h" #include "image.h" #include "filesrc.h" #include "eltorito.h" diff --git a/libisofs/joliet.c b/libisofs/joliet.c index 7c21fd9..0b86f03 100644 --- a/libisofs/joliet.c +++ b/libisofs/joliet.c @@ -10,7 +10,6 @@ #include "joliet.h" #include "messages.h" #include "writer.h" -#include "error.h" #include "image.h" #include "filesrc.h" #include "eltorito.h" diff --git a/libisofs/libisofs.h b/libisofs/libisofs.h index 7cddb21..2fdca25 100644 --- a/libisofs/libisofs.h +++ b/libisofs/libisofs.h @@ -8,6 +8,55 @@ #ifndef LIBISO_LIBISOFS_H_ #define LIBISO_LIBISOFS_H_ +/** + * These three release version numbers tell the revision of this header file + * and of the API it describes. They are memorized by applications at compile + * time. + * + * Before usage on your code, please read the usage discussion below. + */ +#define libisofs_header_version_major 0 +#define libisofs_header_version_minor 6 +#define libisofs_header_version_micro 1 + +/** + * Usage discussion: + * + * Some developers of the libburnia project have differing opinions how to + * ensure the compatibility of libaries and applications. + * + * It is about whether to use at compile time and at runtime the version + * numbers provided here. Thomas Schmitt advises to use them. Vreixo Formoso + * advises to use other means. + * + * At compile time: + * + * Vreixo Formoso advises to leave proper version matching to properly + * programmed checks in the the application's build system, which will + * eventually refuse compilation. + * + * Thomas Schmitt advises to use the macros defined here for comparison with + * the application's requirements of library revisions and to eventually + * break compilation. + * + * Both advises are combinable. I.e. be master of your build system and have + * #if checks in the source code of your application, nevertheless. + * + * At runtime (via iso_lib_is_compatible()): + * + * Vreixo Formoso advises to compare the application's requirements of + * library revisions with the runtime library. This is to allow runtime + * libraries which are young enough for the application but too old for + * the lib*.h files seen at compile time. + * + * Thomas Schmitt advises to compare the header revisions defined here with + * the runtime library. This is to enforce a strictly monotonous chain of + * revisions from app to header to library, at the cost of excluding some older + * libraries. + * + * These two advises are mutually exclusive. + */ + #include #include @@ -25,6 +74,21 @@ typedef struct Iso_Symlink IsoSymlink; typedef struct Iso_File IsoFile; typedef struct Iso_Special IsoSpecial; +/* macros to check node type */ +#define ISO_NODE_IS_DIR(n) (iso_node_get_type(n) == LIBISO_DIR) +#define ISO_NODE_IS_FILE(n) (iso_node_get_type(n) == LIBISO_FILE) +#define ISO_NODE_IS_SYMLINK(n) (iso_node_get_type(n) == LIBISO_SYMLINK) +#define ISO_NODE_IS_SPECIAL(n) (iso_node_get_type(n) == LIBISO_SPECIAL) +#define ISO_NODE_IS_BOOTCAT(n) (iso_node_get_type(n) == LIBISO_BOOT) + +/* macros for safe downcasting */ +#define ISO_DIR(n) ((IsoDir*)(ISO_NODE_IS_DIR(n) ? n : NULL)) +#define ISO_FILE(n) ((IsoFile*)(ISO_NODE_IS_FILE(n) ? n : NULL)) +#define ISO_SYMLINK(n) ((IsoSymlink*)(ISO_NODE_IS_SYMLINK(n) ? n : NULL)) +#define ISO_SPECIAL(n) ((IsoSpecial*)(ISO_NODE_IS_SPECIAL(n) ? n : NULL)) + +#define ISO_NODE(n) ((IsoNode*)n) + typedef struct Iso_Dir_Iter IsoDirIter; typedef struct el_torito_boot_image ElToritoBootImage; @@ -126,11 +190,12 @@ typedef struct iso_data_source IsoDataSource; * it with regular .iso images, and also with block devices that represent a * drive. */ -struct iso_data_source { +struct iso_data_source +{ /* reserved for future usage, set to 0 */ int version; - + /** * Reference count for the data source. Should be 1 when a new source * is created. Don't access it directly, but with iso_data_source_ref() @@ -192,20 +257,20 @@ struct iso_read_image_features * Will be filled with the size (in 2048 byte block) of the image, as * reported in the PVM. */ - uint32_t size; - + uint32_t size; + /** It will be set to 1 if RR extensions are present, to 0 if not. */ unsigned int hasRR :1; - + /** It will be set to 1 if Joliet extensions are present, to 0 if not. */ unsigned int hasJoliet :1; - + /** * It will be set to 1 if the image is an ISO 9660:1999, i.e. it has * a version 2 Enhanced Volume Descriptor. */ unsigned int hasIso1999 :1; - + /** It will be set to 1 if El-Torito boot record is present, to 0 if not.*/ unsigned int hasElTorito :1; }; @@ -314,7 +379,7 @@ struct iso_filesystem * @return 1 on success, < 0 on error */ int (*close)(IsoFilesystem *fs); - + /** * Free implementation specific data. Should never be called by user. * Use iso_filesystem_unref() instead. @@ -557,6 +622,14 @@ int iso_image_new(const char *name, IsoImage **image); */ void iso_lib_version(int *major, int *minor, int *micro); +/** + * Check if the library is ABI compatible with the given version. + * + * @return + * 1 lib is compatible, 0 is not. + */ +int iso_lib_is_compatible(int major, int minor, int micro); + /** * Creates an IsoWriteOpts for writing an image. You should set the options * desired with the correspondent setters. @@ -785,6 +858,8 @@ int iso_write_opts_set_always_gmt(IsoWriteOpts *opts, int gmt); * Set the charset to use for the RR names of the files that will be created * on the image. * NULL to use default charset, that is the locale charset. + * You can obtain the list of charsets supported on your system executing + * "iconv -l" in a shell. */ int iso_write_opts_set_output_charset(IsoWriteOpts *opts, const char *charset); @@ -950,13 +1025,24 @@ int iso_read_opts_set_default_gid(IsoReadOpts *opts, gid_t gid); /** * Set default permissions for files when RR extensions are not present. + * + * @param file_perm + * Permissions for files. + * @param dir_perm + * Permissions for directories. */ -int iso_read_opts_set_default_permissions(IsoReadOpts *opts, mode_t perm); +int iso_read_opts_set_default_permissions(IsoReadOpts *opts, mode_t file_perm, + mode_t dir_perm); /** * Set the input charset of the file names on the image. NULL to use locale * charset. You have to specify a charset if the image filenames are encoded - * in a charset different that the local one. + * in a charset different that the local one. This could happen, for example, + * if the image was created on a system with different charset. + * + * @param charset + * The charset to use as input charset. You can obtain the list of + * charsets supported on your system executing "iconv -l" in a shell. */ int iso_read_opts_set_input_charset(IsoReadOpts *opts, const char *charset); @@ -980,8 +1066,7 @@ int iso_read_opts_set_input_charset(IsoReadOpts *opts, const char *charset); * @return * 1 on success, < 0 on error */ -int iso_image_import(IsoImage *image, IsoDataSource *src, - IsoReadOpts *opts, +int iso_image_import(IsoImage *image, IsoDataSource *src, IsoReadOpts *opts, struct iso_read_image_features **features); /** @@ -1175,10 +1260,11 @@ const char *iso_image_get_biblio_file_id(const IsoImage *image); * @return * 1 on success, < 0 on error */ -int iso_image_set_boot_image(IsoImage *image, const char *image_path, - enum eltorito_boot_media_type type, - const char *catalog_path, - ElToritoBootImage **boot); +int + iso_image_set_boot_image(IsoImage *image, const char *image_path, + enum eltorito_boot_media_type type, + const char *catalog_path, + ElToritoBootImage **boot); /* TODO #00026 : add support for "hidden" bootable images. */ @@ -1411,12 +1497,15 @@ void iso_node_set_hidden(IsoNode *node, int hide_attrs); * ISO_NODE_NAME_NOT_UNIQUE, a node with same name already exists * ISO_WRONG_ARG_VALUE, if child == dir, or replace != (0,1) */ -int iso_dir_add_node(IsoDir *dir, IsoNode *child, - enum iso_replace_mode replace); +int + iso_dir_add_node(IsoDir *dir, IsoNode *child, + enum iso_replace_mode replace); /** * Locate a node inside a given dir. * + * @param dir + * The dir where to look for the node. * @param name * The name of the node * @param node @@ -1776,6 +1865,65 @@ void iso_tree_set_ignore_special(IsoImage *image, int skip); */ int iso_tree_get_ignore_special(IsoImage *image); +/** + * Add a excluded path. These are paths that won't never added to image, + * and will be excluded even when adding recursively its parent directory. + * + * For example, in + * + * iso_tree_add_exclude(image, "/home/user/data/private"); + * iso_tree_add_dir_rec(image, root, "/home/user/data"); + * + * the directory /home/user/data/private won't be added to image. + * + * However, if you explicity add a deeper dir, it won't be excluded. i.e., + * in the following example. + * + * iso_tree_add_exclude(image, "/home/user/data"); + * iso_tree_add_dir_rec(image, root, "/home/user/data/private"); + * + * the directory /home/user/data/private is added. On the other, side, and + * foollowing the the example above, + * + * iso_tree_add_dir_rec(image, root, "/home/user"); + * + * will exclude the directory "/home/user/data". + * + * Absolute paths are not mandatory, you can, for example, add a relative + * path such as: + * + * iso_tree_add_exclude(image, "private"); + * iso_tree_add_exclude(image, "user/data"); + * + * to excluve, respectively, all files or dirs named private, and also all + * files or dirs named data that belong to a folder named "user". Not that the + * above rule about deeper dirs is still valid. i.e., if you call + * + * iso_tree_add_dir_rec(image, root, "/home/user/data/music"); + * + * it is included even containing "user/data" string. However, a possible + * "/home/user/data/music/user/data" is not added. + * + * Usual wildcards, such as * or ? are also supported, with the usual meaning + * as stated in "man 7 glob". For example + * + * // to exclude backup text files + * iso_tree_add_exclude(image, "*.~"); + * + * @return + * 1 on success, < 0 on error + */ +int iso_tree_add_exclude(IsoImage *image, const char *path); + +/** + * Remove a previously added exclude. + * + * @see iso_tree_add_exclude + * @return + * 1 on success, 0 exclude do not exists, < 0 on error + */ +int iso_tree_remove_exclude(IsoImage *image, const char *path); + /** * Set a callback function that libisofs will call for each file that is * added to the given image by a recursive addition function. This includes @@ -1789,8 +1937,7 @@ int iso_tree_get_ignore_special(IsoImage *image); * continue, < 0 to abort the process * NULL is allowed if you don't want any callback. */ -void iso_tree_set_report_callback(IsoImage *image, - int (*report)(IsoImage*, IsoFileSource*)); +void iso_tree_set_report_callback(IsoImage *image, int (*report)(IsoImage*, IsoFileSource*)); /** * Add a new node to the image tree, from an existing file. @@ -1900,7 +2047,7 @@ int iso_data_source_new_from_file(const char *path, IsoDataSource **src); * 6="ended" : consumption has ended without input error * 7="aborted" : consumption has ended after input error */ -int iso_ring_buffer_get_status(struct burn_source *b, size_t *size, +int iso_ring_buffer_get_status(struct burn_source *b, size_t *size, size_t *free_bytes); #define ISO_MSGS_MESSAGE_LEN 4096 @@ -1918,7 +2065,7 @@ int iso_ring_buffer_get_status(struct burn_source *b, size_t *size, * @param print_id A text prefix to be printed before the message. * @return >0 for success, <=0 for error */ -int iso_set_msgs_severities(char *queue_severity, char *print_severity, +int iso_set_msgs_severities(char *queue_severity, char *print_severity, char *print_id); /** @@ -1930,12 +2077,17 @@ int iso_set_msgs_severities(char *queue_severity, char *print_severity, * "NOTE", "UPDATE", "DEBUG", "ALL". To call with minimum_severity "NEVER" * will discard the whole queue. * - * @param error_code Will become a unique error code as listed in error.h - * @param imgid Id of the image that was issued the message. - * @param msg_text Must provide at least ISO_MSGS_MESSAGE_LEN bytes. - * @param severity Will become the severity related to the message and - * should provide at least 80 bytes. - * @return 1 if a matching item was found, 0 if not, <0 for severe errors + * @param error_code + * Will become a unique error code as listed at the end of this header + * @param imgid + * Id of the image that was issued the message. + * @param msg_text + * Must provide at least ISO_MSGS_MESSAGE_LEN bytes. + * @param severity + * Will become the severity related to the message and should provide at + * least 80 bytes. + * @return + * 1 if a matching item was found, 0 if not, <0 for severe errors */ int iso_obtain_msgs(char *minimum_severity, int *error_code, int *imgid, char msg_text[], char severity[]); @@ -2090,6 +2242,13 @@ int iso_file_source_close(IsoFileSource *src); * more needed. Not valid for dirs. On symlinks it reads the destination * file. * + * @param src + * The given source + * @param buf + * Pointer to a buffer of at least count bytes where the read data will be + * stored + * @param count + * Bytes to read * @return * number of bytes read, 0 if EOF, < 0 on error * Error codes: @@ -2131,12 +2290,14 @@ int iso_file_source_readdir(IsoFileSource *src, IsoFileSource **child); * Read the destination of a symlink. You don't need to open the file * to call this. * + * @param src + * An IsoFileSource corresponding to a symbolic link. * @param buf * allocated buffer of at least bufsiz bytes. * The dest. will be copied there, and it will be NULL-terminated * @param bufsiz * characters to be copied. Destination link will be truncated if - * it is larger than given size. This include the \0 character. + * it is larger than given size. This include the '\0' character. * @return * 1 on success, < 0 on error * Error codes: @@ -2186,8 +2347,8 @@ void iso_filesystem_unref(IsoFilesystem *fs); * @param * 1 on success, < 0 on error */ -int iso_image_filesystem_new(IsoDataSource *src, IsoReadOpts *opts, - int msgid, IsoImageFilesystem **fs); +int iso_image_filesystem_new(IsoDataSource *src, IsoReadOpts *opts, int msgid, + IsoImageFilesystem **fs); /** * Get the volset identifier for an existent image. The returned string belong @@ -2243,4 +2404,212 @@ const char *iso_image_fs_get_abstract_file_id(IsoImageFilesystem *fs); */ const char *iso_image_fs_get_biblio_file_id(IsoImageFilesystem *fs); +/************ Error codes and return values for libisofs ********************/ + +/* + * error codes are 32 bit numbers, that follow the following conventions: + * + * bit 31 (MSB) -> 1 (to make the value always negative) + * bits 30-24 -> Encoded severity (Use ISO_ERR_SEV to translate an error code + * to a LIBISO_MSGS_SEV_* constant) + * = 0x10 -> DEBUG + * = 0x20 -> UPDATE + * = 0x30 -> NOTE + * = 0x40 -> HINT + * = 0x50 -> WARNING + * = 0x60 -> SORRY + * = 0x68 -> FAILURE + * = 0x70 -> FATAL + * = 0x71 -> ABORT + * bits 23-20 -> Encoded priority (Use ISO_ERR_PRIO to translate an error code + * to a LIBISO_MSGS_PRIO_* constant) + * = 0x0 -> ZERO + * = 0x1 -> LOW + * = 0x2 -> MEDIUM + * = 0x3 -> HIGH + * bits 19-16 -> Reserved for future usage (maybe message ranges) + * bits 15-0 -> Error code + */ + +#define ISO_ERR_SEV(e) (e & 0x7F000000) +#define ISO_ERR_PRIO(e) ((e & 0x00F00000) << 8) +#define ISO_ERR_CODE(e) (e & 0x0000FFFF) + +/** successfully execution */ +#define ISO_SUCCESS 1 + +/** + * special return value, it could be or not an error depending on the + * context. + */ +#define ISO_NONE 0 + +/** Operation canceled (FAILURE,HIGH, -1) */ +#define ISO_CANCELED 0xE830FFFF + +/** Unknown or unexpected fatal error (FATAL,HIGH, -2) */ +#define ISO_FATAL_ERROR 0xF030FFFE + +/** Unknown or unexpected error (FAILURE,HIGH, -3) */ +#define ISO_ERROR 0xE830FFFD + +/** Internal programming error. Please report this bug (FATAL,HIGH, -4) */ +#define ISO_ASSERT_FAILURE 0xF030FFFC + +/** + * NULL pointer as value for an arg. that doesn't allow NULL (FAILURE,HIGH, -5) + */ +#define ISO_NULL_POINTER 0xE830FFFB + +/** Memory allocation error (FATAL,HIGH, -6) */ +#define ISO_OUT_OF_MEM 0xF030FFFA + +/** Interrupted by a signal (FATAL,HIGH, -7) */ +#define ISO_INTERRUPTED 0xF030FFF9 + +/** Invalid parameter value (FAILURE,HIGH, -8) */ +#define ISO_WRONG_ARG_VALUE 0xE830FFF8 + +/** Can't create a needed thread (FATAL,HIGH, -9) */ +#define ISO_THREAD_ERROR 0xF030FFF7 + +/** Write error (FAILURE,HIGH, -10) */ +#define ISO_WRITE_ERROR 0xE830FFF6 + +/** Buffer read error (FAILURE,HIGH, -11) */ +#define ISO_BUF_READ_ERROR 0xE830FFF5 + +/** Trying to add to a dir a node already added to a dir (FAILURE,HIGH, -64) */ +#define ISO_NODE_ALREADY_ADDED 0xE830FFC0 + +/** Node with same name already exists (FAILURE,HIGH, -65) */ +#define ISO_NODE_NAME_NOT_UNIQUE 0xE830FFBF + +/** Trying to remove a node that was not added to dir (FAILURE,HIGH, -65) */ +#define ISO_NODE_NOT_ADDED_TO_DIR 0xE830FFBE + +/** A requested node does not exists (FAILURE,HIGH, -66) */ +#define ISO_NODE_DOESNT_EXIST 0xE830FFBD + +/** + * Try to set the boot image of an already bootable image (FAILURE,HIGH, -67) + */ +#define ISO_IMAGE_ALREADY_BOOTABLE 0xE830FFBC + +/** Trying to use an invalid file as boot image (FAILURE,HIGH, -68) */ +#define ISO_BOOT_IMAGE_NOT_VALID 0xE830FFBB + +/** + * Error on file operation (FAILURE,HIGH, -128) + * (take a look at more specified error codes below) + */ +#define ISO_FILE_ERROR 0xE830FF80 + +/** Trying to open an already openned file (FAILURE,HIGH, -129) */ +#define ISO_FILE_ALREADY_OPENNED 0xE830FF7F + +/** Access to file is not allowed (FAILURE,HIGH, -130) */ +#define ISO_FILE_ACCESS_DENIED 0xE830FF7E + +/** Incorrect path to file (FAILURE,HIGH, -131) */ +#define ISO_FILE_BAD_PATH 0xE830FF7D + +/** The file does not exists in the filesystem (FAILURE,HIGH, -132) */ +#define ISO_FILE_DOESNT_EXIST 0xE830FF7C + +/** Trying to read or close a file not openned (FAILURE,HIGH, -133) */ +#define ISO_FILE_NOT_OPENNED 0xE830FF7B + +/** Directory used where no dir is expected (FAILURE,HIGH, -134) */ +#define ISO_FILE_IS_DIR 0xE830FF7A + +/** Read error (FAILURE,HIGH, -135) */ +#define ISO_FILE_READ_ERROR 0xE830FF79 + +/** Not dir used where a dir is expected (FAILURE,HIGH, -136) */ +#define ISO_FILE_IS_NOT_DIR 0xE830FF78 + +/** Not symlink used where a symlink is expected (FAILURE,HIGH, -137) */ +#define ISO_FILE_IS_NOT_SYMLINK 0xE830FF77 + +/** Can't seek to specified location (FAILURE,HIGH, -138) */ +#define ISO_FILE_SEEK_ERROR 0xE830FF76 + +/** File not supported in ECMA-119 tree and thus ignored (HINT,MEDIUM, -139) */ +#define ISO_FILE_IGNORED 0xC020FF75 + +/* A file is bigger than supported by used standard (HINT,MEDIUM, -140) */ +#define ISO_FILE_TOO_BIG 0xC020FF74 + +/* File read error during image creations (SORRY,HIGH, -141) */ +#define ISO_FILE_CANT_WRITE 0xE030FF73 + +/* Can't convert filename to requested charset (HINT,MEDIUM, -142) */ +#define ISO_FILENAME_WRONG_CHARSET 0xC020FF72 + +/* File can't be added to the tree (SORRY,HIGH, -143) */ +#define ISO_FILE_CANT_ADD 0xE030FF71 + +/** + * File path break specification constraints and will be ignored + * (HINT,MEDIUM, -141) + */ +#define ISO_FILE_IMGPATH_WRONG 0xC020FF73 + +/** Charset conversion error (FAILURE,HIGH, -256) */ +#define ISO_CHARSET_CONV_ERROR 0xE830FF00 + +/** + * Too much files to mangle, i.e. we cannot guarantee unique file names + * (FAILURE,HIGH, -257) + */ +#define ISO_MANGLE_TOO_MUCH_FILES 0xE830FEFF + +/* image related errors */ + +/** + * Wrong or damaged Primary Volume Descriptor (FAILURE,HIGH, -320) + * This could mean that the file is not a valid ISO image. + */ +#define ISO_WRONG_PVD 0xE830FEC0 + +/** Wrong or damaged RR entry (SORRY,HIGH, -321) */ +#define ISO_WRONG_RR 0xE030FEBF + +/** Unsupported RR feature (SORRY,HIGH, -322) */ +#define ISO_UNSUPPORTED_RR 0xE030FEBE + +/** Wrong or damaged ECMA-119 (FAILURE,HIGH, -323) */ +#define ISO_WRONG_ECMA119 0xE830FEBD + +/** Unsupported ECMA-119 feature (FAILURE,HIGH, -324) */ +#define ISO_UNSUPPORTED_ECMA119 0xE830FEBC + +/** Wrong or damaged El-Torito catalog (SORRY,HIGH, -325) */ +#define ISO_WRONG_EL_TORITO 0xE030FEBB + +/** Unsupported El-Torito feature (SORRY,HIGH, -326) */ +#define ISO_UNSUPPORTED_EL_TORITO 0xE030FEBA + +/** Can't patch an isolinux boot image (SORRY,HIGH, -327) */ +#define ISO_ISOLINUX_CANT_PATCH 0xE030FEB9 + +/** Unsupported SUSP feature (SORRY,HIGH, -328) */ +#define ISO_UNSUPPORTED_SUSP 0xE030FEB8 + +/** Error on a RR entry that can be ignored (WARNING,MEDIUM, -329) */ +#define ISO_WRONG_RR_WARN 0xD020FEB7 + +/** Error on a RR entry that can be ignored (HINT,MEDIUM, -330) */ +#define ISO_SUSP_UNHANDLED 0xC020FEB6 + +/** Multiple ER SUSP entries found (WARNING,MEDIUM, -331) */ +#define ISO_SUSP_MULTIPLE_ER 0xD020FEB5 + +/** Unsupported volume descriptor found (HINT,MEDIUM, -332) */ +#define ISO_UNSUPPORTED_VD 0xC020FEB4 + +/** El-Torito related warning (WARNING,MEDIUM, -333) */ +#define ISO_EL_TORITO_WARN 0xD020FEB3 + #endif /*LIBISO_LIBISOFS_H_*/ diff --git a/libisofs/messages.c b/libisofs/messages.c index 19282aa..92f6e24 100644 --- a/libisofs/messages.c +++ b/libisofs/messages.c @@ -12,7 +12,6 @@ #include "libisofs.h" #include "messages.h" -#include "error.h" int iso_message_id = LIBISO_MSGS_ORIGIN_IMAGE_BASE; diff --git a/libisofs/node.c b/libisofs/node.c index 04846db..9df3bac 100644 --- a/libisofs/node.c +++ b/libisofs/node.c @@ -8,7 +8,6 @@ #include "libisofs.h" #include "node.h" -#include "error.h" #include "stream.h" #include diff --git a/libisofs/rockridge.c b/libisofs/rockridge.c index c48b9e4..e57ed3d 100644 --- a/libisofs/rockridge.c +++ b/libisofs/rockridge.c @@ -10,7 +10,6 @@ #include "rockridge.h" #include "node.h" #include "ecma119_tree.h" -#include "error.h" #include "writer.h" #include "messages.h" #include "image.h" diff --git a/libisofs/rockridge_read.c b/libisofs/rockridge_read.c index 87d2271..02dbc86 100644 --- a/libisofs/rockridge_read.c +++ b/libisofs/rockridge_read.c @@ -15,7 +15,6 @@ #include "ecma119.h" #include "util.h" #include "rockridge.h" -#include "error.h" #include "messages.h" #include diff --git a/libisofs/stream.c b/libisofs/stream.c index 60bcafb..9d315c6 100644 --- a/libisofs/stream.c +++ b/libisofs/stream.c @@ -9,7 +9,6 @@ #include "libisofs.h" #include "stream.h" #include "fsource.h" -#include "error.h" #include "util.h" #include diff --git a/libisofs/tree.c b/libisofs/tree.c index 09853b8..5dc360e 100644 --- a/libisofs/tree.c +++ b/libisofs/tree.c @@ -12,7 +12,6 @@ #include "libisofs.h" #include "node.h" -#include "error.h" #include "image.h" #include "fsource.h" #include "builder.h" @@ -24,6 +23,7 @@ #include #include #include +#include /** * Add a new directory to the iso tree. @@ -350,6 +350,68 @@ void iso_tree_set_report_callback(IsoImage *image, image->report = report; } +/** + * Add a excluded path. These are paths that won't never added to image, + * and will be excluded even when adding recursively its parent directory. + * + * For example, in + * + * iso_tree_add_exclude(image, "/home/user/data/private"); + * iso_tree_add_dir_rec(image, root, "/home/user/data"); + * + * the directory /home/user/data/private won't be added to image. + * + * @return + * 1 on success, < 0 on error + */ +int iso_tree_add_exclude(IsoImage *image, const char *path) +{ + if (image == NULL || path == NULL) { + return ISO_NULL_POINTER; + } + image->excludes = realloc(image->excludes, ++image->nexcludes * + sizeof(void*)); + if (image->excludes == NULL) { + return ISO_OUT_OF_MEM; + } + image->excludes[image->nexcludes - 1] = strdup(path); + if (image->excludes[image->nexcludes - 1] == NULL) { + return ISO_OUT_OF_MEM; + } + return ISO_SUCCESS; +} + +/** + * Remove a previously added exclude. + * + * @see iso_tree_add_exclude + * @return + * 1 on success, 0 exclude do not exists, < 0 on error + */ +int iso_tree_remove_exclude(IsoImage *image, const char *path) +{ + size_t i, j; + + if (image == NULL || path == NULL) { + return ISO_NULL_POINTER; + } + + for (i = 0; i < image->nexcludes; ++i) { + if (strcmp(image->excludes[i], path) == 0) { + /* exclude found */ + free(image->excludes[i]); + --image->nexcludes; + for (j = i; j < image->nexcludes; ++j) { + image->excludes[j] = image->excludes[j+1]; + } + image->excludes = realloc(image->excludes, image->nexcludes * + sizeof(void*)); + return ISO_SUCCESS; + } + } + return 0; +} + static int iso_tree_add_node_builder(IsoImage *image, IsoDir *parent, IsoFileSource *src, IsoNodeBuilder *builder, @@ -416,16 +478,26 @@ int iso_tree_add_node(IsoImage *image, IsoDir *parent, const char *path, static int check_excludes(IsoImage *image, const char *path) { - char **exclude; - if (image->excludes == NULL) { - return 0; - } - exclude = image->excludes; - while (*exclude) { - if (strcmp(*exclude, path) == 0) { - return 1; + int i; + + for (i = 0; i < image->nexcludes; ++i) { + char *exclude = image->excludes[i]; + if (exclude[0] == '/') { + /* absolute exclude, must completely match path */ + if (!fnmatch(exclude, path, FNM_PERIOD|FNM_PATHNAME)) { + return 1; + } + } else { + /* relative exclude, it is enought if a part of the path matches */ + char *pos = (char*)path; + while (pos != NULL) { + pos++; + if (!fnmatch(exclude, pos, FNM_PERIOD|FNM_PATHNAME)) { + return 1; + } + pos = strchr(pos, '/'); + } } - ++exclude; } return 0; } diff --git a/libisofs/util.c b/libisofs/util.c index 36d3830..6317a8b 100644 --- a/libisofs/util.c +++ b/libisofs/util.c @@ -8,7 +8,7 @@ */ #include "util.h" -#include "error.h" +#include "libisofs.h" #include "../version.h" #include @@ -1248,3 +1248,17 @@ void iso_lib_version(int *major, int *minor, int *micro) *minor = LIBISOFS_MINOR_VERSION; *micro = LIBISOFS_MICRO_VERSION; } + +int iso_lib_is_compatible(int major, int minor, int micro) +{ + int cmajor, cminor, cmicro; + + /* for now, the rule is that library is compitable if requested + * version is lower */ + iso_lib_version(&cmajor, &cminor, &cmicro); + + return cmajor > major + || (cmajor == major + && (cminor > minor + || (cminor == minor && cmicro >= micro))); +} diff --git a/libisofs/util_htable.c b/libisofs/util_htable.c index 08b46c3..684ce6e 100644 --- a/libisofs/util_htable.c +++ b/libisofs/util_htable.c @@ -7,7 +7,7 @@ */ #include "util.h" -#include "error.h" +#include "libisofs.h" #include #include diff --git a/libisofs/util_rbtree.c b/libisofs/util_rbtree.c index d3eeb1b..7a30fc2 100644 --- a/libisofs/util_rbtree.c +++ b/libisofs/util_rbtree.c @@ -7,7 +7,7 @@ */ #include "util.h" -#include "error.h" +#include "libisofs.h" #include diff --git a/test/mocked_fsrc.c b/test/mocked_fsrc.c index 9f76ad5..13c6b45 100644 --- a/test/mocked_fsrc.c +++ b/test/mocked_fsrc.c @@ -5,7 +5,7 @@ #include "fsource.h" #include "mocked_fsrc.h" -#include "error.h" +#include "libisofs.h" #include #include diff --git a/test/test_node.c b/test/test_node.c index dad5c74..6e8f6f2 100644 --- a/test/test_node.c +++ b/test/test_node.c @@ -5,7 +5,6 @@ #include "libisofs.h" #include "node.h" #include "test.h" -#include "error.h" #include diff --git a/test/test_tree.c b/test/test_tree.c index 85946bd..8379439 100644 --- a/test/test_tree.c +++ b/test/test_tree.c @@ -4,7 +4,6 @@ #include "libisofs.h" #include "node.h" -#include "error.h" #include "image.h" #include "test.h" diff --git a/test/test_util.c b/test/test_util.c index 00b53b4..e1412e9 100644 --- a/test/test_util.c +++ b/test/test_util.c @@ -5,7 +5,6 @@ */ #include "test.h" #include "util.h" -#include "error.h" #include #include