diff --git a/.gitignore b/.gitignore index 17b652862..217b16528 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,6 @@ share/config.fish share/man/ toc.txt user_doc/ -xsel-0.9.6/ +xsel-1.2.0/ +tests/*tmp.* +tests/foo.txt diff --git a/Doxyfile b/Doxyfile index 29524351a..d25badb90 100644 --- a/Doxyfile +++ b/Doxyfile @@ -14,181 +14,181 @@ # Project related configuration options #--------------------------------------------------------------------------- -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. PROJECT_NAME = fish -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# 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 = 1 -# 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 +# 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 = doc -# 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 +# 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: -# 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, Norwegian, -# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, +# 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: +# 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, 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). +# 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 +# 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" +# 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 = YES -# 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 +# 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 +# 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 +# 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 +# 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 = +STRIP_FROM_PATH = -# 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 +# 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 = +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 +# 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 the Qt-style comments (thus requiring an +# 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 the Qt-style comments (thus requiring an # explicit @brief command for a brief description. JAVADOC_AUTOBRIEF = YES -# 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 +# 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 = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# 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 +# If set to NO, the detailed description appears after the member # documentation. DETAILS_AT_TOP = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# 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 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 +# 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 -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# 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 = 8 -# 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:". +# 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 = +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 +# 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 +# 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 -# 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 +# 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 @@ -197,168 +197,168 @@ 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 +# 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 = NO -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# 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 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. +# 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 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. +# 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 +# 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 +# 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 +# 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. +# 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 +# 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 = YES -# 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 +# 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 +# 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] +# 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 +# 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 +# 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. +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +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 +# 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 +# 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 +# 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. SHOW_DIRECTORIES = YES @@ -367,134 +367,134 @@ SHOW_DIRECTORIES = YES # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# 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 = NO -# 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 +# 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 +# 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 +# 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 -# 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 +# 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. 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 +# 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 = +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 +# 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 = +INPUT = -# 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 +# 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 -FILE_PATTERNS = *.h *.c +FILE_PATTERNS = *.h *.c -# 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. +# 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 +# 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 = print_help.c xdgmimealias.c xdgmimealias.h xdgmime.c xdgmimeglob.c xdgmimeglob.h xdgmime.h xdgmimeint.c xdgmimeint.h xdgmimemagic.c xdgmimemagic.h xdgmimeparent.c xdgmimeparent.h -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories +# 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 +# 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. -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = -# 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 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 = +EXAMPLE_PATH = -# 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 +# 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 = +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. +# 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_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 = +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 +# 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 = +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 +# 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 = +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 +# 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 @@ -503,38 +503,38 @@ 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 +# 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. SOURCE_BROWSER = NO -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# 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 = YES -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented +# 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 +# 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 VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# 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 @@ -543,133 +543,133 @@ 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 +# 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 +# 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 +# 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 = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# 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 +# 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 = 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 +# 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 +# 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 = +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 +# 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 = +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 +# 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 = +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 +# 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) +# 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 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 +# 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 = +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 +# 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 = +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 +# 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 +# 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 +# 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 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]) +# 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 +# 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 +# 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 = 250 @@ -678,74 +678,74 @@ TREEVIEW_WIDTH = 250 # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. GENERATE_LATEX = YES -# 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 +# 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 +# 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 +# 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 +# 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 +# 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 = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# 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 = +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 +# 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 = +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 +# 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 +# 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 = YES -# 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. +# 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.) +# 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 @@ -754,68 +754,68 @@ 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 +# 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 +# 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 +# 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. +# 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 +# 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 = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_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 +# 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 +# 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 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 +# 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 @@ -824,33 +824,33 @@ 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 +# 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 +# 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 +# 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 = +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 +# 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 = +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 +# 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 @@ -859,10 +859,10 @@ 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 +# 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 @@ -871,266 +871,266 @@ 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 +# 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 +# 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 +# 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 +# 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 = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# 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 +# 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 +# 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 +# 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_PREDEFINED tags. EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# 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 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 = +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 +# 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 = +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 +# 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 = +PREDEFINED = -# 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. +# 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 = +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 +# 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 +# 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 +# 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 +# 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 = +TAGFILES = -# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# 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 = +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 +# 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 +# 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 +# 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 +# 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 +# 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 -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented +# 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 +# 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 +# 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 = NO -# 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 +# 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 UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling +# 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 +# If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. TEMPLATE_RELATIONS = NO -# 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 +# 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 = NO -# 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 +# 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 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 +# If the CALL_GRAPH 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 GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# 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 = YES -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# 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 +# 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 on the path. -DOT_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 +# 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 = +DOTFILE_DIRS = -# 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 a graph may be further truncated if the graph's image dimensions are -# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). +# 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 a graph may be further truncated if the graph's image dimensions are +# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). # If 0 is used for the depth value (the default), the graph is not depth-constrained. MAX_DOT_GRAPH_DEPTH = 0 -# 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 +# 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 +# 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 +# Configuration::additions related to the search engine #--------------------------------------------------------------------------- -# The SEARCHENGINE tag specifies whether or not a search engine should be +# 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/Doxyfile.help.in b/Doxyfile.help.in index b300477b9..f5ed20c6a 100644 --- a/Doxyfile.help.in +++ b/Doxyfile.help.in @@ -14,191 +14,191 @@ # Project related configuration options #--------------------------------------------------------------------------- -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. PROJECT_NAME = fish -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# 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 +# 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 = help_doc -# 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 +# 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: -# 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, Norwegian, -# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, +# 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: +# 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, Norwegian, +# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, # Swedish, and Ukrainian. OUTPUT_LANGUAGE = English -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for +# This tag can be used to specify the encoding used in the generated output. +# The encoding is not always determined by the language that is chosen, +# but also whether or not the output is meant for Windows or non-Windows users. +# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES +# forces the Windows encoding (this is the default for the Windows binary), +# whereas setting the tag to NO uses a Unix-style encoding (the default for # all platforms other than Windows). USE_WINDOWS_ENCODING = NO -# 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). +# 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 +# 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" +# 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 = YES -# 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 +# 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 +# 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 +# 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 +# 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 = +STRIP_FROM_PATH = -# 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 +# 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 = +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 +# 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 the Qt-style comments (thus requiring an +# 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 the Qt-style comments (thus requiring an # explicit @brief command for a brief description. JAVADOC_AUTOBRIEF = YES -# 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 +# 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 = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# 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 +# If set to NO, the detailed description appears after the member # documentation. DETAILS_AT_TOP = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# 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 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 +# 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 -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# 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 = 8 -# 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:". +# 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 = +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 +# 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 +# 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 -# 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 +# 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 @@ -207,168 +207,168 @@ 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 +# 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 = NO -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. EXTRACT_STATIC = NO -# 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 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. +# 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 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. +# 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 +# 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 +# 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 +# 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. +# 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 +# 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 = YES -# 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 +# 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 +# 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] +# 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 +# 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 +# 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. +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +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 +# 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 +# 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 +# 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. SHOW_DIRECTORIES = YES @@ -377,133 +377,133 @@ SHOW_DIRECTORIES = YES # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# 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 = NO -# 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 +# 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 +# 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 +# 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 -# 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 +# 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. 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 +# 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 = +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 +# 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 = doc_src -# 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 +# 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 FILE_PATTERNS = *.doxygen -# 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. +# 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 +# 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 = +EXCLUDE = -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories +# 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 +# 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. -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = -# 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 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 = +EXAMPLE_PATH = -# 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 +# 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 = +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. +# 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_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 = +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 +# 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 = +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 +# 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 = +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 +# 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 @@ -512,38 +512,38 @@ 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 +# 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. SOURCE_BROWSER = NO -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# 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 = YES -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented +# 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 +# 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 VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# 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 @@ -552,133 +552,133 @@ 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 +# 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 +# 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 +# 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 = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. GENERATE_HTML = NO -# 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 +# 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 = 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 +# 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 +# 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 = +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 +# 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 = +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 +# 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 = +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 +# 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) +# 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 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 +# 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 = +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 +# 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 = +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 +# 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 +# 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 +# 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 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]) +# 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 +# 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 +# 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 = 250 @@ -687,74 +687,74 @@ TREEVIEW_WIDTH = 250 # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# 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 = +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 +# 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 = +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 +# 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 +# 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 = YES -# 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. +# 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.) +# 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 @@ -763,68 +763,68 @@ 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 +# 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 +# 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 +# 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. +# 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 +# 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 = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_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 +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages GENERATE_MAN = YES -# 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 +# 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 MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) MAN_EXTENSION = .1 -# 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 +# 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 = YES @@ -833,33 +833,33 @@ MAN_LINKS = YES # 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 +# 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 +# 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 +# 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 = +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 +# 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 = +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 +# 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 @@ -868,10 +868,10 @@ 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 +# 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 @@ -880,282 +880,282 @@ 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 +# 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 +# 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 +# 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 +# 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 = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# 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 +# 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 +# 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 +# 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_PREDEFINED tags. EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# 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 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 = +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 +# 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 = +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 +# 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 = +PREDEFINED = -# 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. +# 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 = +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 +# 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 +# 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 +# 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 +# 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 = +TAGFILES = -# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# 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 = +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 +# 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 +# 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 +# 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 +# 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 +# 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 -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented +# 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 +# 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 = NO -# 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 +# 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 +# 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 UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling +# 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 +# If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. TEMPLATE_RELATIONS = NO -# 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 +# 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 +# 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 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 +# If the CALL_GRAPH 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 GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# 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 = YES -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# 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 +# 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 on the path. -DOT_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 +# 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 = +DOTFILE_DIRS = -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very +# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very # large images. MAX_DOT_GRAPH_WIDTH = 1024 -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very +# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very # large images. MAX_DOT_GRAPH_HEIGHT = 1024 -# 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 a graph may be further truncated if the graph's image dimensions are -# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). +# 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 a graph may be further truncated if the graph's image dimensions are +# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). # If 0 is used for the depth value (the default), the graph is not depth-constrained. MAX_DOT_GRAPH_DEPTH = 0 -# 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 +# 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 +# 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 +# Configuration::additions related to the search engine #--------------------------------------------------------------------------- -# The SEARCHENGINE tag specifies whether or not a search engine should be +# 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/Doxyfile.user b/Doxyfile.user index f6acde7e0..99927595b 100644 --- a/Doxyfile.user +++ b/Doxyfile.user @@ -10,8 +10,8 @@ ABBREVIATE_BRIEF = YES ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = YES -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO @@ -19,7 +19,7 @@ DETAILS_AT_TOP = NO INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO TAB_SIZE = 8 -ALIASES = +ALIASES = OPTIMIZE_OUTPUT_FOR_C = YES OPTIMIZE_OUTPUT_JAVA = NO SUBGROUPING = YES @@ -44,7 +44,7 @@ GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = +ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES SHOW_DIRECTORIES = YES @@ -53,19 +53,19 @@ WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -INPUT = +WARN_LOGFILE = +INPUT = FILE_PATTERNS = doc.h RECURSIVE = NO -EXCLUDE = +EXCLUDE = EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = FILTER_SOURCE_FILES = NO SOURCE_BROWSER = NO INLINE_SOURCES = NO @@ -75,17 +75,17 @@ REFERENCES_RELATION = YES VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = NO COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = +IGNORE_PREFIX = GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html HTML_HEADER = user_doc.head.html -HTML_FOOTER = -HTML_STYLESHEET = +HTML_FOOTER = +HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = +CHM_FILE = +HHC_LOCATION = GENERATE_CHI = NO BINARY_TOC = NO TOC_EXPAND = NO @@ -99,8 +99,8 @@ LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = +EXTRA_PACKAGES = +LATEX_HEADER = PDF_HYPERLINKS = YES USE_PDFLATEX = YES LATEX_BATCHMODE = NO @@ -109,33 +109,33 @@ GENERATE_RTF = NO RTF_OUTPUT = rtf COMPACT_RTF = NO RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = GENERATE_MAN = NO MAN_OUTPUT = man MAN_EXTENSION = .3 MAN_LINKS = NO GENERATE_XML = NO XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = +XML_SCHEMA = +XML_DTD = XML_PROGRAMLISTING = YES GENERATE_AUTOGEN_DEF = NO GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = ENABLE_PREPROCESSING = YES MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES -TAGFILES = -GENERATE_TAGFILE = +TAGFILES = +GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl @@ -151,8 +151,8 @@ INCLUDED_BY_GRAPH = YES CALL_GRAPH = YES GRAPHICAL_HIERARCHY = YES DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = +DOT_PATH = +DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 750 MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 0 diff --git a/INSTALL b/INSTALL index fefe0404e..3a039fb21 100644 --- a/INSTALL +++ b/INSTALL @@ -49,7 +49,7 @@ Then, use following commands to compile fish: Finally, if you wish to use fish as your default shell, use the following command: - % chsh -s /usr/local/bin/fish + % chsh -s /usr/local/bin/fish chsh will prompt you for your password, and change your default shell. diff --git a/Makefile.in b/Makefile.in index 897c5c3c1..f52b8a405 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,16 +53,16 @@ sysconfdir = @sysconfdir@ docdir = @docdir@ localedir = @localedir@ prefix = @prefix@ -optbindirs = @optbindirs@ +optbindirs = @optbindirs@ # # Various flags # -MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -CFLAGS = @CFLAGS@ $(MACROS) -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LIBS@ @LDFLAGS@ +MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" +CFLAGS = @CFLAGS@ $(MACROS) $(EXTRA_CFLAGS) +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LIBS@ @LDFLAGS@ LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@ LDFLAGS_FISH_INDENT = ${LDFLAGS} @LIBS_FISH_INDENT@ LDFLAGS_FISH_PAGER = ${LDFLAGS} @LIBS_FISH_PAGER@ @@ -158,7 +158,7 @@ HDR_FILES_SRC := doc_src/index.hdr.in doc_src/commands.hdr.in doc_src/design.hdr HDR_FILES := $(subst .hdr.in,.hdr,$(HDR_FILES_SRC)) # -# Files containing documentation for external commands. +# Files containing documentation for external commands. # HELP_SRC := $(wildcard doc_src/*.txt) @@ -208,7 +208,7 @@ MAIN_DIR_FILES := $(sort $(MAIN_DIR_FILES_UNSORTED)) # Files in ./etc/ # -ETC_DIR_FILES :=etc/config.fish.in +ETC_DIR_FILES :=etc/config.fish.in # @@ -245,7 +245,7 @@ FUNCTIONS_DIR_FILES := $(wildcard share/functions/*.fish) # SIMPLE_PROGRAMS := fish set_color mimedb fish_pager fishd fish_indent -PROGRAMS := $(SIMPLE_PROGRAMS) @XSEL@ @SEQ_FALLBACK@ +PROGRAMS := $(SIMPLE_PROGRAMS) @XSEL_BIN@ @SEQ_FALLBACK@ # @@ -264,12 +264,19 @@ TRANSLATIONS_SRC := $(wildcard po/*.po) TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo) +# +# Extra util +# + +XSEL := @XSEL@ +XSEL_BIN := @XSEL_BIN@ + # # Make everything needed for installing fish # all: $(PROGRAMS) user_doc share/man etc/config.fish share/config.fish $(TRANSLATIONS) - @echo fish has now been built. + @echo fish has now been built. @echo Use \'$(MAKE) install\' to install fish. .PHONY: all @@ -292,15 +299,18 @@ Makefile: Makefile.in configure # debug: - $(MAKE) fish CFLAGS="@CFLAGS@ $(MACROS) -O0 -Wno-unused -Werror -g" + $(MAKE) all EXTRA_CFLAGS="-O0 -Wno-unused -Werror -g" .PHONY: debug +prof: + $(MAKE) all EXTRA_CFLAGS="-pg" LDFLAGS="-pg" +.PHONY: prof # # User documentation, describing the features of the fish shell. # -# Depend on the sources (*.hdr.in) and manually make the +# Depend on the sources (*.hdr.in) and manually make the # intermediate *.hdr and doc.h files if needed user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC) @@ -313,19 +323,19 @@ user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC) # Source code documentation. Also includes user documentation. # -doc: *.h *.c doc.h Doxyfile - doxygen; +doc: *.h *.c doc.h Doxyfile + doxygen; # # PDF version of the source code documentation. # -doc/refman.pdf: doc - cd doc/latex; - make; - mv refman.pdf ..; - cd ../..; +doc/refman.pdf: doc + cd doc/latex; + make; + mv refman.pdf ..; + cd ../..; rm -r doc/latex; @@ -342,11 +352,8 @@ test: $(PROGRAMS) fish_tests # Build the xsel program, which is maintained in its own tarball # -xsel-0.9.6: - tar -xf xsel-0.9.6.tar - -xsel-0.9.6/xsel: xsel-0.9.6 - cd xsel-0.9.6; ./configure && make || echo "Failed to build xsel - either add the required dependencies or use './configure --without-xsel' to disable it." +$(XSEL_BIN): + $(MAKE) -C $(XSEL) || echo "Failed to build xsel - either add the required dependencies or use './configure --without-xsel' to disable it." # @@ -362,7 +369,7 @@ doc_src/commands.hdr:$(HELP_SRC) doc_src/commands.hdr.in echo >>command_list.tmp; \ echo >>command_list.tmp; \ echo "Back to index". >>command_list.tmp; \ - done + done mv command_list.tmp command_list.txt cat $@.in | awk '{if ($$0 ~ /@command_list@/){ system("cat command_list.txt");} else{ print $$0;}}' >$@ @@ -400,19 +407,19 @@ doc.h: $(HDR_FILES) # %.doxygen:%.txt - echo "/** \page " `basename $*` >$@; - cat $*.txt >>$@; + echo "/** \page " `basename $*` >$@; + cat $*.txt >>$@; echo "*/" >>$@ -%: %.in +%: %.in sed <$@.in >$@ \ -e "s,@sysconfdir\@,$(sysconfdir),g" \ -e "s,@datadir\@,$(datadir),g" \ -e "s,@docdir\@,$(docdir),g" \ -e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|g" \ -e "s,@prefix\@,$(prefix),g" \ - -e "s,@optbindirs\@,$(optbindirs),g" -#-e "s,@\@,$()," + -e "s,@optbindirs\@,$(optbindirs),g" +#-e "s,@\@,$()," # @@ -477,8 +484,8 @@ common.o: $(COMMON_FILES) # (__fish_print_help) # || # \/ -# formated text -# with escape +# formated text +# with escape # sequences # # @@ -500,7 +507,7 @@ share/man: $(HELP_SRC) for i in $(HELP_SRC); do \ CMD_NAME=`basename $$i .txt`; \ sed -e "s/\(.\)\\.SH/\1/" -e "s/$$CMD_NAME *\\\\- *\"\(.*\)\"/\1/" share/man/$$CMD_NAME.1; \ - done + done rm doc_src/*.doxygen # Clean up intermediate files in doc_src/ rm -r help_doc # Clean up intermediate help_doc tree @@ -565,7 +572,7 @@ install: all install-sh check-uninstall install-force # install-force: all install-translations - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) + $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) for i in $(PROGRAMS); do\ $(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \ done; @@ -595,7 +602,7 @@ install-force: all install-translations for i in $(MANUALS); do \ $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \ done; - @echo fish is now installed on your system. + @echo fish is now installed on your system. @echo To run fish, type \'fish\' in your terminal. @echo @echo To use fish as your login shell: @@ -652,7 +659,7 @@ uninstall-legacy: uninstall -rmdir $(DESTDIR)$(sysconfdir)/fish.d/completions -rmdir $(DESTDIR)$(sysconfdir)/fish.d -rm $(DESTDIR)$(sysconfdir)/fish - @echo The previous fish installation has been removed. + @echo The previous fish installation has been removed. .PHONY: uninstall-legacy install-translations: $(TRANSLATIONS) @@ -665,7 +672,7 @@ install-translations: $(TRANSLATIONS) fi; .PHONY: install-translations -uninstall-translations: +uninstall-translations: if test $(HAVE_GETTEXT) = 1; then \ for i in $(TRANSLATIONS_SRC); do \ rm -f $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/fish.mo; \ @@ -682,7 +689,7 @@ uninstall-translations: # Build the fish program. # -fish: $(FISH_OBJS) fish.o +fish: $(FISH_OBJS) fish.o $(CC) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@ @@ -698,7 +705,7 @@ fish_pager: $(FISH_PAGER_OBJS) # Build the fishd program. # -fishd: $(FISHD_OBJS) +fishd: $(FISHD_OBJS) $(CC) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@ @@ -756,7 +763,7 @@ key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_c # Update dependencies # depend: - makedepend -fMakefile.in -Y *.c + makedepend -fMakefile.in -Y *.c ./config.status .PHONY: depend @@ -765,7 +772,7 @@ depend: # an archive from it. Simplest way I could think of to make an archive # witout backups, autogenerated files, etc. # -# Uses install instead of mkdir so build won't fail if the directory +# Uses install instead of mkdir so build won't fail if the directory # exists # @@ -817,7 +824,7 @@ dist: fish-@PACKAGE_VERSION@.tar.bz2 .PHONY: dist # -# Build the RPM spec file. +# Build the RPM spec file. # fish.spec: fish.spec.in @@ -854,9 +861,10 @@ rpm: fish-@PACKAGE_VERSION@.tar.bz2 fish.spec # distclean: clean - rm -f fish.spec Doxyfile.help + rm -f fish.spec Doxyfile.help rm -f etc/config.fish seq share/config.fish rm -f config.status config.log config.h Makefile + rm -rf $(XSEL) .PHONY: distclean @@ -868,15 +876,15 @@ distclean: clean clean: rm -f *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.c doc_src/*.o doc_src/commands.hdr rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt - rm -f $(PROGRAMS) fish_tests tokenizer_test key_reader + rm -f $(PROGRAMS) fish_tests tokenizer_test key_reader rm -f share/config.fish etc/config.fish doc_src/index.hdr doc_src/commands.hdr - rm -f fish-@PACKAGE_VERSION@.tar - rm -f fish-@PACKAGE_VERSION@.tar.gz + rm -f fish-@PACKAGE_VERSION@.tar + rm -f fish-@PACKAGE_VERSION@.tar.gz rm -f fish-@PACKAGE_VERSION@.tar.bz2 - rm -rf doc; + rm -rf doc; rm -rf fish-@PACKAGE_VERSION@ - rm -rf xsel-0.9.6/ rm -f $(TRANSLATIONS) + -make -C $(XSEL) clean .PHONY: clean diff --git a/builtin.c b/builtin.c index fe59ce292..13694aacb 100644 --- a/builtin.c +++ b/builtin.c @@ -83,7 +83,7 @@ #define FG_MSG _( L"Send job %d, '%ls' to foreground\n" ) /** - Datastructure to describe a builtin. + Datastructure to describe a builtin. */ typedef struct builtin_data { @@ -152,7 +152,7 @@ static int builtin_count_args( wchar_t **argv ) return argc; } -/** +/** This function works like wperror, but it prints its result into the sb_err string_buffer_t instead of to stderr. Used by the builtin commands. @@ -191,7 +191,7 @@ wchar_t *builtin_help_get( const wchar_t *name ) array_list_t lst; string_buffer_t cmd; wchar_t *name_esc; - + /* Because the contents of this buffer is returned by this function, it must not be free'd on exit, so we allocate it @@ -199,10 +199,10 @@ wchar_t *builtin_help_get( const wchar_t *name ) */ static string_buffer_t *out = 0; int i; - + al_init( &lst ); sb_init( &cmd ); - + if( !out ) { out = sb_halloc( global_context ); @@ -214,24 +214,24 @@ wchar_t *builtin_help_get( const wchar_t *name ) name_esc = escape( name, 1 ); sb_printf( &cmd, L"__fish_print_help %ls", name_esc ); - + if( exec_subshell( (wchar_t *)cmd.buff, &lst ) >= 0 ) - { + { for( i=0; ibuff; - + } /** @@ -242,15 +242,15 @@ wchar_t *builtin_help_get( const wchar_t *name ) message is about to be printed to an interactive screen, it may be shortened to fit the screen. - + */ static void builtin_print_help( const wchar_t *cmd, string_buffer_t *b ) { - + const wchar_t *h; int is_short = 0; - + if( b == sb_err ) { sb_append( sb_err, @@ -268,12 +268,12 @@ static void builtin_print_help( const wchar_t *cmd, string_buffer_t *b ) if( b==sb_err ) { - + /* Interactive mode help to screen - only print synopsis if - the rest won't fit + the rest won't fit */ - + int screen_height, lines; screen_height = common_get_height(); @@ -283,24 +283,24 @@ static void builtin_print_help( const wchar_t *cmd, string_buffer_t *b ) wchar_t *pos; int cut=0; int i; - + is_short = 1; - + /* First move down 4 lines */ - + pos = str; for( i=0; (i<4) && pos && *pos; i++ ) { pos = wcschr( pos+1, L'\n' ); } - + if( pos && *pos ) { - - /* - Then find the next empty line + + /* + Then find the next empty line */ for( ; *pos; pos++ ) { @@ -308,12 +308,12 @@ static void builtin_print_help( const wchar_t *cmd, string_buffer_t *b ) { wchar_t *pos2; int is_empty = 1; - + for( pos2 = pos+1; *pos2; pos2++ ) { if( *pos2 == L'\n' ) break; - + if( *pos2 != L'\t' && *pos2 !=L' ' ) { is_empty = 0; @@ -332,7 +332,7 @@ static void builtin_print_help( const wchar_t *cmd, string_buffer_t *b ) } } } - + /* We did not find a good place to cut message to shorten it - so we make sure we don't print @@ -345,13 +345,13 @@ static void builtin_print_help( const wchar_t *cmd, string_buffer_t *b ) } } - + sb_append( b, str ); if( is_short ) { sb_printf( b, _(L"%ls: Type 'help %ls' for related documentation\n\n"), cmd, cmd ); } - + free( str ); } } @@ -414,18 +414,18 @@ static void builtin_bind_list() { array_list_t lst; int i; - - + + al_init( &lst ); input_mapping_get_names( &lst ); - + for( i=0; itype != FUNCTION_CALL && block->type != FUNCTION_CALL_NO_SHADOW ) block = block->outer; @@ -925,7 +925,7 @@ static int builtin_builtin( wchar_t **argv ) woptind=0; - const static struct woption + static const struct woption long_options[] = { { @@ -991,11 +991,11 @@ static int builtin_builtin( wchar_t **argv ) al_init( &names ); builtin_get_names( &names ); sort_list( &names ); - + for( i=0; iparam1.param ); break; } - + } } al_destroy( &ev ); - + named = function_get_named_arguments( name ); if( named ) { @@ -1230,7 +1230,7 @@ static void functions_def( wchar_t *name, string_buffer_t *out ) sb_printf( out, L" %ls", (wchar_t *)al_get( named, i ) ); } } - + sb_printf( out, L"\n\t%ls\nend\n", def ); } @@ -1252,10 +1252,11 @@ static int builtin_functions( wchar_t **argv ) int show_hidden=0; int res = STATUS_BUILTIN_OK; int query = 0; + int copy = 0; woptind=0; - const static struct woption + static const struct woption long_options[] = { { @@ -1282,6 +1283,10 @@ static int builtin_functions( wchar_t **argv ) L"query", no_argument, 0, 'q' } , + { + L"copy", no_argument, 0, 'c' + } + , { 0, 0, 0, 0 } @@ -1294,7 +1299,7 @@ static int builtin_functions( wchar_t **argv ) int opt = wgetopt_long( argc, argv, - L"ed:nahq", + L"ed:nahqc", long_options, &opt_index ); if( opt == -1 ) @@ -1305,10 +1310,10 @@ static int builtin_functions( wchar_t **argv ) case 0: if(long_options[opt_index].flag != 0) break; - sb_printf( sb_err, - BUILTIN_ERR_UNKNOWN, - argv[0], - long_options[opt_index].name ); + sb_printf( sb_err, + BUILTIN_ERR_UNKNOWN, + argv[0], + long_options[opt_index].name ); builtin_print_help( argv[0], sb_err ); @@ -1338,6 +1343,10 @@ static int builtin_functions( wchar_t **argv ) query = 1; break; + case 'c': + copy = 1; + break; + case '?': builtin_unknown_option( argv[0], argv[woptind-1] ); return STATUS_BUILTIN_ERROR; @@ -1347,9 +1356,9 @@ static int builtin_functions( wchar_t **argv ) } /* - Erase, desc, query and list are mutually exclusive + Erase, desc, query, copy and list are mutually exclusive */ - if( (erase + (!!desc) + list + query) > 1 ) + if( (erase + (!!desc) + list + query + copy) > 1 ) { sb_printf( sb_err, _( L"%ls: Invalid combination of options\n" ), @@ -1434,6 +1443,61 @@ static int builtin_functions( wchar_t **argv ) al_destroy( &names ); return STATUS_BUILTIN_OK; } + else if( copy ) + { + wchar_t *current_func; + wchar_t *new_func; + + if( argc-woptind != 2 ) + { + sb_printf( sb_err, + _( L"%ls: Expected exactly two names (current function name, and new function name)\n" ), + argv[0] ); + builtin_print_help ( argv[0], sb_err ); + + return STATUS_BUILTIN_ERROR; + } + current_func = argv[woptind]; + new_func = argv[woptind+1]; + + if( !function_exists( current_func ) ) + { + sb_printf( sb_err, + _( L"%ls: Function '%ls' does not exist\n" ), + argv[0], + current_func ); + builtin_print_help( argv[0], sb_err ); + + return STATUS_BUILTIN_ERROR; + } + + if( (wcsfuncname( new_func ) != 0) || parser_keywords_is_reserved( new_func ) ) + { + sb_printf( sb_err, + _( L"%ls: Illegal function name '%ls'\n"), + argv[0], + new_func ); + builtin_print_help( argv[0], sb_err ); + return STATUS_BUILTIN_ERROR; + } + + // keep things simple: don't allow existing names to be copy targets. + if( function_exists( new_func ) ) + { + sb_printf( sb_err, + _( L"%ls: Function '%ls' already exists. Cannot create copy '%ls'\n" ), + argv[0], + new_func, + current_func ); + builtin_print_help( argv[0], sb_err ); + + return STATUS_BUILTIN_ERROR; + } + + if( function_copy( current_func, new_func ) ) + return STATUS_BUILTIN_OK; + return STATUS_BUILTIN_ERROR; + } for( i=woptind; itype = EVENT_GENERIC; e->param1.param = halloc_wcsdup( current_block, woptarg ); e->function_name=0; @@ -1622,7 +1686,7 @@ static int builtin_function( wchar_t **argv ) e = halloc( current_block, sizeof(event_t)); if( !e ) DIE_MEM(); - + if( ( opt == 'j' ) && ( wcscasecmp( woptarg, L"caller" ) == 0 ) ) { @@ -1693,15 +1757,15 @@ static int builtin_function( wchar_t **argv ) if( !named_arguments ) named_arguments = al_halloc( current_block ); break; - + case 'S': shadows = 0; break; - + case 'h': builtin_print_help( argv[0], sb_out ); return STATUS_BUILTIN_OK; - + case '?': builtin_unknown_option( argv[0], argv[woptind-1] ); res = 1; @@ -1713,7 +1777,7 @@ static int builtin_function( wchar_t **argv ) if( !res ) { - + if( argc == woptind ) { sb_printf( sb_err, @@ -1744,7 +1808,7 @@ static int builtin_function( wchar_t **argv ) { name = argv[woptind++]; - + if( named_arguments ) { while( woptind < argc ) @@ -1758,7 +1822,7 @@ static int builtin_function( wchar_t **argv ) res = STATUS_BUILTIN_ERROR; break; } - + al_push( named_arguments, halloc_wcsdup( current_block, argv[woptind++] ) ); } } @@ -1769,7 +1833,7 @@ static int builtin_function( wchar_t **argv ) argv[0], argc ); res=1; - + } } } @@ -1811,13 +1875,13 @@ static int builtin_function( wchar_t **argv ) else { function_data_t * d = halloc( current_block, sizeof( function_data_t )); - + d->name=halloc_wcsdup( current_block, name); d->description=desc?halloc_wcsdup( current_block, desc):0; d->events = events; d->named_arguments = named_arguments; d->shadows = shadows; - + for( i=0; idata = d; - + } - + current_block->tok_pos = parser_get_pos(); current_block->skip = 1; @@ -1842,12 +1906,12 @@ static int builtin_random( wchar_t **argv ) { static int seeded=0; static struct drand48_data seed_buffer; - + int argc = builtin_count_args( argv ); woptind=0; - const static struct woption + static const struct woption long_options[] = { { @@ -1903,14 +1967,14 @@ static int builtin_random( wchar_t **argv ) case 0: { long res; - + if( !seeded ) { seeded=1; srand48_r(time(0), &seed_buffer); } lrand48_r( &seed_buffer, &res ); - + sb_printf( sb_out, L"%d\n", abs(res%32767) ); break; } @@ -1965,12 +2029,12 @@ static int builtin_read( wchar_t **argv ) int exit_res=STATUS_BUILTIN_OK; wchar_t *mode_name = READ_MODE_NAME; int shell = 0; - + woptind=0; - + while( 1 ) { - const static struct woption + static const struct woption long_options[] = { { @@ -2077,7 +2141,7 @@ static int builtin_read( wchar_t **argv ) case 's': shell = 1; break; - + case 'h': builtin_print_help( argv[0], sb_out ); return STATUS_BUILTIN_OK; @@ -2146,7 +2210,7 @@ static int builtin_read( wchar_t **argv ) if( isatty(0) && builtin_stdin == 0 ) { wchar_t *line; - + reader_push( mode_name ); reader_set_prompt( prompt ); if( shell ) @@ -2155,10 +2219,10 @@ static int builtin_read( wchar_t **argv ) reader_set_highlight_function( &highlight_shell ); reader_set_test_function( &reader_shell_test ); } - + reader_set_buffer( commandline, wcslen( commandline ) ); proc_push_interactive( 1 ); - + event_fire_generic(L"fish_prompt"); line = reader_readline( ); proc_pop_interactive(); @@ -2176,9 +2240,9 @@ static int builtin_read( wchar_t **argv ) { string_buffer_t sb; int eof=0; - + sb_init( &sb ); - + while( 1 ) { int finished=0; @@ -2232,32 +2296,32 @@ static int builtin_read( wchar_t **argv ) { exit_res = 1; } - + buff = wcsdup( (wchar_t *)sb.buff ); sb_destroy( &sb ); } if( i != argc && !exit_res ) { - + wchar_t *state; ifs = env_get( L"IFS" ); if( ifs == 0 ) ifs = L""; - + nxt = wcstok( buff, (iparam1.source_dest = fn_intern; - + parse_util_set_argv( (argc>2)?(argv+2):(argv+1), 0); - + res = reader_read( fd, real_io ); - + parser_pop_block(); - + if( res ) { sb_printf( sb_err, @@ -2855,12 +2919,12 @@ static int builtin_source( wchar_t ** argv ) { res = proc_get_last_status(); } - + /* Do not close fd after calling reader_read. reader_read automatically closes it before calling eval. */ - + reader_pop_current_filename(); return res; @@ -2910,7 +2974,7 @@ static int builtin_fg( wchar_t **argv ) */ for( j=first_job; j; j=j->next ) { - if( job_get_flag( j, JOB_CONSTRUCTED ) && (!job_is_completed(j)) && + if( job_get_flag( j, JOB_CONSTRUCTED ) && (!job_is_completed(j)) && ( (job_is_stopped(j) || (!job_get_flag(j, JOB_FOREGROUND)) ) && job_get_flag( j, JOB_CONTROL) ) ) { break; @@ -2935,16 +2999,16 @@ static int builtin_fg( wchar_t **argv ) wchar_t *endptr; int pid; int found_job = 0; - + errno = 0; pid = wcstol( argv[1], &endptr, 10 ); if( !( *endptr || errno ) ) - { + { j = job_get_from_pid( pid ); if( j ) found_job = 1; } - + if( found_job ) { sb_printf( sb_err, @@ -2966,11 +3030,11 @@ static int builtin_fg( wchar_t **argv ) } else { - wchar_t *end; + wchar_t *end; int pid; errno = 0; pid = abs(wcstol( argv[1], &end, 10 )); - + if( *end || errno ) { sb_printf( sb_err, @@ -3095,7 +3159,7 @@ static int builtin_bg( wchar_t **argv ) break; } } - + if( !j ) { sb_printf( sb_err, @@ -3114,7 +3178,7 @@ static int builtin_bg( wchar_t **argv ) int i; int pid; int err = 0; - + for( i=1; argv[i]; i++ ) { errno=0; @@ -3127,7 +3191,7 @@ static int builtin_bg( wchar_t **argv ) argv[i] ); err = 1; break; - } + } } if( !err ) @@ -3139,7 +3203,7 @@ static int builtin_bg( wchar_t **argv ) } } } - + return res; } @@ -3294,7 +3358,7 @@ static int builtin_end( wchar_t **argv ) env_set( current_block->param1.for_variable, val, ENV_LOCAL); current_block->loop_status = LOOP_NORMAL; current_block->skip = 0; - + kill_block = 0; parser_set_pos( current_block->tok_pos ); } @@ -3303,9 +3367,9 @@ static int builtin_end( wchar_t **argv ) case FUNCTION_DEF: { - + function_data_t *d = (function_data_t *)current_block->data; - + if( d ) { /** @@ -3317,13 +3381,13 @@ static int builtin_end( wchar_t **argv ) wchar_t *def = wcsndup( parser_get_buffer()+current_block->tok_pos, parser_get_job_pos()-current_block->tok_pos ); d->definition = def; - - function_add( d ); + + function_add( d ); free( def ); } else { - debug(0, + debug(0, _(L"%ls: Missing function definition information."), argv[0] ); bugreport(); @@ -3432,12 +3496,12 @@ static int builtin_break_continue( wchar_t **argv ) static int builtin_breakpoint( wchar_t **argv ) { - parser_push_block( BREAKPOINT ); - - reader_read( 0, real_io ); - - parser_pop_block(); - + parser_push_block( BREAKPOINT ); + + reader_read( STDIN_FILENO, real_io ); + + parser_pop_block(); + return proc_get_last_status(); } @@ -3482,7 +3546,7 @@ static int builtin_return( wchar_t **argv ) while( (b != 0) && - ( b->type != FUNCTION_CALL && + ( b->type != FUNCTION_CALL && b->type != FUNCTION_CALL_NO_SHADOW) ) { b = b->outer; @@ -3537,7 +3601,7 @@ static int builtin_switch( wchar_t **argv ) current_block->skip=1; current_block->param2.switch_taken=0; } - + return res; } @@ -3550,7 +3614,7 @@ static int builtin_case( wchar_t **argv ) int argc = builtin_count_args( argv ); int i; wchar_t *unescaped=0; - + if( current_block->type != SWITCH ) { sb_printf( sb_err, @@ -3559,22 +3623,22 @@ static int builtin_case( wchar_t **argv ) builtin_print_help( argv[0], sb_err ); return STATUS_BUILTIN_ERROR; } - + current_block->skip = 1; - + if( current_block->param2.switch_taken ) { return STATUS_BUILTIN_OK; } - + for( i=1; iparam1.switch_value, unescaped ); free( unescaped ); - + if( match ) { current_block->skip = 0; @@ -3582,7 +3646,7 @@ static int builtin_case( wchar_t **argv ) break; } } - + return STATUS_BUILTIN_OK; } @@ -3595,7 +3659,7 @@ static int builtin_case( wchar_t **argv ) /** Data about all the builtin commands in fish */ -const static builtin_data_t builtin_data[]= +static const builtin_data_t builtin_data[]= { { L"block", &builtin_block, N_( L"Temporarily block delivery of events" ) @@ -3606,15 +3670,15 @@ const static builtin_data_t builtin_data[]= } , { - L"cd", &builtin_cd, N_( L"Change working directory" ) + L"cd", &builtin_cd, N_( L"Change working directory" ) } , { - L"count", &builtin_count, N_( L"Count the number of arguments" ) + L"count", &builtin_count, N_( L"Count the number of arguments" ) } , { - L"contains", &builtin_contains, N_( L"Search for a specified string in a list" ) + L"contains", &builtin_contains, N_( L"Search for a specified string in a list" ) } , { @@ -3626,99 +3690,99 @@ const static builtin_data_t builtin_data[]= } , { - L"function", &builtin_function, N_( L"Define a new function" ) + L"function", &builtin_function, N_( L"Define a new function" ) } , { - L"functions", &builtin_functions, N_( L"List or remove functions" ) + L"functions", &builtin_functions, N_( L"List or remove functions" ) } , { - L"complete", &builtin_complete, N_( L"Edit command specific completions" ) + L"complete", &builtin_complete, N_( L"Edit command specific completions" ) } , { - L"end", &builtin_end, N_( L"End a block of commands" ) + L"end", &builtin_end, N_( L"End a block of commands" ) } , { - L"else", &builtin_else, N_( L"Evaluate block if condition is false" ) + L"else", &builtin_else, N_( L"Evaluate block if condition is false" ) } , { - L"for", &builtin_for, N_( L"Perform a set of commands multiple times" ) + L"for", &builtin_for, N_( L"Perform a set of commands multiple times" ) } , { - L".", &builtin_source, N_( L"Evaluate contents of file" ) + L".", &builtin_source, N_( L"Evaluate contents of file" ) } , { - L"set", &builtin_set, N_( L"Handle environment variables" ) + L"set", &builtin_set, N_( L"Handle environment variables" ) } , { - L"fg", &builtin_fg, N_( L"Send job to foreground" ) + L"fg", &builtin_fg, N_( L"Send job to foreground" ) } , { - L"bg", &builtin_bg, N_( L"Send job to background" ) + L"bg", &builtin_bg, N_( L"Send job to background" ) } , { - L"jobs", &builtin_jobs, N_( L"Print currently running jobs" ) + L"jobs", &builtin_jobs, N_( L"Print currently running jobs" ) } , { - L"read", &builtin_read, N_( L"Read a line of input into variables" ) + L"read", &builtin_read, N_( L"Read a line of input into variables" ) } , { - L"break", &builtin_break_continue, N_( L"Stop the innermost loop" ) + L"break", &builtin_break_continue, N_( L"Stop the innermost loop" ) } , { - L"continue", &builtin_break_continue, N_( L"Skip the rest of the current lap of the innermost loop" ) + L"continue", &builtin_break_continue, N_( L"Skip the rest of the current lap of the innermost loop" ) } , { - L"return", &builtin_return, N_( L"Stop the currently evaluated function" ) + L"return", &builtin_return, N_( L"Stop the currently evaluated function" ) } , { - L"commandline", &builtin_commandline, N_( L"Set or get the commandline" ) + L"commandline", &builtin_commandline, N_( L"Set or get the commandline" ) } , { - L"switch", &builtin_switch, N_( L"Conditionally execute a block of commands" ) + L"switch", &builtin_switch, N_( L"Conditionally execute a block of commands" ) } , { - L"case", &builtin_case, N_( L"Conditionally execute a block of commands" ) + L"case", &builtin_case, N_( L"Conditionally execute a block of commands" ) } , { - L"bind", &builtin_bind, N_( L"Handle fish key bindings" ) + L"bind", &builtin_bind, N_( L"Handle fish key bindings" ) } , { - L"random", &builtin_random, N_( L"Generate random number" ) + L"random", &builtin_random, N_( L"Generate random number" ) } , { - L"status", &builtin_status, N_( L"Return status information about fish" ) + L"status", &builtin_status, N_( L"Return status information about fish" ) } , { - L"ulimit", &builtin_ulimit, N_( L"Set or get the shells resource usage limits" ) + L"ulimit", &builtin_ulimit, N_( L"Set or get the shells resource usage limits" ) } , { - L"begin", &builtin_begin, N_( L"Create a block of code" ) + L"begin", &builtin_begin, N_( L"Create a block of code" ) } , { - L"breakpoint", &builtin_breakpoint, N_( L"Temporarily halt execution of a script and launch an interactive debug prompt" ) + L"breakpoint", &builtin_breakpoint, N_( L"Temporarily halt execution of a script and launch an interactive debug prompt" ) } , @@ -3728,31 +3792,31 @@ const static builtin_data_t builtin_data[]= listings of builtin commands, etc.. */ { - L"command", &builtin_generic, N_( L"Run a program instead of a function or builtin" ) + L"command", &builtin_generic, N_( L"Run a program instead of a function or builtin" ) } , { - L"if", &builtin_generic, N_( L"Evaluate block if condition is true" ) + L"if", &builtin_generic, N_( L"Evaluate block if condition is true" ) } , { - L"while", &builtin_generic, N_( L"Perform a command multiple times" ) + L"while", &builtin_generic, N_( L"Perform a command multiple times" ) } , { - L"not", &builtin_generic, N_( L"Negate exit status of job" ) + L"not", &builtin_generic, N_( L"Negate exit status of job" ) } , { - L"and", &builtin_generic, N_( L"Execute command if previous command suceeded" ) + L"and", &builtin_generic, N_( L"Execute command if previous command suceeded" ) } , { - L"or", &builtin_generic, N_( L"Execute command if previous command failed" ) + L"or", &builtin_generic, N_( L"Execute command if previous command failed" ) } , { - L"exec", &builtin_generic, N_( L"Run command in current process" ) + L"exec", &builtin_generic, N_( L"Run command in current process" ) } , { @@ -3760,13 +3824,13 @@ const static builtin_data_t builtin_data[]= } } ; - + void builtin_init() { - + int i; - + wopterr = 0; al_init( &io_stack ); @@ -3795,7 +3859,7 @@ void builtin_destroy() int builtin_exists( wchar_t *cmd ) { CHECK( cmd, 0 ); - + return !!hash_get(&builtin, cmd); } @@ -3815,12 +3879,12 @@ int builtin_run( wchar_t **argv, io_data_t *io ) { int (*cmd)(wchar_t **argv)=0; real_io = io; - + CHECK( argv, STATUS_BUILTIN_ERROR ); CHECK( argv[0], STATUS_BUILTIN_ERROR ); - + cmd = (int (*)(wchar_t **))hash_get( &builtin, argv[0] ); - + if( argv[1] != 0 && !internal_help(argv[0]) ) { if( argv[2] == 0 && (parser_is_help( argv[1], 0 ) ) ) @@ -3848,14 +3912,14 @@ int builtin_run( wchar_t **argv, io_data_t *io ) void builtin_get_names( array_list_t *list ) { - CHECK( list, ); + CHECK( list, ); hash_get_keys( &builtin, list ); } const wchar_t *builtin_get_desc( const wchar_t *b ) { CHECK( b, 0 ); - + if( !desc ) { int i; diff --git a/builtin.h b/builtin.h index 245fe16c1..876c5d389 100644 --- a/builtin.h +++ b/builtin.h @@ -64,7 +64,7 @@ enum #define BUILTIN_FOR_ERR_IN _( L"%ls: Second argument must be 'in'\n" ) /** - Error message for insufficient number of arguments + Error message for insufficient number of arguments */ #define BUILTIN_FOR_ERR_COUNT _( L"%ls: Expected at least two arguments, got %d\n") @@ -108,7 +108,7 @@ extern int builtin_err_redirect; /** - Initialize builtin data. + Initialize builtin data. */ void builtin_init(); @@ -123,11 +123,11 @@ void builtin_destroy(); int builtin_exists( wchar_t *cmd ); /** - Execute a builtin command + Execute a builtin command - \param argv Array containing the command and parameters + \param argv Array containing the command and parameters of the builtin. The list is terminated by a - null pointer. This syntax resembles the syntax + null pointer. This syntax resembles the syntax for exec. \param io the io redirections to perform on this builtin. diff --git a/builtin_commandline.c b/builtin_commandline.c index db43a18d7..f23e1153f 100644 --- a/builtin_commandline.c +++ b/builtin_commandline.c @@ -1,6 +1,6 @@ /** \file builtin_commandline.c Functions defining the commandline builtin -Functions used for implementing the commandline builtin. +Functions used for implementing the commandline builtin. */ #include "config.h" @@ -96,20 +96,20 @@ static void replace_part( const wchar_t *begin, const wchar_t *buff = get_buffer(); string_buffer_t out; int out_pos=get_cursor_pos(); - + sb_init( &out ); sb_append_substring( &out, buff, begin-buff ); - + switch( append_mode) { case REPLACE_MODE: { - + sb_append( &out, insert ); - out_pos = wcslen( insert ) + (begin-buff); + out_pos = wcslen( insert ) + (begin-buff); break; - + } case APPEND_MODE: { @@ -123,7 +123,7 @@ static void replace_part( const wchar_t *begin, sb_append_substring( &out, begin, cursor ); sb_append( &out, insert ); sb_append_substring( &out, begin+cursor, end-begin-cursor ); - out_pos += wcslen( insert ); + out_pos += wcslen( insert ); break; } } @@ -131,7 +131,7 @@ static void replace_part( const wchar_t *begin, reader_set_buffer( (wchar_t *)out.buff, out_pos ); sb_destroy( &out ); } - + /** Output the specified selection. @@ -140,11 +140,11 @@ static void replace_part( const wchar_t *begin, \param cut_at_cursor whether printing should stop at the surrent cursor position \param tokenize whether the string should be tokenized, printing one string token on every line and skipping non-string tokens */ -static void write_part( const wchar_t *begin, - const wchar_t *end, - int cut_at_cursor, +static void write_part( const wchar_t *begin, + const wchar_t *end, + int cut_at_cursor, int tokenize ) -{ +{ tokenizer tok; string_buffer_t out; wchar_t *buff; @@ -157,7 +157,7 @@ static void write_part( const wchar_t *begin, buff = wcsndup( begin, end-begin ); // fwprintf( stderr, L"Subshell: %ls, end char %lc\n", buff, *end ); sb_init( &out ); - + for( tok_init( &tok, buff, TOK_ACCEPT_UNFINISHED ); tok_has_next( &tok ); tok_next( &tok ) ) @@ -165,7 +165,7 @@ static void write_part( const wchar_t *begin, if( (cut_at_cursor) && (tok_get_pos( &tok)+wcslen(tok_last( &tok)) >= pos) ) break; - + switch( tok_last_type( &tok ) ) { case TOK_STRING: @@ -175,13 +175,13 @@ static void write_part( const wchar_t *begin, free( tmp ); break; } - - } + + } } sb_append( sb_out, (wchar_t *)out.buff ); - + free( buff ); tok_destroy( &tok ); sb_destroy( &out ); @@ -189,10 +189,10 @@ static void write_part( const wchar_t *begin, else { wchar_t *buff, *esc; - + if( cut_at_cursor ) { - end = begin+pos; + end = begin+pos; } buff = wcsndup( begin, end-begin ); @@ -202,10 +202,10 @@ static void write_part( const wchar_t *begin, sb_append( sb_out, esc ); sb_append( sb_out, L"\n" ); - + free( esc ); free( buff ); - + } } @@ -219,14 +219,14 @@ static int builtin_commandline( wchar_t **argv ) int buffer_part=0; int cut_at_cursor=0; - + int argc = builtin_count_args( argv ); int append_mode=0; int function_mode = 0; - - int tokenize = 0; - + + int tokenize = 0; + int cursor_mode = 0; int line_mode = 0; int search_mode = 0; @@ -254,7 +254,7 @@ static int builtin_commandline( wchar_t **argv ) */ return 1; } - + sb_append( sb_err, argv[0], L": Can not set commandline in non-interactive mode\n", @@ -267,7 +267,7 @@ static int builtin_commandline( wchar_t **argv ) while( 1 ) { - const static struct woption + static const struct woption long_options[] = { { @@ -293,11 +293,11 @@ static int builtin_commandline( wchar_t **argv ) { L"current-token", no_argument, 0, 't' } - , + , { L"current-buffer", no_argument, 0, 'b' } - , + , { L"cut-at-cursor", no_argument, 0, 'c' } @@ -314,7 +314,7 @@ static int builtin_commandline( wchar_t **argv ) L"help", no_argument, 0, 'h' } , - { + { L"input", required_argument, 0, 'I' } , @@ -331,21 +331,21 @@ static int builtin_commandline( wchar_t **argv ) } , { - 0, 0, 0, 0 + 0, 0, 0, 0 } } - ; - + ; + int opt_index = 0; - + int opt = wgetopt_long( argc, - argv, - L"abijpctwforhI:CLS", - long_options, + argv, + L"abijpctwforhI:CLS", + long_options, &opt_index ); if( opt == -1 ) break; - + switch( opt ) { case 0: @@ -358,7 +358,7 @@ static int builtin_commandline( wchar_t **argv ) builtin_print_help( argv[0], sb_err ); return 1; - + case L'a': append_mode = APPEND_MODE; break; @@ -366,8 +366,8 @@ static int builtin_commandline( wchar_t **argv ) case L'b': buffer_part = STRING_MODE; break; - - + + case L'i': append_mode = INSERT_MODE; break; @@ -375,11 +375,11 @@ static int builtin_commandline( wchar_t **argv ) case L'r': append_mode = REPLACE_MODE; break; - + case 'c': cut_at_cursor=1; break; - + case 't': buffer_part = TOKEN_MODE; break; @@ -404,33 +404,33 @@ static int builtin_commandline( wchar_t **argv ) current_buffer = woptarg; current_cursor_pos = wcslen( woptarg ); break; - + case 'C': cursor_mode = 1; break; - + case 'L': line_mode = 1; break; - + case 'S': search_mode = 1; break; - + case 'h': builtin_print_help( argv[0], sb_out ); return 0; case L'?': builtin_unknown_option( argv[0], argv[woptind-1] ); - return 1; + return 1; } - } + } if( function_mode ) { int i; - + /* Check for invalid switch combinations */ @@ -439,18 +439,18 @@ static int builtin_commandline( wchar_t **argv ) sb_printf(sb_err, BUILTIN_ERR_COMBO, argv[0] ); - + builtin_print_help( argv[0], sb_err ); return 1; } - + if( argc == woptind ) { sb_printf( sb_err, BUILTIN_ERR_MISSING, argv[0] ); - + builtin_print_help( argv[0], sb_err ); return 1; } @@ -476,16 +476,16 @@ static int builtin_commandline( wchar_t **argv ) return 1; } } - - return 0; + + return 0; } - + /* Check for invalid switch combinations */ if( (search_mode || line_mode || cursor_mode) && (argc-woptind > 1) ) { - + sb_append( sb_err, argv[0], L": Too many arguments\n", @@ -495,15 +495,15 @@ static int builtin_commandline( wchar_t **argv ) } if( (buffer_part || tokenize || cut_at_cursor) && (cursor_mode || line_mode || search_mode) ) - { + { sb_printf( sb_err, BUILTIN_ERR_COMBO, argv[0] ); builtin_print_help( argv[0], sb_err ); return 1; - } - + } + if( (tokenize || cut_at_cursor) && (argc-woptind) ) { @@ -511,7 +511,7 @@ static int builtin_commandline( wchar_t **argv ) BUILTIN_ERR_COMBO2, argv[0], L"--cut-at-cursor and --tokenize can not be used when setting the commandline" ); - + builtin_print_help( argv[0], sb_err ); return 1; @@ -524,7 +524,7 @@ static int builtin_commandline( wchar_t **argv ) argv[0], L"insertion mode switches can not be used when not in insertion mode" ); - builtin_print_help( argv[0], sb_err ); + builtin_print_help( argv[0], sb_err ); return 1; } @@ -535,7 +535,7 @@ static int builtin_commandline( wchar_t **argv ) { append_mode = REPLACE_MODE; } - + if( !buffer_part ) { buffer_part = STRING_MODE; @@ -548,7 +548,7 @@ static int builtin_commandline( wchar_t **argv ) wchar_t *endptr; int new_pos; errno = 0; - + new_pos = wcstol( argv[woptind], &endptr, 10 ); if( *endptr || errno ) { @@ -558,7 +558,7 @@ static int builtin_commandline( wchar_t **argv ) argv[woptind] ); builtin_print_help( argv[0], sb_err ); } - + current_buffer = reader_get_buffer(); new_pos = maxi( 0, mini( new_pos, wcslen( current_buffer ) ) ); reader_set_buffer( current_buffer, new_pos ); @@ -569,98 +569,98 @@ static int builtin_commandline( wchar_t **argv ) sb_printf( sb_out, L"%d\n", reader_get_cursor_pos() ); return 0; } - + } - + if( line_mode ) { int pos = reader_get_cursor_pos(); wchar_t *buff = reader_get_buffer(); sb_printf( sb_out, L"%d\n", parse_util_lineno( buff, pos ) ); return 0; - + } - + if( search_mode ) { return !reader_search_mode(); } - - + + switch( buffer_part ) { case STRING_MODE: - { + { begin = get_buffer(); end = begin+wcslen(begin); - break; + break; } case PROCESS_MODE: { parse_util_process_extent( get_buffer(), get_cursor_pos(), - &begin, + &begin, &end ); break; } - + case JOB_MODE: { parse_util_job_extent( get_buffer(), get_cursor_pos(), &begin, - &end ); - break; + &end ); + break; } - + case TOKEN_MODE: { parse_util_token_extent( get_buffer(), get_cursor_pos(), - &begin, - &end, + &begin, + &end, 0, 0 ); - break; + break; } - + } switch(argc-woptind) { case 0: - { + { write_part( begin, end, cut_at_cursor, tokenize ); break; } - + case 1: { replace_part( begin, end, argv[woptind], append_mode ); break; - } + } default: { string_buffer_t sb; int i; - + sb_init( &sb ); - + sb_append( &sb, argv[woptind] ); - + for( i=woptind+1; iflags & COMPLETE_NO_CASE ) { prepend = L""; @@ -571,7 +571,7 @@ static int builtin_complete( wchar_t **argv ) { prepend = token; } - + if( next->description ) { @@ -582,17 +582,17 @@ static int builtin_complete( wchar_t **argv ) sb_printf( sb_out, L"%ls%ls\n", prepend, next->completion ); } } - + halloc_free( comp ); recursion_level--; } - - temporary_buffer = prev_temporary_buffer; - + + temporary_buffer = prev_temporary_buffer; + } else if( woptind != argc ) { - sb_printf( sb_err, + sb_printf( sb_err, _( L"%ls: Too many arguments\n" ), argv[0] ); builtin_print_help( argv[0], sb_err ); @@ -603,7 +603,7 @@ static int builtin_complete( wchar_t **argv ) { /* No arguments specified, meaning we print the definitions of * all specified completions to stdout.*/ - complete_print( sb_out ); + complete_print( sb_out ); } else { @@ -613,26 +613,26 @@ static int builtin_complete( wchar_t **argv ) &path, (wchar_t *)short_opt.buff, &gnu_opt, - &old_opt ); + &old_opt ); } else { - builtin_complete_add( &cmd, + builtin_complete_add( &cmd, &path, (wchar_t *)short_opt.buff, &gnu_opt, - &old_opt, - result_mode, + &old_opt, + result_mode, authoritative, condition, comp, desc, - flags ); + flags ); } - } + } } - + al_foreach( &cmd, &free ); al_foreach( &path, &free ); diff --git a/builtin_jobs.c b/builtin_jobs.c index ec6ba21b7..8d17dba14 100644 --- a/builtin_jobs.c +++ b/builtin_jobs.c @@ -173,7 +173,7 @@ static int builtin_jobs( wchar_t **argv ) while( 1 ) { - const static struct woption + static const struct woption long_options[] = { { @@ -248,7 +248,7 @@ static int builtin_jobs( wchar_t **argv ) case 'h': builtin_print_help( argv[0], sb_out ); - return 0; + return 0; case '?': builtin_unknown_option( argv[0], argv[woptind-1] ); diff --git a/builtin_set.c b/builtin_set.c index 3eaca346e..7fa41fa97 100644 --- a/builtin_set.c +++ b/builtin_set.c @@ -1,6 +1,6 @@ /** \file builtin_set.c Functions defining the set builtin -Functions used for implementing the set builtin. +Functions used for implementing the set builtin. */ #include "config.h" @@ -61,19 +61,19 @@ static int my_env_set( const wchar_t *key, array_list_t *val, int scope ) int i; int retcode = 0; wchar_t *val_str=0; - + if( is_path_variable( key ) ) { int error = 0; - + for( i=0; i 64 ) { shorten = 1; @@ -384,12 +384,12 @@ static void print_variables(int include_values, int esc, int scope) DIE_MEM(); } } - + e_value = esc ? expand_escape_variable(value) : wcsdup(value); - + sb_append(sb_out, L" ", e_value, (void *)0); free(e_value); - + if( shorten ) { sb_append(sb_out, L"\u2026"); @@ -398,7 +398,7 @@ static void print_variables(int include_values, int esc, int scope) } } - + sb_append(sb_out, L"\n"); free(e_key); } @@ -411,57 +411,57 @@ static void print_variables(int include_values, int esc, int scope) The set builtin. Creates, updates and erases environment variables and environemnt variable arrays. */ -static int builtin_set( wchar_t **argv ) +static int builtin_set( wchar_t **argv ) { - + /** Variables used for parsing the argument list */ - const static struct woption - long_options[] = + static const struct woption + long_options[] = { - { - L"export", no_argument, 0, 'x' + { + L"export", no_argument, 0, 'x' } , - { - L"global", no_argument, 0, 'g' + { + L"global", no_argument, 0, 'g' } , - { - L"local", no_argument, 0, 'l' + { + L"local", no_argument, 0, 'l' } , - { - L"erase", no_argument, 0, 'e' + { + L"erase", no_argument, 0, 'e' } , - { - L"names", no_argument, 0, 'n' - } + { + L"names", no_argument, 0, 'n' + } , - { - L"unexport", no_argument, 0, 'u' - } + { + L"unexport", no_argument, 0, 'u' + } , - { - L"universal", no_argument, 0, 'U' - } + { + L"universal", no_argument, 0, 'U' + } , - { - L"query", no_argument, 0, 'q' - } + { + L"query", no_argument, 0, 'q' + } , - { - L"help", no_argument, 0, 'h' - } + { + L"help", no_argument, 0, 'h' + } , - { - 0, 0, 0, 0 + { + 0, 0, 0, 0 } } ; - + const wchar_t *short_options = L"+xglenuUqh"; int argc = builtin_count_args(argv); @@ -472,7 +472,7 @@ static int builtin_set( wchar_t **argv ) int local = 0, global = 0, export = 0; int erase = 0, list = 0, unexport=0; int universal = 0, query=0; - + /* Variables used for performing the actual work @@ -482,22 +482,22 @@ static int builtin_set( wchar_t **argv ) int scope; int slice=0; int i; - + wchar_t *bad_char; - - + + /* Parse options to obtain the requested operation and the modifiers */ woptind = 0; - while (1) + while (1) { int c = wgetopt_long(argc, argv, short_options, long_options, 0); - if (c == -1) + if (c == -1) { break; } - - switch(c) + + switch(c) { case 0: break; @@ -561,18 +561,18 @@ static int builtin_set( wchar_t **argv ) sb_printf(sb_err, BUILTIN_ERR_COMBO, argv[0] ); - + builtin_print_help( argv[0], sb_err ); return 1; } - + /* We can't both list and erase varaibles */ - if( erase && list ) + if( erase && list ) { sb_printf(sb_err, BUILTIN_ERR_COMBO, - argv[0] ); + argv[0] ); builtin_print_help( argv[0], sb_err ); return 1; @@ -581,7 +581,7 @@ static int builtin_set( wchar_t **argv ) /* Variables can only have one scope */ - if( local + global + universal > 1 ) + if( local + global + universal > 1 ) { sb_printf( sb_err, BUILTIN_ERR_GLOCAL, @@ -593,7 +593,7 @@ static int builtin_set( wchar_t **argv ) /* Variables can only have one export status */ - if( export && unexport ) + if( export && unexport ) { sb_printf( sb_err, BUILTIN_ERR_EXPUNEXP, @@ -605,7 +605,7 @@ static int builtin_set( wchar_t **argv ) /* Calculate the scope value for variable assignement */ - scope = (local ? ENV_LOCAL : 0) | (global ? ENV_GLOBAL : 0) | (export ? ENV_EXPORT : 0) | (unexport ? ENV_UNEXPORT : 0) | (universal ? ENV_UNIVERSAL:0) | ENV_USER; + scope = (local ? ENV_LOCAL : 0) | (global ? ENV_GLOBAL : 0) | (export ? ENV_EXPORT : 0) | (unexport ? ENV_UNEXPORT : 0) | (universal ? ENV_UNIVERSAL:0) | ENV_USER; if( query ) { @@ -621,7 +621,7 @@ static int builtin_set( wchar_t **argv ) if( !(dest = wcsdup(arg))) { - DIE_MEM(); + DIE_MEM(); } if( wcschr( dest, L'[' ) ) @@ -629,18 +629,18 @@ static int builtin_set( wchar_t **argv ) slice = 1; *wcschr( dest, L'[' )=0; } - + if( slice ) { array_list_t indexes; array_list_t result; int j; - + al_init( &result ); al_init( &indexes ); tokenize_variable_array( env_get( dest ), &result ); - + if( !parse_index( &indexes, arg, dest, al_get_count( &result ) ) ) { builtin_print_help( argv[0], sb_err ); @@ -663,32 +663,32 @@ static int builtin_set( wchar_t **argv ) retcode++; } } - + free( dest ); - + } return retcode; } - - if( list ) + + if( list ) { /* Maybe we should issue an error if there are any other arguments? */ print_variables(0, 0, scope); return 0; - } - + } + if( woptind == argc ) { /* Print values of variables */ - if( erase ) + if( erase ) { sb_printf( sb_err, - _(L"%ls: Erase needs a variable name\n%ls\n"), + _(L"%ls: Erase needs a variable name\n%ls\n"), argv[0] ); - + builtin_print_help( argv[0], sb_err ); retcode = 1; } @@ -696,13 +696,13 @@ static int builtin_set( wchar_t **argv ) { print_variables( 1, 1, scope ); } - + return retcode; } if( !(dest = wcsdup(argv[woptind]))) { - DIE_MEM(); + DIE_MEM(); } if( wcschr( dest, L'[' ) ) @@ -710,7 +710,7 @@ static int builtin_set( wchar_t **argv ) slice = 1; *wcschr( dest, L'[' )=0; } - + if( !wcslen( dest ) ) { free( dest ); @@ -718,7 +718,7 @@ static int builtin_set( wchar_t **argv ) builtin_print_help( argv[0], sb_err ); return 1; } - + if( (bad_char = wcsvarname( dest ) ) ) { sb_printf( sb_err, BUILTIN_ERR_VARCHAR, argv[0], *bad_char ); @@ -726,7 +726,7 @@ static int builtin_set( wchar_t **argv ) free( dest ); return 1; } - + if( slice && erase && (scope != ENV_USER) ) { free( dest ); @@ -734,12 +734,12 @@ static int builtin_set( wchar_t **argv ) builtin_print_help( argv[0], sb_err ); return 1; } - + /* set assignment can work in two modes, either using slices or using the whole array. We detect which mode is used here. */ - + if( slice ) { @@ -750,22 +750,22 @@ static int builtin_set( wchar_t **argv ) array_list_t values; array_list_t indexes; array_list_t result; - + al_init(&values); al_init(&indexes); al_init(&result); - + tokenize_variable_array( env_get(dest), &result ); - + for( ; woptind ls.rlim_max)) { ls.rlim_cur = ls.rlim_max; - } + } } - + if( setrlimit( resource, &ls ) ) { if( errno == EPERM ) @@ -244,8 +244,8 @@ static int set( int resource, int hard, int soft, rlim_t value ) else builtin_wperror( L"ulimit" ); return 1; - } - return 0; + } + return 0; } /** @@ -256,17 +256,17 @@ static int builtin_ulimit( wchar_t ** argv ) { int hard=0; int soft=0; - + int what = RLIMIT_FSIZE; int report_all = 0; int argc = builtin_count_args( argv ); - + woptind=0; - + while( 1 ) { - const static struct woption + static const struct woption long_options[] = { { @@ -321,27 +321,27 @@ static int builtin_ulimit( wchar_t ** argv ) L"virtual-memory-size", no_argument, 0, 'v' } , - { - L"help", no_argument, 0, 'h' - } + { + L"help", no_argument, 0, 'h' + } , { - 0, 0, 0, 0 + 0, 0, 0, 0 } } - ; - + ; + int opt_index = 0; - + int opt = wgetopt_long( argc, - argv, - L"aHScdflmnstuvh", - long_options, + argv, + L"aHScdflmnstuvh", + long_options, &opt_index ); if( opt == -1 ) break; - + switch( opt ) { case 0: @@ -354,7 +354,7 @@ static int builtin_ulimit( wchar_t ** argv ) builtin_print_help( argv[0], sb_err ); return 1; - + case L'a': report_all=1; break; @@ -364,17 +364,17 @@ static int builtin_ulimit( wchar_t ** argv ) break; case L'S': - soft=1; + soft=1; break; case L'c': what=RLIMIT_CORE; break; - + case L'd': what=RLIMIT_DATA; break; - + case L'f': what=RLIMIT_FSIZE; break; @@ -384,45 +384,45 @@ static int builtin_ulimit( wchar_t ** argv ) break; #endif -#ifdef RLIMIT_RSS +#ifdef RLIMIT_RSS case L'm': what=RLIMIT_RSS; break; #endif - + case L'n': what=RLIMIT_NOFILE; break; - + case L's': what=RLIMIT_STACK; break; - + case L't': what=RLIMIT_CPU; break; - -#ifdef RLIMIT_NPROC + +#ifdef RLIMIT_NPROC case L'u': what=RLIMIT_NPROC; break; #endif - -#ifdef RLIMIT_AS + +#ifdef RLIMIT_AS case L'v': what=RLIMIT_AS; break; #endif - + case L'h': - builtin_print_help( argv[0], sb_out ); + builtin_print_help( argv[0], sb_out ); return 0; case L'?': builtin_unknown_option( argv[0], argv[woptind-1] ); - return 1; + return 1; } - } + } if( report_all ) { @@ -442,7 +442,7 @@ static int builtin_ulimit( wchar_t ** argv ) return 0; } - + switch( argc - woptind ) { case 0: @@ -453,7 +453,7 @@ static int builtin_ulimit( wchar_t ** argv ) print( what, hard ); break; } - + case 1: { /* @@ -469,7 +469,7 @@ static int builtin_ulimit( wchar_t ** argv ) { hard=soft=1; } - + if( wcscasecmp( argv[woptind], L"unlimited" )==0) { new_limit = RLIM_INFINITY; @@ -484,23 +484,23 @@ static int builtin_ulimit( wchar_t ** argv ) } else { - errno=0; + errno=0; new_limit = wcstol( argv[woptind], &end, 10 ); if( errno || *end ) { - sb_printf( sb_err, - L"%ls: Invalid limit '%ls'\n", - argv[0], + sb_printf( sb_err, + L"%ls: Invalid limit '%ls'\n", + argv[0], argv[woptind] ); builtin_print_help( argv[0], sb_err ); return 1; } new_limit *= get_multiplier( what ); } - + return set( what, hard, soft, new_limit ); } - + default: { sb_append( sb_err, @@ -510,7 +510,7 @@ static int builtin_ulimit( wchar_t ** argv ) builtin_print_help( argv[0], sb_err ); return 1; } - + } - return 0; + return 0; } diff --git a/common.c b/common.c index 2dd125b8d..fa5ce6465 100644 --- a/common.c +++ b/common.c @@ -1,5 +1,5 @@ /** \file common.c - + Various functions, mostly string utilities, that are used by most parts of fish. */ @@ -38,7 +38,7 @@ parts of fish. #include #include #include -#include +#include #include #include #include @@ -89,12 +89,12 @@ parts of fish. #include "fallback.c" /** - The number of milliseconds to wait between polls when attempting to acquire + The number of milliseconds to wait between polls when attempting to acquire a lockfile */ #define LOCKPOLLINTERVAL 10 -struct termios shell_modes; +struct termios shell_modes; wchar_t ellipsis_char; @@ -115,7 +115,7 @@ static struct winsize termsize; static string_buffer_t *setlocale_buff=0; -void show_stackframe() +void show_stackframe() { void *trace[32]; char **messages = (char **)NULL; @@ -145,18 +145,18 @@ wchar_t **list_to_char_arr( array_list_t *l ) DIE_MEM(); } for( i=0; iarr, + qsort( comp->arr, al_get_count( comp ), sizeof( void*), &str_cmp ); @@ -233,7 +233,7 @@ wchar_t *str2wcs( const char *in ) { wchar_t *out; size_t len = strlen(in); - + out = malloc( sizeof(wchar_t)*(len+1) ); if( !out ) @@ -254,7 +254,7 @@ wchar_t *str2wcs_internal( const char *in, wchar_t *out ) CHECK( in, 0 ); CHECK( out, 0 ); - + len = strlen(in); memset( &state, 0, sizeof(state) ); @@ -274,7 +274,7 @@ wchar_t *str2wcs_internal( const char *in, wchar_t *out ) } else { - + switch( res ) { case (size_t)(-2): @@ -285,12 +285,12 @@ wchar_t *str2wcs_internal( const char *in, wchar_t *out ) memset( &state, 0, sizeof(state) ); break; } - + case 0: { return out; } - + default: { in_pos += res; @@ -299,17 +299,17 @@ wchar_t *str2wcs_internal( const char *in, wchar_t *out ) } out_pos++; } - + } out[out_pos] = 0; - - return out; + + return out; } char *wcs2str( const wchar_t *in ) { - char *out; - + char *out; + out = malloc( MAX_UTF8_BYTES*wcslen(in)+1 ); if( !out ) @@ -329,9 +329,9 @@ char *wcs2str_internal( const wchar_t *in, char *out ) CHECK( in, 0 ); CHECK( out, 0 ); - + memset( &state, 0, sizeof(state) ); - + while( in[in_pos] ) { if( in[in_pos] == INTERNAL_SEPARATOR ) @@ -345,7 +345,7 @@ char *wcs2str_internal( const wchar_t *in, char *out ) else { res = wcrtomb( &out[out_pos], in[in_pos], &state ); - + if( res == (size_t)(-1) ) { debug( 1, L"Wide character %d has no narrow representation", in[in_pos] ); @@ -359,8 +359,8 @@ char *wcs2str_internal( const wchar_t *in, char *out ) in_pos++; } out[out_pos] = 0; - - return out; + + return out; } char **wcsv2strv( const wchar_t **in ) @@ -373,7 +373,7 @@ char **wcsv2strv( const wchar_t **in ) char **res = malloc( sizeof( char *)*(count+1)); if( res == 0 ) { - DIE_MEM(); + DIE_MEM(); } for( i=0; i 2 ) w=1; - - res += w; + + res += w; } return res; } @@ -488,14 +488,14 @@ int my_wcswidth( const wchar_t *c ) wchar_t *quote_end( const wchar_t *pos ) { wchar_t c = *pos; - + while( 1 ) { pos++; - + if( !*pos ) return 0; - + if( *pos == L'\\') { pos++; @@ -511,36 +511,36 @@ wchar_t *quote_end( const wchar_t *pos ) } } return 0; - + } - + const wchar_t *wsetlocale(int category, const wchar_t *locale) { char *lang = locale?wcs2str( locale ):0; char * res = setlocale(category,lang); - + free( lang ); /* Use ellipsis if on known unicode system, otherwise use $ */ char *ctype = setlocale( LC_CTYPE, (void *)0 ); - ellipsis_char = (strstr( ctype, ".UTF")||strstr( ctype, ".utf") )?L'\u2026':L'$'; - + ellipsis_char = (strstr( ctype, ".UTF")||strstr( ctype, ".utf") )?L'\u2026':L'$'; + if( !res ) return 0; - + if( !setlocale_buff ) { setlocale_buff = sb_halloc( global_context); } - + sb_clear( setlocale_buff ); sb_printf( setlocale_buff, L"%s", res ); - - return (wchar_t *)setlocale_buff->buff; + + return (wchar_t *)setlocale_buff->buff; } int contains_internal( const wchar_t *a, ... ) @@ -550,59 +550,59 @@ int contains_internal( const wchar_t *a, ... ) int res = 0; CHECK( a, 0 ); - + va_start( va, a ); - while( (arg=va_arg(va, wchar_t *) )!= 0 ) + while( (arg=va_arg(va, wchar_t *) )!= 0 ) { if( wcscmp( a,arg) == 0 ) { res=1; break; } - + } va_end( va ); - return res; + return res; } int read_blocked(int fd, void *buf, size_t count) { - int res; - sigset_t chldset, oldset; + int res; + sigset_t chldset, oldset; sigemptyset( &chldset ); sigaddset( &chldset, SIGCHLD ); sigprocmask(SIG_BLOCK, &chldset, &oldset); res = read( fd, buf, count ); sigprocmask( SIG_SETMASK, &oldset, 0 ); - return res; + return res; } ssize_t write_loop(int fd, char *buff, size_t count) { ssize_t out=0; ssize_t out_cum=0; - while( 1 ) + while( 1 ) { - out = write( fd, + out = write( fd, &buff[out_cum], count - out_cum ); - if (out == -1) + if (out == -1) { if( errno != EAGAIN && - errno != EINTR ) + errno != EINTR ) { return -1; } - } else + } else { out_cum += out; } - if( out_cum >= count ) + if( out_cum >= count ) { break; } - } + } return out_cum; } @@ -616,26 +616,26 @@ void debug( int level, const wchar_t *msg, ... ) string_buffer_t sb2; int errno_old = errno; - + if( level > debug_level ) return; CHECK( msg, ); - + sb_init( &sb ); sb_init( &sb2 ); sb_printf( &sb, L"%ls: ", program_name ); - va_start( va, msg ); + va_start( va, msg ); sb_vprintf( &sb, msg, va ); - va_end( va ); + va_end( va ); write_screen( (wchar_t *)sb.buff, &sb2 ); - fwprintf( stderr, L"%ls", sb2.buff ); + fwprintf( stderr, L"%ls", sb2.buff ); - sb_destroy( &sb ); - sb_destroy( &sb2 ); + sb_destroy( &sb ); + sb_destroy( &sb2 ); errno = errno_old; } @@ -646,17 +646,17 @@ void write_screen( const wchar_t *msg, string_buffer_t *buff ) int line_width = 0; int tok_width = 0; int screen_width = common_get_width(); - + CHECK( msg, ); CHECK( buff, ); - + if( screen_width ) { start = pos = msg; while( 1 ) { int overflow = 0; - + tok_width=0; /* @@ -664,7 +664,7 @@ void write_screen( const wchar_t *msg, string_buffer_t *buff ) */ while( *pos && ( !wcschr( L" \n\r\t", *pos ) ) ) { - + /* Check is token is wider than one line. If so we mark it as an overflow and break the token. @@ -672,9 +672,9 @@ void write_screen( const wchar_t *msg, string_buffer_t *buff ) if((tok_width + wcwidth(*pos)) > (screen_width-1)) { overflow = 1; - break; + break; } - + tok_width += wcwidth( *pos ); pos++; } @@ -713,7 +713,7 @@ void write_screen( const wchar_t *msg, string_buffer_t *buff ) free( token ); line_width += (line_width!=0?1:0) + tok_width; } - + /* Break on end of string */ @@ -721,7 +721,7 @@ void write_screen( const wchar_t *msg, string_buffer_t *buff ) { break; } - + start=pos; } } @@ -744,7 +744,7 @@ static wchar_t *escape_simple( const wchar_t *in ) out = malloc( sizeof(wchar_t)*(len+3)); if( !out ) DIE_MEM(); - + out[0] = L'\''; wcscpy(&out[1], in ); out[len+1]=L'\''; @@ -753,14 +753,14 @@ static wchar_t *escape_simple( const wchar_t *in ) } -wchar_t *escape( const wchar_t *in_orig, +wchar_t *escape( const wchar_t *in_orig, int flags ) { const wchar_t *in = in_orig; - + int escape_all = flags & ESCAPE_ALL; int no_quoted = flags & ESCAPE_NO_QUOTED; - + wchar_t *out; wchar_t *pos; @@ -780,14 +780,14 @@ wchar_t *escape( const wchar_t *in_orig, DIE_MEM(); return out; } - - + + out = malloc( sizeof(wchar_t)*(wcslen(in)*4 + 1)); pos = out; - + if( !out ) DIE_MEM(); - + while( *in != 0 ) { @@ -796,53 +796,53 @@ wchar_t *escape( const wchar_t *in_orig, { int val = *in - ENCODE_DIRECT_BASE; int tmp; - + *(pos++) = L'\\'; *(pos++) = L'X'; - - tmp = val/16; + + tmp = val/16; *pos++ = tmp > 9? L'a'+(tmp-10):L'0'+tmp; - - tmp = val%16; + + tmp = val%16; *pos++ = tmp > 9? L'a'+(tmp-10):L'0'+tmp; need_escape=need_complex_escape=1; - + } else { - + switch( *in ) { case L'\t': *(pos++) = L'\\'; - *(pos++) = L't'; + *(pos++) = L't'; need_escape=need_complex_escape=1; break; - + case L'\n': *(pos++) = L'\\'; - *(pos++) = L'n'; + *(pos++) = L'n'; need_escape=need_complex_escape=1; break; - + case L'\b': *(pos++) = L'\\'; - *(pos++) = L'b'; + *(pos++) = L'b'; need_escape=need_complex_escape=1; break; - + case L'\r': *(pos++) = L'\\'; - *(pos++) = L'r'; + *(pos++) = L'r'; need_escape=need_complex_escape=1; break; - + case L'\x1b': *(pos++) = L'\\'; - *(pos++) = L'e'; + *(pos++) = L'e'; need_escape=need_complex_escape=1; break; - + case L'\\': case L'\'': @@ -881,7 +881,7 @@ wchar_t *escape( const wchar_t *in_orig, *pos++ = *in; break; } - + default: { if( *in < 32 ) @@ -891,12 +891,12 @@ wchar_t *escape( const wchar_t *in_orig, *(pos++) = L'\\'; *(pos++) = L'c'; *(pos++) = L'a' + *in -1; - + need_escape=need_complex_escape=1; break; - + } - + int tmp = (*in)%16; *pos++ = L'\\'; @@ -913,47 +913,47 @@ wchar_t *escape( const wchar_t *in_orig, } } } - + in++; } *pos = 0; /* Use quoted escaping if possible, since most people find it - easier to read. + easier to read. */ if( !no_quoted && need_escape && !need_complex_escape && escape_all ) { free( out ); out = escape_simple( in_orig ); } - + return out; } wchar_t *unescape( const wchar_t * orig, int flags ) { - - int mode = 0; + + int mode = 0; int in_pos, out_pos, len; int c; int bracket_count=0; - wchar_t prev=0; + wchar_t prev=0; wchar_t *in; int unescape_special = flags & UNESCAPE_SPECIAL; int allow_incomplete = flags & UNESCAPE_INCOMPLETE; - + CHECK( orig, 0 ); - + len = wcslen( orig ); in = wcsdup( orig ); if( !in ) DIE_MEM(); - - for( in_pos=0, out_pos=0; - in_pos=0)?in[out_pos]:0), out_pos++, in_pos++ ) { c = in[in_pos]; @@ -969,7 +969,7 @@ wchar_t *unescape( const wchar_t * orig, int flags ) { switch( in[++in_pos] ) { - + /* A null character after a backslash is an error, return null @@ -982,12 +982,12 @@ wchar_t *unescape( const wchar_t * orig, int flags ) return 0; } } - + /* Numeric escape sequences. No prefix means octal escape, otherwise hexadecimal. */ - + case L'0': case L'1': case L'2': @@ -1005,10 +1005,10 @@ wchar_t *unescape( const wchar_t * orig, int flags ) long long res=0; int chars=2; int base=16; - + int byte = 0; wchar_t max_val = ASCII_MAX; - + switch( in[in_pos] ) { case L'u': @@ -1017,45 +1017,45 @@ wchar_t *unescape( const wchar_t * orig, int flags ) max_val = UCS2_MAX; break; } - + case L'U': { chars=8; max_val = WCHAR_MAX; break; } - + case L'x': { break; } - + case L'X': { byte=1; max_val = BYTE_MAX; break; } - + default: { base=8; chars=3; in_pos--; break; - } + } } - + for( i=0; i= timeout || elapsed < 0 ) @@ -1670,7 +1670,7 @@ int acquire_lock_file( const char *lockfile, const int timeout, int force ) else { /* - Timed out and final try was unsuccessful or + Timed out and final try was unsuccessful or force was not specified */ debug( 1, L"acquire_lock_file: timed out " @@ -1729,7 +1729,7 @@ void tokenize_variable_array( const wchar_t *val, array_list_t *out ) { if( *pos == ARRAY_SEP ) { - + *pos=0; next = start==cpy?cpy:wcsdup(start); if( !next ) @@ -1751,13 +1751,13 @@ int create_directory( wchar_t *d ) int ok = 0; struct stat buf; int stat_res = 0; - + while( (stat_res = wstat(d, &buf ) ) != 0 ) { if( errno != EAGAIN ) break; } - + if( stat_res == 0 ) { if( S_ISDIR( buf.st_mode ) ) @@ -1781,7 +1781,7 @@ int create_directory( wchar_t *d ) free(dir); } } - + return ok?0:-1; } @@ -1818,7 +1818,7 @@ void sb_format_size( string_buffer_t *sb, else { int i; - + for( i=0; sz_name[i]; i++ ) { if( sz < (1024*1024) || !sz_name[i+1] ) @@ -1831,19 +1831,19 @@ void sb_format_size( string_buffer_t *sb, break; } sz /= 1024; - + } - } + } } double timef() { int time_res; struct timeval tv; - + time_res = gettimeofday(&tv, 0); - - if( time_res ) + + if( time_res ) { /* Fixme: What on earth is the correct parameter value for NaN? @@ -1854,6 +1854,6 @@ double timef() */ return nan(""); } - + return (double)tv.tv_sec + 0.000001*tv.tv_usec; } diff --git a/common.h b/common.h index 115785f3d..24c360880 100644 --- a/common.h +++ b/common.h @@ -60,10 +60,10 @@ #define ESCAPE_NO_QUOTED 2 -/** +/** Save the shell mode on startup so we can restore them on exit */ -extern struct termios shell_modes; +extern struct termios shell_modes; /** The character to use where the text has been truncated. Is an @@ -116,7 +116,7 @@ extern wchar_t *program_name; exit_read_count=read( 0, &exit_read_buff, 1 ); \ exit( 1 ); \ } \ - + /** Exit program at once, leaving an error message about running out of memory. @@ -144,7 +144,7 @@ extern wchar_t *program_name; show_stackframe(); \ return retval; \ } - + /** Shorthand for wgettext call */ @@ -152,7 +152,7 @@ extern wchar_t *program_name; /** Noop, used to tell xgettext that a string should be translated, - even though it is not directly sent to wgettext. + even though it is not directly sent to wgettext. */ #define N_(wstr) wstr @@ -181,7 +181,7 @@ wchar_t **list_to_char_arr( array_list_t *l ); Read a line from the stream f into the buffer buff of length len. If buff is to small, it will be reallocated, and both buff and len will be updated to reflect this. Returns the number of bytes read or -1 - on failiure. + on failiure. If the carriage return character is encountered, it is ignored. fgetws() considers the line to end if reading the file @@ -258,7 +258,7 @@ __sentinel wchar_t *wcsdupcat_internal( const wchar_t *a, ... ); /** - Test if the given string is a valid variable name. + Test if the given string is a valid variable name. \return null if this is a valid name, and a pointer to the first invalid character otherwise */ @@ -267,7 +267,7 @@ wchar_t *wcsvarname( const wchar_t *str ); /** - Test if the given string is a valid function name. + Test if the given string is a valid function name. \return null if this is a valid name, and a pointer to the first invalid character otherwise */ @@ -275,7 +275,7 @@ wchar_t *wcsvarname( const wchar_t *str ); wchar_t *wcsfuncname( const wchar_t *str ); /** - Test if the given string is valid in a variable name + Test if the given string is valid in a variable name \return 1 if this is a valid name, 0 otherwise */ @@ -311,14 +311,14 @@ void error_reset(); This function behaves exactly like a wide character equivalent of the C function setlocale, except that it will also try to detect if the user is using a Unicode character set, and if so, use the - unicode ellipsis character as ellipsis, instead of '$'. + unicode ellipsis character as ellipsis, instead of '$'. */ const wchar_t *wsetlocale( int category, const wchar_t *locale ); /** Checks if \c needle is included in the list of strings specified. A warning is printed if needle is zero. - \param needle the string to search for in the list + \param needle the string to search for in the list \return zero if needle is not found, of if needle is null, non-zero otherwise */ @@ -346,9 +346,9 @@ ssize_t write_loop(int fd, char *buff, size_t count); Because debug is often called to tell the user about an error, before using wperror to give a specific error message, debug will never ever modify the value of errno. - + \param level the priority of the message. Lower number means higher priority. Messages with a priority_number higher than \c debug_level will be ignored.. - \param msg the message format string. + \param msg the message format string. Example: @@ -360,7 +360,7 @@ void debug( int level, const wchar_t *msg, ... ); /** Replace special characters with backslash escape sequences. Newline is - replaced with \n, etc. + replaced with \n, etc. \param in The string to be escaped \param escape_all Whether all characters wich hold special meaning in fish (Pipe, semicolon, etc,) should be escaped, or only unprintable characters @@ -380,21 +380,21 @@ wchar_t *escape( const wchar_t *in, int escape_all ); an invalid sequence is specified, 0 is returned. */ -wchar_t *unescape( const wchar_t * in, +wchar_t *unescape( const wchar_t * in, int escape_special ); /** - Attempt to acquire a lock based on a lockfile, waiting LOCKPOLLINTERVAL - milliseconds between polls and timing out after timeout seconds, + Attempt to acquire a lock based on a lockfile, waiting LOCKPOLLINTERVAL + milliseconds between polls and timing out after timeout seconds, thereafter forcibly attempting to obtain the lock if force is non-zero. Returns 1 on success, 0 on failure. To release the lock the lockfile must be unlinked. - A unique temporary file named by appending characters to the lockfile name + A unique temporary file named by appending characters to the lockfile name is used; any pre-existing file of the same name is subject to deletion. */ int acquire_lock_file( const char *lockfile, const int timeout, int force ); -/** +/** Returns the width of the terminal window, so that not all functions that use these values continually have to keep track of it separately. @@ -428,9 +428,9 @@ void write_screen( const wchar_t *msg, string_buffer_t *buff ); Tokenize the specified string into the specified array_list_t. Each new element is allocated using malloc and must be freed by the caller. - + \param val the input string. The contents of this string is not changed. - \param out the list in which to place the elements. + \param out the list in which to place the elements. */ void tokenize_variable_array( const wchar_t *val, array_list_t *out ); diff --git a/complete.c b/complete.c index 9193be148..3853e8700 100644 --- a/complete.c +++ b/complete.c @@ -124,7 +124,7 @@ If either short_opt or long_opt are non-zero, they specify a switch for the command. If \c comp is also not empty, it contains a list of non-switch arguments that may only follow directly after the - specified switch. + specified switch. */ typedef struct complete_entry_opt { @@ -202,12 +202,12 @@ void completion_allocate( array_list_t *context, int len = wcslen(comp); flags = flags & (~COMPLETE_AUTO_SPACE); - + if( ( len > 0 ) && ( wcschr( L"/=@:", comp[ len - 1 ] ) != 0 ) ) flags |= COMPLETE_NO_SPACE; - + } - + res->flags = flags; al_push( context, res ); } @@ -218,7 +218,7 @@ void completion_allocate( array_list_t *context, static void complete_destroy() { complete_entry_t *i=first_entry, *prev; - + while( i ) { prev = i; @@ -226,9 +226,9 @@ static void complete_destroy() complete_free_entry( prev ); } first_entry = 0; - + parse_util_load_reset( L"fish_complete_path", 0 ); - + } /** @@ -318,7 +318,7 @@ static void complete_free_opt_recursive( complete_entry_opt_t *o ) { if( !o ) return; - + complete_free_opt_recursive( o->next ); halloc_free( o ); } @@ -369,7 +369,7 @@ static complete_entry_t *complete_get_exact_entry( const wchar_t *cmd, { DIE_MEM(); } - + c->next = first_entry; first_entry = c; @@ -416,7 +416,7 @@ void complete_add( const wchar_t *cmd, c = complete_get_exact_entry( cmd, cmd_type ); opt = halloc( 0, sizeof( complete_entry_opt_t ) ); - + opt->next = c->first_option; c->first_option = opt; if( short_opt != L'\0' ) @@ -432,7 +432,7 @@ void complete_add( const wchar_t *cmd, wcscat( c->short_opt_str, L":" ); } } - + opt->short_opt = short_opt; opt->result_mode = result_mode; opt->old_mode=old_mode; @@ -441,7 +441,7 @@ void complete_add( const wchar_t *cmd, opt->condition = condition?halloc_wcsdup(opt, condition):L""; opt->long_opt = long_opt?halloc_wcsdup(opt, long_opt):L"" ; opt->flags = flags; - + if( desc && wcslen( desc ) ) { opt->desc = halloc_wcsdup( opt, desc ); @@ -450,7 +450,7 @@ void complete_add( const wchar_t *cmd, { opt->desc = L""; } - + } /** @@ -463,7 +463,7 @@ static complete_entry_t *complete_remove_entry( complete_entry_t *e, { complete_entry_opt_t *o, *oprev=0, *onext=0; - + if(( short_opt == 0 ) && (long_opt == 0 ) ) { complete_free_opt_recursive( e->first_option ); @@ -471,11 +471,11 @@ static complete_entry_t *complete_remove_entry( complete_entry_t *e, } else { - + for( o= e->first_option; o; o=onext ) { onext=o->next; - + if( ( short_opt==o->short_opt ) || ( wcscmp( long_opt, o->long_opt ) == 0 ) ) { @@ -496,13 +496,13 @@ static complete_entry_t *complete_remove_entry( complete_entry_t *e, { pos2++; } - + memmove( pos, pos2, sizeof(wchar_t)*wcslen(pos2) ); } } - + if( oprev == 0 ) { e->first_option = o->next; @@ -519,14 +519,14 @@ static complete_entry_t *complete_remove_entry( complete_entry_t *e, } } } - + if( e && (e->first_option == 0) ) { free( e->short_opt_str ); free( e ); e=0; } - + return e; } @@ -540,7 +540,7 @@ void complete_remove( const wchar_t *cmd, complete_entry_t *e, *eprev=0, *enext=0; CHECK( cmd, ); - + for( e = first_entry; e; e=enext ) { enext=e->next; @@ -566,7 +566,7 @@ void complete_remove( const wchar_t *cmd, first_entry = enext; } } - + } } @@ -575,7 +575,7 @@ void complete_remove( const wchar_t *cmd, pointers are allocated using halloc and will be free'd when\c context is halloc_free'd. */ -static void parse_cmd_string( void *context, +static void parse_cmd_string( void *context, const wchar_t *str, wchar_t **pathp, wchar_t **cmdp ) @@ -592,7 +592,7 @@ static void parse_cmd_string( void *context, */ path = halloc_wcsdup( context, L""); } - + /* Make sure the path is not included in the command */ cmd = wcsrchr( str, L'/' ); if( cmd != 0 ) @@ -603,7 +603,7 @@ static void parse_cmd_string( void *context, { cmd = (wchar_t *)str; } - + *pathp=path; *cmdp=cmd; } @@ -627,10 +627,10 @@ int complete_is_valid_option( const wchar_t *str, char *short_validated; void *context; - + CHECK( str, 0 ); CHECK( opt, 0 ); - + /* Check some generic things like -- and - options. */ @@ -642,7 +642,7 @@ int complete_is_valid_option( const wchar_t *str, { return 1; } - + case 2: { if( wcscmp( L"--", opt ) == 0 ) @@ -652,7 +652,7 @@ int complete_is_valid_option( const wchar_t *str, break; } } - + if( opt[0] != L'-' ) { if( errors ) @@ -668,7 +668,7 @@ int complete_is_valid_option( const wchar_t *str, { DIE_MEM(); } - + memset( short_validated, 0, wcslen( opt ) ); @@ -690,14 +690,14 @@ int complete_is_valid_option( const wchar_t *str, gnu_opt_len = wcslen(opt)-2; } } - + parse_cmd_string( context, str, &path, &cmd ); /* Make sure completions are loaded for the specified command */ complete_load( cmd, 0 ); - + for( i=first_entry; i; i=i->next ) { wchar_t *match = i->cmd_type?path:cmd; @@ -707,7 +707,7 @@ int complete_is_valid_option( const wchar_t *str, { continue; } - + found_match = 1; if( !i->authoritative ) @@ -726,7 +726,7 @@ int complete_is_valid_option( const wchar_t *str, { continue; } - + if( wcsncmp( &opt[2], o->long_opt, gnu_opt_len )==0) { hash_put( &gnu_match_hash, o->long_opt, L"" ); @@ -845,7 +845,7 @@ int complete_is_valid_option( const wchar_t *str, hash_destroy( &gnu_match_hash ); halloc_free( context ); - + return (authoritative && found_match)?opt_found:1; } @@ -893,7 +893,7 @@ static void complete_strings( array_list_t *comp_out, wc = parse_util_unescape_wildcards( tmp ); free(tmp); - + for( i=0; icompletion) || (c->completion[wcslen(c->completion)-1] != L'/' )) + + if( !wcslen( c->completion) || (c->completion[wcslen(c->completion)-1] != L'/' )) { skip = 0; break; } - + } - + if( skip ) { return; } - + esc = escape( cmd_start, 1 ); @@ -985,7 +985,7 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp ) */ if( exec_subshell( lookup_cmd, &list ) != -1 ) { - + /* Then discard anything that is not a possible completion and put the result into a hashtable with the completion as key and the @@ -997,7 +997,7 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp ) { wchar_t *el = (wchar_t *)al_get( &list, i ); wchar_t *key, *key_end, *val_begin; - + if( !el ) continue; @@ -1006,7 +1006,7 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp ) if( !key_end ) continue; - + *key_end = 0; val_begin = key_end+1; @@ -1016,7 +1016,7 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp ) things. */ val_begin[0]=towupper(val_begin[0]); - + hash_put( &lookup, key, val_begin ); } @@ -1031,19 +1031,19 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp ) { completion_t *c = (completion_t *)al_get( comp, i ); const wchar_t *el = c->completion; - + wchar_t *new_desc; - + new_desc = (wchar_t *)hash_get( &lookup, el ); - + if( new_desc ) { c->description = halloc_wcsdup( comp, new_desc ); } } } - + hash_destroy( &lookup ); al_foreach( &list, &free ); @@ -1095,7 +1095,7 @@ static void complete_cmd( const wchar_t *cmd, if( use_command ) { - + if( expand_string( 0, wcsdup(cmd), comp, @@ -1109,13 +1109,13 @@ static void complete_cmd( const wchar_t *cmd, { if( use_command ) { - + path = env_get(L"PATH"); if( path ) { - + path_cpy = wcsdup( path ); - + for( nxt_path = wcstok( path_cpy, ARRAY_SEP_STR, &state ); nxt_path != 0; nxt_path = wcstok( 0, ARRAY_SEP_STR, &state) ) @@ -1124,21 +1124,21 @@ static void complete_cmd( const wchar_t *cmd, int i; int path_len = wcslen(nxt_path); int add_slash; - + if( !path_len ) { continue; } - + add_slash = nxt_path[path_len-1]!=L'/'; nxt_completion = wcsdupcat( nxt_path, add_slash?L"/":L"", cmd ); if( ! nxt_completion ) continue; - + prev_count = al_get_count( comp ); - + if( expand_string( 0, nxt_completion, comp, @@ -1159,7 +1159,7 @@ static void complete_cmd( const wchar_t *cmd, complete_cmd_desc( cmd, comp ); } } - + /* These return the original strings - don't free them */ @@ -1173,7 +1173,7 @@ static void complete_cmd( const wchar_t *cmd, } al_truncate( &possible_comp, 0 ); - + if( use_builtin ) { builtin_get_names( &possible_comp ); @@ -1202,7 +1202,7 @@ static void complete_cmd( const wchar_t *cmd, { continue; } - + if( expand_string( 0, nxt_completion, comp, @@ -1242,7 +1242,7 @@ static void complete_from_args( const wchar_t *str, proc_push_interactive(0); eval_args( args, &possible_comp ); proc_pop_interactive(); - + complete_strings( comp_out, str, desc, 0, &possible_comp, flags ); al_foreach( &possible_comp, &free ); @@ -1355,10 +1355,10 @@ static void complete_load_handler( const wchar_t *cmd ) void complete_load( const wchar_t *name, int reload ) { CHECK( name, ); - parse_util_load( name, + parse_util_load( name, L"fish_complete_path", - &complete_load_handler, - reload ); + &complete_load_handler, + reload ); } /** @@ -1380,7 +1380,7 @@ static int complete_param( const wchar_t *cmd_orig, int use_common=1, use_files=1; void *context = halloc( 0, 0 ); - + parse_cmd_string( context, cmd_orig, &path, &cmd ); complete_load( cmd, 1 ); @@ -1395,11 +1395,11 @@ static int complete_param( const wchar_t *cmd_orig, { continue; } - + use_common=1; if( use_switches ) { - + if( str[0] == L'-' ) { /* Check if we are entering a combined option and argument @@ -1420,7 +1420,7 @@ static int complete_param( const wchar_t *cmd_orig, { /* Set to true if we found a matching old-style switch */ int old_style_match = 0; - + /* If we are using old style long options, check for them first @@ -1438,7 +1438,7 @@ static int complete_param( const wchar_t *cmd_orig, } } } - + /* No old style option matched, or we are not using old style options. We check if any short (or gnu style @@ -1467,7 +1467,7 @@ static int complete_param( const wchar_t *cmd_orig, } } } - + if( use_common ) { @@ -1487,7 +1487,7 @@ static int complete_param( const wchar_t *cmd_orig, use_files &= ((o->result_mode & NO_FILES )==0); complete_from_args( str, o->comp, C_(o->desc), comp_out, o->flags ); } - + if( wcslen(str) > 0 && use_switches ) { /* @@ -1500,7 +1500,7 @@ static int complete_param( const wchar_t *cmd_orig, wchar_t completion[2]; completion[0] = o->short_opt; completion[1] = 0; - + completion_allocate( comp_out, completion, desc, 0 ); } @@ -1511,7 +1511,7 @@ static int complete_param( const wchar_t *cmd_orig, if( o->long_opt[0] != L'\0' ) { int match=0, match_no_case=0; - + string_buffer_t *whole_opt = sb_halloc( context ); sb_append( whole_opt, o->old_mode?L"-":L"--", o->long_opt, (void *)0 ); @@ -1521,7 +1521,7 @@ static int complete_param( const wchar_t *cmd_orig, { match_no_case = wcsncasecmp( str, (wchar_t *)whole_opt->buff, wcslen(str) )==0; } - + if( match || match_no_case ) { int has_arg=0; /* Does this switch have any known arguments */ @@ -1530,7 +1530,7 @@ static int complete_param( const wchar_t *cmd_orig, int offset = 0; int flags = 0; - + if( match ) offset = wcslen( str ); else @@ -1541,7 +1541,7 @@ static int complete_param( const wchar_t *cmd_orig, if( !o->old_mode && ( has_arg && !req_arg ) ) { - + /* Optional arguments to a switch can only be handled using the '=', so we @@ -1555,31 +1555,31 @@ static int complete_param( const wchar_t *cmd_orig, sb_init( &completion ); sb_printf( &completion, - L"%ls=", + L"%ls=", ((wchar_t *)whole_opt->buff)+offset ); - + completion_allocate( comp_out, (wchar_t *)completion.buff, C_(o->desc), - flags ); - + flags ); + sb_destroy( &completion ); - + } - + completion_allocate( comp_out, ((wchar_t *)whole_opt->buff) + offset, C_(o->desc), flags ); - } + } } } } } } - + halloc_free( context ); - + return use_files; } @@ -1592,7 +1592,7 @@ static void complete_param_expand( wchar_t *str, { wchar_t *comp_str; int flags; - + if( (wcsncmp( str, L"--", 2 )) == 0 && (comp_str = wcschr(str, L'=' ) ) ) { comp_str++; @@ -1602,18 +1602,18 @@ static void complete_param_expand( wchar_t *str, comp_str = str; } - flags = EXPAND_SKIP_CMDSUBST | - ACCEPT_INCOMPLETE | + flags = EXPAND_SKIP_CMDSUBST | + ACCEPT_INCOMPLETE | (do_file?0:EXPAND_SKIP_WILDCARDS); - - if( expand_string( 0, + + if( expand_string( 0, wcsdup(comp_str), comp_out, flags ) == EXPAND_ERROR ) { debug( 3, L"Error while expanding string '%ls'", comp_str ); } - + } @@ -1636,13 +1636,13 @@ static int complete_variable( const wchar_t *whole_var, { wchar_t *name = (wchar_t *)al_get( &names, i ); int namelen = wcslen( name ); - int match=0, match_no_case=0; + int match=0, match_no_case=0; if( varlen > namelen ) continue; match = ( wcsncmp( var, name, varlen) == 0 ); - + if( !match ) { match_no_case = ( wcsncasecmp( var, name, varlen) == 0 ); @@ -1659,11 +1659,11 @@ static int complete_variable( const wchar_t *whole_var, string_buffer_t comp; int flags = 0; int offset = 0; - + sb_init( &comp ); if( match ) { - sb_append( &comp, &name[varlen] ); + sb_append( &comp, &name[varlen] ); offset = varlen; } else @@ -1672,23 +1672,23 @@ static int complete_variable( const wchar_t *whole_var, sb_append( &comp, name ); flags = COMPLETE_NO_CASE | COMPLETE_DONT_ESCAPE; } - + value = expand_escape_variable( value_unescaped ); sb_init( &desc ); sb_printf( &desc, COMPLETE_VAR_DESC_VAL, value ); - - completion_allocate( comp_list, + + completion_allocate( comp_list, (wchar_t *)comp.buff, (wchar_t *)desc.buff, flags ); res =1; - + free( value ); sb_destroy( &desc ); sb_destroy( &comp ); } - + } } @@ -1698,7 +1698,7 @@ static int complete_variable( const wchar_t *whole_var, /** Search the specified string for the \$ sign. If found, try to - complete as an environment variable. + complete as an environment variable. \return 0 if unable to complete, 1 otherwise */ @@ -1735,7 +1735,7 @@ static int try_complete_user( const wchar_t *cmd, const wchar_t *first_char=cmd; int res=0; double start_time = timef(); - + if( *first_char ==L'~' && !wcschr(first_char, L'/')) { const wchar_t *user_name = first_char+1; @@ -1744,19 +1744,19 @@ static int try_complete_user( const wchar_t *cmd, { struct passwd *pw; int name_len = wcslen( user_name ); - + setpwent(); - + while((pw=getpwent()) != 0) { double current_time = timef(); wchar_t *pw_name; - if( current_time - start_time > 0.2 ) + if( current_time - start_time > 0.2 ) { return 1; } - + pw_name = str2wcs( pw->pw_name ); if( pw_name ) @@ -1764,26 +1764,26 @@ static int try_complete_user( const wchar_t *cmd, if( wcsncmp( user_name, pw_name, name_len )==0 ) { string_buffer_t desc; - + sb_init( &desc ); sb_printf( &desc, COMPLETE_USER_DESC, pw_name ); - - completion_allocate( comp, + + completion_allocate( comp, &pw_name[name_len], (wchar_t *)desc.buff, COMPLETE_NO_SPACE ); - + res=1; - + sb_destroy( &desc ); } else if( wcsncasecmp( user_name, pw_name, name_len )==0 ) { - string_buffer_t name; - string_buffer_t desc; - + string_buffer_t name; + string_buffer_t desc; + sb_init( &name ); sb_init( &desc ); sb_printf( &name, @@ -1792,16 +1792,16 @@ static int try_complete_user( const wchar_t *cmd, sb_printf( &desc, COMPLETE_USER_DESC, pw_name ); - - completion_allocate( comp, + + completion_allocate( comp, (wchar_t *)name.buff, (wchar_t *)desc.buff, COMPLETE_NO_CASE | COMPLETE_DONT_ESCAPE | COMPLETE_NO_SPACE ); res=1; - + sb_destroy( &desc ); sb_destroy( &name ); - + } free( pw_name ); } @@ -1862,9 +1862,9 @@ void complete( const wchar_t *cmd, if( !done ) { pos = cursor_pos-(cmdsubst_begin-cmd); - + buff = wcsndup( cmdsubst_begin, cmdsubst_end-cmdsubst_begin ); - + if( !buff ) done=1; } @@ -1887,7 +1887,7 @@ void complete( const wchar_t *cmd, wchar_t *ncmd = tok_last( &tok ); int is_ddash = (wcscmp( ncmd, L"--" ) == 0) && ( (tok_get_pos( &tok )+2) < pos ); - + if( !had_cmd ) { @@ -1908,17 +1908,17 @@ void complete( const wchar_t *cmd, break; } - + if( !is_ddash || ( (use_command && use_function && use_builtin ) ) ) { int token_end; - + free( current_command ); current_command = wcsdup( ncmd ); - + token_end = tok_get_pos( &tok ) + wcslen( ncmd ); - + on_command = (pos <= token_end ); had_cmd=1; } @@ -1931,10 +1931,10 @@ void complete( const wchar_t *cmd, had_ddash = 1; } } - + break; } - + case TOK_END: case TOK_PIPE: case TOK_BACKGROUND: @@ -1946,20 +1946,20 @@ void complete( const wchar_t *cmd, use_builtin = 1; break; } - + case TOK_ERROR: { end_loop=1; break; } - + } if( tok_get_pos( &tok ) >= pos ) { end_loop=1; } - + tok_next( &tok ); } @@ -1974,7 +1974,7 @@ void complete( const wchar_t *cmd, current_token = wcsndup( tok_begin, cursor_pos-(tok_begin-cmd) ); prev_token = prev_begin ? wcsndup( prev_begin, prev_end - prev_begin ): wcsdup(L""); - + // debug( 0, L"on_command: %d, %ls %ls\n", on_command, current_command, current_token ); /* @@ -1983,9 +1983,9 @@ void complete( const wchar_t *cmd, case, complete using the builtins completions, not using a subcommand. */ - + if( (on_command || (wcscmp( current_token, L"--" ) == 0 ) ) && - (current_token[0] == L'-') && + (current_token[0] == L'-') && !(use_command && use_function && use_builtin ) ) { free( current_command ); @@ -1993,11 +1993,11 @@ void complete( const wchar_t *cmd, current_command = wcsdup( L"builtin" ); else current_command = wcsdup( L"command" ); - + had_cmd = 1; on_command = 0; } - + /* Use command completions if in between commands */ @@ -2005,7 +2005,7 @@ void complete( const wchar_t *cmd, { on_command=1; } - + /* We don't want these to be null */ @@ -2014,12 +2014,12 @@ void complete( const wchar_t *cmd, { current_token = wcsdup(L""); } - + if( !current_command ) { current_command = wcsdup(L""); } - + if( !prev_token ) { prev_token = wcsdup(L""); @@ -2036,31 +2036,31 @@ void complete( const wchar_t *cmd, else { int do_file=0; - + wchar_t *current_command_unescape = unescape( current_command, 0 ); wchar_t *prev_token_unescape = unescape( prev_token, 0 ); wchar_t *current_token_unescape = unescape( current_token, UNESCAPE_INCOMPLETE ); - + if( current_token_unescape && prev_token_unescape && current_token_unescape ) { - do_file = complete_param( current_command_unescape, - prev_token_unescape, - current_token_unescape, - !had_ddash, + do_file = complete_param( current_command_unescape, + prev_token_unescape, + current_token_unescape, + !had_ddash, comp ); } - + free( current_command_unescape ); free( prev_token_unescape ); free( current_token_unescape ); - + /* If we have found no command specific completions at all, fall back to using file completions. */ if( !al_get_count( comp ) ) do_file = 1; - + /* This function wants the unescaped string */ @@ -2068,7 +2068,7 @@ void complete( const wchar_t *cmd, } } } - + free( current_token ); free( current_command ); free( prev_token ); diff --git a/complete.h b/complete.h index 74c2b5a0d..36d10e3a0 100644 --- a/complete.h +++ b/complete.h @@ -16,39 +16,39 @@ #include "util.h" -/** - Use all completions +/** + Use all completions */ #define SHARED 0 -/** - Do not use file completion +/** + Do not use file completion */ #define NO_FILES 1 -/** - Require a parameter after completion +/** + Require a parameter after completion */ #define NO_COMMON 2 -/** +/** Only use the argument list specifies with completion after option. This is the same as (NO_FILES & NO_COMMON) */ #define EXCLUSIVE 3 -/** - Command is a path +/** + Command is a path */ #define PATH 1 -/** - Command is not a path +/** + Command is not a path */ #define COMMAND 0 -/** +/** Separator between completion and description */ #define COMPLETE_SEP L'\004' -/** +/** Separator between completion and description */ #define COMPLETE_SEP_STR L"\004" @@ -73,7 +73,7 @@ #define COMPLETE_NO_SPACE 1 /** - This compeltion is case insensitive. + This compeltion is case insensitive. Warning: The contents of the completion_t structure is actually different if this flag is set! Specifically, the completion string @@ -115,7 +115,7 @@ typedef struct const wchar_t *description; /** - Flags determining the completion behaviour. + Flags determining the completion behaviour. Determines whether a space should be inserted after this compeltion if it is the only possible completion using the @@ -132,17 +132,17 @@ typedef struct /** - Add a completion. + Add a completion. All supplied values are copied, they should be freed by or otherwise disposed by the caller. - Examples: - + Examples: + The command 'gcc -o' requires that a file follows it, so the NO_COMMON option is suitable. This can be done using the following line: - + complete -c gcc -s o -r The command 'grep -d' required that one of the strings 'read', @@ -159,7 +159,7 @@ typedef struct will be interpreted as the command name. \param short_opt The single character name of an option. (-a is a short option, --all and -funroll are long options) \param long_opt The multi character name of an option. (-a is a short option, --all and -funroll are long options) - \param long_mode Whether to use old style, single dash long options. + \param long_mode Whether to use old style, single dash long options. \param result_mode Whether to search further completions when this completion has been succesfully matched. If result_mode is SHARED, any other completions may also be used. If result_mode is NO_FILES, @@ -172,16 +172,16 @@ typedef struct \param condition a command to be run to check it this completion should be used. If \c condition is empty, the completion is always used. \param flags A set of completion flags */ -void complete_add( const wchar_t *cmd, - int cmd_type, +void complete_add( const wchar_t *cmd, + int cmd_type, wchar_t short_opt, const wchar_t *long_opt, - int long_mode, - int result_mode, + int long_mode, + int result_mode, const wchar_t *condition, const wchar_t *comp, const wchar_t *desc, - int flags ); + int flags ); /** Sets whether the completion list for this command is complete. If true, any options not matching one of the provided options will be @@ -194,8 +194,8 @@ void complete_set_authoritative( const wchar_t *cmd, /** Remove a previously defined completion */ -void complete_remove( const wchar_t *cmd, - int cmd_type, +void complete_remove( const wchar_t *cmd, + int cmd_type, wchar_t short_opt, const wchar_t *long_opt ); @@ -212,7 +212,7 @@ void complete_remove( const wchar_t *cmd, void complete( const wchar_t *cmd, array_list_t *out ); /** - Print a list of all current completions into the string_buffer_t. + Print a list of all current completions into the string_buffer_t. \param out The string_buffer_t to write completions to */ @@ -221,16 +221,16 @@ void complete_print( string_buffer_t *out ); /** Tests if the specified option is defined for the specified command */ -int complete_is_valid_option( const wchar_t *str, - const wchar_t *opt, +int complete_is_valid_option( const wchar_t *str, + const wchar_t *opt, array_list_t *errors ); /** Tests if the specified argument is valid for the specified option and command */ -int complete_is_valid_argument( const wchar_t *str, - const wchar_t *opt, +int complete_is_valid_argument( const wchar_t *str, + const wchar_t *opt, const wchar_t *arg ); diff --git a/configure.ac b/configure.ac index 7862b48ba..377ab5ebe 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,11 @@ AC_INIT(fish,1.23.1,fish-users@lists.sf.net) +# +# preserve configure arguments for xsel +# + +conf_arg=$@ # # List of output variables produced by this configure script @@ -31,6 +36,7 @@ AC_SUBST(prefix) AC_SUBST(SEQ_FALLBACK) AC_SUBST(XSEL) AC_SUBST(XSEL_MAN) +AC_SUBST(XSEL_BIN) AC_SUBST(XSEL_MAN_PATH) # @@ -54,7 +60,7 @@ if test configure -ot configure.ac; then fi exit 1 else - AC_MSG_ERROR( + AC_MSG_ERROR( [cannot find the autoconf program in your path. This program needs to be run whenever the configure.ac file is modified. Please install it and try again.] @@ -79,7 +85,7 @@ if test ! -f ./config.h.in -o config.h.in -ot configure.ac; then AC_MSG_NOTICE([running autoheader]) autoheader || exit 1 else - AC_MSG_ERROR( + AC_MSG_ERROR( [cannot find the autoheader program in your path. This program needs to be run whenever the configure.ac file is modified. Please install it and try again.] @@ -130,7 +136,7 @@ done # -# Tell autoconf to create config.h header +# Tell autoconf to create config.h header # AC_CONFIG_HEADERS(config.h) @@ -144,8 +150,8 @@ AH_BOTTOM([#if __GNUC__ >= 3 #define __warn_unused __attribute__ ((warn_unused_result)) #define __sentinel __attribute__ ((sentinel)) #else -#define __warn_unused -#define __sentinel +#define __warn_unused +#define __sentinel #endif]) @@ -195,20 +201,22 @@ fi # Optionally drop xsel command # -AC_ARG_WITH( - xsel, +AC_ARG_WITH( + xsel, AC_HELP_STRING( [--without-xsel], - [do not build the xsel program needed for X clipboard integration] + [do not build the xsel program needed for X clipboard integration. + If build xsel, it will be configured with the same options as fish.] ), [xsel=$withval], - [xsel=with_xsel] + [xsel=with_xsel] ) if [[ "$xsel" = "with_xsel" ]]; then - XSEL=xsel-0.9.6/xsel + XSEL=xsel-1.2.0 + XSEL_BIN=$XSEL/xsel XSEL_MAN=xsel.1x - XSEL_MAN_PATH=xsel-0.9.6/xsel.1x + XSEL_MAN_PATH=$XSEL/xsel.1x fi @@ -226,7 +234,7 @@ AC_ARG_WITH( [local_gettext=yes] ) -if test x$local_gettext != xno; then +if test x$local_gettext != xno; then AC_DEFINE([USE_GETTEXT],[1],[Perform string translations with gettext]) fi @@ -338,9 +346,9 @@ AC_RUN_IFELSE( return STATUS; ] ) - ], - [glibc=yes], - [glibc=no] + ], + [glibc=yes], + [glibc=no] ) if test "$glibc" = yes; then @@ -383,7 +391,7 @@ fi AC_MSG_CHECKING([if we are under Solaris]) case $target_os in - solaris*) + solaris*) AC_DEFINE( __EXTENSIONS__, 1, [Macro to enable additional prototypes under Solaris]) AC_MSG_RESULT(yes) ;; @@ -397,7 +405,7 @@ AC_MSG_CHECKING([if we are using non varargs tparm.]) AC_COMPILE_IFELSE( [ AC_LANG_PROGRAM( - [ + [ #include #include ], @@ -406,8 +414,8 @@ AC_COMPILE_IFELSE( ] ) ], - [tparm_solaris_kludge=no], - [tparm_solaris_kludge=yes] + [tparm_solaris_kludge=no], + [tparm_solaris_kludge=yes] ) if test "x$tparm_solaris_kludge" = "xyes"; then AC_MSG_RESULT(yes) @@ -427,7 +435,7 @@ fi AC_MSG_CHECKING([if we are under BSD]) case $target_os in - *bsd*) + *bsd*) AC_DEFINE( __BSD_VISIBLE, 1, [Macro to enable additional prototypes under BSD]) AC_DEFINE( _NETBSD_SOURCE, 1, [Macro to enable additional prototypes under BSD]) AC_MSG_RESULT(yes) @@ -486,7 +494,7 @@ AC_CHECK_FILES([/proc/self/stat]) # AC_DEFINE( - [HAVE_TRANSLATE_H], + [HAVE_TRANSLATE_H], [1], [Define to 1 if the wgettext function should be used for translating strings.] ) @@ -510,12 +518,12 @@ LIBS_SHARED=$LIBS LIBS=$LIBS_COMMON # -# Check for libraries needed by fish. +# Check for libraries needed by fish. # LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" -if test x$local_gettext != xno; then +if test x$local_gettext != xno; then AC_SEARCH_LIBS( gettext, intl,,) fi @@ -527,24 +535,24 @@ LIBS_FISH=$LIBS LIBS=$LIBS_COMMON # -# Check for libraries needed by fish_indent. +# Check for libraries needed by fish_indent. # LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" -if test x$local_gettext != xno; then +if test x$local_gettext != xno; then AC_SEARCH_LIBS( gettext, intl,,) fi LIBS_FISH_INDENT=$LIBS LIBS=$LIBS_COMMON # -# Check for libraries needed by fish_pager. +# Check for libraries needed by fish_pager. # LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" -if test x$local_gettext != xno; then +if test x$local_gettext != xno; then AC_SEARCH_LIBS( gettext, intl,,) fi AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] ) @@ -552,12 +560,12 @@ LIBS_FISH_PAGER=$LIBS LIBS=$LIBS_COMMON # -# Check for libraries needed by fishd. +# Check for libraries needed by fishd. # LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" -if test x$local_gettext != xno; then +if test x$local_gettext != xno; then AC_SEARCH_LIBS( gettext, intl,,) fi AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] ) @@ -565,12 +573,12 @@ LIBS_FISHD=$LIBS LIBS=$LIBS_COMMON # -# Check for libraries needed by mimedb. +# Check for libraries needed by mimedb. # LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" -if test x$local_gettext != xno; then +if test x$local_gettext != xno; then AC_SEARCH_LIBS( gettext, intl,,) fi LIBS_MIMEDB=$LIBS @@ -578,12 +586,12 @@ LIBS=$LIBS_COMMON # -# Check for libraries needed by set_color +# Check for libraries needed by set_color # LIBS_COMMON=$LIBS LIBS="$LIBS_SHARED" -if test x$local_gettext != xno; then +if test x$local_gettext != xno; then AC_SEARCH_LIBS( gettext, intl,,) fi LIBS_SET_COLOR=$LIBS @@ -599,8 +607,8 @@ AC_CHECK_HEADER( [regex.h], [ AC_DEFINE( - [HAVE_REGEX_H], - [1], + [HAVE_REGEX_H], + [1], [Define to 1 if you have the header file.] ) ], @@ -697,10 +705,10 @@ for i in "" "-D_POSIX_C_SOURCE=200112L" "-D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=2 /* Extended-POSIX: might be unhidden by _XOPEN_SOURCE. */ ret += killpg( 0, 0 ); /* Non-standard: might be hidden by the macros. */ - { + { struct winsize termsize; ret += (int)(void *)&termsize; - ret += SIGWINCH + TIOCGWINSZ + SIGIO; + ret += SIGWINCH + TIOCGWINSZ + SIGIO; } return ret; @@ -744,7 +752,7 @@ AC_CHECK_FUNCS( dcgettext backtrace backtrace_symbols sysconf ) # the translations should be installed. # -if test x$local_gettext != xno; then +if test x$local_gettext != xno; then AC_CHECK_FUNC( gettext, HAVE_GETTEXT=1, HAVE_GETTEXT=0 ) fi @@ -768,22 +776,22 @@ AC_RUN_IFELSE( #include ], [ - int status; - char *res; - res = realpath( "somefile", 0 ); - status = !(res != 0 || errno == ENOENT); + int status; + char *res; + res = realpath( "somefile", 0 ); + status = !(res != 0 || errno == ENOENT); exit( status ); ] ) - ], - [have_realpath_null=yes], - [have_realpath_null=no] + ], + [have_realpath_null=yes], + [have_realpath_null=no] ) if test "$have_realpath_null" = yes; then AC_MSG_RESULT(yes) AC_DEFINE( - [HAVE_REALPATH_NULL], + [HAVE_REALPATH_NULL], [1], [Define to 1 if realpath accepts null for its second argument.] ) @@ -810,15 +818,15 @@ AC_LINK_IFELSE( #endif ], [ - struct winsize termsize = {0}; + struct winsize termsize = {0}; TIOCGWINSZ; ] ) - ], + ], [ - AC_MSG_RESULT(yes); + AC_MSG_RESULT(yes); AC_DEFINE([HAVE_WINSIZE], [1], [Define to 1 if the winsize struct and TIOCGWINSZ macro exist]) - ], + ], [ AC_MSG_RESULT(no) ] @@ -854,7 +862,7 @@ if test "$ac_cv_func_fwprintf" = yes; then [ AC_MSG_RESULT([yes]) AC_DEFINE([HAVE_BROKEN_FWPRINTF], [1], [Define to 1 one if the implemented fwprintf is broken]) - ] + ] ) fi @@ -870,19 +878,19 @@ AC_TRY_LINK( ], [ extern int _nl_msg_cat_cntr; - int tmp = _nl_msg_cat_cntr; + int tmp = _nl_msg_cat_cntr; exit(tmp); ], - have__nl_msg_cat_cntr=yes, + have__nl_msg_cat_cntr=yes, have__nl_msg_cat_cntr=no ) if test "$have__nl_msg_cat_cntr" = yes; then AC_MSG_RESULT(yes) AC_DEFINE( - [HAVE__NL_MSG_CAT_CNTR], + [HAVE__NL_MSG_CAT_CNTR], [1], [Define to 1 if the _nl_msg_cat_cntr symbol is exported.] - ) + ) else AC_MSG_RESULT(no) fi @@ -895,19 +903,19 @@ AC_TRY_LINK( ], [ extern char **__environ; - char **tmp = __environ; + char **tmp = __environ; exit(tmp!=0); ], - have___environ=yes, + have___environ=yes, have___environ=no ) if test "$have___environ" = yes; then AC_MSG_RESULT(yes) AC_DEFINE( - [HAVE___ENVIRON], + [HAVE___ENVIRON], [1], [Define to 1 if the __environ symbol is exported.] - ) + ) else AC_MSG_RESULT(no) fi @@ -924,26 +932,26 @@ AC_TRY_LINK( static struct option long_options[] = { - 0, 0, 0, 0 + 0, 0, 0, 0 } ; int opt = getopt_long( 0, - 0, 0, - long_options, + 0, + long_options, 0 ); - + ], - have_working_getopt_long=yes, + have_working_getopt_long=yes, have_working_getopt_long=no ) if test "$have_working_getopt_long" = yes; then AC_MSG_RESULT(yes) AC_DEFINE( - [HAVE_WORKING_GETOPT_LONG], + [HAVE_WORKING_GETOPT_LONG], [1], [Define to 1 if getopt_long exists and works.] - ) + ) else AC_MSG_RESULT(no) fi @@ -975,6 +983,12 @@ if test ! x$local_found_posix_switch = xyes; then echo "Some fish features may be disabled." fi +if [[ "$xsel" = "with_xsel" ]]; then + echo "Now configure xsel with $conf_arg" + rm -rf $XSEL + tar xf $XSEL.tar.gz + cd $XSEL && ./configure $conf_arg +fi echo "fish is now configured." echo "Use 'make' and 'make install' to build and install fish." diff --git a/doc_src/alias.txt b/doc_src/alias.txt index 523e47772..2ab277e9f 100644 --- a/doc_src/alias.txt +++ b/doc_src/alias.txt @@ -12,7 +12,7 @@ shells. For other uses, it is recommended to define a function. Alias does not keep track of which functions have been defined using -alias, nor does it allow erasing of aliases. +alias, nor does it allow erasing of aliases. - NAME is the name of the function to define - DEFINITION is the body of the function. The string " $argv" will be appended to the body. diff --git a/doc_src/begin.txt b/doc_src/begin.txt index b4a822c3b..f5f7f53e0 100644 --- a/doc_src/begin.txt +++ b/doc_src/begin.txt @@ -37,7 +37,7 @@ In the following code, all output is redirected to the file out.html. begin echo $xml_header echo $html_header - if test -e $file + if test -e $file ... end ... diff --git a/doc_src/commandline.txt b/doc_src/commandline.txt index 0202bbb34..df03ab13f 100644 --- a/doc_src/commandline.txt +++ b/doc_src/commandline.txt @@ -13,9 +13,9 @@ The following switches change what the commandline builtin does -- \c -C or \c --cursor set or get the current cursor position, not +- \c -C or \c --cursor set or get the current cursor position, not the contents of the buffer. If no argument is given, the current - cursor position is printed, otherwise the argument is interpreted + cursor position is printed, otherwise the argument is interpreted as the new cursor position. - \c -f or \c --function inject readline functions into the reader. This option can not be combined with any other option. It @@ -44,7 +44,7 @@ or updated - \c -t or \c --current-token select the current token. The following switch changes the way \c commandline prints the current -commandline buffer +commandline buffer - \c -c or \c --cut-at-cursor only print selection up until the current cursor position diff --git a/doc_src/commands.hdr.in b/doc_src/commands.hdr.in index 188d5d8d9..b62a6d568 100644 --- a/doc_src/commands.hdr.in +++ b/doc_src/commands.hdr.in @@ -1,5 +1,5 @@ /** \page commands Commands, functions and builtins bundled with fish -Fish ships with a large number of builtin commands, shellscript functions and external commands. These are all described below. +Fish ships with a large number of builtin commands, shellscript functions and external commands. These are all described below. @command_list@ diff --git a/doc_src/design.hdr b/doc_src/design.hdr index db93fa175..c6fea80a7 100644 --- a/doc_src/design.hdr +++ b/doc_src/design.hdr @@ -7,8 +7,8 @@ design fish. The fish design has three high level goals. These are: -# Everything that can be done in other shell languages should be possible to do in fish, though fish may rely on external commands in -doing so. --# Fish should be user friendly, but not at the expense of expressiveness. +doing so. +-# Fish should be user friendly, but not at the expense of expressiveness. Most tradeoffs between power and ease of use can be avoided with careful design. -# Whenever possible without breaking the above goals, fish should follow the Posix syntax. @@ -33,7 +33,7 @@ program harder to maintain and update. Examples: - Here documents are too similar to using echo inside of a pipeline. -- Subshells, command substitution and process substitution are strongly related. \c fish only supports command substitution, the others can be achived either using a block or the psub shellscript function. +- Subshells, command substitution and process substitution are strongly related. \c fish only supports command substitution, the others can be achived either using a block or the psub shellscript function. - Having both aliases and functions is confusing, especially since both of them have limitations and problems. \c fish functions have none of the drawbacks of either syntax. - The many Posix quoting styles are silly, especially \$''. @@ -57,14 +57,14 @@ take the whole system down. Examples: - Builtin commands should only be created when it cannot be -avoided. \c echo, \c kill, \c printf and \c time are among the commands -that fish does not implement internally since they can be provided as -external commands. Several other commands that are commonly implemented +avoided. \c echo, \c kill, \c printf and \c time are among the commands +that fish does not implement internally since they can be provided as +external commands. Several other commands that are commonly implemented as builtins and can not be implemented as external commands, including \c type, \c vared, \c pushd and \c popd are implemented as shellscript functions in fish. - Mathematical calculations, regex matching, generating lists of numbers -and many other funtions can easily be done in external programs. They +and many other funtions can easily be done in external programs. They should not be supported internally by the shell. The law of minimalism does not imply that a large feature set is diff --git a/doc_src/dirh.txt b/doc_src/dirh.txt index 0a65bdb62..efd4ac79f 100644 --- a/doc_src/dirh.txt +++ b/doc_src/dirh.txt @@ -3,6 +3,6 @@ \subsection dirh-synopsis Synopsis dirh -\subsection dirh-description Description +\subsection dirh-description Description dirh prints the current directory history. The current position in the history is highlighted using $fish_color_history_current. diff --git a/doc_src/dirs.txt b/doc_src/dirs.txt index 0419440ca..b5b9c0aea 100644 --- a/doc_src/dirs.txt +++ b/doc_src/dirs.txt @@ -3,5 +3,5 @@ \subsection dirs-synopsis Synopsis dirs -\subsection dirs-description Description +\subsection dirs-description Description dirs prints the current directory stack. diff --git a/doc_src/else.txt b/doc_src/else.txt index 035abd624..e0f8b85bb 100644 --- a/doc_src/else.txt +++ b/doc_src/else.txt @@ -13,5 +13,5 @@ status is 0, the commands COMMANDS_TRUE will execute. If it is not 0 and The command if test -f foo.txt; echo foo.txt exists; else; echo foo.txt does not exist; end will print foo.txt exists if the file foo.txt -exists and is a regular file, otherwise it will print +exists and is a regular file, otherwise it will print foo.txt does not exist. diff --git a/doc_src/emit.txt b/doc_src/emit.txt index 78d36917c..f28217487 100644 --- a/doc_src/emit.txt +++ b/doc_src/emit.txt @@ -5,7 +5,7 @@ \subsection emit-description Description -The emit builtin fires a generic fish event. Such events can be caught by special functions called event handlers. +The emit builtin fires a generic fish event. Such events can be caught by special functions called event handlers. \subsection emit-example Example diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr index d8058ab1b..0fc746344 100644 --- a/doc_src/faq.hdr +++ b/doc_src/faq.hdr @@ -33,7 +33,7 @@ parent is ~. This issue is not possible to fix without either making every single command into a builtin, breaking Unix semantics or implementing kludges in every single command. -This issue can also be seen when doing IO redirection. +This issue can also be seen when doing IO redirection. Another related issue is that many programs that operate on recursive directory trees, like the find command, silently ignore symlinked @@ -56,7 +56,7 @@ feature, write set CDPATH . on the commandline. If fish is unable to locate a command with a given name, fish will test if a directory of that name exists. If it does, it is implicitly -assumed that you want to change working directory. For example, the +assumed that you want to change working directory. For example, the fastest way to switch to your home directory is to simply press ~ and enter. @@ -141,21 +141,21 @@ set fish_greeting \section faq-history Why doesn't history substitution ("!$" etc.) work? -Because history substitution is an awkward interface that was invented before -interactive line editing was even possible. Fish drops it in favor of -perfecting the interactive history recall interface. Switching requires a -small change of habits: if you want to modify an old line/word, first recall -it, then edit. E.g. don't type "sudo !!" - first press Up, then Home, then +Because history substitution is an awkward interface that was invented before +interactive line editing was even possible. Fish drops it in favor of +perfecting the interactive history recall interface. Switching requires a +small change of habits: if you want to modify an old line/word, first recall +it, then edit. E.g. don't type "sudo !!" - first press Up, then Home, then type "sudo ". Fish history recall is very simple yet effective: - As in any modern shell, the Up arrow recalls whole lines, starting from the last line executed. A single press replaces "!!", later presses replace "!-3" and the like. - - If the line you want is far back in the history, type any part of the line and then press Up one or more times. This will constrain the recall to lines that include this text, and you will get to the line you want much faster. This replaces "!vi", "!?bar.c" and the like. + - If the line you want is far back in the history, type any part of the line and then press Up one or more times. This will constrain the recall to lines that include this text, and you will get to the line you want much faster. This replaces "!vi", "!?bar.c" and the like. - Alt+Up recalls individual arguments, starting from the last argument in the last line executed. A single press replaces "!$", later presses replace "!!:4" and the like. - If the argument you want is far back in history (e.g. 2 lines back - that's a lot of words!), type any part of it and then press Alt+Up. This will show only arguments containing that part and you will get what you want much faster. Try it out, this is very convenient! - If you want to reuse several arguments from the same line ("!!:3*" and the like), consider recalling the whole line and removing what you don't need (Alt+D and Alt+Backspace are your friends). - + See documentation for more details about line editing in fish. */ diff --git a/doc_src/for.txt b/doc_src/for.txt index b4b3dfaf1..2ffffe40a 100644 --- a/doc_src/for.txt +++ b/doc_src/for.txt @@ -11,7 +11,7 @@ not be executed at all. \subsection for-example Example -The command +The command for i in foo bar baz; echo $i; end @@ -21,5 +21,5 @@ would output: foo bar baz - + diff --git a/doc_src/functions.txt b/doc_src/functions.txt index 7643bfc68..928cd545a 100644 --- a/doc_src/functions.txt +++ b/doc_src/functions.txt @@ -8,6 +8,7 @@ This builtin command is used to print or erase functions. - -a or --all list all functions, even those whose name start with an underscore. +- -c OLDNAME NEWNAME or --copy OLDNAME NEWNAME creates a new function named NEWNAME, using the definition of the OLDNAME function. - -d DESCRIPTION or --description=DESCRIPTION change the description of this function - -e or --erase causes the specified functions to be erased. - -h or --help display a help message and exit @@ -17,11 +18,14 @@ This builtin command is used to print or erase functions. The default behavior of \c functions when called with no arguments, is to print the names and definitions of all defined functions. If any non-switch parameters are given, only the definition of the specified -functions are printed. +functions are printed. Automatically loaded functions can not be removed using functions -e. Either remove the definition file or change the $fish_function_path variable to remove autoloaded functions. +Function copies, created with -c, will not have any event/signal/on-exit +notifications that the original may have had. + The exit status of the functions builtin is the number functions specified in the argument list that do not exist. diff --git a/doc_src/if.txt b/doc_src/if.txt index dbbd378f4..afad53843 100644 --- a/doc_src/if.txt +++ b/doc_src/if.txt @@ -8,7 +8,7 @@ if will execute the command CONDITION. If the condition's exit status is 0, the commands COMMANDS_TRUE will execute. If the exit status is not 0 and else is given, COMMANDS_FALSE will -be executed. +be executed. In order to use the exit status of multiple commands as the condition of an if block, use begin; ...; end and @@ -29,5 +29,5 @@ else end will print foo.txt exists if the file foo.txt -exists and is a regular file, otherwise it will print +exists and is a regular file, otherwise it will print foo.txt does not exist. diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in index fc8226f58..84dc0a034 100644 --- a/doc_src/index.hdr.in +++ b/doc_src/index.hdr.in @@ -59,7 +59,7 @@ Here is a list of some useful commands: - \c mv, move (rename) files - \c cp, copy files - \c open, open files with the default application associated with each filetype -- \c less, list the contents of files +- \c less, list the contents of files Commands and parameters are separated by the space character ( ). Every command ends with either a newline (i.e. by pressing @@ -147,7 +147,7 @@ these characters, so called escape sequences are provided. These are: Most program use three types of input/output (IO), each represented by a number called a file descriptor (FD). These are: -- Standard input, FD 0, for reading, defaults to reading from the keyboard. +- Standard input, FD 0, for reading, defaults to reading from the keyboard. - Standard output, FD 1, for writing, defaults to writing to the screen. - Standard error, FD 2, for writing errors and warnings, defaults to writing to the screen. @@ -160,13 +160,13 @@ default through a simple mechanism called a redirection. An example of a file redirection is echo hello \>output.txt, which directs the output of the echo command to the file error.txt. -- To redirect standard input, write \ -- To redirect standard output, write \>DESTINATION -- To redirect standard error, write ^DESTINATION +- To redirect standard input, write \ +- To redirect standard output, write \>DESTINATION +- To redirect standard error, write ^DESTINATION - To redirect standard output to a file which will be appended, write \>\>DESTINATION_FILE -- To redirect standard error to a file which will be appended, write ^^DESTINATION_FILE +- To redirect standard error to a file which will be appended, write ^^DESTINATION_FILE -DESTINATION can be one of the following: +DESTINATION can be one of the following: - A filename. The output will be written to the specified file. - An ampersand (\&) followed by the number of another file descriptor. The file descriptor will be a duplicate of the specified file descriptor. @@ -182,7 +182,7 @@ Any FD can be redirected in an arbitrary way by prefixing the redirection with the number of the FD. - To redirect input of FD number N, write N\ -- To redirect output of FD number N, write N\>DESTINATION +- To redirect output of FD number N, write N\>DESTINATION - To redirect output of FD number N to a file which will be appended, write N\>\>DESTINATION_FILE Example: echo Hello 2\>- and echo Hello ^- are @@ -230,7 +230,7 @@ Example: emacs \& -will start the emacs text editor in the background. +will start the emacs text editor in the background. \subsection syntax-job-control Job control @@ -323,10 +323,10 @@ function already be loaded, i.e. a circular dependency. \subsection syntax-conditional Conditional execution of code There are four fish builtins that let you execute commands only if a -specific criterion is met. These builtins are -if, -switch, -and and +specific criterion is met. These builtins are +if, +switch, +and and or. The \c switch command is used to execute one of possibly many blocks @@ -335,7 +335,7 @@ for switch for more information. The other conditionals use the exit status of a command to decide if a command or a block of commands -should be executed. See the documentation for +should be executed. See the documentation for if, and and or for more information. @@ -392,13 +392,13 @@ These are the general purpose tab completions that \c fish provides: of these completions are simple options like the \c -l option for \c ls, but some are more advanced. The latter include: -- The programs 'man' and 'whatis' show all installed +- The programs 'man' and 'whatis' show all installed manual pages as completions. -- The 'make' program uses all targets in the Makefile in +- The 'make' program uses all targets in the Makefile in the current directory as completions. - The 'mount' command uses all mount points specified in fstab as completions. -- The 'ssh' command uses all hosts that are stored -in the known_hosts file as completions. (see the ssh documentation for more information) +- The 'ssh' command uses all hosts that are stored +in the known_hosts file as completions. (see the ssh documentation for more information) - The 'su' command uses all users on the system as completions. - The \c apt-get, \c rpm and \c yum commands use all installed packages as completions. @@ -415,7 +415,7 @@ this can be specified as complete -c myprog -a 'start stop'. The argument to the \c -a switch is always a single string. At completion time, it will be tokenized on spaces and tabs, and variable expansion, command substitution and other forms of -parameter expansion will take place. +parameter expansion will take place. Fish has a special syntax to support specifying switches accepted by a command. The switches \c -s, \c -l and \c -o are used to specify a @@ -532,7 +532,7 @@ performing wildcard matching on files, inserting the value of environment variables into the parameter or even using the output of another command as a parameter list. -\subsection expand-wildcard Wildcards +\subsection expand-wildcard Wildcards If a star (*) or a question mark (?) is present in the parameter, \c fish attempts to match the given parameter to any files in such a @@ -609,7 +609,7 @@ href="#variables"> Environment variables section. Example: echo \$HOME prints the home directory of the current -user. +user. If you wish to combine environment variables with text, you can encase the variables within braces to embed a variable inside running @@ -687,9 +687,9 @@ performed: - If the string is the entire word \c self, the shells pid is the result - Otherwise, if the string is the id of a job, the result is the process group id of the job. -- Otherwise, if any child processes match the specified string, their -pids are the result of the expansion. -- Otherwise, if any processes owned by the user match the specified +- Otherwise, if any child processes match the specified string, their +pids are the result of the expansion. +- Otherwise, if any processes owned by the user match the specified string, their pids are the result of the expansion. This form of expansion is useful for commands like kill and fg, which @@ -739,7 +739,7 @@ expansion. To set a variable value, use the \c set command. -Example: +Example: To set the variable \c smurf_color to the value \c blue, use the command set smurf_color blue. @@ -869,7 +869,7 @@ echo $PATH[3] Note that array indices start at 1 in fish, not 0, as is more common in other languages. This is because many common Unix tools like seq -are more suited to such use. +are more suited to such use. If you do not use any brackets, all the elements of the array will be written as separate items. This means you can easily iterate over an @@ -921,13 +921,13 @@ certain environment variables. \c fish also sends additional information to the user through the values of certain environment variables. The user can not change the -values of most of these variables. +values of most of these variables. - \c _, which is the name of the currently running command. - \c argv, which is an array of arguments to the shell or function. \c argv is only defined when inside a function call, or if fish was invoked with a list of arguments, like 'fish myscript.fish foo bar'. This variable can be changed by the user. - \c history, which is an array containing the last commands that where entered. - \c HOME, which is the users home directory. This variable can only be changed by the root user. -- \c PWD, which is the current working directory. +- \c PWD, which is the current working directory. - \c status, which is the exit status of the last foreground job to exit. If the job was terminated through a signal, the exit status will be 128 plus the signal number. - \c USER, which is the username. This variable can only be changed by the root user. @@ -1024,7 +1024,7 @@ variables set the specified aspect of the locale information. LANG is a fallback value, it will be used if none of the LC_ variables are specified. -\section builtin-overview Builtins +\section builtin-overview Builtins Many other shells have a large library of builtin commands. Most of these commands are also available as standalone commands, but have @@ -1042,7 +1042,7 @@ switch of the command. The \c fish editor features copy and paste, a searchable history and many editor functions that can be bound to special keyboard -shortcuts. The most important keybinding is probably the tab key, which is bound to the complete function. +shortcuts. The most important keybinding is probably the tab key, which is bound to the complete function. Here are some of the commands available in the editor: - Tab completes the current token @@ -1060,12 +1060,12 @@ Here are some of the commands available in the editor: - Ctrl-l clear and repaint screen - Ctrl-w move previous word to the killring - Alt-d move next word to the killring -- Alt-w prints a short description of the command under the cursor -- Alt-l lists the contents of the current directory, unless the cursor is over a directory argument, in which case the contents of that directory will be listed +- Alt-w prints a short description of the command under the cursor +- Alt-l lists the contents of the current directory, unless the cursor is over a directory argument, in which case the contents of that directory will be listed - Alt-p adds the string '| less;' to the end of the job under the cursor. The result is that the output of the command will be paged. -You can change these key bindings using the -bind builtin command. +You can change these key bindings using the +bind builtin command. - \c backward-char, moves one character to the left @@ -1096,7 +1096,7 @@ If such a script produces output, the script needs to finish by calling 'commandline -f repaint' in order to tell fish that a repaint is in order. -\subsection killring Copy and paste (Kill Ring) +\subsection killring Copy and paste (Kill Ring) \c fish uses an Emacs style kill ring for copy and paste functionality. Use Ctrl-K to cut from the current cursor position to @@ -1107,7 +1107,7 @@ Meta-Y to rotate to the previous kill. If the environment variable DISPLAY is set, \c fish will try to connect to the X-windows server specified by this variable, and use -the clipboard on the X server for copying and pasting. +the clipboard on the X server for copying and pasting. \subsection history Searchable history @@ -1158,7 +1158,7 @@ graphical user interface from the terminal, and then be able to continue using the shell. In such cases, there are several ways in which the user can change fish's behavior. --# By ending a command with the \& (ampersand) symbol, the user tells \c fish to put the specified command into the background. A background process will be run simultaneous with \c fish. \c fish will retain control of the terminal, so the program will not be able to read from the keyboard. +-# By ending a command with the \& (ampersand) symbol, the user tells \c fish to put the specified command into the background. A background process will be run simultaneous with \c fish. \c fish will retain control of the terminal, so the program will not be able to read from the keyboard. -# By pressing ^Z, the user stops a currently running foreground program and returns control to \c fish. Some programs do not support this feature, or remap it to another key. Gnu emacs uses ^X z to stop running. -# By using the fg and bg builtin commands, the user can send any currently running job into the foreground or background. @@ -1247,7 +1247,7 @@ returning to the shell) when the \c fish_prompt function is called. Example:

-The default \c fish title is +The default \c fish title is 

@@ -1379,9 +1379,9 @@ href='fish-users@lists.sf.net'>fish-users@lists.sf.net.
 \subsection todo-features Missing features
 
 - Complete vi-mode key bindings
-- More completions (for example konsole, gnome-terminal, 
+- More completions (for example konsole, gnome-terminal,
 rlogin, rsync, arch, finger, bibtex, aspell, xpdf,
-compress, wine, dig, batch, 
+compress, wine, dig, batch,
 g++, javac, java, gcj, lpr, doxygen, whois)
 - Undo support
 - wait shellscript
@@ -1391,7 +1391,7 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 
 \subsection todo-possible Possible features
 
-- mouse support like zsh has with http://stchaz.free.fr/mouse.zsh 
+- mouse support like zsh has with http://stchaz.free.fr/mouse.zsh
   installed would be awesome
 - suggest a completion on unique matches by writing it out in an understated color
 - Highlight beginning/end of block when moving over a block command
@@ -1408,7 +1408,7 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 - History could reload itself when the file is updated. This would need to be done in a clever way to avoid chain reactions
 - The error function should probably be moved into it's own library, and be made mere general purpose.
 - The code validation functions should be moved from the parser to parse_util.
-- Try to remove more malloc calls to reduce memory usage. The time_t arrays used by the autoloader sound like a good candidate. 
+- Try to remove more malloc calls to reduce memory usage. The time_t arrays used by the autoloader sound like a good candidate.
 - The code validator should warn about unknown commands.
 - Auto-newlines
 - A fault injector could be written to increase robustness and testing of error recovery paths
@@ -1417,7 +1417,7 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 - exec_subshell should be either merged with eval or moved to parser.c
 - Don't use expand_string to perform completions. wildcard_complete can be called directly, the brace expansion handling should be universal, and the process expansion can be moved to complete.c.
 - Make the history search support incremental searching
-- An automatic logout feature 
+- An automatic logout feature
 - Make tab completions completely silent by default, i.e. kill stderr when running completion commands. This needs to be overridalbe for debugging purposes.
 - Move history to an environment variable
 
@@ -1426,8 +1426,8 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 - Suspending and then resuming pipelines containing a builtin or a shellscript function is broken. Ideally, the exec function in exec.c should be able to resume execution of a partially executed job.
 - delete-word is broken on the commandline 'sudo update-alternatives --config x-'
 - Sometimes autoheader needs to be run on a fresh tarball. Fix dates before creating tarballs.
-- The completion autoloader does not remember which completions where actually autoloaded, and may unload manually specified completions. 
-- There have been stray reports of issues with strange values of the PATH variable during startup. 
+- The completion autoloader does not remember which completions where actually autoloaded, and may unload manually specified completions.
+- There have been stray reports of issues with strange values of the PATH variable during startup.
 - bindings in config.fish are overwritten by default key bindings.
 - Adding 'bind -k ...' doesn't overwrite non-keybinding binds of the same sequence.
 - History file does not remove duplicates.
diff --git a/doc_src/license.hdr b/doc_src/license.hdr
index 5a5654c23..a05927b99 100644
--- a/doc_src/license.hdr
+++ b/doc_src/license.hdr
@@ -14,7 +14,7 @@ Version 2, June 1991
 

 
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
 
 Everyone is permitted to copy and distribute verbatim copies
@@ -447,7 +447,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
License for XSel

 
 The XSel command, written and copyrighted by Conrad Parker, is
-distributed together with \c fish. 
+distributed together with \c fish.
 
 
 It is Copyright (C) 2001 Conrad Parker 
@@ -802,7 +802,7 @@ of these things:
     that the user who changes the contents of definitions files in the
     Library will not necessarily be able to recompile the application
     to use the modified definitions.)
-	 
+
     
  • b) Use a suitable shared library mechanism for linking with the
     Library.  A suitable mechanism is one that (1) uses at run time a
     copy of the library already present on the user's computer system,
diff --git a/doc_src/math.txt b/doc_src/math.txt
index 0bef1437b..9455e0da0 100644
--- a/doc_src/math.txt
+++ b/doc_src/math.txt
@@ -9,7 +9,7 @@
 math is used to perform mathematical calculations. It is only a very
 thin wrapper for the bc program, that makes it possible to specify an
 expression from the command line without using non-standard extensions
-or a pipeline. Simply use a command like math 1+1. 
+or a pipeline. Simply use a command like math 1+1.
 
 For a description of the syntax supported by math, see the manual for
 the bc program. Keep in mind that parameter expansion takes place on
diff --git a/doc_src/mimedb.txt b/doc_src/mimedb.txt
index fbfcdf9ee..6a4e99446 100644
--- a/doc_src/mimedb.txt
+++ b/doc_src/mimedb.txt
@@ -5,7 +5,7 @@
 
 \subsection mimedb-description Description
 
-- \c FILES is a list of files to analyse 
+- \c FILES is a list of files to analyse
 - \c -t, \c --input-file-data the specified files type should be determined both by their filename and by their contents (Default)
 - \c -f, \c --input-filename the specified files type should be determined by their filename
 - \c -i, \c --input-mime the arguments are not files but mimetypes
diff --git a/doc_src/not.txt b/doc_src/not.txt
index 5adedc3a9..bb053da74 100644
--- a/doc_src/not.txt
+++ b/doc_src/not.txt
@@ -5,7 +5,7 @@
 
 \subsection not-description Description
 
-The \c not builtin is used to negate the exit status of another command. 
+The \c not builtin is used to negate the exit status of another command.
 
 \subsection not-example Example
 
diff --git a/doc_src/popd.txt b/doc_src/popd.txt
index 521059abb..b3c87584d 100644
--- a/doc_src/popd.txt
+++ b/doc_src/popd.txt
@@ -3,6 +3,6 @@
 \subsection popd-synopsis Synopsis
 popd
 
-\subsection popd-description Description 
-popd removes the top directory from the directory stack and 
+\subsection popd-description Description
+popd removes the top directory from the directory stack and
 cd's to the new top directory.
diff --git a/doc_src/prevd.txt b/doc_src/prevd.txt
index 57917f105..83d6b9093 100644
--- a/doc_src/prevd.txt
+++ b/doc_src/prevd.txt
@@ -3,7 +3,7 @@
 \subsection prevd-synopsis Synopsis
 prevd [-l | --list] [pos]
 
-\subsection prevd-description Description 
+\subsection prevd-description Description
 
 prevd moves backwards pos positions in the history
 of visited directories; if the beginning of the history has been hit,
diff --git a/doc_src/pushd.txt b/doc_src/pushd.txt
index 4a208791e..525690720 100644
--- a/doc_src/pushd.txt
+++ b/doc_src/pushd.txt
@@ -3,7 +3,7 @@
 \subsection pushd-synopsis Synopsis
 pushd [DIRECTORY]
 
-\subsection pushd-description Description 
+\subsection pushd-description Description
 The pushd function adds DIRECTORY to the top of the directory stack
 and makes it the current directory. Use popd to pop it off and and
 return to the original directory.
diff --git a/doc_src/random.txt b/doc_src/random.txt
index f6dd0928f..ad9b658a0 100644
--- a/doc_src/random.txt
+++ b/doc_src/random.txt
@@ -21,4 +21,4 @@ for i in (seq (random) -1 1)
 	echo $i
 	sleep
 end
-
    •  
+
    diff --git a/doc_src/read.txt b/doc_src/read.txt index 564b890a8..b85b5fd8f 100644 --- a/doc_src/read.txt +++ b/doc_src/read.txt @@ -6,12 +6,12 @@ \subsection read-description Description The read builtin causes fish to read one line from standard -input and store the result in one or more environment variables. +input and store the result in one or more environment variables. - -c CMD or --command=CMD specifies that the initial string in the interactive mode command buffer should be CMD. - -e or --export specifies that the variables will be exported to subshells. - -g or --global specifies that the variables will be made global. -- -m NAME or --mode-name=NAME specifies that the name NAME should be used to save/load the history file. If NAME is fish, the regular fish history will be available. +- -m NAME or --mode-name=NAME specifies that the name NAME should be used to save/load the history file. If NAME is fish, the regular fish history will be available. - -p PROMPT_CMD or --prompt=PROMPT_CMD specifies that the output of the shell command PROMPT_CMD should be used as the prompt for the interactive mode prompt. The default prompt command is set_color green; echo read; set_color normal; echo "> ". - -s or --shell Use syntax highlighting, tab completions and command termination suitable for entering shellscript code - -u or --unexport causes the specified environment not to be exported to child processes diff --git a/doc_src/return.txt b/doc_src/return.txt index e7883f37f..2cfd5ab62 100644 --- a/doc_src/return.txt +++ b/doc_src/return.txt @@ -3,7 +3,7 @@ \subsection return-synopsis Synopsis function NAME; [COMMANDS...;] return [STATUS]; [COMMANDS...;] end -\subsection return-description Description +\subsection return-description Description The \c return builtin is used to halt a currently running function. It is usually added inside of a conditional block such as an set_color --bold white     will result in a white font color. Not all terminal emulators support all these features. This is not a -bug in set_color but a missing feature in the terminal emulator. +bug in set_color but a missing feature in the terminal emulator. set_color uses the terminfo database to look up how to change terminal colors on whatever terminal is in use. Some systems have old and diff --git a/doc_src/source.txt b/doc_src/source.txt index 05abc4fc1..9c6f11d3e 100644 --- a/doc_src/source.txt +++ b/doc_src/source.txt @@ -3,7 +3,7 @@ \subsection source-synopsis Synopsis . FILENAME [ARGUMENTS...] -\subsection source-description Description +\subsection source-description Description Evaluates the commands of the specified file in the current shell. This is different from starting a new process to perform the diff --git a/doc_src/ulimit.txt b/doc_src/ulimit.txt index ebed0f09b..6e21eba30 100644 --- a/doc_src/ulimit.txt +++ b/doc_src/ulimit.txt @@ -27,7 +27,7 @@ Note that not all these limits are available in all operating systems. The value of limit can be a number in the unit specified for the resource or one of the special values hard, soft, or unlimited, which stand for the current hard limit, the current soft limit, and no -limit, respectively. +limit, respectively. If limit is given, it is the new value of the specified resource. If no option is given, then -f is assumed. Values are in kilobytes, diff --git a/doc_src/vared.txt b/doc_src/vared.txt index bf383560e..9f1cef531 100644 --- a/doc_src/vared.txt +++ b/doc_src/vared.txt @@ -1,4 +1,4 @@ -\section vared vared - interactively edit the value of an environment variable +\section vared vared - interactively edit the value of an environment variable \subsection vared-synopsis Synopsis vared VARIABLE_NAME @@ -7,7 +7,7 @@ vared is used to interactively edit the value of an environment variable. Array variables as a whole can not be edited using vared, -but individual array elements can. +but individual array elements can. \subsection vared-example Example diff --git a/env.c b/env.c index 321251851..b7c848e3a 100644 --- a/env.c +++ b/env.c @@ -83,11 +83,11 @@ extern char **__environ; */ typedef struct env_node { - /** - Variable table + /** + Variable table */ hash_table_t env; - /** + /** Does this node imply a new variable scope? If yes, all non-global variables below this one in the stack are invisible. If new_scope is set for the global variable node, @@ -98,8 +98,8 @@ typedef struct env_node Does this node contain any variables which are exported to subshells */ int export; - - /** + + /** Pointer to next level */ struct env_node *next; @@ -115,7 +115,7 @@ typedef struct var_entry { int export; /**< Whether the variable should be exported */ size_t size; /**< The maximum length (excluding the NULL) that will fit into this var_entry_t */ - + #if __STDC_VERSION__ < 199901L wchar_t val[1]; /**< The value of the variable */ #else @@ -206,12 +206,12 @@ static const wchar_t *locale_variable[] = */ static void clear_hash_entry( void *key, void *data ) { - var_entry_t *entry = (var_entry_t *)data; + var_entry_t *entry = (var_entry_t *)data; if( entry->export ) { has_changed = 1; } - + free( (void *)key ); free( (void *)data ); } @@ -227,20 +227,20 @@ static void start_fishd() { string_buffer_t cmd; struct passwd *pw; - + sb_init( &cmd ); pw = getpwuid(getuid()); - + debug( 3, L"Spawning new copy of fishd" ); - + if( !pw ) { debug( 0, _( L"Could not get user information" ) ); return; } - + sb_printf( &cmd, FISHD_CMD, pw->pw_name ); - + eval( (wchar_t *)cmd.buff, 0, TOP ); @@ -287,10 +287,10 @@ static void handle_locale() /* Array of locale constants corresponding to the local variable names defined in locale_variable */ - static const int cat[] = + static const int cat[] = { - 0, - LC_ALL, + 0, + LC_ALL, LC_COLLATE, LC_CTYPE, LC_MESSAGES, @@ -299,7 +299,7 @@ static void handle_locale() LC_TIME } ; - + if( lc_all ) { wsetlocale( LC_ALL, lc_all ); @@ -311,7 +311,7 @@ static void handle_locale() { wsetlocale( LC_ALL, lang ); } - + for( i=2; locale_variable[i]; i++ ) { const wchar_t *val = env_get( locale_variable[i] ); @@ -322,11 +322,11 @@ static void handle_locale() } } } - + if( wcscmp( wsetlocale( LC_MESSAGES, (void *)0 ), old ) != 0 ) { - /* + /* Try to make change known to gettext. Both changing _nl_msg_cat_cntr and calling dcgettext might potentially tell some gettext implementation that the translation @@ -338,14 +338,14 @@ static void handle_locale() _nl_msg_cat_cntr++; dcgettext( "fish", "Changing language to English", LC_MESSAGES ); - + if( is_interactive ) { debug( 0, _(L"Changing language to English") ); } } free( old ); - + } @@ -354,16 +354,16 @@ static void handle_locale() proper events are triggered when an event occurs. */ static void universal_callback( int type, - const wchar_t *name, + const wchar_t *name, const wchar_t *val ) { wchar_t *str=0; - + if( is_locale( name ) ) { handle_locale(); } - + switch( type ) { case SET: @@ -372,29 +372,29 @@ static void universal_callback( int type, str=L"SET"; break; } - + case ERASE: { str=L"ERASE"; break; } } - + if( str ) { event_t ev; - + has_changed=1; - + ev.type=EVENT_VARIABLE; ev.param1.variable=name; ev.function_name=0; - + al_init( &ev.arguments ); al_push( &ev.arguments, L"VARIABLE" ); al_push( &ev.arguments, str ); al_push( &ev.arguments, name ); - event_fire( &ev ); + event_fire( &ev ); al_destroy( &ev.arguments ); } } @@ -405,11 +405,11 @@ static void universal_callback( int type, static void setup_path() { wchar_t *path; - + int i, j; array_list_t l; - const wchar_t *path_el[] = + const wchar_t *path_el[] = { L"/bin", L"/usr/bin", @@ -419,19 +419,19 @@ static void setup_path() ; path = env_get( L"PATH" ); - + al_init( &l ); - + if( path ) { tokenize_variable_array( path, &l ); } - + for( j=0; path_el[j]; j++ ) { int has_el=0; - + for( i=0; ipw_dir ); env_set( L"HOME", dir, ENV_GLOBAL ); - free( dir ); + free( dir ); free( unam_narrow ); - } + } env_set_pwd(); - + } void env_init() @@ -527,15 +527,16 @@ void env_init() struct passwd *pw; wchar_t *uname; wchar_t *version; - + wchar_t *shlvl; + sb_init( &dyn_var ); b_init( &export_buffer ); - + /* These variables can not be altered directly by the user */ hash_init( &env_read_only, &hash_wcs_func, &hash_wcs_cmp ); - + hash_put( &env_read_only, L"status", L"" ); hash_put( &env_read_only, L"history", L"" ); hash_put( &env_read_only, L"version", L"" ); @@ -543,7 +544,8 @@ void env_init() hash_put( &env_read_only, L"LINES", L"" ); hash_put( &env_read_only, L"COLUMNS", L"" ); hash_put( &env_read_only, L"PWD", L"" ); - + hash_put( &env_read_only, L"SHLVL", L"" ); + /* Names of all dynamically calculated variables */ @@ -561,20 +563,20 @@ void env_init() hash_put( &env_read_only, L"HOME", L"" ); hash_put( &env_read_only, L"USER", L"" ); } - + top = malloc( sizeof(env_node_t) ); top->next = 0; top->new_scope = 0; top->export=0; hash_init( &top->env, &hash_wcs_func, &hash_wcs_cmp ); global_env = top; - global = &top->env; - + global = &top->env; + /* Now the environemnt variable handling is set up, the next step is to insert valid data */ - + /* Import environment variables */ @@ -582,14 +584,14 @@ void env_init() { wchar_t *key, *val; wchar_t *pos; - + key = str2wcs(*p); if( !key ) { continue; } - + val = wcschr( key, L'=' ); if( val == 0 ) @@ -597,7 +599,7 @@ void env_init() env_set( key, L"", ENV_EXPORT ); } else - { + { *val = L'\0'; val++; pos=val; @@ -612,10 +614,10 @@ void env_init() } env_set( key, val, ENV_EXPORT | ENV_GLOBAL ); - } + } free(key); } - + /* Set up the PATH variable */ @@ -638,12 +640,44 @@ void env_init() version = str2wcs( PACKAGE_VERSION ); env_set( L"version", version, ENV_GLOBAL ); free( version ); - - env_universal_init( env_get( L"FISHD_SOCKET_DIR"), + + env_universal_init( env_get( L"FISHD_SOCKET_DIR"), env_get( L"USER" ), &start_fishd, &universal_callback ); + /* + Set up SHLVL variable + */ + shlvl = env_get( L"SHLVL" ); + if ( shlvl ) + { + wchar_t *nshlvl, **end_nshlvl; + /* add an extra space for digit dump (9+1=10) */ + size_t i = wcslen( shlvl ) + 2 * sizeof(wchar_t); + + nshlvl = malloc(i); + end_nshlvl = calloc( 1, sizeof(nshlvl) ); + if ( !nshlvl || !end_nshlvl ) + DIE_MEM(); + + if ( nshlvl && swprintf( nshlvl, i, + L"%ld", wcstoul( shlvl, end_nshlvl, 10 )+1 ) != -1 ) + { + env_set( L"SHLVL", + nshlvl, + ENV_GLOBAL | ENV_EXPORT ); + } + free( end_nshlvl ); + free( nshlvl ); + } + else + { + env_set( L"SHLVL", + L"1", + ENV_GLOBAL | ENV_EXPORT ); + } + /* Set correct defaults for e.g. USER and HOME variables */ @@ -653,26 +687,26 @@ void env_init() void env_destroy() { env_universal_destroy(); - + sb_destroy( &dyn_var ); b_destroy( &export_buffer ); - + while( &top->env != global ) { env_pop(); } - + hash_destroy( &env_read_only ); hash_destroy( &env_electric ); - + hash_foreach( global, &clear_hash_entry ); hash_destroy( global ); free( top ); - + free( export_arr ); - + } /** @@ -687,7 +721,7 @@ static env_node_t *env_get_node( const wchar_t *key ) while( env != 0 ) { - res = (var_entry_t *) hash_get( &env->env, + res = (var_entry_t *) hash_get( &env->env, key ); if( res != 0 ) { @@ -698,17 +732,17 @@ static env_node_t *env_get_node( const wchar_t *key ) { env = global_env; } - else + else { env = env->next; } } - + return 0; } -int env_set( const wchar_t *key, - const wchar_t *val, +int env_set( const wchar_t *key, + const wchar_t *val, int var_mode ) { int free_val = 0; @@ -716,14 +750,14 @@ int env_set( const wchar_t *key, env_node_t *node; int has_changed_old = has_changed; int has_changed_new = 0; - var_entry_t *e=0; + var_entry_t *e=0; int done=0; event_t ev; - int is_universal = 0; - + int is_universal = 0; + CHECK( key, ENV_INVALID ); - + if( val && contains( key, L"PWD", L"HOME" ) ) { void *context = halloc( 0, 0 ); @@ -737,12 +771,12 @@ int env_set( const wchar_t *key, halloc_free( context ); } - if( (var_mode & ENV_USER ) && + if( (var_mode & ENV_USER ) && hash_get( &env_read_only, key ) ) { return ENV_PERM; } - + if( wcscmp( key, L"umask" ) == 0) { wchar_t *end; @@ -752,10 +786,10 @@ int env_set( const wchar_t *key, Set the new umask */ if( val && wcslen(val) ) - { + { errno=0; mask = wcstol( val, &end, 8 ); - + if( !errno && (!*end) && (mask <= 0777) && (mask >= 0) ) { umask( mask ); @@ -776,7 +810,7 @@ int env_set( const wchar_t *key, { val = ENV_NULL; } - + if( var_mode & ENV_UNIVERSAL ) { int export = 0; @@ -786,31 +820,31 @@ int env_set( const wchar_t *key, { env_universal_get_export( key ); } - else + else { export = (var_mode & ENV_EXPORT ); } - + env_universal_set( key, val, export ); is_universal = 1; } else { - + node = env_get_node( key ); if( node && &node->env != 0 ) { - e = (var_entry_t *) hash_get( &node->env, + e = (var_entry_t *) hash_get( &node->env, key ); - + if( e->export ) { has_changed_new = 1; } } - if( (var_mode & ENV_LOCAL) || + if( (var_mode & ENV_LOCAL) || (var_mode & ENV_GLOBAL) ) { node = ( var_mode & ENV_GLOBAL )?global_env:top; @@ -821,7 +855,7 @@ int env_set( const wchar_t *key, { if( !(var_mode & ENV_EXPORT ) && !(var_mode & ENV_UNEXPORT ) ) - { + { var_mode = e->export?ENV_EXPORT:0; } } @@ -832,26 +866,26 @@ int env_set( const wchar_t *key, proc_had_barrier=1; env_universal_barrier(); } - + if( env_universal_get( key ) ) { int export = 0; - + if( !(var_mode & ENV_EXPORT ) && !(var_mode & ENV_UNEXPORT ) ) { env_universal_get_export( key ); } - else + else { export = (var_mode & ENV_EXPORT ); } - + env_universal_set( key, val, export ); is_universal = 1; - + done = 1; - + } else { @@ -859,7 +893,7 @@ int env_set( const wchar_t *key, New variable with unspecified scope. The default scope is the innermost scope that is shadowing, which will be either the current function or the - global scope. + global scope. */ node = top; while( node->next && !node->new_scope ) @@ -869,7 +903,7 @@ int env_set( const wchar_t *key, } } } - + if( !done ) { void *k, *v; @@ -885,46 +919,46 @@ int env_set( const wchar_t *key, { k = wcsdup(key); } - + old_entry = (var_entry_t *)v; if( old_entry && old_entry->size >= val_len ) { entry = old_entry; - + if( !!(var_mode & ENV_EXPORT) || entry->export ) { entry->export = !!(var_mode & ENV_EXPORT); - has_changed_new = 1; + has_changed_new = 1; } } else { free( v ); - entry = malloc( sizeof( var_entry_t ) + + entry = malloc( sizeof( var_entry_t ) + sizeof(wchar_t )*(val_len+1)); - + if( !entry ) { DIE_MEM(); } - + entry->size = val_len; - + if( var_mode & ENV_EXPORT) { entry->export = 1; - has_changed_new = 1; + has_changed_new = 1; } else { entry->export = 0; } - + } wcscpy( entry->val, val ); - + hash_put( &node->env, k, entry ); if( entry->export ) @@ -936,10 +970,10 @@ int env_set( const wchar_t *key, { free((void *)val); } - + has_changed = has_changed_old || has_changed_new; } - + } if( !is_universal ) @@ -947,16 +981,16 @@ int env_set( const wchar_t *key, ev.type=EVENT_VARIABLE; ev.param1.variable = key; ev.function_name = 0; - + al_init( &ev.arguments ); al_push( &ev.arguments, L"VARIABLE" ); al_push( &ev.arguments, L"SET" ); al_push( &ev.arguments, key ); - -// debug( 1, L"env_set: fire events on variable %ls", key ); + +// debug( 1, L"env_set: fire events on variable %ls", key ); event_fire( &ev ); -// debug( 1, L"env_set: return from event firing" ); - al_destroy( &ev.arguments ); +// debug( 1, L"env_set: return from event firing" ); + al_destroy( &ev.arguments ); } if( is_locale( key ) ) @@ -985,15 +1019,15 @@ static int try_remove( env_node_t *n, { return 0; } - - hash_remove( &n->env, + + hash_remove( &n->env, key, - &old_key_void, + &old_key_void, &old_val_void ); old_key = (wchar_t *)old_key_void; old_val = (wchar_t *)old_val_void; - + if( old_key != 0 ) { var_entry_t * v = (var_entry_t *)old_val; @@ -1001,7 +1035,7 @@ static int try_remove( env_node_t *n, { has_changed = 1; } - + free(old_key); free(old_val); return 1; @@ -1011,7 +1045,7 @@ static int try_remove( env_node_t *n, { return 0; } - + if( n->new_scope ) { return try_remove( global_env, key, var_mode ); @@ -1027,48 +1061,48 @@ int env_remove( const wchar_t *key, int var_mode ) { env_node_t *first_node; int erased = 0; - + CHECK( key, 1 ); - - if( (var_mode & ENV_USER ) && + + if( (var_mode & ENV_USER ) && hash_get( &env_read_only, key ) ) { return 2; } - + first_node = top; - + if( ! (var_mode & ENV_UNIVERSAL ) ) { - + if( var_mode & ENV_GLOBAL ) { first_node = global_env; } - + if( try_remove( first_node, key, var_mode ) ) - { + { event_t ev; - + ev.type=EVENT_VARIABLE; ev.param1.variable=key; ev.function_name=0; - + al_init( &ev.arguments ); al_push( &ev.arguments, L"VARIABLE" ); al_push( &ev.arguments, L"ERASE" ); al_push( &ev.arguments, key ); - - event_fire( &ev ); - + + event_fire( &ev ); + al_destroy( &ev.arguments ); erased = 1; } } - - if( !erased && + + if( !erased && !(var_mode & ENV_GLOBAL) && - !(var_mode & ENV_LOCAL) ) + !(var_mode & ENV_LOCAL) ) { erased = !env_universal_remove( key ); } @@ -1077,8 +1111,8 @@ int env_remove( const wchar_t *key, int var_mode ) { handle_locale(); } - - return !erased; + + return !erased; } @@ -1087,23 +1121,23 @@ wchar_t *env_get( const wchar_t *key ) var_entry_t *res; env_node_t *env = top; wchar_t *item; - + CHECK( key, 0 ); if( wcscmp( key, L"history" ) == 0 ) { wchar_t *current; - int i; + int i; int add_current=0; - sb_clear( &dyn_var ); - + sb_clear( &dyn_var ); + current = reader_get_buffer(); if( current && wcslen( current ) ) { add_current=1; sb_append( &dyn_var, current ); } - + for( i=add_current;; i++ ) { wchar_t *next = history_get( i-add_current ); @@ -1111,7 +1145,7 @@ wchar_t *env_get( const wchar_t *key ) { break; } - + if( i!=0) { sb_append( &dyn_var, ARRAY_SEP_STR ); @@ -1124,45 +1158,45 @@ wchar_t *env_get( const wchar_t *key ) } else if( wcscmp( key, L"COLUMNS" )==0 ) { - sb_clear( &dyn_var ); - sb_printf( &dyn_var, L"%d", common_get_width() ); - return (wchar_t *)dyn_var.buff; - } + sb_clear( &dyn_var ); + sb_printf( &dyn_var, L"%d", common_get_width() ); + return (wchar_t *)dyn_var.buff; + } else if( wcscmp( key, L"LINES" )==0 ) { - sb_clear( &dyn_var ); - sb_printf( &dyn_var, L"%d", common_get_height() ); + sb_clear( &dyn_var ); + sb_printf( &dyn_var, L"%d", common_get_height() ); return (wchar_t *)dyn_var.buff; } else if( wcscmp( key, L"status" )==0 ) { - sb_clear( &dyn_var ); - sb_printf( &dyn_var, L"%d", proc_get_last_status() ); - return (wchar_t *)dyn_var.buff; + sb_clear( &dyn_var ); + sb_printf( &dyn_var, L"%d", proc_get_last_status() ); + return (wchar_t *)dyn_var.buff; } else if( wcscmp( key, L"umask" )==0 ) { - sb_clear( &dyn_var ); - sb_printf( &dyn_var, L"0%0.3o", get_umask() ); - return (wchar_t *)dyn_var.buff; + sb_clear( &dyn_var ); + sb_printf( &dyn_var, L"0%0.3o", get_umask() ); + return (wchar_t *)dyn_var.buff; } - + while( env != 0 ) { - res = (var_entry_t *) hash_get( &env->env, + res = (var_entry_t *) hash_get( &env->env, key ); if( res != 0 ) { - if( wcscmp( res->val, ENV_NULL )==0) + if( wcscmp( res->val, ENV_NULL )==0) { return 0; } else { - return res->val; + return res->val; } } - + if( env->new_scope ) { env = global_env; @@ -1171,15 +1205,15 @@ wchar_t *env_get( const wchar_t *key ) { env = env->next; } - } + } if( !proc_had_barrier) { proc_had_barrier=1; env_universal_barrier(); } - + item = env_universal_get( key ); - + if( !item || (wcscmp( item, ENV_NULL )==0)) { return 0; @@ -1197,7 +1231,7 @@ int env_exist( const wchar_t *key, int mode ) wchar_t *item=0; CHECK( key, 0 ); - + /* Read only variables all exist, and they are all global. A local version can not exist. @@ -1213,21 +1247,21 @@ int env_exist( const wchar_t *key, int mode ) if( ! (mode & ENV_UNIVERSAL) ) { env = (mode & ENV_GLOBAL)?global_env:top; - + while( env != 0 ) { - res = (var_entry_t *) hash_get( &env->env, + res = (var_entry_t *) hash_get( &env->env, key ); if( res != 0 ) { return 1; } - + if( mode & ENV_LOCAL ) { break; } - + if( env->new_scope ) { env = global_env; @@ -1236,9 +1270,9 @@ int env_exist( const wchar_t *key, int mode ) { env = env->next; } - } + } } - + if( ! (mode & ENV_LOCAL) && ! (mode & ENV_GLOBAL) ) { if( !proc_had_barrier) @@ -1246,9 +1280,9 @@ int env_exist( const wchar_t *key, int mode ) proc_had_barrier=1; env_universal_barrier(); } - + item = env_universal_get( key ); - + } return item != 0; @@ -1259,16 +1293,16 @@ int env_exist( const wchar_t *key, int mode ) */ static int local_scope_exports( env_node_t *n ) { - + if( n==global_env ) return 0; - + if( n->export ) return 1; - + if( n->new_scope ) return 0; - + return local_scope_exports( n->next ); } @@ -1283,7 +1317,7 @@ void env_push( int new_scope ) { has_changed |= local_scope_exports(top); } - top = node; + top = node; } @@ -1294,7 +1328,7 @@ void env_pop() { int i; int locale_changed = 0; - + env_node_t *killme = top; for( i=0; locale_variable[i]; i++ ) @@ -1310,7 +1344,7 @@ void env_pop() { has_changed |= killme->export || local_scope_exports( killme->next ); } - + top = top->next; hash_foreach( &killme->env, &clear_hash_entry ); hash_destroy( &killme->env ); @@ -1318,14 +1352,14 @@ void env_pop() if( locale_changed ) handle_locale(); - + } else { debug( 0, _( L"Tried to pop empty environment stack." ) ); sanity_lose(); - } + } } @@ -1333,12 +1367,12 @@ void env_pop() Function used with hash_foreach to insert keys of one table into another */ -static void add_key_to_hash( void *key, +static void add_key_to_hash( void *key, void *data, void *aux ) { var_entry_t *e = (var_entry_t *)data; - if( ( e->export && get_names_show_exported) || + if( ( e->export && get_names_show_exported) || ( !e->export && get_names_show_unexported) ) { hash_put( (hash_table_t *)aux, key, 0 ); @@ -1358,8 +1392,8 @@ static void add_to_hash( void *k, void *aux ) /** Add key to list */ -static void add_key_to_list( void * key, - void * val, +static void add_key_to_list( void * key, + void * val, void *aux ) { al_push( (array_list_t *)aux, key ); @@ -1376,10 +1410,10 @@ void env_get_names( array_list_t *l, int flags ) env_node_t *n=top; CHECK( l, ); - - get_names_show_exported = + + get_names_show_exported = flags & ENV_EXPORT|| (!(flags & ENV_UNEXPORT)); - get_names_show_unexported = + get_names_show_unexported = flags & ENV_UNEXPORT|| (!(flags & ENV_EXPORT)); if( !show_local && !show_global && !show_universal ) @@ -1388,58 +1422,58 @@ void env_get_names( array_list_t *l, int flags ) } hash_init( &names, &hash_wcs_func, &hash_wcs_cmp ); - + if( show_local ) { while( n ) { if( n == global_env ) break; - - hash_foreach2( &n->env, + + hash_foreach2( &n->env, add_key_to_hash, &names ); if( n->new_scope ) - break; + break; else n = n->next; } } - + if( show_global ) { - hash_foreach2( &global_env->env, + hash_foreach2( &global_env->env, add_key_to_hash, &names ); if( get_names_show_unexported ) hash_foreach2( &env_electric, &add_key_to_list, l ); - + if( get_names_show_exported ) { al_push( l, L"COLUMNS" ); al_push( l, L"LINES" ); } - + } - + if( show_universal ) { array_list_t uni_list; al_init( &uni_list ); - - env_universal_get_names( &uni_list, + + env_universal_get_names( &uni_list, get_names_show_exported, get_names_show_unexported ); al_foreach2( &uni_list, &add_to_hash, &names ); al_destroy( &uni_list ); } - + hash_get_keys( &names, l ); - hash_destroy( &names ); + hash_destroy( &names ); } /** @@ -1453,10 +1487,10 @@ static void export_func1( void *k, void *v, void *aux ) hash_remove( h, k, 0, 0 ); if( val_entry->export && wcscmp( val_entry->val, ENV_NULL ) ) - { + { hash_put( h, k, val_entry->val ); } - + } /** @@ -1466,14 +1500,14 @@ static void get_exported( env_node_t *n, hash_table_t *h ) { if( !n ) return; - + if( n->new_scope ) get_exported( global_env, h ); else get_exported( n->next, h ); - hash_foreach2( &n->env, &export_func1, h ); -} + hash_foreach2( &n->env, &export_func1, h ); +} /** @@ -1483,10 +1517,10 @@ static void export_func2( void *k, void *v, void *aux ) { wchar_t *key = (wchar_t *)k; wchar_t *val = (wchar_t *)v; - + char *ks = wcs2str( key ); char *vs = wcs2str( val ); - + char *pos = vs; buffer_t *out = (buffer_t *)aux; @@ -1495,18 +1529,18 @@ static void export_func2( void *k, void *v, void *aux ) { DIE_MEM(); } - + /* Make arrays into colon-separated lists */ while( *pos ) { if( *pos == ARRAY_SEP ) - *pos = ':'; + *pos = ':'; pos++; } int nil = 0; - + b_append( out, ks, strlen(ks) ); b_append( out, "=", 1 ); b_append( out, vs, strlen(vs) ); @@ -1523,21 +1557,21 @@ char **env_export_arr( int recalc ) proc_had_barrier=1; env_universal_barrier(); } - + if( has_changed ) { array_list_t uni; hash_table_t vals; int prev_was_null=1; - int pos=0; + int pos=0; int i; debug( 4, L"env_export_arr() recalc" ); - + hash_init( &vals, &hash_wcs_func, &hash_wcs_cmp ); - + get_exported( top, &vals ); - + al_init( &uni ); env_universal_get_names( &uni, 1, 0 ); for( i=0; ipw_name ); } - + name = malloc( strlen(dir) + - strlen(uname) + - strlen(SOCK_FILENAME) + + strlen(uname) + + strlen(SOCK_FILENAME) + 2 ); - + strcpy( name, dir ); strcat( name, "/" ); strcat( name, SOCK_FILENAME ); strcat( name, uname ); - + free( dir ); free( uname ); - + debug( 3, L"Connect to socket %s at fd %2", name, s ); - + local.sun_family = AF_UNIX; strcpy(local.sun_path, name ); free( name ); len = sizeof(local); - - if( connect( s, (struct sockaddr *)&local, len) == -1 ) + + if( connect( s, (struct sockaddr *)&local, len) == -1 ) { close( s ); if( fork_ok && start_fishd ) { debug( 2, L"Could not connect to socket %d, starting fishd", s ); - + start_fishd(); - + return get_socket( 0 ); } - + debug( 1, L"Could not connect to universal variable server, already tried manual restart (or no command supplied). You will not be able to share variable values between fish sessions. Is fish properly installed?" ); return -1; } - - if( (fcntl( s, F_SETFL, O_NONBLOCK ) != 0) || (fcntl( s, F_SETFD, FD_CLOEXEC ) != 0) ) + + if( (fcntl( s, F_SETFL, O_NONBLOCK ) != 0) || (fcntl( s, F_SETFD, FD_CLOEXEC ) != 0) ) { wperror( L"fcntl" ); - close( s ); - + close( s ); + return -1; } debug( 3, L"Connected to fd %d", s ); - + return s; } @@ -166,7 +166,7 @@ static int get_socket( int fork_ok ) Callback function used whenever a new fishd message is recieved */ static void callback( int type, const wchar_t *name, const wchar_t *val ) -{ +{ if( type == BARRIER_REPLY ) { barrier_reply = 1; @@ -174,8 +174,8 @@ static void callback( int type, const wchar_t *name, const wchar_t *val ) else { if( external_callback ) - external_callback( type, name, val ); - } + external_callback( type, name, val ); + } } /** @@ -186,21 +186,21 @@ static void check_connection() { if( !init ) return; - + if( env_universal_server.killme ) { debug( 3, L"Lost connection to universal variable server." ); - + if( close( env_universal_server.fd ) ) { wperror( L"close" ); } - + env_universal_server.fd = -1; env_universal_server.killme=0; - env_universal_server.input.used=0; + env_universal_server.input.used=0; env_universal_read_all(); - } + } } /** @@ -210,10 +210,10 @@ static void env_universal_remove_all() { array_list_t lst; int i; - + al_init( &lst ); - - env_universal_common_get_names( &lst, + + env_universal_common_get_names( &lst, 1, 1 ); @@ -224,7 +224,7 @@ static void env_universal_remove_all() } al_destroy( &lst ); - + } @@ -237,9 +237,9 @@ static void reconnect() { if( get_socket_count >= RECONNECT_COUNT ) return; - + debug( 3, L"Get new fishd connection" ); - + init = 0; env_universal_server.buffer_consumed = env_universal_server.buffer_used = 0; env_universal_server.fd = get_socket(1); @@ -252,22 +252,22 @@ static void reconnect() } -void env_universal_init( wchar_t * p, - wchar_t *u, +void env_universal_init( wchar_t * p, + wchar_t *u, void (*sf)(), void (*cb)( int type, const wchar_t *name, const wchar_t *val )) { path=p; user=u; - start_fishd=sf; + start_fishd=sf; external_callback = cb; connection_init( &env_universal_server, -1 ); - + env_universal_server.fd = get_socket(1); env_universal_common_init( &callback ); - env_universal_read_all(); - init = 1; + env_universal_read_all(); + init = 1; if( env_universal_server.fd >= 0 ) { env_universal_barrier(); @@ -285,7 +285,7 @@ void env_universal_destroy() { wperror( L"fcntl" ); } - try_send_all( &env_universal_server ); + try_send_all( &env_universal_server ); } connection_destroy( &env_universal_server ); @@ -305,22 +305,22 @@ int env_universal_read_all() if( env_universal_server.fd == -1 ) { - reconnect(); + reconnect(); if( env_universal_server.fd == -1 ) - return 0; + return 0; } - + if( env_universal_server.fd != -1 ) { read_message( &env_universal_server ); - check_connection(); + check_connection(); return 1; } else { debug( 2, L"No connection to universal variable server" ); return 0; - } + } } wchar_t *env_universal_get( const wchar_t *name ) @@ -329,7 +329,7 @@ wchar_t *env_universal_get( const wchar_t *name ) return 0; CHECK( name, 0 ); - + return env_universal_common_get( name ); } @@ -339,7 +339,7 @@ int env_universal_get_export( const wchar_t *name ) return 0; CHECK( name, 0 ); - + return env_universal_common_get_export( name ); } @@ -366,19 +366,19 @@ void env_universal_barrier() debug( 3, L"Create barrier" ); while( 1 ) { - try_send_all( &env_universal_server ); - check_connection(); - + try_send_all( &env_universal_server ); + check_connection(); + if( q_empty( &env_universal_server.unsent ) ) break; - + if( env_universal_server.fd == -1 ) { reconnect(); debug( 2, L"barrier interrupted, exiting" ); - return; + return; } - + FD_ZERO( &fds ); FD_SET( env_universal_server.fd, &fds ); select( env_universal_server.fd+1, 0, &fds, 0, 0 ); @@ -394,10 +394,10 @@ void env_universal_barrier() { reconnect(); debug( 2, L"barrier interrupted, exiting (2)" ); - return; - } + return; + } FD_ZERO( &fds ); - FD_SET( env_universal_server.fd, &fds ); + FD_SET( env_universal_server.fd, &fds ); select( env_universal_server.fd+1, &fds, 0, 0, 0 ); env_universal_read_all(); } @@ -408,12 +408,12 @@ void env_universal_barrier() void env_universal_set( const wchar_t *name, const wchar_t *value, int export ) { message_t *msg; - + if( !init ) return; CHECK( name, ); - + debug( 3, L"env_universal_set( \"%ls\", \"%ls\" )", name, value ); if( is_dead() ) @@ -422,8 +422,8 @@ void env_universal_set( const wchar_t *name, const wchar_t *value, int export ) } else { - msg = create_message( export?SET_EXPORT:SET, - name, + msg = create_message( export?SET_EXPORT:SET, + name, value); if( !msg ) @@ -431,7 +431,7 @@ void env_universal_set( const wchar_t *name, const wchar_t *value, int export ) debug( 1, L"Could not create universal variable message" ); return; } - + msg->count=1; q_put( &env_universal_server.unsent, msg ); env_universal_barrier(); @@ -441,18 +441,18 @@ void env_universal_set( const wchar_t *name, const wchar_t *value, int export ) int env_universal_remove( const wchar_t *name ) { int res; - + message_t *msg; if( !init ) return 1; - + CHECK( name, 1 ); res = !env_universal_common_get( name ); debug( 3, L"env_universal_remove( \"%ls\" )", name ); - + if( is_dead() ) { env_universal_common_remove( name ); @@ -464,7 +464,7 @@ int env_universal_remove( const wchar_t *name ) q_put( &env_universal_server.unsent, msg ); env_universal_barrier(); } - + return res; } @@ -476,8 +476,8 @@ void env_universal_get_names( array_list_t *l, return; CHECK( l, ); - - env_universal_common_get_names( l, + + env_universal_common_get_names( l, show_exported, - show_unexported ); + show_unexported ); } diff --git a/env_universal.h b/env_universal.h index bd76491d9..25e8fc99f 100644 --- a/env_universal.h +++ b/env_universal.h @@ -40,7 +40,7 @@ int env_universal_get_export( const wchar_t *name ); void env_universal_set( const wchar_t *name, const wchar_t *val, int export ); /** Erase a universal variable - + \return zero if the variable existed, and non-zero if the variable did not exist */ int env_universal_remove( const wchar_t *name ); @@ -52,7 +52,7 @@ int env_universal_read_all(); /** Get the names of all universal variables - + \param l the list to insert the names into \param show_exported whether exported variables should be shown \param show_unexported whether unexported variables should be shown diff --git a/env_universal_common.c b/env_universal_common.c index dde329be1..3cd58c0db 100644 --- a/env_universal_common.c +++ b/env_universal_common.c @@ -109,8 +109,8 @@ hash_table_t env_universal_var; /** Callback function, should be called on all events */ -void (*callback)( int type, - const wchar_t *key, +void (*callback)( int type, + const wchar_t *key, const wchar_t *val ); /** @@ -140,8 +140,8 @@ static char *iconv_utf8_names[]= */ static char *iconv_wide_names_unknown[]= { - "wchar_t", "WCHAR_T", - "wchar", "WCHAR", + "wchar_t", "WCHAR_T", + "wchar", "WCHAR", 0 } ; @@ -151,12 +151,12 @@ static char *iconv_wide_names_unknown[]= */ static char *iconv_wide_names_4[]= { - "wchar_t", "WCHAR_T", - "wchar", "WCHAR", - "ucs-4", "UCS-4", - "ucs4", "UCS4", - "utf-32", "UTF-32", - "utf32", "UTF32", + "wchar_t", "WCHAR_T", + "wchar", "WCHAR", + "ucs-4", "UCS-4", + "ucs4", "UCS4", + "utf-32", "UTF-32", + "utf32", "UTF32", 0 } ; @@ -166,12 +166,12 @@ static char *iconv_wide_names_4[]= */ static char *iconv_wide_names_2[]= { - "wchar_t", "WCHAR_T", - "wchar", "WCHAR", - "ucs-2", "UCS-2", - "ucs2", "UCS2", - "utf-16", "UTF-16", - "utf16", "UTF16", + "wchar_t", "WCHAR_T", + "wchar", "WCHAR", + "ucs-2", "UCS-2", + "ucs2", "UCS2", + "utf-16", "UTF-16", + "utf16", "UTF16", 0 } ; @@ -196,7 +196,7 @@ static wchar_t *utf2wcs( const char *in ) switch (sizeof (wchar_t)) { - + case 2: to_name = iconv_wide_names_2; break; @@ -204,15 +204,15 @@ static wchar_t *utf2wcs( const char *in ) case 4: to_name = iconv_wide_names_4; break; - + default: to_name = iconv_wide_names_unknown; break; } - + /* - The line protocol fish uses is always utf-8. + The line protocol fish uses is always utf-8. */ char **from_name = iconv_utf8_names; @@ -220,13 +220,13 @@ static wchar_t *utf2wcs( const char *in ) size_t out_len = sizeof( wchar_t )*(in_len+2); size_t nconv; char *nout; - + out = malloc( out_len ); nout = (char *)out; if( !out ) return 0; - + for( i=0; to_name[i]; i++ ) { for( j=0; from_name[j]; j++ ) @@ -236,7 +236,7 @@ static wchar_t *utf2wcs( const char *in ) if( cd != (iconv_t) -1) { goto start_conversion; - + } } } @@ -246,23 +246,23 @@ static wchar_t *utf2wcs( const char *in ) if (cd == (iconv_t) -1) { /* Something went wrong. */ - debug( 0, L"Could not perform utf-8 conversion" ); + debug( 0, L"Could not perform utf-8 conversion" ); if(errno != EINVAL) wperror( L"iconv_open" ); - + /* Terminate the output string. */ free(out); - return 0; + return 0; } - + nconv = iconv( cd, (char **)&in, &in_len, &nout, &out_len ); - + if (nconv == (size_t) -1) { debug( 0, L"Error while converting from utf string" ); return 0; } - + *((wchar_t *) nout) = L'\0'; /* @@ -281,12 +281,12 @@ static wchar_t *utf2wcs( const char *in ) } free( out_old ); } - - + + if (iconv_close (cd) != 0) wperror (L"iconv_close"); - - return out; + + return out; } /** @@ -296,7 +296,7 @@ static char *wcs2utf( const wchar_t *in ) { iconv_t cd=(iconv_t) -1; int i,j; - + char *char_in = (char *)in; char *out; @@ -310,7 +310,7 @@ static char *wcs2utf( const wchar_t *in ) switch (sizeof (wchar_t)) { - + case 2: from_name = iconv_wide_names_2; break; @@ -318,7 +318,7 @@ static char *wcs2utf( const wchar_t *in ) case 4: from_name = iconv_wide_names_4; break; - + default: from_name = iconv_wide_names_unknown; break; @@ -330,24 +330,24 @@ static char *wcs2utf( const wchar_t *in ) size_t out_len = sizeof( char )*( (MAX_UTF8_BYTES*in_len)+1); size_t nconv; char *nout; - + out = malloc( out_len ); nout = (char *)out; in_len *= sizeof( wchar_t ); if( !out ) return 0; - + for( i=0; to_name[i]; i++ ) { for( j=0; from_name[j]; j++ ) { cd = iconv_open ( to_name[i], from_name[j] ); - + if( cd != (iconv_t) -1) { goto start_conversion; - + } } } @@ -357,17 +357,17 @@ static char *wcs2utf( const wchar_t *in ) if (cd == (iconv_t) -1) { /* Something went wrong. */ - debug( 0, L"Could not perform utf-8 conversion" ); + debug( 0, L"Could not perform utf-8 conversion" ); if(errno != EINVAL) wperror( L"iconv_open" ); - + /* Terminate the output string. */ free(out); - return 0; + return 0; } - + nconv = iconv( cd, &char_in, &in_len, &nout, &out_len ); - + if (nconv == (size_t) -1) { @@ -375,13 +375,13 @@ static char *wcs2utf( const wchar_t *in ) debug( 0, L"Error while converting from to string" ); return 0; } - + *nout = '\0'; - + if (iconv_close (cd) != 0) wperror (L"iconv_close"); - - return out; + + return out; } @@ -421,9 +421,9 @@ static int read_byte( connection_t *src ) int res; res = read( src->fd, src->buffer, ENV_UNIVERSAL_BUFFER_SIZE ); - + // debug(4, L"Read chunk '%.*s'", res, src->buffer ); - + if( res < 0 ) { @@ -432,20 +432,20 @@ static int read_byte( connection_t *src ) { return ENV_UNIVERSAL_AGAIN; } - + return ENV_UNIVERSAL_ERROR; } - + if( res == 0 ) { return ENV_UNIVERSAL_EOF; } - + src->buffer_consumed = 0; src->buffer_used = res; } - + return src->buffer[src->buffer_consumed++]; } @@ -455,10 +455,10 @@ void read_message( connection_t *src ) { while( 1 ) { - + int ib = read_byte( src ); char b; - + switch( ib ) { case ENV_UNIVERSAL_AGAIN: @@ -483,43 +483,43 @@ void read_message( connection_t *src ) { char c = 0; b_append( &src->input, &c, 1 ); - debug( 1, - L"Universal variable connection closed while reading command. Partial command recieved: '%s'", + debug( 1, + L"Universal variable connection closed while reading command. Partial command recieved: '%s'", (wchar_t *)src->input.buff ); } return; } } - + b = (char)ib; - + if( b == '\n' ) { wchar_t *msg; - + b = 0; b_append( &src->input, &b, 1 ); - + msg = utf2wcs( src->input.buff ); - + /* Before calling parse_message, we must empty reset everything, since the callback function could potentially call read_message. */ src->input.used=0; - + if( msg ) { - parse_message( msg, src ); + parse_message( msg, src ); } else { debug( 0, _(L"Could not convert message '%s' to wide character string"), src->input.buff ); } - + free( msg ); - + } else { @@ -534,7 +534,7 @@ void read_message( connection_t *src ) void env_universal_common_remove( const wchar_t *name ) { void *k, *v; - hash_remove( &env_universal_var, + hash_remove( &env_universal_var, name, &k, &v ); @@ -553,7 +553,7 @@ static int match( const wchar_t *msg, const wchar_t *cmd ) if( msg[len] && msg[len]!= L' ' && msg[len] != L'\t' ) return 0; - + return 1; } @@ -564,20 +564,20 @@ void env_universal_common_set( const wchar_t *key, const wchar_t *val, int expor CHECK( key, ); CHECK( val, ); - - entry = malloc( sizeof(var_uni_entry_t) + sizeof(wchar_t)*(wcslen(val)+1) ); + + entry = malloc( sizeof(var_uni_entry_t) + sizeof(wchar_t)*(wcslen(val)+1) ); name = wcsdup(key); - + if( !entry || !name ) DIE_MEM(); - + entry->export=export; - + wcscpy( entry->val, val ); env_universal_common_remove( name ); - + hash_put( &env_universal_var, name, entry ); - + if( callback ) { callback( export?SET_EXPORT:SET, name, val ); @@ -588,67 +588,67 @@ void env_universal_common_set( const wchar_t *key, const wchar_t *val, int expor /** Parse message msg */ -static void parse_message( wchar_t *msg, +static void parse_message( wchar_t *msg, connection_t *src ) { // debug( 3, L"parse_message( %ls );", msg ); - + if( msg[0] == L'#' ) return; - + if( match( msg, SET_STR ) || match( msg, SET_EXPORT_STR )) { wchar_t *name, *tmp; int export = match( msg, SET_EXPORT_STR ); - + name = msg+(export?wcslen(SET_EXPORT_STR):wcslen(SET_STR)); while( wcschr( L"\t ", *name ) ) name++; - + tmp = wcschr( name, L':' ); if( tmp ) { wchar_t *key; wchar_t *val; - + key = malloc( sizeof( wchar_t)*(tmp-name+1)); memcpy( key, name, sizeof( wchar_t)*(tmp-name)); key[tmp-name]=0; - + val = tmp+1; val = unescape( val, 0 ); - + env_universal_common_set( key, val, export ); - + free( val ); free( key ); } else { debug( 1, PARSE_ERR, msg ); - } + } } else if( match( msg, ERASE_STR ) ) { wchar_t *name, *tmp; - + name = msg+wcslen(ERASE_STR); while( wcschr( L"\t ", *name ) ) name++; - + tmp = name; while( iswalnum( *tmp ) || *tmp == L'_') tmp++; - + *tmp = 0; - + if( !wcslen( name ) ) { debug( 1, PARSE_ERR, msg ); } env_universal_common_remove( name ); - + if( callback ) { callback( ERASE, name, 0 ); @@ -671,7 +671,7 @@ static void parse_message( wchar_t *msg, else { debug( 1, PARSE_ERR, msg ); - } + } } /** @@ -684,7 +684,7 @@ static int try_send( message_t *msg, { debug( 3, - L"before write of %d chars to fd %d", strlen(msg->body), fd ); + L"before write of %d chars to fd %d", strlen(msg->body), fd ); int res = write( fd, msg->body, strlen(msg->body) ); @@ -696,26 +696,26 @@ static int try_send( message_t *msg, { debug( 4, L"Failed to write message '%s'", msg->body ); } - + if( res == -1 ) { switch( errno ) { case EAGAIN: return 0; - + default: debug( 2, L"Error while sending universal variable message to fd %d. Closing connection", fd ); if( debug_level > 2 ) wperror( L"write" ); - + return -1; - } + } } msg->count--; - + if( !msg->count ) { free( msg ); @@ -726,7 +726,7 @@ static int try_send( message_t *msg, void try_send_all( connection_t *c ) { /* debug( 3, - L"Send all updates to connection on fd %d", + L"Send all updates to connection on fd %d", c->fd );*/ while( !q_empty( &c->unsent) ) { @@ -735,12 +735,12 @@ void try_send_all( connection_t *c ) case 1: q_get( &c->unsent); break; - + case 0: debug( 4, - L"Socket full, send rest later" ); + L"Socket full, send rest later" ); return; - + case -1: c->killme = 1; return; @@ -779,16 +779,16 @@ static wchar_t *full_escape( const wchar_t *in ) message_t *create_message( int type, - const wchar_t *key_in, + const wchar_t *key_in, const wchar_t *val_in ) { message_t *msg=0; - + char *key=0; size_t sz; // debug( 4, L"Crete message of type %d", type ); - + if( key_in ) { if( wcsvarname( key_in ) ) @@ -796,7 +796,7 @@ message_t *create_message( int type, debug( 0, L"Illegal variable name: '%ls'", key_in ); return 0; } - + key = wcs2utf(key_in); if( !key ) { @@ -806,8 +806,8 @@ message_t *create_message( int type, return 0; } } - - + + switch( type ) { case SET: @@ -817,29 +817,29 @@ message_t *create_message( int type, { val_in=L""; } - + wchar_t *esc = full_escape( val_in ); if( !esc ) break; - + char *val = wcs2utf(esc ); free(esc); - + sz = strlen(type==SET?SET_MBS:SET_EXPORT_MBS) + strlen(key) + strlen(val) + 4; msg = malloc( sizeof( message_t ) + sz ); - + if( !msg ) DIE_MEM(); - + strcpy( msg->body, (type==SET?SET_MBS:SET_EXPORT_MBS) ); strcat( msg->body, " " ); strcat( msg->body, key ); strcat( msg->body, ":" ); strcat( msg->body, val ); strcat( msg->body, "\n" ); - + free( val ); - + break; } @@ -850,7 +850,7 @@ message_t *create_message( int type, if( !msg ) DIE_MEM(); - + strcpy( msg->body, ERASE_MBS " " ); strcat( msg->body, key ); strcat( msg->body, "\n" ); @@ -859,14 +859,14 @@ message_t *create_message( int type, case BARRIER: { - msg = malloc( sizeof( message_t ) + + msg = malloc( sizeof( message_t ) + strlen( BARRIER_MBS ) +2); if( !msg ) DIE_MEM(); strcpy( msg->body, BARRIER_MBS "\n" ); break; } - + case BARRIER_REPLY: { msg = malloc( sizeof( message_t ) + @@ -876,7 +876,7 @@ message_t *create_message( int type, strcpy( msg->body, BARRIER_REPLY_MBS "\n" ); break; } - + default: { debug( 0, L"create_message: Unknown message type" ); @@ -890,19 +890,19 @@ message_t *create_message( int type, // debug( 4, L"Message body is '%s'", msg->body ); - return msg; + return msg; } /** Function used with hash_foreach to insert keys of one table into another */ -static void add_key_to_hash( void *key, +static void add_key_to_hash( void *key, void *data, void *aux ) { var_uni_entry_t *e = (var_uni_entry_t *)data; - if( ( e->export && get_names_show_exported) || + if( ( e->export && get_names_show_exported) || ( !e->export && get_names_show_unexported) ) al_push( (array_list_t *)aux, key ); } @@ -913,18 +913,18 @@ void env_universal_common_get_names( array_list_t *l, { get_names_show_exported = show_exported; get_names_show_unexported = show_unexported; - - hash_foreach2( &env_universal_var, + + hash_foreach2( &env_universal_var, add_key_to_hash, l ); } wchar_t *env_universal_common_get( const wchar_t *name ) { - var_uni_entry_t *e = (var_uni_entry_t *)hash_get( &env_universal_var, name ); + var_uni_entry_t *e = (var_uni_entry_t *)hash_get( &env_universal_var, name ); if( e ) return e->val; - return 0; + return 0; } int env_universal_common_get_export( const wchar_t *name ) @@ -952,17 +952,17 @@ static void enqueue( void *k, const wchar_t *key = (const wchar_t *)k; const var_uni_entry_t *val = (const var_uni_entry_t *)v; dyn_queue_t *queue = (dyn_queue_t *)q; - + message_t *msg = create_message( val->export?SET_EXPORT:SET, key, val->val ); msg->count=1; - + q_put( queue, msg ); } void enqueue_all( connection_t *c ) { hash_foreach2( &env_universal_var, - &enqueue, + &enqueue, (void *)&c->unsent ); try_send_all( c ); } @@ -974,7 +974,7 @@ void connection_init( connection_t *c, int fd ) c->fd = fd; b_init( &c->input ); q_init( &c->unsent ); - c->buffer_consumed = c->buffer_used = 0; + c->buffer_consumed = c->buffer_used = 0; } void connection_destroy( connection_t *c) diff --git a/env_universal_common.h b/env_universal_common.h index 97edd7119..ed56b4156 100644 --- a/env_universal_common.h +++ b/env_universal_common.h @@ -76,9 +76,9 @@ typedef struct connection newline is encountered, the buffer is parsed and cleared. */ buffer_t input; - + /** - The read buffer. + The read buffer. */ char buffer[ENV_UNIVERSAL_BUFFER_SIZE]; @@ -86,12 +86,12 @@ typedef struct connection Number of bytes that have already been consumed. */ int buffer_consumed; - + /** - Number of bytes that have been read into the buffer. + Number of bytes that have been read into the buffer. */ int buffer_used; - + /** Link to the next connection @@ -103,7 +103,7 @@ typedef struct connection /** A struct representing a message to be sent between client and server */ -typedef struct +typedef struct { /** Number of queues that contain this message. Once this reaches zero, the message should be deleted @@ -163,7 +163,7 @@ void env_universal_common_get_names( array_list_t *l, void env_universal_common_set( const wchar_t *key, const wchar_t *val, int export ); /** - Remove the specified variable. + Remove the specified variable. This function operate agains the local copy of all universal variables, it does not communicate with any other process. diff --git a/etc/config.fish.in b/etc/config.fish.in index 9ccf99b12..e32dc8bcc 100644 --- a/etc/config.fish.in +++ b/etc/config.fish.in @@ -39,7 +39,7 @@ if status --is-login end # -# There are variables that contain colons that are not arrays. This +# There are variables that contain colons that are not arrays. This # reverts them back to regular strings. # diff --git a/event.c b/event.c index 38ef9a730..6a53254f0 100644 --- a/event.c +++ b/event.c @@ -44,11 +44,11 @@ typedef struct /** Whether signals have been skipped */ - int overflow; + int overflow; /** Array of signal events */ - int signal[SIG_UNHANDLED_MAX]; + int signal[SIG_UNHANDLED_MAX]; } signal_list_t; @@ -95,23 +95,23 @@ static int event_match( event_t *class, event_t *instance ) if( class->type == EVENT_ANY ) return 1; - + if( class->type != instance->type ) return 0; - + switch( class->type ) { - + case EVENT_SIGNAL: if( class->param1.signal == EVENT_ANY_SIGNAL ) return 1; return class->param1.signal == instance->param1.signal; - + case EVENT_VARIABLE: return wcscmp( instance->param1.variable, class->param1.variable )==0; - + case EVENT_EXIT: if( class->param1.pid == EVENT_ANY_PID ) return 1; @@ -125,11 +125,11 @@ static int event_match( event_t *class, event_t *instance ) class->param1.param )==0; } - + /** This should never be reached */ - return 0; + return 0; } @@ -140,10 +140,10 @@ static int event_match( event_t *class, event_t *instance ) static event_t *event_copy( event_t *event, int copy_arguments ) { event_t *e = malloc( sizeof( event_t ) ); - + if( !e ) DIE_MEM(); - + memcpy( e, event, sizeof(event_t)); if( e->function_name ) @@ -153,7 +153,7 @@ static event_t *event_copy( event_t *event, int copy_arguments ) e->param1.variable = wcsdup( e->param1.variable ); else if( e->type == EVENT_GENERIC ) e->param1.param = wcsdup( e->param1.param ); - + al_init( &e->arguments ); if( copy_arguments ) { @@ -162,9 +162,9 @@ static event_t *event_copy( event_t *event, int copy_arguments ) { al_push( &e->arguments, wcsdup( (wchar_t *)al_get( &event->arguments, i ) ) ); } - + } - + return e; } @@ -175,7 +175,7 @@ static int event_is_blocked( event_t *e ) { block_t *block; event_block_t *eb; - + for( block = current_block; block; block = block->outer ) { for( eb = block->first_event_block; eb; eb=eb->next ) @@ -193,9 +193,9 @@ static int event_is_blocked( event_t *e ) if( eb->type & (1<type) ) return 1; return 1; - + } - + return 0; } @@ -217,18 +217,18 @@ const wchar_t *event_get_desc( event_t *e ) { sb_clear( get_desc_buff ); } - + switch( e->type ) { - + case EVENT_SIGNAL: sb_printf( get_desc_buff, _(L"signal handler for %ls (%ls)"), sig2wcs(e->param1.signal ), signal_get_desc( e->param1.signal ) ); break; - + case EVENT_VARIABLE: sb_printf( get_desc_buff, _(L"handler for variable '%ls'"), e->param1.variable ); break; - + case EVENT_EXIT: if( e->param1.pid > 0 ) { @@ -242,9 +242,9 @@ const wchar_t *event_get_desc( event_t *e ) else sb_printf( get_desc_buff, _(L"exit handler for job with process group %d"), -e->param1.pid ); } - + break; - + case EVENT_JOB_ID: { job_t *j = job_get( e->param1.job_id ); @@ -255,17 +255,17 @@ const wchar_t *event_get_desc( event_t *e ) break; } - + case EVENT_GENERIC: sb_printf( get_desc_buff, _(L"handler for generic event '%ls'"), e->param1.param ); break; - + default: sb_printf( get_desc_buff, _(L"Unknown event type") ); break; - + } - + return (const wchar_t *)get_desc_buff->buff; } @@ -275,7 +275,7 @@ void event_add_handler( event_t *event ) event_t *e; CHECK( event, ); - + e = event_copy( event, 0 ); if( !events ) @@ -285,8 +285,8 @@ void event_add_handler( event_t *event ) { signal_handle( e->param1.signal, 1 ); } - - al_push( events, e ); + + al_push( events, e ); } void event_remove( event_t *criterion ) @@ -294,7 +294,7 @@ void event_remove( event_t *criterion ) int i; array_list_t *new_list=0; event_t e; - + CHECK( criterion, ); /* @@ -305,19 +305,19 @@ void event_remove( event_t *criterion ) that shouldn't be killed to new_list, and then drops the empty events-list. */ - + if( !events ) return; for( i=0; iparam1.signal; e.function_name = 0; - + if( event_get( &e, 0 ) == 1 ) { signal_handle( e.param1.signal, 0 ); - } + } } } else @@ -344,7 +344,7 @@ void event_remove( event_t *criterion ) } } al_destroy( events ); - free( events ); + free( events ); events = new_list; } @@ -352,21 +352,21 @@ int event_get( event_t *criterion, array_list_t *out ) { int i; int found = 0; - + if( !events ) - return 0; + return 0; CHECK( criterion, 0 ); - + for( i=0; ifunction_name ); - + for( j=0; jarguments); j++ ) { - wchar_t *arg_esc = escape( (wchar_t *)al_get( &event->arguments, j), 1 ); + wchar_t *arg_esc = escape( (wchar_t *)al_get( &event->arguments, j), 1 ); sb_append( b, L" " ); sb_append( b, arg_esc ); - free( arg_esc ); + free( arg_esc ); } // debug( 1, L"Event handler fires command '%ls'", (wchar_t *)b->buff ); - + /* Event handlers are not part of the main flow of code, so they are marked as non-interactive @@ -500,27 +500,27 @@ static void event_fire_internal( event_t *event ) current_block->param1.event = event; eval( (wchar_t *)b->buff, 0, TOP ); parser_pop_block(); - proc_pop_interactive(); + proc_pop_interactive(); proc_set_last_status( prev_status ); } if( b ) { sb_destroy( b ); - free( b ); + free( b ); } - + if( fire ) { al_destroy( fire ); free( fire ); } - + /* Free killed events */ - event_free_kills(); - + event_free_kills(); + } /** @@ -532,7 +532,7 @@ static void event_fire_delayed() int i; /* - If is_event is one, we are running the event-handler non-recursively. + If is_event is one, we are running the event-handler non-recursively. When the event handler has called a piece of code that triggers another event, we do not want to fire delayed events because of @@ -541,7 +541,7 @@ static void event_fire_delayed() if( blocked && is_event==1) { array_list_t *new_blocked = 0; - + for( i=0; i 0 ) { signal_list_t *lst; event_t e; - al_init( &e.arguments ); + al_init( &e.arguments ); /* Switch signal lists @@ -576,47 +576,47 @@ static void event_fire_delayed() active_list=1-active_list; /* - Set up + Set up */ e.type=EVENT_SIGNAL; e.function_name=0; - + lst = &sig_list[1-active_list]; - + if( lst->overflow ) { debug( 0, _( L"Signal list overflow. Signals have been ignored." ) ); } - + /* Send all signals in our private list */ for( i=0; icount; i++ ) { e.param1.signal = lst->signal[i]; - al_set( &e.arguments, 0, sig2wcs( e.param1.signal ) ); + al_set( &e.arguments, 0, sig2wcs( e.param1.signal ) ); if( event_is_blocked( &e ) ) { if( !blocked ) blocked = al_new(); - al_push( blocked, event_copy(&e, 1) ); + al_push( blocked, event_copy(&e, 1) ); } else { event_fire_internal( &e ); } } - + al_destroy( &e.arguments ); - - } + + } } void event_fire( event_t *event ) { is_event++; - + if( event && (event->type == EVENT_SIGNAL) ) { /* @@ -636,14 +636,14 @@ void event_fire( event_t *event ) Fire events triggered by signals */ event_fire_delayed(); - + if( event ) { if( event_is_blocked( event ) ) { if( !blocked ) blocked = al_new(); - + al_push( blocked, event_copy(event, 1) ); } else @@ -651,8 +651,8 @@ void event_fire( event_t *event ) event_fire_internal( event ); } } - - } + + } is_event--; } @@ -668,7 +668,7 @@ void event_destroy() { al_foreach( events, (void (*)(void *))&event_free ); al_destroy( events ); - free( events ); + free( events ); events=0; } @@ -676,9 +676,9 @@ void event_destroy() { al_foreach( killme, (void (*)(void *))&event_free ); al_destroy( killme ); - free( killme ); - killme=0; - } + free( killme ); + killme=0; + } } void event_free( event_t *e ) @@ -711,11 +711,11 @@ void event_fire_generic_internal(const wchar_t *name, ...) wchar_t *arg; CHECK( name, ); - + ev.type = EVENT_GENERIC; ev.param1.param = name; ev.function_name=0; - + al_init( &ev.arguments ); va_start( va, name ); while( (arg=va_arg(va, wchar_t *) )!= 0 ) @@ -723,9 +723,9 @@ void event_fire_generic_internal(const wchar_t *name, ...) al_push( &ev.arguments, arg ); } va_end( va ); - + event_fire( &ev ); } - + diff --git a/event.h b/event.h index 6e3423c65..80a46dc12 100644 --- a/event.h +++ b/event.h @@ -7,7 +7,7 @@ functions produce output or perform memory allocations, since such functions may not be safely called by signal handlers. - + */ #ifndef FISH_EVENT_H #define FISH_EVENT_H @@ -44,7 +44,7 @@ enum - When used as a parameter to event_add, it represents a class of events, and function_name is the name of the function which will be called whenever an event matching the specified class occurs. This is also how events are stored internally. - When used as a parameter to event_get, event_remove and event_fire, it represents a class of events, and if the function_name field is non-zero, only events which call the specified function will be returned. */ -typedef struct +typedef struct { /** Type of event @@ -78,13 +78,13 @@ typedef struct The parameter describing this generic event */ const wchar_t *param; - + } param1; /** The name of the event handler function */ - const wchar_t *function_name; + const wchar_t *function_name; /** The argument list. Only used when sending a new event using @@ -96,28 +96,28 @@ typedef struct event_t; /** - Add an event handler + Add an event handler May not be called by a signal handler, since it may allocate new memory. */ void event_add_handler( event_t *event ); /** - Remove all events matching the specified criterion. + Remove all events matching the specified criterion. May not be called by a signal handler, since it may free allocated memory. */ void event_remove( event_t *event ); /** - Return all events which match the specified event class + Return all events which match the specified event class This function is safe to call from a signal handler _ONLY_ if the out parameter is null. \param criterion Is the class of events to return. If the criterion has a non-null function_name, only events which trigger the specified function will return. \param out the list to add events to. May be 0, in which case no events will be added, but the result count will still be valid - + \return the number of found matches */ int event_get( event_t *criterion, array_list_t *out ); diff --git a/exec.c b/exec.c index 921002eae..13fb81b5f 100644 --- a/exec.c +++ b/exec.c @@ -99,7 +99,7 @@ static int set_child_group( job_t *j, process_t *p, int print_errors ); static void exec_write_and_exit( int fd, char *buff, size_t count, int status ) { - if( write_loop(fd, buff, count) == -1 ) + if( write_loop(fd, buff, count) == -1 ) { debug( 0, WRITE_ERROR); wperror( L"write" ); @@ -118,7 +118,7 @@ void exec_close( int fd ) debug( 0, L"Called close on invalid file descriptor " ); return; } - + while( close(fd) == -1 ) { if( errno != EINTR ) @@ -128,7 +128,7 @@ void exec_close( int fd ) break; } } - + if( open_fds ) { for( i=0; iio_mode == IO_BUFFER ) || + + if( ( io->io_mode == IO_BUFFER ) || ( io->io_mode == IO_PIPE ) ) { if( io->param1.pipe_fd[0] == fd || io->param1.pipe_fd[1] == fd ) return 1; } - + return use_fd_in_pipe( fd, io->next ); } @@ -201,14 +201,14 @@ static int use_fd_in_pipe( int fd, io_data_t *io ) Close all fds in open_fds, except for those that are mentioned in the redirection list io. This should make sure that there are no stray opened file descriptors in the child. - + \param io the list of io redirections for this job. Pipes mentioned here should not be closed. */ static void close_unused_internal_pipes( io_data_t *io ) { int i=0; - + if( open_fds ) { for( ;iio_mode == IO_PIPE ) || ( io->io_mode == IO_BUFFER ) ) { int i; @@ -245,9 +245,9 @@ void free_fd( io_data_t *io, int fd ) { if( errno != EINTR ) { - debug( 1, + debug( 1, FD_ERROR, - fd ); + fd ); wperror( L"dup" ); FATAL_EXIT(); } @@ -292,11 +292,11 @@ static int handle_child_io( io_data_t *io ) if( io->fd > 2 ) { /* - Make sure the fd used by this redirection is not used by e.g. a pipe. + Make sure the fd used by this redirection is not used by e.g. a pipe. */ free_fd( io, io->fd ); } - + switch( io->io_mode ) { case IO_CLOSE: @@ -317,19 +317,19 @@ static int handle_child_io( io_data_t *io ) if( ( io->param2.flags & O_EXCL ) && ( errno ==EEXIST ) ) { - debug( 1, + debug( 1, NOCLOB_ERROR, io->param1.filename ); } else { - debug( 1, + debug( 1, FILE_ERROR, io->param1.filename ); - + wperror( L"open" ); } - + return -1; } else if( tmp != io->fd) @@ -339,20 +339,20 @@ static int handle_child_io( io_data_t *io ) this is just a precausion. */ close(io->fd); - + if(dup2( tmp, io->fd ) == -1 ) { - debug( 1, + debug( 1, FD_ERROR, io->fd ); wperror( L"dup2" ); return -1; } exec_close( tmp ); - } + } break; } - + case IO_FD: { /* @@ -363,7 +363,7 @@ static int handle_child_io( io_data_t *io ) if( dup2( io->param1.old_fd, io->fd ) == -1 ) { - debug( 1, + debug( 1, FD_ERROR, io->fd ); wperror( L"dup2" ); @@ -371,17 +371,17 @@ static int handle_child_io( io_data_t *io ) } break; } - + case IO_BUFFER: case IO_PIPE: { int write_pipe; - + write_pipe = !io->is_input; /* debug( 0, - L"%ls %ls on fd %d (%d %d)", - write_pipe?L"write":L"read", + L"%ls %ls on fd %d (%d %d)", + write_pipe?L"write":L"read", (io->io_mode == IO_BUFFER)?L"buffer":L"pipe", io->fd, io->param1.pipe_fd[0], @@ -394,7 +394,7 @@ static int handle_child_io( io_data_t *io ) return -1; } - if( write_pipe ) + if( write_pipe ) { exec_close( io->param1.pipe_fd[0]); exec_close( io->param1.pipe_fd[1]); @@ -405,12 +405,12 @@ static int handle_child_io( io_data_t *io ) } break; } - + } } return 0; - + } /** @@ -432,13 +432,13 @@ static int handle_child_io( io_data_t *io ) static int setup_child_process( job_t *j, process_t *p ) { int res=0; - + if( p ) { res = set_child_group( j, p, 1 ); } - - if( !res ) + + if( !res ) { res = handle_child_io( j->io ); if( p != 0 && res ) @@ -446,18 +446,18 @@ static int setup_child_process( job_t *j, process_t *p ) exit( 1 ); } } - + /* Set the handling for job control signals back to the default. */ if( !res ) { signal_reset_handlers(); } - + /* Remove all signal blocks */ - signal_unblock(); - + signal_unblock(); + return res; - + } /** @@ -484,9 +484,9 @@ static wchar_t *get_interpreter( wchar_t *file ) sb_append_char( &sb, (wchar_t)ch ); } } - + res = (wchar_t *)sb.buff; - + if( !wcsncmp( L"#! /", res, 4 ) ) return res+3; if( !wcsncmp( L"#!/", res, 3 ) ) @@ -494,7 +494,7 @@ static wchar_t *get_interpreter( wchar_t *file ) return 0; } - + /** This function is executed by the child process created by a call to fork(). It should be called after \c setup_child_process. It calls @@ -505,19 +505,19 @@ static void launch_process( process_t *p ) { FILE* f; int err; - + // debug( 1, L"exec '%ls'", p->argv[0] ); char **argv = wcsv2strv( (const wchar_t **) p->argv); char **envv = env_export_arr( 0 ); - - execve ( wcs2str(p->actual_cmd), + + execve ( wcs2str(p->actual_cmd), argv, envv ); - + err = errno; - - /* + + /* Something went wrong with execve, check for a ":", and run /bin/sh if encountered. This is a weird predecessor to the shebang that is still sometimes used since it is supported on Windows. @@ -527,49 +527,49 @@ static void launch_process( process_t *p ) { char begin[1] = {0}; size_t read; - + read = fread(begin, 1, 1, f); fclose( f ); - + if( (read==1) && (begin[0] == ':') ) { int count = 0; int i = 1; wchar_t **res; char **res_real; - + while( p->argv[count] != 0 ) count++; - + res = malloc( sizeof(wchar_t*)*(count+2)); - + res[0] = L"/bin/sh"; res[1] = p->actual_cmd; - + for( i=1; p->argv[i]; i++ ){ res[i+1] = p->argv[i]; } - + res[i+1] = 0; p->argv = res; p->actual_cmd = L"/bin/sh"; res_real = wcsv2strv( (const wchar_t **) res); - - execve ( wcs2str(p->actual_cmd), + + execve ( wcs2str(p->actual_cmd), res_real, envv ); } } - + errno = err; - debug( 0, + debug( 0, _( L"Failed to execute process '%ls'. Reason:" ), p->actual_cmd ); - + switch( errno ) { - + case E2BIG: { size_t sz = 0; @@ -577,31 +577,31 @@ static void launch_process( process_t *p ) string_buffer_t sz1; string_buffer_t sz2; - + long arg_max = -1; - + sb_init( &sz1 ); sb_init( &sz2 ); - + for(p=argv; *p; p++) { sz += strlen(*p)+1; } - + for(p=envv; *p; p++) { sz += strlen(*p)+1; } - + sb_format_size( &sz1, sz ); arg_max = sysconf( _SC_ARG_MAX ); - + if( arg_max > 0 ) { - + sb_format_size( &sz2, arg_max ); - + debug( 0, L"The total size of the argument and environment lists (%ls) exceeds the operating system limit of %ls.", (wchar_t *)sz1.buff, @@ -613,21 +613,21 @@ static void launch_process( process_t *p ) L"The total size of the argument and environment lists (%ls) exceeds the operating system limit.", (wchar_t *)sz1.buff); } - - debug( 0, + + debug( 0, L"Try running the command again with fewer arguments."); sb_destroy( &sz1 ); sb_destroy( &sz2 ); - + exit(STATUS_EXEC_FAIL); - + break; } case ENOEXEC: { wperror(L"exec"); - + debug(0, L"The file '%ls' is marked as an executable but could not be run by the operating system.", p->actual_cmd); exit(STATUS_EXEC_FAIL); } @@ -635,7 +635,7 @@ static void launch_process( process_t *p ) case ENOENT: { wchar_t *interpreter = get_interpreter( p->actual_cmd ); - + if( interpreter && waccess( interpreter, X_OK ) ) { debug(0, L"The file '%ls' specified the interpreter '%ls', which is not an executable command.", p->actual_cmd, interpreter ); @@ -644,7 +644,7 @@ static void launch_process( process_t *p ) { debug(0, L"The file '%ls' or a script or ELF interpreter does not exist, or a shared library needed for file or interpreter cannot be found.", p->actual_cmd); } - + exit(STATUS_EXEC_FAIL); } @@ -657,12 +657,12 @@ static void launch_process( process_t *p ) default: { wperror(L"exec"); - + // debug(0, L"The file '%ls' is marked as an executable but could not be run by the operating system.", p->actual_cmd); exit(STATUS_EXEC_FAIL); } } - + } @@ -691,7 +691,7 @@ static void io_untransmogrify( io_data_t * in, io_data_t *out ) case IO_FILE: exec_close( out->param1.old_fd ); break; - } + } free(out); } @@ -711,16 +711,16 @@ static io_data_t *io_transmogrify( io_data_t * in ) if( !in ) return 0; - + out = malloc( sizeof( io_data_t ) ); if( !out ) DIE_MEM(); - + out->fd = in->fd; out->io_mode = IO_FD; out->param2.close_old = 1; out->next=0; - + switch( in->io_mode ) { /* @@ -741,23 +741,23 @@ static io_data_t *io_transmogrify( io_data_t * in ) case IO_FILE: { int fd; - + if( (fd=wopen( in->param1.filename, in->param2.flags, OPEN_MASK ) )==-1 ) { - debug( 1, + debug( 1, FILE_ERROR, in->param1.filename ); - + wperror( L"open" ); free( out ); return 0; - } + } out->param1.old_fd = fd; break; } } - + if( in->next) { out->next = io_transmogrify( in->next ); @@ -767,7 +767,7 @@ static io_data_t *io_transmogrify( io_data_t * in ) return 0; } } - + return out; } @@ -780,14 +780,14 @@ static io_data_t *io_transmogrify( io_data_t * in ) \param io the io redirections to be performed on this block */ -static void internal_exec_helper( const wchar_t *def, +static void internal_exec_helper( const wchar_t *def, int block_type, io_data_t *io ) { io_data_t *io_internal = io_transmogrify( io ); int is_block_old=is_block; is_block=1; - + /* Did the transmogrification fail - if so, set error status and return */ @@ -796,13 +796,13 @@ static void internal_exec_helper( const wchar_t *def, proc_set_last_status( STATUS_EXEC_FAIL ); return; } - + signal_unblock(); - - eval( def, io_internal, block_type ); - + + eval( def, io_internal, block_type ); + signal_block(); - + io_untransmogrify( io, io_internal ); job_reap( 0 ); is_block=is_block_old; @@ -818,24 +818,24 @@ static void internal_exec_helper( const wchar_t *def, exit. The parent process may safely ignore the exit status of this call. - Returns 0 on sucess, -1 on failiure. + Returns 0 on sucess, -1 on failiure. */ static int set_child_group( job_t *j, process_t *p, int print_errors ) { int res = 0; - + if( job_get_flag( j, JOB_CONTROL ) ) { if (!j->pgid) { j->pgid = p->pid; } - + if( setpgid (p->pid, j->pgid) ) { if( getpgid( p->pid) != j->pgid && print_errors ) { - debug( 1, + debug( 1, _( L"Could not send process %d, '%ls' in job %d, '%ls' from group %d to group %d" ), p->pid, p->argv[0], @@ -858,8 +858,8 @@ static int set_child_group( job_t *j, process_t *p, int print_errors ) { if( tcsetpgrp (0, j->pgid) && print_errors ) { - debug( 1, _( L"Could not send job %d ('%ls') to foreground" ), - j->job_id, + debug( 1, _( L"Could not send job %d ('%ls') to foreground" ), + j->job_id, j->command ); wperror( L"tcsetpgrp" ); res = -1; @@ -880,7 +880,7 @@ static pid_t exec_fork() pid_t pid; struct timespec pollint; int i; - + for( i=0; icommand, j->job_id ); - + + debug( 4, L"Exec job '%ls' with id %d", j->command, j->job_id ); + if( block_io ) { if( j->io ) @@ -985,16 +985,16 @@ void exec( job_t *j ) } else { - j->io=io_duplicate( j, block_io); + j->io=io_duplicate( j, block_io); } } - + io_data_t *input_redirect; for( input_redirect = j->io; input_redirect; input_redirect = input_redirect->next ) { - if( (input_redirect->io_mode == IO_BUFFER) && + if( (input_redirect->io_mode == IO_BUFFER) && input_redirect->is_input ) { /* @@ -1010,7 +1010,7 @@ void exec( job_t *j ) break; } } - + if( j->first_process->type==INTERNAL_EXEC ) { /* @@ -1036,7 +1036,7 @@ void exec( job_t *j ) return; } - } + } pipe_read.fd=0; pipe_write.fd=1; @@ -1050,9 +1050,9 @@ void exec( job_t *j ) pipe_read.next=0; pipe_write.next=0; pipe_write.param1.pipe_fd[0]=pipe_write.param1.pipe_fd[1]=-1; - + j->io = io_add( j->io, &pipe_write ); - + signal_block(); /* @@ -1064,7 +1064,7 @@ void exec( job_t *j ) continuing in the pipeline, causing the group leader to exit. */ - + if( job_get_flag( j, JOB_CONTROL ) ) { for( p=j->first_process; p; p = p->next ) @@ -1081,12 +1081,12 @@ void exec( job_t *j ) needs_keepalive = 1; break; } - + } - + } } - + if( needs_keepalive ) { keepalive.pid = exec_fork(); @@ -1095,15 +1095,15 @@ void exec( job_t *j ) { keepalive.pid = getpid(); set_child_group( j, &keepalive, 1 ); - pause(); + pause(); exit(0); } else { - set_child_group( j, &keepalive, 0 ); + set_child_group( j, &keepalive, 0 ); } } - + /* This loop loops over every process_t in the job, starting it as appropriate. This turns out to be rather complex, since a @@ -1116,13 +1116,13 @@ void exec( job_t *j ) { mypipe[1]=-1; skip_fork=0; - + pipe_write.fd = p->pipe_write_fd; pipe_read.fd = p->pipe_read_fd; // debug( 0, L"Pipe created from fd %d to fd %d", pipe_write.fd, pipe_read.fd ); - - /* + + /* This call is used so the global environment variable array is regenerated, if needed, before the fork. That way, we avoid a lot of duplicate work where EVERY child would need @@ -1133,21 +1133,21 @@ void exec( job_t *j ) */ if( p->type == EXTERNAL ) env_export_arr( 1 ); - - + + /* - Set up fd:s that will be used in the pipe + Set up fd:s that will be used in the pipe */ - + if( p == j->first_process->next ) { j->io = io_add( j->io, &pipe_read ); } - + if( p->next ) { // debug( 1, L"%ls|%ls" , p->argv[0], p->next->argv[0]); - + if( exec_pipe( mypipe ) == -1 ) { debug( 1, PIPE_ERROR ); @@ -1165,7 +1165,7 @@ void exec( job_t *j ) Remove the io redirection for pipe output. */ j->io = io_remove( j->io, &pipe_write ); - + } switch( p->type ) @@ -1176,7 +1176,7 @@ void exec( job_t *j ) wchar_t * def=0; array_list_t *named_arguments; int shadows; - + /* Calls to function_get_definition might need to @@ -1190,7 +1190,7 @@ void exec( job_t *j ) shadows = function_get_shadows( p->argv[0] ); signal_block(); - + if( orig_def ) { def = halloc_register( j, wcsdup(orig_def) ); @@ -1202,10 +1202,10 @@ void exec( job_t *j ) } parser_push_block( shadows?FUNCTION_CALL:FUNCTION_CALL_NO_SHADOW ); - + current_block->param2.function_call_process = p; current_block->param1.function_call_name = halloc_register( current_block, wcsdup( p->argv[0] ) ); - + /* set_argv might trigger an event @@ -1215,34 +1215,34 @@ void exec( job_t *j ) signal_unblock(); parse_util_set_argv( p->argv+1, named_arguments ); signal_block(); - + parser_forbid_function( p->argv[0] ); if( p->next ) { - io_buffer = io_buffer_create( 0 ); + io_buffer = io_buffer_create( 0 ); j->io = io_add( j->io, io_buffer ); } - + internal_exec_helper( def, TOP, j->io ); - + parser_allow_function(); parser_pop_block(); - - break; + + break; } - + case INTERNAL_BLOCK: { if( p->next ) { - io_buffer = io_buffer_create( 0 ); + io_buffer = io_buffer_create( 0 ); j->io = io_add( j->io, io_buffer ); } - - internal_exec_helper( p->argv[0], TOP, j->io ); + + internal_exec_helper( p->argv[0], TOP, j->io ); break; - + } case INTERNAL_BUILTIN: @@ -1259,12 +1259,12 @@ void exec( job_t *j ) if( p == j->first_process ) { io_data_t *in = io_get( j->io, 0 ); - + if( in ) { switch( in->io_mode ) { - + case IO_FD: { builtin_stdin = in->param1.old_fd; @@ -1275,14 +1275,14 @@ void exec( job_t *j ) builtin_stdin = in->param1.pipe_fd[0]; break; } - + case IO_FILE: { builtin_stdin=wopen( in->param1.filename, in->param2.flags, OPEN_MASK ); if( builtin_stdin == -1 ) { - debug( 1, + debug( 1, FILE_ERROR, in->param1.filename ); wperror( L"open" ); @@ -1291,10 +1291,10 @@ void exec( job_t *j ) { close_stdin = 1; } - + break; } - + case IO_CLOSE: { /* @@ -1317,19 +1317,19 @@ void exec( job_t *j ) handled? */ builtin_stdin = -1; - + break; } - + default: { builtin_stdin=-1; - debug( 1, + debug( 1, _( L"Unknown input redirection type %d" ), in->io_mode); break; } - + } } } @@ -1348,7 +1348,7 @@ void exec( job_t *j ) int old_out = builtin_out_redirect; int old_err = builtin_err_redirect; - /* + /* Since this may be the foreground job, and since a builtin may execute another foreground job, we need to pretend to suspend this job while @@ -1362,24 +1362,24 @@ void exec( job_t *j ) walking the job list, but it seems more robust to make exec handle things. */ - + builtin_push_io( builtin_stdin ); - + builtin_out_redirect = has_fd( j->io, 1 ); - builtin_err_redirect = has_fd( j->io, 2 ); + builtin_err_redirect = has_fd( j->io, 2 ); fg = job_get_flag( j, JOB_FOREGROUND ); job_set_flag( j, JOB_FOREGROUND, 0 ); - + signal_unblock(); - + p->status = builtin_run( p->argv, j->io ); - + builtin_out_redirect=old_out; builtin_err_redirect=old_err; - + signal_block(); - + /* Restore the fg flag, which is temporarily set to false during builtin execution so as not to confuse @@ -1387,7 +1387,7 @@ void exec( job_t *j ) */ job_set_flag( j, JOB_FOREGROUND, fg ); } - + /* If stdin has been redirected, close the redirection stream. @@ -1395,16 +1395,16 @@ void exec( job_t *j ) if( close_stdin ) { exec_close( builtin_stdin ); - } - break; + } + break; } } - + if( exec_error ) { break; } - + switch( p->type ) { @@ -1412,7 +1412,7 @@ void exec( job_t *j ) case INTERNAL_FUNCTION: { int status = proc_get_last_status(); - + /* Handle output from a block or function. This usually means do nothing, but in the case of pipes, we have @@ -1434,39 +1434,39 @@ void exec( job_t *j ) } j->io = io_remove( j->io, io_buffer ); - + io_buffer_read( io_buffer ); - + if( io_buffer->param2.out_buffer->used != 0 ) { pid = exec_fork(); if( pid == 0 ) { - + /* This is the child process. Write out the contents of the pipeline. */ p->pid = getpid(); setup_child_process( j, p ); - exec_write_and_exit(io_buffer->fd, + exec_write_and_exit(io_buffer->fd, io_buffer->param2.out_buffer->buff, io_buffer->param2.out_buffer->used, status); } else { - /* + /* This is the parent process. Store away information on the child, and possibly give it control over the terminal. */ - p->pid = pid; + p->pid = pid; set_child_group( j, p, 0 ); - - } - + + } + } else { @@ -1476,20 +1476,20 @@ void exec( job_t *j ) } p->completed = 1; } - + io_buffer_destroy( io_buffer ); - + io_buffer=0; break; - + } case INTERNAL_BUFFER: { - + pid = exec_fork(); - + if( pid == 0 ) { /* @@ -1498,30 +1498,30 @@ void exec( job_t *j ) */ p->pid = getpid(); setup_child_process( j, p ); - + exec_write_and_exit( 1, - input_redirect->param2.out_buffer->buff, + input_redirect->param2.out_buffer->buff, input_redirect->param2.out_buffer->used, 0); } else { - /* + /* This is the parent process. Store away information on the child, and possibly give it control over the terminal. */ - p->pid = pid; - set_child_group( j, p, 0 ); - } + p->pid = pid; + set_child_group( j, p, 0 ); + } - break; + break; } - + case INTERNAL_BUILTIN: { int skip_fork; - + /* Handle output from builtin commands. In the general case, this means forking of a worker process, that @@ -1539,7 +1539,7 @@ void exec( job_t *j ) ( !sb_out->used ) && ( !sb_err->used ) && ( !p->next ); - + /* If the output of a builtin is to be sent to an internal buffer, there is no need to fork. This helps out the @@ -1548,10 +1548,10 @@ void exec( job_t *j ) io_data_t *io = io_get( j->io, 1 ); int buffer_stdout = io && io->io_mode == IO_BUFFER; - - if( ( !sb_err->used ) && + + if( ( !sb_err->used ) && ( !p->next ) && - ( sb_out->used ) && + ( sb_out->used ) && ( buffer_stdout ) ) { char *res = wcs2str( (wchar_t *)sb_out->buff ); @@ -1567,14 +1567,14 @@ void exec( job_t *j ) skip_fork = 0; } } - + if( skip_fork ) { p->completed=1; if( p->next == 0 ) { debug( 3, L"Set status of %ls to %d using short circut", j->command, p->status ); - + int status = proc_format_status(p->status); proc_set_last_status( job_get_flag( j, JOB_NEGATE )?(!status):status ); } @@ -1584,7 +1584,7 @@ void exec( job_t *j ) /* Ok, unfortunatly, we have to do a real fork. Bummer. */ - + pid = exec_fork(); if( pid == 0 ) { @@ -1597,45 +1597,45 @@ void exec( job_t *j ) p->pid = getpid(); setup_child_process( j, p ); do_builtin_io( sb_out->used ? (wchar_t *)sb_out->buff : 0, sb_err->used ? (wchar_t *)sb_err->buff : 0 ); - + exit( p->status ); - + } else { - /* + /* This is the parent process. Store away information on the child, and possibly give it control over the terminal. */ p->pid = pid; - + set_child_group( j, p, 0 ); - - } - + + } + break; } - + case EXTERNAL: { pid = exec_fork(); if( pid == 0 ) { /* - This is the child process. + This is the child process. */ p->pid = getpid(); setup_child_process( j, p ); launch_process( p ); - + /* launch_process _never_ returns... */ } else { - /* + /* This is the parent process. Store away information on the child, and possibly fice it control over the terminal. @@ -1643,30 +1643,30 @@ void exec( job_t *j ) p->pid = pid; set_child_group( j, p, 0 ); - + } break; } - + } if( p->type == INTERNAL_BUILTIN ) builtin_pop_io(); - - /* + + /* Close the pipe the current process uses to read from the previous process_t */ if( pipe_read.param1.pipe_fd[0] >= 0 ) exec_close( pipe_read.param1.pipe_fd[0] ); - /* + /* Set up the pipe the next process uses to read from the current process_t */ if( p->next ) pipe_read.param1.pipe_fd[0] = mypipe[0]; - - /* + + /* If there is a next process in the pipeline, close the output end of the current pipe (the surrent child subprocess already has a copy of the pipe - this makes sure @@ -1676,7 +1676,7 @@ void exec( job_t *j ) if( p->next ) { exec_close(mypipe[1]); - } + } } /* @@ -1687,8 +1687,8 @@ void exec( job_t *j ) { kill( keepalive.pid, SIGKILL ); } - - signal_unblock(); + + signal_unblock(); debug( 3, L"Job is constructed" ); @@ -1696,7 +1696,7 @@ void exec( job_t *j ) for( tmp = block_io; tmp; tmp=tmp->next ) j->io = io_remove( j->io, tmp ); - + job_set_flag( j, JOB_CONSTRUCTED, 1 ); if( !job_get_flag( j, JOB_FOREGROUND ) ) @@ -1708,10 +1708,10 @@ void exec( job_t *j ) { job_continue (j, 0); } - + } -int exec_subshell( const wchar_t *cmd, +int exec_subshell( const wchar_t *cmd, array_list_t *lst ) { char *begin, *end; @@ -1721,7 +1721,7 @@ int exec_subshell( const wchar_t *cmd, io_data_t *io_buffer; const wchar_t *ifs; char sep=0; - + CHECK( cmd, -1 ); ifs = env_get(L"IFS"); @@ -1737,14 +1737,14 @@ int exec_subshell( const wchar_t *cmd, sep = 0; debug( 0, L"Warning - invalid command substitution separator '%lc'. Please change the firsta character of IFS", ifs[0] ); } - + } - - is_subshell=1; + + is_subshell=1; io_buffer= io_buffer_create( 0 ); - + prev_status = proc_get_last_status(); - + if( eval( cmd, io_buffer, SUBST ) ) { status = -1; @@ -1753,16 +1753,16 @@ int exec_subshell( const wchar_t *cmd, { status = proc_get_last_status(); } - + io_buffer_read( io_buffer ); - + proc_set_last_status( prev_status ); - + is_subshell = prev_subshell; - + b_append( io_buffer->param2.out_buffer, &z, 1 ); - - begin=end=io_buffer->param2.out_buffer->buff; + + begin=end=io_buffer->param2.out_buffer->buff; if( lst ) { @@ -1781,9 +1781,9 @@ int exec_subshell( const wchar_t *cmd, { debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ ); } - } + } io_buffer_destroy( io_buffer ); - + return status; } else if( *end == sep ) @@ -1804,8 +1804,8 @@ int exec_subshell( const wchar_t *cmd, end++; } } - + io_buffer_destroy( io_buffer ); - return status; + return status; } diff --git a/exec.h b/exec.h index 63e0d0a36..ac051da31 100644 --- a/exec.h +++ b/exec.h @@ -19,7 +19,7 @@ #define PIPE_ERROR _(L"An error occurred while setting up pipe") /** - Execute the processes specified by j. + Execute the processes specified by j. I've put a fair bit of work into making builtins behave like other programs as far as pipes are concerned. Unlike i.e. bash, builtins @@ -51,7 +51,7 @@ void exec( job_t *j ); \return the status of the last job to exit, or -1 if en error was encountered. */ -__warn_unused int exec_subshell( const wchar_t *cmd, +__warn_unused int exec_subshell( const wchar_t *cmd, array_list_t *l ); diff --git a/expand.c b/expand.c index f731c772d..e871691bf 100644 --- a/expand.c +++ b/expand.c @@ -1,7 +1,7 @@ /**\file expand.c String expansion functions. These functions perform several kinds of -parameter expansion. +parameter expansion. */ @@ -195,7 +195,7 @@ wchar_t *expand_escape_variable( const wchar_t *in ) case 0: sb_append( &buff, L"''"); break; - + case 1: { wchar_t *el = (wchar_t *)al_get( &l, 0 ); @@ -276,14 +276,14 @@ static int match_pid( const wchar_t *cmd, int *offset) { /* Test for direct match */ - + if( wcsncmp( cmd, proc, wcslen( proc ) ) == 0 ) { if( offset ) *offset = 0; return 1; } - + /* Test if the commandline is a path to the command, if so we try to match against only the command part @@ -313,7 +313,7 @@ static int match_pid( const wchar_t *cmd, { if( offset ) *offset = start+1-first_token; - + free( first_token ); return 1; @@ -373,14 +373,14 @@ static int find_process( const wchar_t *proc, if( wcsncmp( proc, jid, wcslen(proc ) )==0 ) { string_buffer_t desc_buff; - + sb_init( &desc_buff ); - - sb_printf( &desc_buff, + + sb_printf( &desc_buff, COMPLETE_JOB_DESC_VAL, j->command ); - - completion_allocate( out, + + completion_allocate( out, jid+wcslen(proc), (wchar_t *)desc_buff.buff, 0 ); @@ -395,7 +395,7 @@ static int find_process( const wchar_t *proc, int jid; wchar_t *end; - + errno = 0; jid = wcstol( proc, &end, 10 ); if( jid > 0 && !errno && !*end ) @@ -403,7 +403,7 @@ static int find_process( const wchar_t *proc, j = job_get( jid ); if( (j != 0) && (j->command != 0 ) ) { - + { result = malloc(sizeof(wchar_t)*16 ); swprintf( result, 16, L"%d", j->pgid ); @@ -420,15 +420,15 @@ static int find_process( const wchar_t *proc, for( j=first_job; j != 0; j=j->next ) { int offset; - + if( j->command == 0 ) continue; - + if( match_pid( j->command, proc, flags, &offset ) ) { if( flags & ACCEPT_INCOMPLETE ) { - completion_allocate( out, + completion_allocate( out, j->command + offset + wcslen(proc), COMPLETE_JOB_DESC, 0 ); @@ -456,7 +456,7 @@ static int find_process( const wchar_t *proc, for( p=j->first_process; p; p=p->next ) { int offset; - + if( p->actual_cmd == 0 ) continue; @@ -464,7 +464,7 @@ static int find_process( const wchar_t *proc, { if( flags & ACCEPT_INCOMPLETE ) { - completion_allocate( out, + completion_allocate( out, p->actual_cmd + offset + wcslen(proc), COMPLETE_CHILD_PROCESS_DESC, 0 ); @@ -496,7 +496,7 @@ static int find_process( const wchar_t *proc, pdir_name = malloc( sizeof(wchar_t)*256 ); pfile_name = malloc( sizeof(wchar_t)*64 ); wcscpy( pdir_name, L"/proc/" ); - + while( (next=wreaddir(dir))!=0 ) { wchar_t *name = next->d_name; @@ -533,7 +533,7 @@ static int find_process( const wchar_t *proc, signal_block(); fgetws2( &cmd, &sz, cmdfile ); signal_unblock(); - + fclose( cmdfile ); } else @@ -574,12 +574,12 @@ static int find_process( const wchar_t *proc, if( cmd != 0 ) { int offset; - + if( match_pid( cmd, proc, flags, &offset ) ) { if( flags & ACCEPT_INCOMPLETE ) { - completion_allocate( out, + completion_allocate( out, cmd + offset + wcslen(proc), COMPLETE_PROCESS_DESC, 0 ); @@ -615,7 +615,7 @@ static int expand_pid( wchar_t *in, CHECK( in, 0 ); CHECK( out, 0 ); - + if( *in != PROCESS_EXPAND ) { al_push( out, in ); @@ -626,16 +626,16 @@ static int expand_pid( wchar_t *in, { if( wcsncmp( in+1, SELF_STR, wcslen(in+1) )==0 ) { - completion_allocate( out, + completion_allocate( out, SELF_STR+wcslen(in+1), - COMPLETE_SELF_DESC, + COMPLETE_SELF_DESC, 0 ); } else if( wcsncmp( in+1, LAST_STR, wcslen(in+1) )==0 ) { - completion_allocate( out, - LAST_STR+wcslen(in+1), - COMPLETE_LAST_DESC, + completion_allocate( out, + LAST_STR+wcslen(in+1), + COMPLETE_LAST_DESC, 0 ); } } @@ -692,7 +692,7 @@ static int expand_pid( wchar_t *in, void expand_variable_error( const wchar_t *token, int token_pos, int error_pos ) { int stop_pos = token_pos+1; - + switch( token[stop_pos] ) { case BRACKET_BEGIN: @@ -707,13 +707,13 @@ void expand_variable_error( const wchar_t *token, int token_pos, int error_pos ) { post = end+1; *end = 0; - + if( !wcsvarname( name ) ) { is_var = 1; } } - + if( is_var ) { error( SYNTAX_ERROR, @@ -721,7 +721,7 @@ void expand_variable_error( const wchar_t *token, int token_pos, int error_pos ) COMPLETE_VAR_BRACKET_DESC, cpy, name, - post ); + post ); } else { @@ -733,18 +733,18 @@ void expand_variable_error( const wchar_t *token, int token_pos, int error_pos ) L"" ); } free( cpy ); - + break; } - + case INTERNAL_SEPARATOR: { error( SYNTAX_ERROR, error_pos, - COMPLETE_VAR_PARAN_DESC ); + COMPLETE_VAR_PARAN_DESC ); break; } - + case 0: { error( SYNTAX_ERROR, @@ -752,7 +752,7 @@ void expand_variable_error( const wchar_t *token, int token_pos, int error_pos ) COMPLETE_VAR_NULL_DESC ); break; } - + default: { error( SYNTAX_ERROR, @@ -769,28 +769,28 @@ void expand_variable_error( const wchar_t *token, int token_pos, int error_pos ) */ static int parse_slice( wchar_t *in, wchar_t **end_ptr, array_list_t *idx ) { - - + + wchar_t *end; - + int pos = 1; // debug( 0, L"parse_slice on '%ls'", in ); - + while( 1 ) { long tmp; - + while( iswspace(in[pos]) || (in[pos]==INTERNAL_SEPARATOR)) - pos++; - + pos++; + if( in[pos] == L']' ) { pos++; break; } - + errno=0; tmp = wcstol( &in[pos], &end, 10 ); if( ( errno ) || ( end == &in[pos] ) ) @@ -798,19 +798,19 @@ static int parse_slice( wchar_t *in, wchar_t **end_ptr, array_list_t *idx ) return 1; } // debug( 0, L"Push idx %d", tmp ); - + al_push_long( idx, tmp ); pos = end-in; } - + if( end_ptr ) { // debug( 0, L"Remainder is '%ls', slice def was %d characters long", in+pos, pos ); - + *end_ptr = in+pos; } // debug( 0, L"ok, done" ); - + return 0; } @@ -843,7 +843,7 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx ) CHECK( in, 0 ); CHECK( out, 0 ); - + if( !var_tmp ) { var_tmp = sb_halloc( global_context ); @@ -878,7 +878,7 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx ) wchar_t * new_in; int is_single = (c==VARIABLE_EXPAND_SINGLE); int var_name_stop_pos; - + stop_pos = start_pos; while( 1 ) @@ -892,15 +892,15 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx ) stop_pos++; } var_name_stop_pos = stop_pos; - + /* printf( "Stop for '%c'\n", in[stop_pos]);*/ var_len = stop_pos - start_pos; if( var_len == 0 ) { - expand_variable_error( in, stop_pos-1, -1 ); - + expand_variable_error( in, stop_pos-1, -1 ); + is_ok = 0; break; } @@ -919,17 +919,17 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx ) { wchar_t *slice_end; all_vars=0; - + if( parse_slice( &in[stop_pos], &slice_end, var_idx_list ) ) { error( SYNTAX_ERROR, -1, - L"Invalid index value" ); + L"Invalid index value" ); is_ok = 0; - } + } stop_pos = (slice_end-in); - } - + } + if( is_ok ) { tokenize_variable_array( var_val, &var_item_list ); @@ -974,12 +974,12 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx ) if( is_ok ) { - + if( is_single ) { string_buffer_t res; in[i]=0; - + sb_init( &res ); sb_append( &res, in ); sb_append_char( &res, INTERNAL_SEPARATOR ); @@ -987,7 +987,7 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx ) for( j=0; j1 && new_in[start_pos-2]!=VARIABLE_EXPAND) @@ -1032,20 +1032,20 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx ) } else new_in[start_pos-1]=L'\0'; - + wcscat( new_in, next ); wcscat( new_in, &in[stop_pos] ); - + is_ok &= expand_variables( new_in, out, i ); } } free( next ); } - + } } } - + free(in); al_destroy( &var_item_list ); return is_ok; @@ -1116,7 +1116,7 @@ static int expand_brackets( wchar_t *in, int flags, array_list_t *out ) CHECK( in, 0 ); CHECK( out, 0 ); - + for( pos=in; (*pos) && !syntax_error; pos++ ) @@ -1138,7 +1138,7 @@ static int expand_brackets( wchar_t *in, int flags, array_list_t *out ) { bracket_end = pos; } - + if( bracket_count < 0 ) { syntax_error = 1; @@ -1246,12 +1246,12 @@ static int expand_cmdsubst( wchar_t *in, array_list_t *out ) array_list_t *sub_res, *tail_expand; int i, j; const wchar_t *item_begin; - wchar_t *tail_begin = 0; + wchar_t *tail_begin = 0; void *context; CHECK( in, 0 ); CHECK( out, 0 ); - + switch( parse_util_locate_cmdsubst(in, @@ -1281,7 +1281,7 @@ static int expand_cmdsubst( wchar_t *in, array_list_t *out ) sub_res = al_halloc( context ); if( !(subcmd = halloc( context, sizeof(wchar_t)*(paran_end-paran_begin) ))) { - halloc_free( context ); + halloc_free( context ); return 0; } @@ -1300,10 +1300,10 @@ static int expand_cmdsubst( wchar_t *in, array_list_t *out ) { array_list_t *slice_idx = al_halloc( context ); wchar_t *slice_end; - + if( parse_slice( tail_begin, &slice_end, slice_idx ) ) { - halloc_free( context ); + halloc_free( context ); error( SYNTAX_ERROR, -1, L"Invalid index value" ); return 0; } @@ -1318,23 +1318,23 @@ static int expand_cmdsubst( wchar_t *in, array_list_t *out ) { idx = al_get_count( sub_res ) + idx + 1; } - + if( idx < 1 || idx > al_get_count( sub_res ) ) { halloc_free( context ); error( SYNTAX_ERROR, -1, L"Invalid index value" ); return 0; } - + idx = idx-1; - + al_push( sub_res2, al_get( sub_res, idx ) ); // debug( 0, L"Pushing item '%ls' with index %d onto sliced result", al_get( sub_res, idx ), idx ); - + al_set( sub_res, idx, 0 ); } al_foreach( sub_res, &free ); - sub_res = sub_res2; + sub_res = sub_res2; } } @@ -1371,16 +1371,16 @@ static int expand_cmdsubst( wchar_t *in, array_list_t *out ) sb_append_substring( &whole_item, sub_item2, item_len ); sb_append_char( &whole_item, INTERNAL_SEPARATOR ); sb_append( &whole_item, tail_item ); - + al_push( out, whole_item.buff ); } - + free( sub_item2 ); } free(in); al_foreach( tail_expand, &free ); - halloc_free( context ); + halloc_free( context ); return 1; } @@ -1481,7 +1481,7 @@ static wchar_t * expand_tilde_internal( wchar_t *in ) wchar_t *expand_tilde( wchar_t *in) { CHECK( in, 0 ); - + if( in[0] == L'~' ) { in[0] = HOME_DIRECTORY; @@ -1498,7 +1498,7 @@ static void remove_internal_separator( const void *s, int conv ) { wchar_t *in = (wchar_t *)s; wchar_t *out=in; - + CHECK( s, ); while( *in ) @@ -1508,7 +1508,7 @@ static void remove_internal_separator( const void *s, int conv ) case INTERNAL_SEPARATOR: in++; break; - + case ANY_CHAR: in++; *out++ = conv?L'?':ANY_CHAR; @@ -1564,7 +1564,7 @@ int expand_string( void *context, if( EXPAND_SKIP_CMDSUBST & flags ) { wchar_t *begin, *end; - + if( parse_util_locate_cmdsubst( str, &begin, &end, @@ -1611,7 +1611,7 @@ int expand_string( void *context, if( !next ) { debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ ); - continue; + continue; } if( EXPAND_SKIP_VARIABLES & flags ) @@ -1645,8 +1645,8 @@ int expand_string( void *context, if( !next ) { debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ ); - continue; - } + continue; + } if( !expand_brackets( next, flags, out )) { @@ -1667,8 +1667,8 @@ int expand_string( void *context, if( !next ) { debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ ); - continue; - } + continue; + } if( !(next=expand_tilde_internal( next ) ) ) { @@ -1719,11 +1719,11 @@ int expand_string( void *context, if( !next ) { debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ ); - continue; - } + continue; + } remove_internal_separator( next, EXPAND_SKIP_WILDCARDS & flags ); - + if( ((flags & ACCEPT_INCOMPLETE) && (!(flags & EXPAND_SKIP_WILDCARDS))) || wildcard_has( next, 1 ) ) { @@ -1745,14 +1745,14 @@ int expand_string( void *context, { list = end_out; } - + wc_res = wildcard_expand( rest, start, flags, list ); free( next ); if( !(flags & ACCEPT_INCOMPLETE) ) { - + switch( wc_res ) { case 0: @@ -1764,7 +1764,7 @@ int expand_string( void *context, break; } } - + case 1: { int j; @@ -1777,8 +1777,8 @@ int expand_string( void *context, if( !next ) { debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ ); - continue; - } + continue; + } al_push( end_out, next ); } al_truncate( out, 0 ); @@ -1792,10 +1792,10 @@ int expand_string( void *context, al_destroy( out ); return EXPAND_ERROR; } - + } } - + } else { @@ -1822,7 +1822,7 @@ int expand_string( void *context, } } - + return res; } @@ -1835,13 +1835,13 @@ wchar_t *expand_one( void *context, wchar_t *string, int flags ) wchar_t *one; CHECK( string, 0 ); - + if( (!(flags & ACCEPT_INCOMPLETE)) && expand_is_clean( string ) ) { halloc_register( context, string ); return string; } - + al_init( &l ); res = expand_string( 0, string, &l, flags ); if( !res ) diff --git a/expand.h b/expand.h index 767a372ee..3c2cad826 100644 --- a/expand.h +++ b/expand.h @@ -6,7 +6,7 @@ benefit from using a more clever memory allocation scheme, perhaps an evil combination of talloc, string buffers and reference counting. - + */ #ifndef FISH_EXPAND_H @@ -70,7 +70,7 @@ enum /** Character represeting process expansion */ PROCESS_EXPAND, - + /** Character representing variable expansion */ VARIABLE_EXPAND, @@ -86,7 +86,7 @@ enum /** Character representing separation between two bracket elements */ BRACKET_SEP, /** - Separate subtokens in a token with this character. + Separate subtokens in a token with this character. */ INTERNAL_SEPARATOR, @@ -128,7 +128,7 @@ enum (\$VAR_NAME becomes the value of the environment variable VAR_NAME), cmdsubst expansion and wildcard expansion. The results are inserted into the list out. - + If the parameter does not need expansion, it is copied into the list out. If expansion is performed, the original parameter is freed and newly allocated strings are inserted into the list out. @@ -136,7 +136,7 @@ enum If \c context is non-null, all the strings contained in the array_list_t \c out will be registered to be free'd when context is free'd. - + \param context the halloc context to use for automatic deallocation \param in The parameter to expand \param flag Specifies if any expansion pass should be skipped. Legal values are any combination of EXPAND_SKIP_CMDSUBST EXPAND_SKIP_VARIABLES and EXPAND_SKIP_WILDCARDS @@ -152,8 +152,8 @@ __warn_unused int expand_string( void *context, wchar_t *in, array_list_t *out, If \c context is non-null, the returning string ill be registered to be free'd when context is free'd. - - \param context the halloc context to use for automatic deallocation + + \param context the halloc context to use for automatic deallocation \param in The parameter to expand \param flag Specifies if any expansion pass should be skipped. Legal values are any combination of EXPAND_SKIP_CMDSUBST EXPAND_SKIP_VARIABLES and EXPAND_SKIP_WILDCARDS \return The expanded parameter, or 0 on failiure diff --git a/fallback.c b/fallback.c index 004e198fe..452ac6643 100644 --- a/fallback.c +++ b/fallback.c @@ -60,7 +60,7 @@ int tputs(const char *str, int affcnt, int (*fish_putc)(tputs_arg_t)) while( *str ) { fish_putc( *str++ ); - } + } } #endif @@ -81,26 +81,26 @@ char *tparm_solaris_kludge( char *str, ... ) if( ( set_a_foreground && ! strcmp( str, set_a_foreground ) ) || ( set_a_background && ! strcmp( str, set_a_background ) ) - || ( set_foreground && ! strcmp( str, set_foreground ) ) + || ( set_foreground && ! strcmp( str, set_foreground ) ) || ( set_background && ! strcmp( str, set_background ) ) - || ( enter_underline_mode && ! strcmp( str, enter_underline_mode ) ) - || ( exit_underline_mode && ! strcmp( str, exit_underline_mode ) ) - || ( enter_standout_mode && ! strcmp( str, enter_standout_mode ) ) - || ( exit_standout_mode && ! strcmp( str, exit_standout_mode ) ) - || ( flash_screen && ! strcmp( str, flash_screen ) ) - || ( enter_subscript_mode && ! strcmp( str, enter_subscript_mode ) ) - || ( exit_subscript_mode && ! strcmp( str, exit_subscript_mode ) ) - || ( enter_superscript_mode && ! strcmp( str, enter_superscript_mode ) ) - || ( exit_superscript_mode && ! strcmp( str, exit_superscript_mode ) ) - || ( enter_blink_mode && ! strcmp( str, enter_blink_mode ) ) - || ( enter_italics_mode && ! strcmp( str, enter_italics_mode ) ) - || ( exit_italics_mode && ! strcmp( str, exit_italics_mode ) ) - || ( enter_reverse_mode && ! strcmp( str, enter_reverse_mode ) ) - || ( enter_shadow_mode && ! strcmp( str, enter_shadow_mode ) ) - || ( exit_shadow_mode && ! strcmp( str, exit_shadow_mode ) ) - || ( enter_standout_mode && ! strcmp( str, enter_standout_mode ) ) - || ( exit_standout_mode && ! strcmp( str, exit_standout_mode ) ) - || ( enter_secure_mode && ! strcmp( str, enter_secure_mode ) ) + || ( enter_underline_mode && ! strcmp( str, enter_underline_mode ) ) + || ( exit_underline_mode && ! strcmp( str, exit_underline_mode ) ) + || ( enter_standout_mode && ! strcmp( str, enter_standout_mode ) ) + || ( exit_standout_mode && ! strcmp( str, exit_standout_mode ) ) + || ( flash_screen && ! strcmp( str, flash_screen ) ) + || ( enter_subscript_mode && ! strcmp( str, enter_subscript_mode ) ) + || ( exit_subscript_mode && ! strcmp( str, exit_subscript_mode ) ) + || ( enter_superscript_mode && ! strcmp( str, enter_superscript_mode ) ) + || ( exit_superscript_mode && ! strcmp( str, exit_superscript_mode ) ) + || ( enter_blink_mode && ! strcmp( str, enter_blink_mode ) ) + || ( enter_italics_mode && ! strcmp( str, enter_italics_mode ) ) + || ( exit_italics_mode && ! strcmp( str, exit_italics_mode ) ) + || ( enter_reverse_mode && ! strcmp( str, enter_reverse_mode ) ) + || ( enter_shadow_mode && ! strcmp( str, enter_shadow_mode ) ) + || ( exit_shadow_mode && ! strcmp( str, exit_shadow_mode ) ) + || ( enter_standout_mode && ! strcmp( str, enter_standout_mode ) ) + || ( exit_standout_mode && ! strcmp( str, exit_standout_mode ) ) + || ( enter_secure_mode && ! strcmp( str, enter_secure_mode ) ) || ( enter_bold_mode && ! strcmp ( str, enter_bold_mode ) ) ) { param[0] = va_arg( ap, long int ); @@ -140,11 +140,11 @@ char *tparm_solaris_kludge( char *str, ... ) */ static void pad( void (*writer)(wchar_t), int count) { - + int i; if( count < 0 ) return; - + for( i=0; i= L'0') && (*filter <= L'9')) { width=10*width+(*filter++ - L'0'); - } + } } while( loop ) { - + switch(*filter) { case L'l': @@ -219,9 +219,9 @@ static int vgwprintf( void (*writer)(wchar_t), filter++; pad_left=0; break; - + case L'.': - /* + /* Set precision. */ filter++; @@ -235,10 +235,10 @@ static int vgwprintf( void (*writer)(wchar_t), while( (*filter >= L'0') && (*filter <= L'9')) { precision=10*precision+(*filter++ - L'0'); - } + } } break; - + default: loop=0; break; @@ -253,8 +253,8 @@ static int vgwprintf( void (*writer)(wchar_t), if( (width >= 0) && pad_left ) { - pad( writer, width-1 ); - count += maxi( width-1, 0 ); + pad( writer, width-1 ); + count += maxi( width-1, 0 ); } c = is_long?va_arg(va, wint_t):btowc(va_arg(va, int)); @@ -265,16 +265,16 @@ static int vgwprintf( void (*writer)(wchar_t), if( (width >= 0) && !pad_left ) { pad( writer, width-1 ); - count += maxi( width-1, 0 ); + count += maxi( width-1, 0 ); } - + count++; - + break; } case L's': - { - + { + wchar_t *ss=0; if( is_long ) { @@ -287,41 +287,41 @@ static int vgwprintf( void (*writer)(wchar_t), if( ns ) { ss = str2wcs( ns ); - } + } } - + if( !ss ) { return -1; } - + if( (width >= 0) && pad_left ) { - pad( writer, width-wcslen(ss) ); - count += maxi(width-wcslen(ss), 0); + pad( writer, width-wcslen(ss) ); + count += maxi(width-wcslen(ss), 0); } - + wchar_t *s=ss; int precount = count; - + while( *s ) { if( (precision > 0) && (precision <= (count-precount) ) ) break; - + writer( *(s++) ); count++; } - + if( (width >= 0) && !pad_left ) { - pad( writer, width-wcslen(ss) ); - count += maxi( width-wcslen(ss), 0 ); + pad( writer, width-wcslen(ss) ); + count += maxi( width-wcslen(ss), 0 ); } - + if( !is_long ) free( ss ); - + break; } @@ -336,7 +336,7 @@ static int vgwprintf( void (*writer)(wchar_t), char *pos; char format[16]; int len; - + format[0]=0; strcat( format, "%"); if( precision >= 0 ) @@ -350,7 +350,7 @@ static int vgwprintf( void (*writer)(wchar_t), strcat( format, "l" ); break; } - + len = strlen(format); format[len++]=(char)*filter; format[len]=0; @@ -360,7 +360,7 @@ static int vgwprintf( void (*writer)(wchar_t), case L'd': case L'i': { - + switch( is_long ) { case 0: @@ -370,10 +370,10 @@ static int vgwprintf( void (*writer)(wchar_t), snprintf( str, 32, format, precision, d ); else snprintf( str, 32, format, d ); - + break; } - + case 1: { long d = va_arg( va, long ); @@ -383,7 +383,7 @@ static int vgwprintf( void (*writer)(wchar_t), snprintf( str, 32, format, d ); break; } - + case 2: { long long d = va_arg( va, long long ); @@ -393,21 +393,21 @@ static int vgwprintf( void (*writer)(wchar_t), snprintf( str, 32, format, d ); break; } - + default: debug( 0, L"Invalid length modifier in string %ls\n", filter_org ); return -1; } break; - + } - + case L'u': case L'o': case L'x': case L'X': { - + switch( is_long ) { case 0: @@ -419,7 +419,7 @@ static int vgwprintf( void (*writer)(wchar_t), snprintf( str, 32, format, d ); break; } - + case 1: { unsigned long d = va_arg( va, unsigned long ); @@ -429,7 +429,7 @@ static int vgwprintf( void (*writer)(wchar_t), snprintf( str, 32, format, d ); break; } - + case 2: { unsigned long long d = va_arg( va, unsigned long long ); @@ -439,43 +439,43 @@ static int vgwprintf( void (*writer)(wchar_t), snprintf( str, 32, format, d ); break; } - + default: debug( 0, L"Invalid length modifier in string %ls\n", filter_org ); return -1; } break; - + } - + default: debug( 0, L"Invalid filter %ls in string %ls\n", *filter, filter_org ); return -1; - + } - + if( (width >= 0) && pad_left ) { int l = maxi(width-strlen(str), 0 ); pad( writer, l ); count += l; } - + pos = str; - + while( *pos ) { writer( *(pos++) ); count++; } - + if( (width >= 0) && !pad_left ) { int l = maxi(width-strlen(str), 0 ); pad( writer, l ); count += l; } - + break; } @@ -484,7 +484,7 @@ static int vgwprintf( void (*writer)(wchar_t), char str[32]; char *pos; double val = va_arg( va, double ); - + if( precision>= 0 ) { if( width>= 0 ) @@ -509,21 +509,21 @@ static int vgwprintf( void (*writer)(wchar_t), } pos = str; - + while( *pos ) { writer( *(pos++) ); count++; } - + break; } case L'n': { int *n = va_arg( va, int *); - - *n = count; + + *n = count; break; } case L'%': @@ -564,14 +564,14 @@ sw_data; static void sw_writer( wchar_t c ) { if( sw_data.count < sw_data.max ) - *(sw_data.pos++)=c; + *(sw_data.pos++)=c; sw_data.count++; } int vswprintf( wchar_t *out, size_t n, const wchar_t *filter, va_list va ) { int written; - + sw_data.pos=out; sw_data.max=n; sw_data.count=0; @@ -586,7 +586,7 @@ int vswprintf( wchar_t *out, size_t n, const wchar_t *filter, va_list va ) { written=-1; } - + return written; } @@ -594,7 +594,7 @@ int swprintf( wchar_t *out, size_t n, const wchar_t *filter, ... ) { va_list va; int written; - + va_start( va, filter ); written = vswprintf( out, n, filter, va ); va_end( va ); @@ -624,7 +624,7 @@ int fwprintf( FILE *f, const wchar_t *filter, ... ) { va_list va; int written; - + va_start( va, filter ); written = vfwprintf( f, filter, va ); va_end( va ); @@ -640,7 +640,7 @@ int wprintf( const wchar_t *filter, ... ) { va_list va; int written; - + va_start( va, filter ); written=vwprintf( filter, va ); va_end( va ); @@ -661,16 +661,16 @@ wint_t fgetwc(FILE *stream) { int b = fgetc( stream ); char bb; - + int sz; - + if( b == EOF ) return WEOF; bb=b; - + sz = mbrtowc( &res, &bb, 1, &state ); - + switch( sz ) { case -1: @@ -733,13 +733,13 @@ static size_t fish_wcsspn (const wchar_t *wcs, for (a = accept; *a != L'\0'; ++a) if (*p == *a) break; - + if (*a == L'\0') return count; else ++count; } - return count; + return count; } /* @@ -752,7 +752,7 @@ static wchar_t *fish_wcspbrk (const wchar_t *wcs, const wchar_t *accept) ++wcs; else return (wchar_t *) wcs; - return NULL; + return NULL; } /* @@ -775,18 +775,18 @@ wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **save_ptr) /* Scan leading delimiters. */ wcs += fish_wcsspn (wcs, delim); - + if (*wcs == L'\0') { - *save_ptr = NULL; + *save_ptr = NULL; return NULL; } /* Find the end of the token. */ result = wcs; - + wcs = fish_wcspbrk (result, delim); - + if (wcs == NULL) { /* This token finishes the string. */ @@ -815,7 +815,7 @@ wchar_t *wcsdup( const wchar_t *in ) memcpy( out, in, sizeof( wchar_t)*(len+1)); return out; - + } #endif @@ -855,7 +855,7 @@ int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count ) { if( count == 0 ) return 0; - + if( *a == 0 ) { return (*b==0)?0:-1; @@ -892,7 +892,7 @@ wchar_t *wcsndup( const wchar_t *in, int c ) return 0; } wcslcpy( res, in, c+1 ); - return res; + return res; } #endif @@ -905,22 +905,22 @@ long convert_digit( wchar_t d, int base ) } else if( (d <= L'z') && (d >= L'a') ) { - res = d + 10 - L'a'; + res = d + 10 - L'a'; } else if( (d <= L'Z') && (d >= L'A') ) { - res = d + 10 - L'A'; + res = d + 10 - L'A'; } if( res >= base ) { res = -1; } - + return res; } #ifndef HAVE_WCSTOL -long wcstol(const wchar_t *nptr, +long wcstol(const wchar_t *nptr, wchar_t **endptr, int base) { @@ -943,7 +943,7 @@ long wcstol(const wchar_t *nptr, { errno = EINVAL; } - return res; + return res; } res = (res*base)+nxt; is_set = 1; @@ -985,25 +985,25 @@ long wcstol(const wchar_t *nptr, size_t wcslcat(wchar_t *dst, const wchar_t *src, size_t siz) { - + register wchar_t *d = dst; register const wchar_t *s = src; - register size_t n = siz; + register size_t n = siz; size_t dlen; /* Find the end of dst and adjust bytes left but don't go past end */ while (n-- != 0 && *d != '\0') d++; - + dlen = d - dst; - n = siz - dlen; + n = siz - dlen; if (n == 0) return(dlen + wcslen(s)); - while (*s != '\0') + while (*s != '\0') { - if (n != 1) + if (n != 1) { *d++ = *s; n--; @@ -1043,12 +1043,12 @@ wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz) register wchar_t *d = dst; register const wchar_t *s = src; register size_t n = siz; - + /* Copy as many bytes as will fit */ - if (n != 0 && --n != 0) - { - do - { + if (n != 0 && --n != 0) + { + do + { if ((*d++ = *s++) == 0) break; } @@ -1056,8 +1056,8 @@ wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz) } /* Not enough room in dst, add NUL and traverse rest of src */ - if (n == 0) - { + if (n == 0) + { if (siz != 0) *d = '\0'; /* NUL-terminate dst */ @@ -1074,7 +1074,7 @@ wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz) int lrand48_r(struct drand48_data *buffer, long int *result) { - *result = rand_r( &buffer->seed ); + *result = rand_r( &buffer->seed ); return 0; } @@ -1143,10 +1143,10 @@ int killpg( int pgr, int sig ) #ifndef HAVE_WORKING_GETOPT_LONG -int getopt_long( int argc, +int getopt_long( int argc, char * const argv[], const char *optstring, - const struct option *longopts, + const struct option *longopts, int *longindex ) { return getopt( argc, argv, optstring ); @@ -1181,7 +1181,7 @@ long sysconf(int name) } return -1; - + } #endif diff --git a/fallback.h b/fallback.h index e4813fb2f..62175ca5c 100644 --- a/fallback.h +++ b/fallback.h @@ -57,12 +57,12 @@ typedef char tputs_arg_t; /** Structure used to get the size of a terminal window */ -struct winsize +struct winsize { /** Number of rows */ - unsigned short ws_row; + unsigned short ws_row; /** Number of columns */ @@ -193,7 +193,7 @@ wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **ptr); /** Return the number of columns used by a character. This is a libc function, but the prototype for this function is missing in some libc - implementations. + implementations. Fish has a fallback implementation in case the implementation is missing altogether. In locales without a native wcwidth, Unicode @@ -320,7 +320,7 @@ size_t wcslcat( wchar_t *dst, const wchar_t *src, size_t siz ); wcslen(src); if retval >= siz, truncation occurred. This is the OpenBSD strlcpy function, modified for wide characters, - and renamed to reflect this change. + and renamed to reflect this change. */ size_t wcslcpy( wchar_t *dst, const wchar_t *src, size_t siz ); @@ -390,7 +390,7 @@ char * textdomain( const char * domainname ); /** Fallback implementation of dcgettext. Just returns the original string. */ -char * dcgettext ( const char * domainname, +char * dcgettext ( const char * domainname, const char * msgid, int category ); @@ -421,7 +421,7 @@ int killpg( int pgr, int sig ); /** Struct describing a long getopt option */ -struct option +struct option { /** Name of option @@ -438,7 +438,7 @@ struct option /** Return value */ - int val; + int val; } ; @@ -454,10 +454,10 @@ struct option #define optional_argument 2 #endif -int getopt_long(int argc, +int getopt_long(int argc, char * const argv[], const char *optstring, - const struct option *longopts, + const struct option *longopts, int *longindex); #endif diff --git a/fish.c b/fish.c index fbc9ffbf4..062c9a729 100644 --- a/fish.c +++ b/fish.c @@ -80,7 +80,7 @@ static int read_init() eval( L"builtin . " DATADIR "/fish/config.fish 2>/dev/null", 0, TOP ); eval( L"builtin . " SYSCONFDIR L"/fish/config.fish 2>/dev/null", 0, TOP ); - + /* We need to get the configuration directory before we can source the user configuration file */ @@ -99,9 +99,9 @@ static int read_init() eval( (wchar_t *)eval_buff->buff, 0, TOP ); free( config_dir_escaped ); } - + halloc_free( context ); - + return 1; } @@ -114,83 +114,83 @@ static int fish_parse_opt( int argc, char **argv, char **cmd_ptr ) { int my_optind; int force_interactive=0; - + while( 1 ) { static struct option long_options[] = { { - "command", required_argument, 0, 'c' + "command", required_argument, 0, 'c' } , { - "debug-level", required_argument, 0, 'd' + "debug-level", required_argument, 0, 'd' } , { - "interactive", no_argument, 0, 'i' + "interactive", no_argument, 0, 'i' } , { - "login", no_argument, 0, 'l' + "login", no_argument, 0, 'l' } , { - "no-execute", no_argument, 0, 'n' + "no-execute", no_argument, 0, 'n' } , { - "profile", required_argument, 0, 'p' + "profile", required_argument, 0, 'p' } , { - "help", no_argument, 0, 'h' + "help", no_argument, 0, 'h' } , { - "version", no_argument, 0, 'v' + "version", no_argument, 0, 'v' } , - { - 0, 0, 0, 0 + { + 0, 0, 0, 0 } } ; - + int opt_index = 0; - + int opt = getopt_long( argc, - argv, + argv, GETOPT_STRING, - long_options, + long_options, &opt_index ); - + if( opt == -1 ) break; - + switch( opt ) { case 0: { break; } - - case 'c': + + case 'c': { - *cmd_ptr = optarg; + *cmd_ptr = optarg; is_interactive_session = 0; break; } - - case 'd': + + case 'd': { char *end; int tmp; errno = 0; tmp = strtol(optarg, &end, 10); - + if( tmp >= 0 && tmp <=10 && !*end && !errno ) { debug_level=tmp; @@ -202,65 +202,65 @@ static int fish_parse_opt( int argc, char **argv, char **cmd_ptr ) } break; } - + case 'h': { *cmd_ptr = "__fish_print_help fish"; break; } - + case 'i': { force_interactive = 1; - break; + break; } - + case 'l': { is_login=1; - break; + break; } - + case 'n': { no_exec=1; - break; + break; } - + case 'p': { profile = optarg; - break; + break; } - + case 'v': { - fwprintf( stderr, - _(L"%s, version %s\n"), + fwprintf( stderr, + _(L"%s, version %s\n"), PACKAGE_NAME, PACKAGE_VERSION ); - exit( 0 ); + exit( 0 ); } - + case '?': { exit( 1 ); } - - } + + } } my_optind = optind; - + is_login |= (strcmp( argv[0], "-fish") == 0); - + /* We are an interactive session if we have not been given an explicit command to execute, _and_ stdin is a tty. */ is_interactive_session &= (*cmd_ptr == 0); is_interactive_session &= (my_optind == argc); - is_interactive_session &= isatty(STDIN_FILENO); + is_interactive_session &= isatty(STDIN_FILENO); /* We are also an interactive session if we have are forced- @@ -282,7 +282,7 @@ int main( int argc, char **argv ) char *cmd=0; int my_optind=0; - halloc_util_init(); + halloc_util_init(); wsetlocale( LC_ALL, L"" ); is_interactive_session=1; @@ -299,9 +299,9 @@ int main( int argc, char **argv ) debug( 1, _(L"Can not use the no-execute mode when running an interactive session") ); no_exec = 0; } - - proc_init(); - event_init(); + + proc_init(); + event_init(); wutil_init(); parser_init(); builtin_init(); @@ -323,28 +323,28 @@ int main( int argc, char **argv ) { if( my_optind == argc ) { - res = reader_read( 0, 0 ); + res = reader_read( STDIN_FILENO, 0 ); } else { - char **ptr; - char *file = *(argv+1); - int i; + char **ptr; + char *file = *(argv+(my_optind++)); + int i; string_buffer_t sb; int fd; wchar_t *rel_filename, *abs_filename; - + if( ( fd = open(file, O_RDONLY) ) == -1 ) { wperror( L"open" ); return 1; } - if( *(argv+2)) + if( *(argv+my_optind)) { sb_init( &sb ); - - for( i=1,ptr = argv+2; *ptr; i++, ptr++ ) + + for( i=1,ptr = argv+my_optind; *ptr; i++, ptr++ ) { if( i != 1 ) sb_append( &sb, ARRAY_SEP_STR ); @@ -352,7 +352,7 @@ int main( int argc, char **argv ) sb_append( &sb, val ); free( val ); } - + env_set( L"argv", (wchar_t *)sb.buff, 0 ); sb_destroy( &sb ); } @@ -373,17 +373,17 @@ int main( int argc, char **argv ) if( res ) { - debug( 1, - _(L"Error while reading file %ls\n"), + debug( 1, + _(L"Error while reading file %ls\n"), reader_current_filename()?reader_current_filename(): _(L"Standard input") ); - } + } reader_pop_current_filename(); } } } - + proc_fire_event( L"PROCESS_EXIT", EVENT_EXIT, getpid(), res ); - + history_destroy(); proc_destroy(); builtin_destroy(); @@ -392,12 +392,12 @@ int main( int argc, char **argv ) parser_destroy(); wutil_destroy(); event_destroy(); - + halloc_util_destroy(); - + env_destroy(); - + intern_free_all(); - - return res?STATUS_UNKNOWN_COMMAND:proc_get_last_status(); + + return res?STATUS_UNKNOWN_COMMAND:proc_get_last_status(); } diff --git a/fish.spec.in b/fish.spec.in index a7403ffef..b16365597 100644 --- a/fish.spec.in +++ b/fish.spec.in @@ -11,7 +11,7 @@ URL: http://www.fishshell.org Source0: http://www.fishshell.org/files/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel gettext groff +BuildRequires: ncurses-devel gettext groff # Locate correct build time-dependencies for providing X headers @@ -50,10 +50,10 @@ BuildRequires: %{xinclude}/X11/Intrinsic.h, %{xinclude}/X11/Xatom.h %endif -%description +%description -fish is a shell geared towards interactive use. Its features are -focused on user friendliness and discoverability. The language syntax +fish is a shell geared towards interactive use. Its features are +focused on user friendliness and discoverability. The language syntax is simple but incompatible with other shell languages. @@ -75,7 +75,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR="$RPM_BUILD_ROOT" +make install DESTDIR="$RPM_BUILD_ROOT" # Find translation files %find_lang %{name}.\* diff --git a/fish_indent.c b/fish_indent.c index 59226ad81..5e709f2b8 100644 --- a/fish_indent.c +++ b/fish_indent.c @@ -64,10 +64,10 @@ static void read_file( FILE *f, string_buffer_t *b ) wperror(L"fgetwc"); exit(1); } - + break; } - + sb_append_char( b, c ); } } @@ -78,12 +78,12 @@ static void read_file( FILE *f, string_buffer_t *b ) static void insert_tabs( string_buffer_t *out, int indent ) { int i; - + for( i=0; i " ); break; - + case TOK_REDIRECT_APPEND: sb_append( out, L">> " ); break; - + case TOK_REDIRECT_IN: sb_append( out, L"< " ); break; - + case TOK_REDIRECT_FD: sb_append( out, L">& " ); break; - + } break; } - + case TOK_BACKGROUND: { @@ -202,7 +202,7 @@ static int indent( string_buffer_t *out, wchar_t *in, int flags ) is_command = 1; break; } - + case TOK_COMMENT: { @@ -210,24 +210,24 @@ static int indent( string_buffer_t *out, wchar_t *in, int flags ) { insert_tabs( out, indent ); } - + sb_printf( out, L"%ls", last ); do_indent = 1; - break; + break; } - + default: { debug( 0, L"Unknown token '%ls'", last ); exit(1); - } + } } - + prev_prev_type = prev_type; prev_type = type; - + } - + tok_destroy( &tok ); return res; @@ -241,27 +241,27 @@ static int indent( string_buffer_t *out, wchar_t *in, int flags ) static wchar_t *trim( wchar_t *in ) { wchar_t *end; - + while( *in == L'\n' ) { in++; } - + end = in + wcslen(in); - + while( 1 ) { if( end < in+2 ) break; end--; - + if( (*end == L'\n' ) && ( *(end-1) == L'\n' ) ) *end=0; else break; } - + return in; } @@ -273,9 +273,9 @@ int main( int argc, char **argv ) { string_buffer_t sb_in; string_buffer_t sb_out; - + int do_indent=1; - + wsetlocale( LC_ALL, L"" ); program_name=L"fish_indent"; @@ -285,55 +285,55 @@ int main( int argc, char **argv ) long_options[] = { { - "no-indent", no_argument, 0, 'i' + "no-indent", no_argument, 0, 'i' } , { - "help", no_argument, 0, 'h' + "help", no_argument, 0, 'h' } , { - "version", no_argument, 0, 'v' + "version", no_argument, 0, 'v' } , - { - 0, 0, 0, 0 + { + 0, 0, 0, 0 } } ; - + int opt_index = 0; - + int opt = getopt_long( argc, - argv, + argv, GETOPT_STRING, - long_options, + long_options, &opt_index ); - + if( opt == -1 ) break; - + switch( opt ) { case 0: { break; } - + case 'h': { print_help( "fish_indent", 1 ); - exit( 0 ); + exit( 0 ); break; } - + case 'v': { - fwprintf( stderr, - _(L"%ls, version %s\n"), + fwprintf( stderr, + _(L"%ls, version %s\n"), program_name, PACKAGE_VERSION ); - exit( 0 ); + exit( 0 ); } case 'i': @@ -341,23 +341,23 @@ int main( int argc, char **argv ) do_indent = 0; break; } - - + + case '?': { exit( 1 ); } - - } + + } } - halloc_util_init(); + halloc_util_init(); sb_init( &sb_in ); sb_init( &sb_out ); read_file( stdin, &sb_in ); - + wutil_init(); if( !indent( &sb_out, (wchar_t *)sb_in.buff, do_indent ) ) @@ -371,7 +371,7 @@ int main( int argc, char **argv ) */ fwprintf( stdout, L"%ls", (wchar_t *)sb_in.buff ); } - + wutil_destroy(); diff --git a/fish_pager.c b/fish_pager.c index 49c154c89..1ed646126 100644 --- a/fish_pager.c +++ b/fish_pager.c @@ -61,7 +61,7 @@ #include "halloc_util.h" #include "print_help.h" -enum +enum { LINE_UP = R_NULL+1, LINE_DOWN, @@ -146,7 +146,7 @@ static buffer_t *pager_buffer; The environment variables used to specify the color of different tokens. */ -static wchar_t *hightlight_var[] = +static wchar_t *hightlight_var[] = { L"fish_pager_color_prefix", L"fish_pager_color_completion", @@ -167,7 +167,7 @@ static FILE *out_file; /** Data structure describing one or a group of related completions */ -typedef struct +typedef struct { /** The list of all completin strings this entry applies to @@ -180,11 +180,11 @@ typedef struct /** On-screen width of the completion string */ - int comp_width; + int comp_width; /** On-screen width of the description information */ - int desc_width; + int desc_width; /** Preffered total width */ @@ -208,20 +208,20 @@ static int get_color( int highlight ) return FISH_COLOR_NORMAL; if( highlight >= (4) ) return FISH_COLOR_NORMAL; - + val = wgetenv( hightlight_var[highlight]); if( !val ) { val = env_universal_get( hightlight_var[highlight]); } - + if( !val ) { return FISH_COLOR_NORMAL; } - - return output_color_code( val ); + + return output_color_code( val ); } /** @@ -236,11 +236,11 @@ static void recalc_width( array_list_t *l, const wchar_t *prefix ) for( i=0; imin_width = mini( c->desc_width, maxi(0,termsize.ws_col/3 - 2)) + mini( c->desc_width, maxi(0,termsize.ws_col/5 - 4)) +4; } - + } /** @@ -251,14 +251,14 @@ static int try_sequence( char *seq ) { int j, k; wint_t c=0; - - for( j=0; - seq[j] != '\0' && seq[j] == (c=input_common_readch( j>0 )); + + for( j=0; + seq[j] != '\0' && seq[j] == (c=input_common_readch( j>0 )); j++ ) ; if( seq[j] == '\0' ) - { + { return 1; } else @@ -281,10 +281,10 @@ static wint_t readch() wint_t bnd; } ; - + struct mapping m[]= { - { + { "\x1b[A", LINE_UP } , @@ -292,7 +292,7 @@ static wint_t readch() key_up, LINE_UP } , - { + { "\x1b[B", LINE_DOWN } , @@ -319,18 +319,18 @@ static wint_t readch() { 0, 0 } - + } ; int i; - + for( i=0; m[i].bnd; i++ ) { if( !m[i].seq ) { continue; } - + if( try_sequence(m[i].seq ) ) return m[i].bnd; } @@ -369,7 +369,7 @@ static int print_max( const wchar_t *str, int max, int has_more ) int written = 0; for( i=0; str[i]; i++ ) { - + if( written + wcwidth(str[i]) > max ) break; if( ( written + wcwidth(str[i]) == max) && (has_more || str[i+1]) ) @@ -378,7 +378,7 @@ static int print_max( const wchar_t *str, int max, int has_more ) written += wcwidth(ellipsis_char ); break; } - + writech( str[i] ); written+= wcwidth( str[i] ); } @@ -393,7 +393,7 @@ static void completion_print_item( const wchar_t *prefix, comp_t *c, int width ) int comp_width=0, desc_width=0; int i; int written=0; - + if( c->pref_width <= width ) { /* @@ -411,7 +411,7 @@ static void completion_print_item( const wchar_t *prefix, comp_t *c, int width ) the description. */ int desc_all = c->desc_width?c->desc_width+4:0; - + comp_width = maxi( mini( c->comp_width, 2*(width-4)/3 ), width - desc_all ); @@ -419,9 +419,9 @@ static void completion_print_item( const wchar_t *prefix, comp_t *c, int width ) desc_width = width-comp_width-4; else c->desc_width=0; - + } - + for( i=0; icomp ); i++ ) { const wchar_t *comp = (const wchar_t *)al_get( c->comp, i ); @@ -455,7 +455,7 @@ static void completion_print_item( const wchar_t *prefix, comp_t *c, int width ) writech( L' '); } } - + } /** @@ -490,14 +490,14 @@ static void completion_print( int cols, comp_t *el; int is_last = (j==(cols-1)); - + if( al_get_count( l ) <= j*rows + i ) continue; el = (comp_t *)al_get( l, j*rows + i ); - + completion_print_item( prefix, el, width[j] - (is_last?0:2) ); - + if( !is_last) writestr( L" " ); } @@ -545,24 +545,24 @@ static int completion_try_print( int cols, Set to one if the list should be printed at this width */ int print=0; - + int i, j; - + int rows = (al_get_count( l )-1)/cols+1; - + int pref_tot_width=0; int min_tot_width = 0; int res=PAGER_RETRY; /* Skip completions on tiny terminals */ - + if( termsize.ws_col < PAGER_MIN_WIDTH ) return PAGER_DONE; - + memset( pref_width, 0, sizeof(pref_width) ); memset( min_width, 0, sizeof(min_width) ); - + /* Calculate how wide the list would be */ for( j = 0; j < cols; j++ ) { @@ -576,7 +576,7 @@ static int completion_try_print( int cols, c = (comp_t *)al_get( l, j*rows + i ); pref = c->pref_width; min = c->min_width; - + if( j != cols-1 ) { pref += 2; @@ -632,7 +632,7 @@ static int completion_try_print( int cols, be helped, but it is not uncommon for the completions to _almost_ fit on one screen. In those cases, it is almost always desirable to 'squeeze' the completions into a - single page. + single page. If we are using N columns and can get everything to fit using squeezing, but everything would also fit @@ -668,7 +668,7 @@ static int completion_try_print( int cols, is_ca_mode = 0; writembs(exit_ca_mode); } - + completion_print( cols, width, 0, rows, prefix, is_quoted, l); pager_flush(); } @@ -687,7 +687,7 @@ static int completion_try_print( int cols, is_ca_mode=1; writembs(enter_ca_mode); } - + completion_print( cols, width, @@ -704,18 +704,18 @@ static int completion_try_print( int cols, { string_buffer_t msg; sb_init( &msg ); - + set_color( FISH_COLOR_BLACK, get_color(HIGHLIGHT_PAGER_PROGRESS) ); sb_printf( &msg, _(L" %d to %d of %d"), pos, - pos+termsize.ws_row-1, + pos+termsize.ws_row-1, rows ); - + sb_printf( &msg, L" \r" ); - + writestr((wchar_t *)msg.buff); sb_destroy( &msg ); set_color( FISH_COLOR_NORMAL, FISH_COLOR_NORMAL ); @@ -817,15 +817,15 @@ static int completion_try_print( int cols, do_loop=0; res=PAGER_RESIZE; break; - + } - + default: { sb_append_char( &out_buff, c ); do_loop = 0; break; - } + } } } writembs(clr_eol); @@ -847,31 +847,31 @@ static void mangle_descriptions( array_list_t *l ) wchar_t *next = (wchar_t *)al_get(l, i); wchar_t *in, *out; skip=1; - + while( *next != COMPLETE_SEP && *next ) next++; - + if( !*next ) continue; - + in=out=(next+1); - + while( *in != 0 ) { if( *in == L' ' || *in==L'\t' || *in<32 ) { if( !skip ) *out++=L' '; - skip=1; + skip=1; } else { - *out++ = *in; + *out++ = *in; skip=0; } in++; } - *out=0; + *out=0; } } @@ -883,7 +883,7 @@ static void join_completions( array_list_t *l ) long i; int in, out; hash_table_t desc_table; - + hash_init( &desc_table, &hash_wcs_func, &hash_wcs_cmp ); for( i=0; icomp = al_halloc( global_context ); - + for( start=end=next; 1; end++ ) { wchar_t c = *end; - + if( (c == COMPLETE_ITEM_SEP) || (c==COMPLETE_SEP) || !c) { *end = 0; wchar_t * str = escape( start, ESCAPE_ALL | ESCAPE_NO_QUOTED ); - + comp->comp_width += my_wcswidth( str ); halloc_register( global_context, str ); al_push( comp->comp, str ); @@ -973,22 +973,22 @@ static void mangle_completions( array_list_t *l, const wchar_t *prefix ) { comp->desc = halloc_wcsdup( global_context, start ); break; - } - + } + if( !c ) break; - + } comp->comp_width += my_wcswidth(prefix)*al_get_count(comp->comp) + 2*(al_get_count(comp->comp)-1); comp->desc_width = comp->desc?my_wcswidth( comp->desc ):0; - + comp->pref_width = comp->comp_width + comp->desc_width + (comp->desc_width?4:0); - + free( next ); al_set( l, i, comp ); } - + recalc_width( l, prefix ); } @@ -1026,10 +1026,10 @@ static void init( int mangle_descriptors, int out ) static struct termios pager_modes; char *term; - + if( mangle_descriptors ) { - + /* Make fd 1 output to screen, and use some other fd for writing the resulting output back to the caller @@ -1042,13 +1042,13 @@ static void init( int mangle_descriptors, int out ) if( (in = open( ttyname(2), O_RDWR )) != -1 ) { if( dup2( 2, 1 ) == -1 ) - { + { debug( 0, _(L"Could not set up output file descriptors for pager") ); exit( 1 ); } - + if( dup2( in, 0 ) == -1 ) - { + { debug( 0, _(L"Could not set up input file descriptors for pager") ); exit( 1 ); } @@ -1059,13 +1059,13 @@ static void init( int mangle_descriptors, int out ) exit( 1 ); } } - + if( !(out_file = fdopen( out, "w" )) ) { debug( 0, _(L"Could not initialize result pipe" ) ); exit( 1 ); } - + /** Init the stringbuffer used to keep any output in @@ -1088,7 +1088,7 @@ static void init( int mangle_descriptors, int out ) wperror( L"sigaction" ); exit(1); } - + handle_winch( 0 ); /* Set handler for window change events */ tcgetattr(0,&pager_modes); /* get the current terminal modes */ @@ -1102,14 +1102,14 @@ static void init( int mangle_descriptors, int out ) pager_modes.c_cc[VTIME]=0; /* - + */ if( tcsetattr(0,TCSANOW,&pager_modes)) /* set the new modes */ { wperror(L"tcsetattr"); exit(1); } - + if( setupterm( 0, STDOUT_FILENO, 0) == ERR ) { @@ -1124,7 +1124,7 @@ static void init( int mangle_descriptors, int out ) output_set_term( wterm ); free( wterm ); } - + } /** @@ -1137,9 +1137,9 @@ static void destroy() wutil_destroy(); if( del_curterm( cur_term ) == ERR ) { - debug( 0, _(L"Error while closing terminfo") ); + debug( 0, _(L"Error while closing terminfo") ); } - + sb_destroy( &out_buff ); fclose( out_file ); } @@ -1164,7 +1164,7 @@ static void read_array( FILE* file, array_list_t *comp ) while( 1 ) { c = getc( file ); - if( c == EOF ) + if( c == EOF ) { break; } @@ -1175,7 +1175,7 @@ static void read_array( FILE* file, array_list_t *comp ) } cc=c; - + b_append( &buffer, &cc, 1 ); } @@ -1183,15 +1183,15 @@ static void read_array( FILE* file, array_list_t *comp ) { cc=0; b_append( &buffer, &cc, 1 ); - + wcs = str2wcs( buffer.buff ); - if( wcs ) + if( wcs ) { unescaped = unescape( wcs, 0 ); if( unescaped ) { al_push( comp, unescaped ); - } + } free( wcs ); } } @@ -1203,9 +1203,9 @@ static void read_array( FILE* file, array_list_t *comp ) static int get_fd( const char *str ) { - char *end; + char *end; long fd; - + errno = 0; fd = strtol( str, &end, 10 ); if( fd < 0 || *end || errno ) @@ -1220,13 +1220,13 @@ static int get_fd( const char *str ) int main( int argc, char **argv ) { int i; - int is_quoted=0; + int is_quoted=0; array_list_t *comp; wchar_t *prefix = 0; int mangle_descriptors = 0; int result_fd = -1; - + /* This initialization is made early, so that the other init code can use global_context for memory managment @@ -1252,69 +1252,69 @@ int main( int argc, char **argv ) /* Third mode */ - + int completion_fd = -1; FILE *completion_file; - + while( 1 ) { static struct option long_options[] = { { - "result-fd", required_argument, 0, 'r' + "result-fd", required_argument, 0, 'r' } , { - "completion-fd", required_argument, 0, 'c' + "completion-fd", required_argument, 0, 'c' } , { - "prefix", required_argument, 0, 'p' + "prefix", required_argument, 0, 'p' } , { - "is-quoted", no_argument, 0, 'q' + "is-quoted", no_argument, 0, 'q' } , { - "help", no_argument, 0, 'h' + "help", no_argument, 0, 'h' } , { - "version", no_argument, 0, 'v' + "version", no_argument, 0, 'v' } , - { - 0, 0, 0, 0 + { + 0, 0, 0, 0 } } ; - + int opt_index = 0; - + int opt = getopt_long( argc, - argv, + argv, GETOPT_STRING, - long_options, + long_options, &opt_index ); - + if( opt == -1 ) break; - + switch( opt ) { case 0: { break; } - + case 'r': { result_fd = get_fd( optarg ); break; } - + case 'c': { completion_fd = get_fd( optarg ); @@ -1330,20 +1330,20 @@ int main( int argc, char **argv ) case 'h': { print_help( argv[0], 1 ); - exit(0); + exit(0); } case 'v': { debug( 0, L"%ls, version %s\n", program_name, PACKAGE_VERSION ); - exit( 0 ); + exit( 0 ); } - + case 'q': { is_quoted = 1; } - + } } @@ -1352,7 +1352,7 @@ int main( int argc, char **argv ) debug( 0, _(L"Unspecified file descriptors") ); exit( 1 ); } - + if( (completion_file = fdopen( completion_fd, "r" ) ) ) { @@ -1370,8 +1370,8 @@ int main( int argc, char **argv ) { prefix = wcsdup( L"" ); } - - + + } else { @@ -1385,7 +1385,7 @@ int main( int argc, char **argv ) forward. A reasonable time frame for removal of the code below has yet to be determined. */ - + if( argc < 3 ) { print_help( argv[0], 1 ); @@ -1394,10 +1394,10 @@ int main( int argc, char **argv ) else { mangle_descriptors = 1; - + prefix = str2wcs( argv[2] ); is_quoted = strcmp( "1", argv[1] )==0; - + if( argc > 3 ) { /* @@ -1420,11 +1420,11 @@ int main( int argc, char **argv ) read_array( stdin, comp ); } } - + } - + // debug( 3, L"prefix is '%ls'", prefix ); - + init( mangle_descriptors, result_fd ); mangle_descriptions( comp ); @@ -1462,9 +1462,9 @@ int main( int argc, char **argv ) i=PAGER_MAX_COLS+1; break; - } + } } - + free(prefix ); fwprintf( out_file, L"%ls", (wchar_t *)out_buff.buff ); @@ -1476,6 +1476,6 @@ int main( int argc, char **argv ) destroy(); halloc_util_destroy(); - + } diff --git a/fish_tests.c b/fish_tests.c index 38e4eb105..a5c3d943a 100644 --- a/fish_tests.c +++ b/fish_tests.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #ifdef HAVE_GETOPT_H #include @@ -85,7 +85,7 @@ static void say( wchar_t *blah, ... ) va_list va; va_start( va, blah ); vwprintf( blah, va ); - va_end( va ); + va_end( va ); wprintf( L"\n" ); } @@ -97,10 +97,10 @@ static void err( wchar_t *blah, ... ) va_list va; va_start( va, blah ); err_count++; - + wprintf( L"Error: " ); vwprintf( blah, va ); - va_end( va ); + va_end( va ); wprintf( L"\n" ); } @@ -119,13 +119,13 @@ static void pq_test( int elements ) { int i; int prev; - + int *count = calloc( sizeof(int), 100 ); - + priority_queue_t q; pq_init( &q, pq_compare ); - + for( i=0; i prev ) err( L"Wrong order of elements in priority_queue_t" ); prev = pos; - + } for( i=0; i<100; i++ ) @@ -163,10 +163,10 @@ static int stack_test( int elements ) long i; int res=1; - + array_list_t s; - al_init( &s ); + al_init( &s ); for( i=0; i&1 'nested \"quoted\" '(string containing subshells ){and,brackets}$as[$well (as variable arrays)]"; - const int types[] = + const int types[] = { TOK_STRING, TOK_REDIRECT_IN, TOK_STRING, TOK_REDIRECT_FD, TOK_STRING, TOK_STRING, TOK_END } ; int i; - + say( L"Test correct tokenization" ); for( i=0, tok_init( &t, str, 0 ); i<(sizeof(types)/sizeof(int)); i++,tok_next( &t ) ) @@ -603,7 +603,7 @@ static void test_tok() if( types[i] != tok_last_type( &t ) ) { err( L"Tokenization error:"); - wprintf( L"Token number %d of string \n'%ls'\n, expected token type %ls, got token '%ls' of type %ls\n", + wprintf( L"Token number %d of string \n'%ls'\n, expected token type %ls, got token '%ls' of type %ls\n", i+1, str, tok_get_desc(types[i]), @@ -612,9 +612,9 @@ static void test_tok() } } } - - + + } /** @@ -623,8 +623,8 @@ static void test_tok() static void test_parser() { say( L"Testing parser" ); - - + + say( L"Testing null input to parser" ); if( !parser_test( 0, 0, 0, 0 ) ) { @@ -634,51 +634,51 @@ static void test_parser() say( L"Testing block nesting" ); if( !parser_test( L"if; end", 0, 0, 0 ) ) { - err( L"Incomplete if statement undetected" ); + err( L"Incomplete if statement undetected" ); } if( !parser_test( L"if test; echo", 0, 0, 0 ) ) { - err( L"Missing end undetected" ); + err( L"Missing end undetected" ); } if( !parser_test( L"if test; end; end", 0, 0, 0 ) ) { - err( L"Unbalanced end undetected" ); + err( L"Unbalanced end undetected" ); } say( L"Testing detection of invalid use of builtin commands" ); if( !parser_test( L"case foo", 0, 0, 0 ) ) { - err( L"'case' command outside of block context undetected" ); + err( L"'case' command outside of block context undetected" ); } if( !parser_test( L"switch ggg; if true; case foo;end;end", 0, 0, 0 ) ) { - err( L"'case' command outside of switch block context undetected" ); + err( L"'case' command outside of switch block context undetected" ); } if( !parser_test( L"else", 0, 0, 0 ) ) { - err( L"'else' command outside of conditional block context undetected" ); + err( L"'else' command outside of conditional block context undetected" ); } if( !parser_test( L"break", 0, 0, 0 ) ) { - err( L"'break' command outside of loop block context undetected" ); + err( L"'break' command outside of loop block context undetected" ); } if( !parser_test( L"exec ls|less", 0, 0, 0 ) || !parser_test( L"echo|return", 0, 0, 0 )) { - err( L"Invalid pipe command undetected" ); - } + err( L"Invalid pipe command undetected" ); + } say( L"Testing basic evaluation" ); if( !eval( 0, 0, TOP ) ) { err( L"Null input when evaluating undetected" ); - } + } if( !eval( L"ls", 0, WHILE ) ) { err( L"Invalid block mode when evaluating undetected" ); } - + } - + /** Perform parameter expansion and test if the output equals the zero-terminated parameter list supplied. @@ -688,42 +688,42 @@ static void test_parser() static int expand_test( const wchar_t *in, int flags, ... ) { - array_list_t out; + array_list_t out; va_list va; int i=0; int res=1; wchar_t *arg; - + al_init( &out ); if( expand_string( 0, wcsdup(in), &out, flags) ) { - + } - - + + va_start( va, flags ); - while( (arg=va_arg(va, wchar_t *) )!= 0 ) + while( (arg=va_arg(va, wchar_t *) )!= 0 ) { if( al_get_count( &out ) == i ) { res=0; break; } - + if( wcscmp( al_get( &out, i ),arg) != 0 ) { res=0; break; } - - i++; + + i++; } va_end( va ); - + al_foreach( &out, &free ); return res; - + } /** @@ -732,7 +732,7 @@ static int expand_test( const wchar_t *in, int flags, ... ) static void test_expand() { say( L"Testing parameter expansion" ); - + if( !expand_test( L"foo", 0, L"foo", 0 )) { err( L"Strings do not expand to themselves" ); @@ -747,7 +747,7 @@ static void test_expand() { err( L"Cannot skip wildcard expansion" ); } - + } /** @@ -758,17 +758,17 @@ static void test_path() say( L"Testing path functions" ); void *context = halloc( 0, 0 ); - + wchar_t *can = path_make_canonical( context, L"//foo//////bar/" ); - + if( wcscmp( can, L"/foo/bar" ) ) { err( L"Bug in canonical PATH code" ); } - + halloc_free( context ); - + } @@ -785,72 +785,72 @@ void perf_complete() double t; wchar_t str[3]= { - 0, 0, 0 + 0, 0, 0 } ; int i; - - + + say( L"Testing completion performance" ); al_init( &out ); - + reader_push(L""); say( L"Here we go" ); - + t1 = get_time(); - - + + for( c=L'a'; c<=L'z'; c++ ) { str[0]=c; reader_set_buffer( str, 0 ); - + complete( str, &out ); - + matches += al_get_count( &out ); - + al_foreach( &out, &free ); al_truncate( &out, 0 ); } t2=get_time(); - + t = (double)(t2-t1)/(1000000*26); - + say( L"One letter command completion took %f seconds per completion, %f microseconds/match", t, (double)(t2-t1)/matches ); - + matches=0; t1 = get_time(); for( i=0; inext ) { msg->count++; q_put( &c->unsent, msg ); - } - + } + for( c = conn; c; c=c->next ) { try_send_all( c ); - } + } } /** @@ -345,7 +345,7 @@ static void daemonize() debug( 0, L"Could not put fishd in background. Quitting" ); wperror( L"fork" ); exit(1); - + case 0: { /* @@ -366,19 +366,19 @@ static void daemonize() sigaction( SIGTERM, &act, 0); break; } - + default: - { + { debug( 0, L"Parent process exiting (This is normal)" ); exit(0); - } + } } - + /* Put ourself in out own processing group */ setsid(); - + /* Close stdin and stdout. We only use stderr, anyway. */ @@ -394,7 +394,7 @@ static wchar_t *fishd_env_get( wchar_t *key ) { char *nres, *nkey; wchar_t *res; - + nkey = wcs2str( key ); nres = getenv( nkey ); free( nkey ); @@ -407,7 +407,7 @@ static wchar_t *fishd_env_get( wchar_t *key ) res = env_universal_common_get( key ); if( res ) res = wcsdup( res ); - + return env_universal_common_get( key ); } } @@ -423,7 +423,7 @@ static wchar_t *fishd_get_config() wchar_t *xdg_dir, *home; int done = 0; wchar_t *res = 0; - + xdg_dir = fishd_env_get( L"XDG_CONFIG_HOME" ); if( xdg_dir ) { @@ -439,7 +439,7 @@ static wchar_t *fishd_get_config() free( xdg_dir ); } else - { + { home = fishd_env_get( L"HOME" ); if( home ) { @@ -455,7 +455,7 @@ static wchar_t *fishd_get_config() free( home ); } } - + if( done ) { return res; @@ -465,7 +465,7 @@ static wchar_t *fishd_get_config() debug( 0, _(L"Unable to create a configuration directory for fish. Your personal settings will not be saved. Please set the $XDG_CONFIG_HOME variable to a directory where the current user has write access." )); return 0; } - + } /** @@ -475,22 +475,22 @@ static void load_or_save( int save) { char *name; wchar_t *wdir = fishd_get_config(); - char *dir; + char *dir; char hostname[HOSTNAME_LEN]; connection_t c; int fd; - + if( !wdir ) { return; } - + dir = wcs2str( wdir ); free( wdir ); - + gethostname( hostname, HOSTNAME_LEN ); - + name = malloc( strlen(dir)+ strlen(FILE)+ strlen(hostname) + 2 ); strcpy( name, dir ); strcat( name, "/" ); @@ -499,20 +499,20 @@ static void load_or_save( int save) free( dir ); - - debug( 4, L"Open file for %s: '%s'", - save?"saving":"loading", + + debug( 4, L"Open file for %s: '%s'", + save?"saving":"loading", name ); - + fd = open( name, save?(O_CREAT | O_TRUNC | O_WRONLY):O_RDONLY, 0600); - + free( name ); - + if( fd == -1 ) { debug( 1, L"Could not open load/save file. No previous saves?" ); wperror( L"open" ); - return; + return; } debug( 4, L"File open on fd %d", c.fd ); @@ -520,14 +520,14 @@ static void load_or_save( int save) if( save ) { - + write_loop( c.fd, SAVE_MSG, strlen(SAVE_MSG) ); enqueue_all( &c ); } else read_message( &c ); - connection_destroy( &c ); + connection_destroy( &c ); } /** @@ -553,10 +553,10 @@ static void init() { sock = get_socket(); - daemonize(); + daemonize(); env_universal_common_init( &broadcast ); - - load(); + + load(); } /** @@ -569,13 +569,13 @@ int main( int argc, char ** argv ) socklen_t t; int max_fd; int update_count=0; - + fd_set read_fd, write_fd; halloc_util_init(); - + program_name=L"fishd"; - wsetlocale( LC_ALL, L"" ); + wsetlocale( LC_ALL, L"" ); /* Parse options @@ -586,57 +586,57 @@ int main( int argc, char ** argv ) long_options[] = { { - "help", no_argument, 0, 'h' + "help", no_argument, 0, 'h' } , { - "version", no_argument, 0, 'v' + "version", no_argument, 0, 'v' } , - { - 0, 0, 0, 0 + { + 0, 0, 0, 0 } } ; - + int opt_index = 0; - + int opt = getopt_long( argc, - argv, + argv, GETOPT_STRING, - long_options, + long_options, &opt_index ); - + if( opt == -1 ) break; - + switch( opt ) { case 0: - break; + break; case 'h': print_help( argv[0], 1 ); - exit(0); - + exit(0); + case 'v': debug( 0, L"%ls, version %s\n", program_name, PACKAGE_VERSION ); - exit( 0 ); - + exit( 0 ); + case '?': return 1; - - } + + } } - + init(); - while(1) + while(1) { connection_t *c; int res; - t = sizeof( remote ); - + t = sizeof( remote ); + FD_ZERO( &read_fd ); FD_ZERO( &write_fd ); FD_SET( sock, &read_fd ); @@ -645,7 +645,7 @@ int main( int argc, char ** argv ) { FD_SET( c->fd, &read_fd ); max_fd = maxi( max_fd, c->fd+1); - + if( ! q_empty( &c->unsent ) ) { FD_SET( c->fd, &write_fd ); @@ -661,22 +661,22 @@ int main( int argc, char ** argv ) save(); exit(0); } - + if( res != -1 ) break; - + if( errno != EINTR ) { wperror( L"select" ); exit(1); } } - + if( FD_ISSET( sock, &read_fd ) ) { - if( (child_socket = - accept( sock, - (struct sockaddr *)&remote, + if( (child_socket = + accept( sock, + (struct sockaddr *)&remote, &t) ) == -1) { wperror( L"accept" ); exit(1); @@ -688,20 +688,20 @@ int main( int argc, char ** argv ) if( fcntl( child_socket, F_SETFL, O_NONBLOCK ) != 0 ) { wperror( L"fcntl" ); - close( child_socket ); + close( child_socket ); } else { connection_t *new = malloc( sizeof(connection_t)); - connection_init( new, child_socket ); + connection_init( new, child_socket ); new->next = conn; send( new->fd, GREETING, strlen(GREETING), MSG_DONTWAIT ); - enqueue_all( new ); + enqueue_all( new ); conn=new; } } } - + for( c=conn; c; c=c->next ) { if( FD_ISSET( c->fd, &write_fd ) ) @@ -709,7 +709,7 @@ int main( int argc, char ** argv ) try_send_all( c ); } } - + for( c=conn; c; c=c->next ) { if( FD_ISSET( c->fd, &read_fd ) ) @@ -728,10 +728,10 @@ int main( int argc, char ** argv ) } } } - + connection_t *prev=0; c=conn; - + while( c ) { if( c->killme ) @@ -745,7 +745,7 @@ int main( int argc, char ** argv ) if( !msg->count ) free( msg ); } - + connection_destroy( c ); if( prev ) { @@ -755,11 +755,11 @@ int main( int argc, char ** argv ) { conn=c->next; } - + free(c); - + c=(prev?prev->next:conn); - + } else { @@ -771,10 +771,10 @@ int main( int argc, char ** argv ) if( !conn ) { debug( 0, L"No more clients. Quitting" ); - save(); + save(); env_universal_common_destroy(); break; - } + } } halloc_util_destroy(); diff --git a/function.c b/function.c index 246974dfc..576465a5d 100644 --- a/function.c +++ b/function.c @@ -43,7 +43,7 @@ typedef struct /** Function definition */ wchar_t *definition; /** Function description */ - wchar_t *description; + wchar_t *description; /** File where this function was defined */ @@ -51,14 +51,14 @@ typedef struct /** Line where definition started */ - int definition_offset; - + int definition_offset; + /** List of all named arguments for this function */ array_list_t *named_arguments; - - + + /** Flag for specifying that this function was automatically loaded */ @@ -96,8 +96,8 @@ static int load( const wchar_t *name ) data = (function_internal_data_t *)hash_get( &function, name ); if( data && !data->is_autoload ) return 0; - - is_autoload = 1; + + is_autoload = 1; res = parse_util_load( name, L"fish_function_path", &function_remove, @@ -113,13 +113,13 @@ static int load( const wchar_t *name ) static void autoload_names( array_list_t *out, int get_hidden ) { int i; - + array_list_t path_list; const wchar_t *path_var = env_get( L"fish_function_path" ); - + if( ! path_var ) return; - + al_init( &path_list ); tokenize_variable_array( path_var, &path_list ); @@ -129,7 +129,7 @@ static void autoload_names( array_list_t *out, int get_hidden ) DIR *dir = wopendir( ndir ); if( !dir ) continue; - + struct wdirent *next; while( (next=wreaddir(dir))!=0 ) { @@ -137,7 +137,7 @@ static void autoload_names( array_list_t *out, int get_hidden ) wchar_t *suffix; if( !get_hidden && fn[0] == L'_' ) continue; - + suffix = wcsrchr( fn, L'.' ); if( suffix && (wcscmp( suffix, L".fish" ) == 0 ) ) { @@ -148,7 +148,7 @@ static void autoload_names( array_list_t *out, int get_hidden ) DIE_MEM(); al_push( out, dup ); } - } + } closedir(dir); } al_foreach( &path_list, &free ); @@ -182,12 +182,12 @@ void function_add( function_data_t *data ) int i; wchar_t *cmd_end; function_internal_data_t *d; - + CHECK( data->name, ); CHECK( data->definition, ); - + function_remove( data->name ); - + d = halloc( 0, sizeof( function_internal_data_t ) ); d->definition_offset = parse_util_lineno( parser_get_buffer(), current_block->tok_pos )-1; d->definition = halloc_wcsdup( d, data->definition ); @@ -201,31 +201,68 @@ void function_add( function_data_t *data ) al_push( d->named_arguments, halloc_wcsdup( d, (wchar_t *)al_get( data->named_arguments, i ) ) ); } } - + cmd_end = d->definition + wcslen(d->definition)-1; - + d->description = data->description?halloc_wcsdup( d, data->description ):0; d->definition_file = intern(reader_current_filename()); d->is_autoload = is_autoload; d->shadows = data->shadows; - + hash_put( &function, intern(data->name), d ); - + for( i=0; ievents ); i++ ) { event_add_handler( (event_t *)al_get( data->events, i ) ); } - + } +int function_copy( const wchar_t *name, const wchar_t *new_name ) +{ + int i; + function_internal_data_t *d, *orig_d; + + CHECK( name, 0 ); + CHECK( new_name, 0 ); + + orig_d = (function_internal_data_t *)hash_get(&function, name); + if( !orig_d ) + return 0; + + d = halloc(0, sizeof( function_internal_data_t ) ); + d->definition_offset = orig_d->definition_offset; + d->definition = halloc_wcsdup( d, orig_d->definition ); + if( orig_d->named_arguments ) + { + d->named_arguments = al_halloc( d ); + for( i=0; inamed_arguments ); i++ ) + { + al_push( d->named_arguments, halloc_wcsdup( d, (wchar_t *)al_get( orig_d->named_arguments, i ) ) ); + } + d->description = orig_d->description?halloc_wcsdup(d, orig_d->description):0; + d->shadows = orig_d->shadows; + + // This new instance of the function shouldn't be tied to the def + // file of the original. + d->definition_file = 0; + d->is_autoload = 0; + } + + hash_put( &function, intern(new_name), d ); + + return 1; +} + + int function_exists( const wchar_t *cmd ) { - + CHECK( cmd, 0 ); - + if( parser_keywords_is_reserved(cmd) ) return 0; - + load( cmd ); return (hash_get(&function, cmd) != 0 ); } @@ -236,7 +273,7 @@ void function_remove( const wchar_t *name ) void *dv; function_internal_data_t *d; event_t ev; - + CHECK( name, ); hash_remove( &function, @@ -245,12 +282,12 @@ void function_remove( const wchar_t *name ) &dv ); d=(function_internal_data_t *)dv; - + if( !key ) return; ev.type=EVENT_ANY; - ev.function_name=name; + ev.function_name=name; event_remove( &ev ); halloc_free( d ); @@ -265,13 +302,13 @@ void function_remove( const wchar_t *name ) parse_util_unload( name, L"fish_function_path", 0 ); } } - + const wchar_t *function_get_definition( const wchar_t *name ) { function_internal_data_t *data; - + CHECK( name, 0 ); - + load( name ); data = (function_internal_data_t *)hash_get( &function, name ); if( data == 0 ) @@ -282,9 +319,9 @@ const wchar_t *function_get_definition( const wchar_t *name ) array_list_t *function_get_named_arguments( const wchar_t *name ) { function_internal_data_t *data; - + CHECK( name, 0 ); - + load( name ); data = (function_internal_data_t *)hash_get( &function, name ); if( data == 0 ) @@ -295,9 +332,9 @@ array_list_t *function_get_named_arguments( const wchar_t *name ) int function_get_shadows( const wchar_t *name ) { function_internal_data_t *data; - + CHECK( name, 0 ); - + load( name ); data = (function_internal_data_t *)hash_get( &function, name ); if( data == 0 ) @@ -305,28 +342,28 @@ int function_get_shadows( const wchar_t *name ) return data->shadows; } - + const wchar_t *function_get_desc( const wchar_t *name ) { function_internal_data_t *data; - + CHECK( name, 0 ); - + load( name ); data = (function_internal_data_t *)hash_get( &function, name ); if( data == 0 ) return 0; - + return _(data->description); } void function_set_desc( const wchar_t *name, const wchar_t *desc ) { function_internal_data_t *data; - + CHECK( name, ); CHECK( desc, ); - + load( name ); data = (function_internal_data_t *)hash_get( &function, name ); if( data == 0 ) @@ -344,7 +381,7 @@ static int al_contains_str( array_list_t *list, const wchar_t * str ) CHECK( list, 0 ); CHECK( str, 0 ); - + for( i=0; i
    - fish home + fish home | - Main documentation page + Main documentation page | Design document | @@ -43,6 +43,6 @@ H4 FAQ | License - +
    diff --git a/util.c b/util.c index c7192ad8c..d232d2c43 100644 --- a/util.c +++ b/util.c @@ -64,7 +64,7 @@ } \ oom_handler_internal( p ); \ } \ - + void util_die_on_oom( void * p); @@ -74,7 +74,7 @@ void (*oom_handler_internal)(void *) = &util_die_on_oom; void (*util_set_oom_handler( void (*h)(void *) ))(void *) { void (*old)(void *) = oom_handler_internal; - + if( h ) oom_handler_internal = h; else @@ -130,9 +130,9 @@ static int q_realloc( dyn_queue_t *q ) void **old_stop = q->stop; int diff; int new_size; - + new_size = 2*(q->stop-q->start); - + q->start=(void**)realloc( q->start, sizeof(void*)*new_size ); if( !q->start ) { @@ -140,13 +140,13 @@ static int q_realloc( dyn_queue_t *q ) oom_handler( q ); return 0; } - + diff = q->start - old_start; q->get_pos += diff; q->stop = &q->start[new_size]; memcpy( old_stop + diff, q->start, sizeof(void*)*(q->get_pos-q->start)); q->put_pos = old_stop + diff + (q->get_pos-q->start); - + return 1; } @@ -155,7 +155,7 @@ int q_put( dyn_queue_t *q, void *e ) *q->put_pos = e; // fprintf( stderr, "Put element %d to queue %d\n", e, q ); - + if( ++q->put_pos == q->stop ) q->put_pos = q->start; if( q->put_pos == q->get_pos ) @@ -175,7 +175,7 @@ void *q_peek( dyn_queue_t *q ) { return *q->get_pos; } - + int q_empty( dyn_queue_t *q ) { // fprintf( stderr, "Queue %d is %s\n", q, (q->put_pos == q->get_pos)?"empty":"non-empty" ); @@ -199,7 +199,7 @@ void hash_init2( hash_table_t *h, reasonably good size with regard to avoiding patterns of collisions. */ sz--; - + h->arr = malloc( sizeof(hash_struct_t)*sz ); if( !h->arr ) @@ -207,7 +207,7 @@ void hash_init2( hash_table_t *h, oom_handler( h ); return; } - + h->size = sz; for( i=0; i< sz; i++ ) h->arr[i].key = 0; @@ -279,10 +279,10 @@ static int hash_realloc( hash_table_t *h, if( ( sz < h->size ) && (h->size < HASH_MIN_SIZE)) return 1; sz = maxi( sz, HASH_MIN_SIZE ); - + hash_struct_t *old_arr = h->arr; int old_size = h->size; - + int i; h->cache = -1; @@ -319,7 +319,7 @@ int hash_put( hash_table_t *h, const void *data ) { int pos; - + if( (float)(h->count+1)/h->size > 0.75f ) { if( !hash_realloc( h, (h->size+1) * 2 -1 ) ) @@ -345,8 +345,8 @@ void *hash_get( hash_table_t *h, { if( !h->count ) return 0; - - int pos = hash_search( h, (void *)key ); + + int pos = hash_search( h, (void *)key ); if( h->arr[pos].key == 0 ) { return 0; @@ -360,10 +360,10 @@ void *hash_get( hash_table_t *h, void *hash_get_key( hash_table_t *h, const void *key ) -{ +{ if( !h->count ) return 0; - + int pos = hash_search( h, (void *)key ); if( h->arr[pos].key == 0 ) return 0; @@ -449,7 +449,7 @@ int hash_contains( hash_table_t *h, { if( !h->count ) return 0; - + int pos = hash_search( h, (void *)key ); return h->arr[pos].key != 0; } @@ -541,7 +541,7 @@ static unsigned int rotl30( unsigned int in ) /** The number of words of input used in each lap by the sha-like - string hashing algorithm. + string hashing algorithm. */ #define WORD_COUNT 16 @@ -550,11 +550,11 @@ int hash_wcs_func( void *data ) const wchar_t *in = (const wchar_t *)data; unsigned int a,b,c,d,e; int t; - unsigned int k0=0x5a827999u; + unsigned int k0=0x5a827999u; unsigned int k1 =0x6ed9eba1u; - - unsigned int w[2*WORD_COUNT]; - + + unsigned int w[2*WORD_COUNT]; + /* Same constants used by sha1 */ @@ -563,10 +563,10 @@ int hash_wcs_func( void *data ) c=0x98badcfeu; d=0x10325476u; e=0xc3d2e1f0u; - + if( data == 0 ) return 0; - + while( *in ) { int i; @@ -586,9 +586,9 @@ int hash_wcs_func( void *data ) } else w[i]=*in++; - + } - + /* And fill up the rest by rotating the previous content */ @@ -642,11 +642,11 @@ int hash_str_cmp( void *a, void *b ) int hash_str_func( void *data ) { int res = 0x67452301u; - const char *str = data; + const char *str = data; while( *str ) res = (18499*rotl5(res)) ^ *str++; - + return res; } @@ -812,7 +812,7 @@ static int al_push_generic( array_list_t *l, anything_t o ) return 0; } l->arr = tmp; - l->size = new_size; + l->size = new_size; } l->arr[l->pos++] = o; return 1; @@ -857,10 +857,10 @@ int al_insert( array_list_t *a, int pos, int count ) assert( pos >= 0 ); assert( count >= 0 ); assert( a ); - + if( !count ) return 0; - + /* Reallocate, if needed */ @@ -870,7 +870,7 @@ int al_insert( array_list_t *a, int pos, int count ) If we reallocate, add a few extra elements just in case we want to do some more reallocating any time soon */ - size_t new_size = maxi( maxi( pos, a->pos ) + count +32, a->size*2); + size_t new_size = maxi( maxi( pos, a->pos ) + count +32, a->size*2); void *tmp = realloc( a->arr, sizeof( anything_t )*new_size ); if( tmp ) { @@ -881,19 +881,19 @@ int al_insert( array_list_t *a, int pos, int count ) oom_handler( a ); return 0; } - + } - + if( a->pos > pos ) { memmove( &a->arr[pos], - &a->arr[pos+count], + &a->arr[pos+count], sizeof(anything_t ) * (a->pos-pos) ); } - + memset( &a->arr[pos], 0, sizeof(anything_t)*count ); a->pos += count; - + return 1; } @@ -905,7 +905,7 @@ int al_insert( array_list_t *a, int pos, int count ) static int al_set_generic( array_list_t *l, int pos, anything_t v ) { int old_pos; - + if( pos < 0 ) return 0; if( pos < l->pos ) @@ -914,16 +914,16 @@ static int al_set_generic( array_list_t *l, int pos, anything_t v ) return 1; } old_pos=l->pos; - + l->pos = pos; if( al_push_generic( l, v ) ) { - memset( &l->arr[old_pos], + memset( &l->arr[old_pos], 0, sizeof(anything_t) * (pos - old_pos) ); - return 1; + return 1; } - return 0; + return 0; } int al_set( array_list_t *l, int pos, const void *o ) @@ -954,7 +954,7 @@ static anything_t al_get_generic( array_list_t *l, int pos ) { anything_t res; res.ptr_val=0; - + if( (pos >= 0) && (pos < l->pos) ) res = l->arr[pos]; @@ -997,8 +997,8 @@ static anything_t al_pop_generic( array_list_t *l ) memset( &e, 0, sizeof(anything_t ) ); return e; } - - + + e = l->arr[--l->pos]; if( (l->pos*3 < l->size) && (l->size < MIN_SIZE) ) { @@ -1022,17 +1022,17 @@ static anything_t al_pop_generic( array_list_t *l ) void *al_pop( array_list_t *l ) { - return al_pop_generic(l).ptr_val; + return al_pop_generic(l).ptr_val; } long al_pop_long( array_list_t *l ) { - return al_pop_generic(l).long_val; + return al_pop_generic(l).long_val; } func_ptr_t al_pop_func( array_list_t *l ) { - return al_pop_generic(l).func_val; + return al_pop_generic(l).func_val; } /** @@ -1050,17 +1050,17 @@ static anything_t al_peek_generic( array_list_t *l ) void *al_peek( array_list_t *l ) { - return al_peek_generic(l).ptr_val; + return al_peek_generic(l).ptr_val; } long al_peek_long( array_list_t *l ) { - return al_peek_generic(l).long_val; + return al_peek_generic(l).long_val; } func_ptr_t al_peek_func( array_list_t *l ) { - return al_peek_generic(l).func_val; + return al_peek_generic(l).func_val; } int al_empty( array_list_t *l ) @@ -1093,7 +1093,7 @@ void al_foreach2( array_list_t *l, void (*func)( void *, void *), void *aux) CHECK( l, ); CHECK( func, ); - + for( i=0; ipos; i++ ) func( l->arr[i].ptr_val, aux ); } @@ -1102,7 +1102,7 @@ int wcsfilecmp( const wchar_t *a, const wchar_t *b ) { CHECK( a, 0 ); CHECK( b, 0 ); - + if( *a==0 ) { if( *b==0) @@ -1122,7 +1122,7 @@ int wcsfilecmp( const wchar_t *a, const wchar_t *b ) long bl; int diff; - errno = 0; + errno = 0; al = wcstol( a, &aend, 10 ); bl = wcstol( b, &bend, 10 ); @@ -1133,7 +1133,7 @@ int wcsfilecmp( const wchar_t *a, const wchar_t *b ) */ return wcscmp( a, b ); } - + diff = al - bl; if( diff ) return diff>0?2:-2; @@ -1165,9 +1165,9 @@ int wcsfilecmp( const wchar_t *a, const wchar_t *b ) return secondary_diff>0?1:-1; } } - + return res; - + } void sb_init( string_buffer_t * b) @@ -1181,7 +1181,7 @@ void sb_init( string_buffer_t * b) return; } - memset( b, 0, sizeof(string_buffer_t) ); + memset( b, 0, sizeof(string_buffer_t) ); b_append( b, &c, sizeof( wchar_t)); b->used -= sizeof(wchar_t); } @@ -1195,7 +1195,7 @@ string_buffer_t *sb_new() oom_handler( 0 ); return 0; } - + sb_init( res ); return res; } @@ -1230,7 +1230,7 @@ void sb_append_internal( string_buffer_t *b, ... ) wchar_t *arg; CHECK( b, ); - + va_start( va, b ); while( (arg=va_arg(va, wchar_t *) )!= 0 ) { @@ -1244,21 +1244,21 @@ int sb_printf( string_buffer_t *buffer, const wchar_t *format, ... ) { va_list va; int res; - + CHECK( buffer, -1 ); CHECK( format, -1 ); - + va_start( va, format ); - res = sb_vprintf( buffer, format, va ); + res = sb_vprintf( buffer, format, va ); va_end( va ); - - return res; + + return res; } int sb_vprintf( string_buffer_t *buffer, const wchar_t *format, va_list va_orig ) { int res; - + CHECK( buffer, -1 ); CHECK( format, -1 ); @@ -1271,20 +1271,20 @@ int sb_vprintf( string_buffer_t *buffer, const wchar_t *format, va_list va_orig oom_handler( buffer ); return -1; } - } + } while( 1 ) { va_list va; va_copy( va, va_orig ); - - res = vswprintf( (wchar_t *)((char *)buffer->buff+buffer->used), - (buffer->length-buffer->used)/sizeof(wchar_t), + + res = vswprintf( (wchar_t *)((char *)buffer->buff+buffer->used), + (buffer->length-buffer->used)/sizeof(wchar_t), format, va ); - - va_end( va ); + + va_end( va ); if( res >= 0 ) { buffer->used+= res*sizeof(wchar_t); @@ -1295,7 +1295,7 @@ int sb_vprintf( string_buffer_t *buffer, const wchar_t *format, va_list va_orig As far as I know, there is no way to check if a vswprintf-call failed because of a badly formated string option or because the supplied destination string was to - small. In GLIBC, errno seems to be set to EINVAL either way. + small. In GLIBC, errno seems to be set to EINVAL either way. Because of this, sb_printf will on failiure try to increase the buffer size until the free space is @@ -1304,7 +1304,7 @@ int sb_vprintf( string_buffer_t *buffer, const wchar_t *format, va_list va_orig formated string option, and return an error. Make sure to null terminate string before that, though. */ - + if( buffer->length - buffer->used > SB_MAX_SIZE ) { wchar_t tmp=0; @@ -1312,7 +1312,7 @@ int sb_vprintf( string_buffer_t *buffer, const wchar_t *format, va_list va_orig buffer->used -= sizeof(wchar_t); break; } - + buffer->buff = realloc( buffer->buff, 2*buffer->length ); if( !buffer->buff ) @@ -1320,10 +1320,10 @@ int sb_vprintf( string_buffer_t *buffer, const wchar_t *format, va_list va_orig oom_handler( buffer ); return -1; } - - buffer->length *= 2; + + buffer->length *= 2; } - return res; + return res; } @@ -1332,7 +1332,7 @@ int sb_vprintf( string_buffer_t *buffer, const wchar_t *format, va_list va_orig void sb_destroy( string_buffer_t * b ) { CHECK( b, ); - + free( b->buff ); } @@ -1345,20 +1345,20 @@ void sb_clear( string_buffer_t * b ) void sb_truncate( string_buffer_t *b, int chars_left ) { wchar_t *arr; - + CHECK( b, ); b->used = (chars_left)*sizeof( wchar_t); arr = (wchar_t *)b->buff; arr[chars_left] = 0; - + } ssize_t sb_length( string_buffer_t *b ) { CHECK( b, -1 ); return (b->used-1)/sizeof( wchar_t); - + } @@ -1384,7 +1384,7 @@ int b_append( buffer_t *b, const void *d, ssize_t len ) if( len<=0 ) return 0; - CHECK( b, -1 ); + CHECK( b, -1 ); if( !b ) { @@ -1400,12 +1400,12 @@ int b_append( buffer_t *b, const void *d, ssize_t len ) { size_t l = maxi( b->length*2, b->used+len+MIN_SIZE ); - + void *d = realloc( b->buff, l ); if( !d ) { oom_handler( b ); - return -1; + return -1; } b->buff=d; b->length = l; diff --git a/util.h b/util.h index 84bbe0970..14753b1cb 100644 --- a/util.h +++ b/util.h @@ -25,7 +25,7 @@ typedef void (*func_ptr_t)(); used to make sure that the pointer type can fit whatever we want to insert. */ -typedef union +typedef union { /** long value @@ -91,7 +91,7 @@ typedef struct hash_table /** The array containing the data */ hash_struct_t *arr; /** A simple one item cache. This should always point to the index of the last item to be used */ - int cache; + int cache; /** Number of elements */ int count; /** Length of array */ @@ -128,12 +128,12 @@ priority_queue_t; */ typedef struct array_list { - /** + /** Array containing the data */ anything_t *arr; - - /** + + /** Internal cursor position of the array_list_t. This is the position to append elements at. This is also what the array_list_t considers to be its true size, as reported by @@ -142,7 +142,7 @@ typedef struct array_list */ size_t pos; - /** + /** Amount of memory allocated in arr, expressed in number of elements. */ size_t size; @@ -181,8 +181,8 @@ typedef buffer_t string_buffer_t; /** Set the out-of-memory handler callback function. If a memory - allocation fails, this function will be called. -*/ + allocation fails, this function will be called. +*/ void (*util_set_oom_handler( void (*h)(void *) ))(void *); /** @@ -207,38 +207,38 @@ int mini( int a, int b ); /* All the datastuctures below autoresize. The queue, stack and priority queue are all impemented using an array and are guaranteed - to never be less than 50% full. + to never be less than 50% full. */ -/** +/** Initialize the queue. A queue is a FIFO buffer, i.e. the first element to be inserted into the buffer is the first element to be - returned. + returned. */ void q_init( dyn_queue_t *q ); /** - Destroy the queue + Destroy the queue */ void q_destroy( dyn_queue_t *q ); /** - Insert element into queue + Insert element into queue */ int q_put( dyn_queue_t *q, void *e ); /** - Remove and return next element from queue + Remove and return next element from queue */ void *q_get( dyn_queue_t *q); /** - Return next element from queue without removing it + Return next element from queue without removing it */ void *q_peek( dyn_queue_t *q); /** - Returns 1 if the queue is empty, 0 otherwise + Returns 1 if the queue is empty, 0 otherwise */ int q_empty( dyn_queue_t *q ); @@ -262,9 +262,9 @@ void hash_init2( hash_table_t *h, */ void hash_destroy( hash_table_t *h ); /** - Set the key/value pair for the hashtable. + Set the key/value pair for the hashtable. */ -int hash_put( hash_table_t *h, +int hash_put( hash_table_t *h, const void *key, const void *data ); /** @@ -275,7 +275,7 @@ void *hash_get( hash_table_t *h, /** Returns the hash tables version of the specified key */ -void *hash_get_key( hash_table_t *h, +void *hash_get_key( hash_table_t *h, const void *key ); /** @@ -290,15 +290,15 @@ int hash_get_count( hash_table_t *h); \param old_key If not 0, a pointer to the old key will be stored at the specified address \param old_data If not 0, a pointer to the data will be stored at the specified address */ -void hash_remove( hash_table_t *h, - const void *key, +void hash_remove( hash_table_t *h, + const void *key, void **old_key, void **old_data ); /** Checks whether the specified key is in the hash table */ -int hash_contains( hash_table_t *h, +int hash_contains( hash_table_t *h, const void *key ); /** @@ -316,20 +316,20 @@ void hash_get_data( hash_table_t *h, /** Call the function func for each key/data pair in the table */ -void hash_foreach( hash_table_t *h, +void hash_foreach( hash_table_t *h, void (*func)( void *, void * ) ); /** Same as hash_foreach, but the function func takes an additional - argument, which is provided by the caller in the variable aux + argument, which is provided by the caller in the variable aux */ -void hash_foreach2( hash_table_t *h, void (*func)( void *, - void *, - void *), +void hash_foreach2( hash_table_t *h, void (*func)( void *, + void *, + void *), void *aux ); /** - Hash function suitable for character strings. + Hash function suitable for character strings. */ int hash_str_func( void *data ); /** @@ -348,7 +348,7 @@ int hash_wcs_func( void *data ); /** Hash comparison function suitable for wide character strings */ -int hash_wcs_cmp( void *a, +int hash_wcs_cmp( void *a, void *b ); /** @@ -365,9 +365,9 @@ int hash_ptr_cmp( void *a, -/** +/** Initialize the priority queue - + \param q the queue to initialize \param compare a comparison function that can compare two entries in the queue */ @@ -378,7 +378,7 @@ void pq_init( priority_queue_t *q, \param q the queue \param e the new element - + */ int pq_put( priority_queue_t *q, void *e ); @@ -392,7 +392,7 @@ void *pq_get( priority_queue_t *q ); */ void *pq_peek( priority_queue_t *q ); -/** +/** Returns 1 if the priority queue is empty, 0 otherwise. */ int pq_empty( priority_queue_t *q ); @@ -402,7 +402,7 @@ int pq_empty( priority_queue_t *q ); */ int pq_get_count( priority_queue_t *q ); -/** +/** Destroy the priority queue and free memory used by it. */ void pq_destroy( priority_queue_t *q ); @@ -413,12 +413,12 @@ void pq_destroy( priority_queue_t *q ); */ array_list_t *al_new(); -/** - Initialize the list. +/** + Initialize the list. */ void al_init( array_list_t *l ); -/** +/** Destroy the list and free memory used by it. */ void al_destroy( array_list_t *l ); @@ -468,15 +468,15 @@ int al_insert( array_list_t *a, int pos, int count ); Sets the element at the specified index \param l The array_list_t - \param pos The index - \param o The element + \param pos The index + \param o The element */ int al_set( array_list_t *l, int pos, const void *o ); /** Sets the element at the specified index \param l The array_list_t - \param pos The index + \param pos The index \param v The element to set */ int al_set_long( array_list_t *l, int pos, long v ); @@ -484,7 +484,7 @@ int al_set_long( array_list_t *l, int pos, long v ); Sets the element at the specified index \param l The array_list_t - \param pos The index + \param pos The index \param f The element to insert */ int al_set_func( array_list_t *l, int pos, func_ptr_t f ); @@ -493,24 +493,24 @@ int al_set_func( array_list_t *l, int pos, func_ptr_t f ); Returns the element at the specified index \param l The array_list_t - \param pos The index - \return The element + \param pos The index + \return The element */ void *al_get( array_list_t *l, int pos ); /** Returns the element at the specified index \param l The array_list_t - \param pos The index - \return The element + \param pos The index + \return The element */ long al_get_long( array_list_t *l, int pos ); /** Returns the element at the specified index \param l The array_list_t - \param pos The index - \return The element + \param pos The index + \return The element */ func_ptr_t al_get_func( array_list_t *l, int pos ); @@ -555,12 +555,12 @@ func_ptr_t al_peek_func( array_list_t *l ); */ int al_empty( array_list_t *l); -/** +/** Call the function func for each entry in the list */ void al_foreach( array_list_t *l, void (*func)( void * )); -/** +/** Same as al_foreach, but the function func takes an additional argument, which is provided by the caller in the variable aux */ diff --git a/wgetopt.c b/wgetopt.c index 08e42cbaa..351fc249e 100644 --- a/wgetopt.c +++ b/wgetopt.c @@ -1,5 +1,5 @@ /** \file wgetopt.c - A version of the getopt library for use with wide character strings. + A version of the getopt library for use with wide character strings. This is simply the gnu getopt library, but converted for use with wchar_t instead of char. This is not usually useful since the argv @@ -257,7 +257,7 @@ exchange (argv) int middle = last_nonopt; int top = woptind; wchar_t *tem; - + /* Exchange the shorter segment with the far end of the longer segment. That puts the shorter segment into the right place. It leaves the longer segment in the right place overall, @@ -712,7 +712,7 @@ wgetopt_long (argc, argv, options, long_options, opt_index) int argc; wchar_t *const *argv; const wchar_t *options; -const struct woption *long_options; +const struct woption *long_options; int *opt_index; { return _wgetopt_internal (argc, argv, options, long_options, opt_index, 0); @@ -723,7 +723,7 @@ wgetopt_long_only (argc, argv, options, long_options, opt_index) int argc; wchar_t *const *argv; const wchar_t *options; -const struct woption *long_options; +const struct woption *long_options; int *opt_index; { return _wgetopt_internal (argc, argv, options, long_options, opt_index, 1); diff --git a/wgetopt.h b/wgetopt.h index 126b42b56..f1f186ed0 100644 --- a/wgetopt.h +++ b/wgetopt.h @@ -1,5 +1,5 @@ /** \file wgetopt.h - A version of the getopt library for use with wide character strings. + A version of the getopt library for use with wide character strings. This is simply the gnu getopt library, but converted for use with wchar_t instead of char. This is not usually useful since the argv @@ -115,12 +115,12 @@ struct woption #else wchar_t *name; #endif - /** + /** Must be one of no_argument, required_argument and optional_argument. has_arg can't be an enum because some compilers complain about - type mismatches in all the code that assumes it is an int. + type mismatches in all the code that assumes it is an int. */ int has_arg; @@ -153,7 +153,7 @@ struct woption #if defined (__STDC__) && __STDC__ #ifdef __GNU_LIBRARY__ -/** +/** Get options from argument list. See the glibc manual for information on how to use this function. */ extern int wgetopt (int argc, wchar_t *const *argv, const wchar_t *shortopts); @@ -161,20 +161,20 @@ extern int wgetopt (int argc, wchar_t *const *argv, const wchar_t *shortopts); extern int wgetopt (); #endif /* __GNU_LIBRARY__ */ -/** +/** Get options from argument list. See the glibc manual for information on how to use this function. */ extern int wgetopt_long (int argc, wchar_t *const *argv, const wchar_t *shortopts, const struct woption *longopts, int *longind); -/** +/** Get options from argument list. See the glibc manual for information on how to use this function. */ extern int wgetopt_long_only (int argc, wchar_t *const *argv, const wchar_t *shortopts, const struct woption *longopts, int *longind); -/** - Internal only. Users should not call this directly. +/** + Internal only. Users should not call this directly. */ extern int _wgetopt_internal (int argc, wchar_t *const *argv, const wchar_t *shortopts, @@ -182,23 +182,23 @@ extern int _wgetopt_internal (int argc, wchar_t *const *argv, int long_only); #else /* not __STDC__ */ -/** +/** Get options from argument list. See the glibc manual for information on how to use this function. */ extern int wgetopt (); -/** +/** Get options from argument list. See the glibc manual for information on how to use this function. */ extern int wgetopt_long (); -/** +/** Get options from argument list. See the glibc manual for information on how to use this function. */ extern int wgetopt_long_only (); -/** - Internal only. Users should not call this directly. +/** + Internal only. Users should not call this directly. */ extern int _wgetopt_internal (); #endif /* __STDC__ */ diff --git a/wildcard.c b/wildcard.c index f585dbb98..49f66d810 100644 --- a/wildcard.c +++ b/wildcard.c @@ -43,7 +43,7 @@ wildcards using **. /** The maximum length of a filename token. This is a fallback value, - an attempt to find the true value using patchconf is always made. + an attempt to find the true value using patchconf is always made. */ #define MAX_FILE_LENGTH 1024 @@ -115,9 +115,9 @@ static void al_push_check( array_list_t *l, const wchar_t *new ) { int i; - for( i = 0; i < al_get_count(l); i++ ) + for( i = 0; i < al_get_count(l); i++ ) { - if( !wcscmp( al_get(l, i), new ) ) + if( !wcscmp( al_get(l, i), new ) ) { free( (void *)new ); return; @@ -143,7 +143,7 @@ int wildcard_has( const wchar_t *str, int internal ) if( !str ) { debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ ); - return 0; + return 0; } if( internal ) @@ -164,33 +164,33 @@ int wildcard_has( const wchar_t *str, int internal ) prev = *str; } } - + return 0; } /** Check whether the string str matches the wildcard string wc. - + \param str String to be matched. \param wc The wildcard. - \param is_first Whether files beginning with dots should not be matched against wildcards. + \param is_first Whether files beginning with dots should not be matched against wildcards. */ -static int wildcard_match2( const wchar_t *str, - const wchar_t *wc, +static int wildcard_match2( const wchar_t *str, + const wchar_t *wc, int is_first ) { - + if( *str == 0 && *wc==0 ) return 1; - + if( *wc == ANY_STRING || *wc == ANY_STRING_RECURSIVE) - { + { /* Ignore hidden file */ if( is_first && *str == L'.' ) { return 0; } - + /* Try all submatches */ do { @@ -215,10 +215,10 @@ static int wildcard_match2( const wchar_t *str, { return 0; } - + return wildcard_match2( str+1, wc+1, 0 ); } - + if( *wc == *str ) return wildcard_match2( str+1, wc+1, 0 ); @@ -230,9 +230,9 @@ static int wildcard_match2( const wchar_t *str, possible completion of the string, the remainder of the string is inserted into the array_list_t. */ -static int wildcard_complete_internal( const wchar_t *orig, - const wchar_t *str, - const wchar_t *wc, +static int wildcard_complete_internal( const wchar_t *orig, + const wchar_t *str, + const wchar_t *wc, int is_first, const wchar_t *desc, const wchar_t *(*desc_func)(const wchar_t *), @@ -242,7 +242,7 @@ static int wildcard_complete_internal( const wchar_t *orig, if( !wc || !str || !orig) { debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ ); - return 0; + return 0; } if( *wc == 0 && @@ -250,12 +250,12 @@ static int wildcard_complete_internal( const wchar_t *orig, { wchar_t *out_completion = 0; const wchar_t *out_desc = desc; - + if( !out ) { return 1; } - + if( flags & COMPLETE_NO_CASE ) { out_completion = wcsdup( orig ); @@ -271,11 +271,11 @@ static int wildcard_complete_internal( const wchar_t *orig, This completion has an embedded description, du not use the generic description */ wchar_t *sep; - + sep = wcschr(out_completion, PROG_COMPLETE_SEP ); *sep = 0; out_desc = sep + 1; - + } else { @@ -290,31 +290,31 @@ static int wildcard_complete_internal( const wchar_t *orig, if( func_desc ) out_desc = func_desc; } - + } - + if( out_completion ) { - completion_allocate( out, + completion_allocate( out, out_completion, out_desc, flags ); } - + free ( out_completion ); - + return 1; } - - + + if( *wc == ANY_STRING ) - { + { int res=0; - + /* Ignore hidden file */ if( is_first && str[0] == L'.' ) return 0; - + /* Try all submatches */ do { @@ -324,12 +324,12 @@ static int wildcard_complete_internal( const wchar_t *orig, } while( *str++ != 0 ); return res; - + } else if( *wc == ANY_CHAR ) { return wildcard_complete_internal( orig, str+1, wc+1, 0, desc, desc_func, out, flags ); - } + } else if( *wc == *str ) { return wildcard_complete_internal( orig, str+1, wc+1, 0, desc, desc_func, out, flags ); @@ -338,19 +338,19 @@ static int wildcard_complete_internal( const wchar_t *orig, { return wildcard_complete_internal( orig, str+1, wc+1, 0, desc, desc_func, out, flags | COMPLETE_NO_CASE ); } - return 0; + return 0; } int wildcard_complete( const wchar_t *str, const wchar_t *wc, - const wchar_t *desc, + const wchar_t *desc, const wchar_t *(*desc_func)(const wchar_t *), array_list_t *out, int flags ) { int res; - - res = wildcard_complete_internal( str, str, wc, 1, desc, desc_func, out, flags ); + + res = wildcard_complete_internal( str, str, wc, 1, desc, desc_func, out, flags ); return res; } @@ -358,21 +358,21 @@ int wildcard_complete( const wchar_t *str, int wildcard_match( const wchar_t *str, const wchar_t *wc ) { - return wildcard_match2( str, wc, 1 ); + return wildcard_match2( str, wc, 1 ); } /** - Creates a path from the specified directory and filename. + Creates a path from the specified directory and filename. */ static wchar_t *make_path( const wchar_t *base_dir, const wchar_t *name ) { - + wchar_t *long_name; int base_len = wcslen( base_dir ); if( !(long_name= malloc( sizeof(wchar_t)*(base_len+wcslen(name)+1) ))) { DIE_MEM(); - } + } wcscpy( long_name, base_dir ); wcscpy(&long_name[base_len], name ); return long_name; @@ -393,12 +393,12 @@ static wchar_t *complete_get_desc_suffix_internal( const wchar_t *suff_orig ) if( !suff || !cmd ) DIE_MEM(); - + al_init( &l ); - + if( exec_subshell( cmd, &l ) != -1 ) { - + if( al_get_count( &l )>0 ) { wchar_t *ln = (wchar_t *)al_get(&l, 0 ); @@ -414,16 +414,16 @@ static wchar_t *complete_get_desc_suffix_internal( const wchar_t *suff_orig ) } } } - + free(cmd); al_foreach( &l, &free ); al_destroy( &l ); - + if( !desc ) { desc = wcsdup(COMPLETE_FILE_DESC); } - + hash_put( suffix_hash, suff, desc ); return desc; @@ -458,7 +458,7 @@ static const wchar_t *complete_get_desc_suffix( const wchar_t *suff_orig ) wchar_t *desc; len = wcslen(suff_orig ); - + if( len == 0 ) return COMPLETE_FILE_DESC; @@ -494,7 +494,7 @@ static const wchar_t *complete_get_desc_suffix( const wchar_t *suff_orig ) { desc = complete_get_desc_suffix_internal( suff ); } - + free( suff ); return desc; @@ -511,20 +511,20 @@ static const wchar_t *complete_get_desc_suffix( const wchar_t *suff_orig ) \param lbuf The struct buf output of calling lstat on the file \param stat_res The result of calling stat on the file \param buf The struct buf output of calling stat on the file - \param err The errno value after a failed stat call on the file. + \param err The errno value after a failed stat call on the file. */ -static const wchar_t *file_get_desc( const wchar_t *filename, +static const wchar_t *file_get_desc( const wchar_t *filename, int lstat_res, - struct stat lbuf, - int stat_res, - struct stat buf, + struct stat lbuf, + int stat_res, + struct stat buf, int err ) { wchar_t *suffix; CHECK( filename, 0 ); - + if( !lstat_res ) { if( S_ISLNK(lbuf.st_mode)) @@ -542,7 +542,7 @@ static const wchar_t *file_get_desc( const wchar_t *filename, ( buf.st_mode & S_IXGRP ) || ( buf.st_mode & S_IXOTH ) ) { - + if( waccess( filename, X_OK ) == 0 ) { /* @@ -557,7 +557,7 @@ static const wchar_t *file_get_desc( const wchar_t *filename, } } } - + return COMPLETE_SYMLINK_DESC; } @@ -569,7 +569,7 @@ static const wchar_t *file_get_desc( const wchar_t *filename, { return COMPLETE_ROTTEN_SYMLINK_DESC; } - + case ELOOP: { return COMPLETE_LOOP_SYMLINK_DESC; @@ -602,13 +602,13 @@ static const wchar_t *file_get_desc( const wchar_t *filename, { return COMPLETE_DIRECTORY_DESC; } - else + else { if( ( buf.st_mode & S_IXUSR ) || ( buf.st_mode & S_IXGRP ) || ( buf.st_mode & S_IXOTH ) ) { - + if( waccess( filename, X_OK ) == 0 ) { /* @@ -624,19 +624,19 @@ static const wchar_t *file_get_desc( const wchar_t *filename, } } } - + suffix = wcsrchr( filename, L'.' ); if( suffix != 0 && !wcsrchr( suffix, L'/' ) ) { return complete_get_desc_suffix( suffix ); } - + return COMPLETE_FILE_DESC ; } /** - Add the specified filename if it matches the specified wildcard. + Add the specified filename if it matches the specified wildcard. If the filename matches, first get the description of the specified filename. If this is a regular file, append the filesize to the @@ -648,8 +648,8 @@ static const wchar_t *file_get_desc( const wchar_t *filename, \param wc the wildcard to match against \param is_cmd whether we are performing command completion */ -static void wildcard_completion_allocate( array_list_t *list, - const wchar_t *fullname, +static void wildcard_completion_allocate( array_list_t *list, + const wchar_t *fullname, const wchar_t *completion, const wchar_t *wc, int is_cmd ) @@ -657,14 +657,14 @@ static void wildcard_completion_allocate( array_list_t *list, const wchar_t *desc; struct stat buf, lbuf; static string_buffer_t *sb = 0; - + int free_completion = 0; - + int flags = 0; int stat_res, lstat_res; int stat_errno=0; - - long long sz; + + long long sz; if( !sb ) { @@ -676,7 +676,7 @@ static void wildcard_completion_allocate( array_list_t *list, } CHECK( fullname, ); - + sb_clear( sb ); /* @@ -694,7 +694,7 @@ static void wildcard_completion_allocate( array_list_t *list, { if( S_ISLNK(lbuf.st_mode)) { - + if( ( stat_res = wstat( fullname, &buf ) ) ) { sz=-1; @@ -703,7 +703,7 @@ static void wildcard_completion_allocate( array_list_t *list, { sz = (long long)buf.st_size; } - + /* In order to differentiate between e.g. rotten symlinks and symlink loops, we also need to know the error status of wstat. @@ -717,9 +717,9 @@ static void wildcard_completion_allocate( array_list_t *list, sz = (long long)buf.st_size; } } - + desc = file_get_desc( fullname, lstat_res, lbuf, stat_res, buf, stat_errno ); - + if( sz >= 0 && S_ISDIR(buf.st_mode) ) { free_completion = 1; @@ -728,7 +728,7 @@ static void wildcard_completion_allocate( array_list_t *list, sb_append( sb, desc ); } else - { + { sb_append( sb, desc, L", ", (void *)0 ); sb_format_size( sb, sz ); } @@ -759,14 +759,14 @@ static int test_flags( wchar_t *filename, return 0; } } - - + + if( flags & EXECUTABLES_ONLY ) { if ( waccess( filename, X_OK ) != 0) return 0; } - + return 1; } @@ -776,24 +776,24 @@ static int test_flags( wchar_t *filename, This function traverses the relevant directory tree looking for matches, and recurses when needed to handle wildcrards spanning - multiple components and recursive wildcards. + multiple components and recursive wildcards. */ -static int wildcard_expand_internal( const wchar_t *wc, +static int wildcard_expand_internal( const wchar_t *wc, const wchar_t *base_dir, int flags, array_list_t *out ) { - + /* Points to the end of the current wildcard segment */ wchar_t *wc_end; /* Variables for traversing a directory */ struct wdirent *next; DIR *dir; - + /* The result returned */ int res = 0; - + /* Length of the directory to search in */ int base_len; @@ -806,24 +806,24 @@ static int wildcard_expand_internal( const wchar_t *wc, /* Description for completions */ string_buffer_t sb_desc; - + // debug( 3, L"WILDCARD_EXPAND %ls in %ls", wc, base_dir ); if( reader_interrupted() ) { return -1; } - + if( !wc || !base_dir || !out) { debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ ); - return 0; + return 0; } if( flags & ACCEPT_INCOMPLETE ) - { - /* - Avoid excessive number of returned matches for wc ending with a * + { + /* + Avoid excessive number of returned matches for wc ending with a * */ int len = wcslen(wc); if( len && (wc[len-1]==ANY_STRING) ) @@ -832,7 +832,7 @@ static int wildcard_expand_internal( const wchar_t *wc, foo[len-1]=0; int res = wildcard_expand_internal( foo, base_dir, flags, out ); free( foo ); - return res; + return res; } } @@ -841,7 +841,7 @@ static int wildcard_expand_internal( const wchar_t *wc, */ dir_string = base_dir[0]==L'\0'?L".":base_dir; - + if( !(dir = wopendir( dir_string ))) { return 0; @@ -852,7 +852,7 @@ static int wildcard_expand_internal( const wchar_t *wc, /* Test for recursive match string in current segment - */ + */ wc_recursive = wcschr( wc, ANY_STRING_RECURSIVE ); is_recursive = ( wc_recursive && (!wc_end || wc_recursive < wc_end)); @@ -883,7 +883,7 @@ static int wildcard_expand_internal( const wchar_t *wc, { wchar_t *name = next->d_name; wchar_t *long_name = make_path( base_dir, name ); - + if( test_flags( long_name, flags ) ) { wildcard_completion_allocate( out, @@ -892,16 +892,16 @@ static int wildcard_expand_internal( const wchar_t *wc, L"", flags & EXECUTABLES_ONLY ); } - + free( long_name ); - } + } } } else - { + { res = 1; al_push_check( out, wcsdup( base_dir ) ); - } + } } else { @@ -911,14 +911,14 @@ static int wildcard_expand_internal( const wchar_t *wc, while( (next=wreaddir(dir))!=0 ) { wchar_t *name = next->d_name; - + if( flags & ACCEPT_INCOMPLETE ) { - + wchar_t *long_name = make_path( base_dir, name ); /* - Test for matches before stating file, so as to minimize the number of calls to the much slower stat function + Test for matches before stating file, so as to minimize the number of calls to the much slower stat function */ if( wildcard_complete( name, wc, @@ -934,12 +934,12 @@ static int wildcard_expand_internal( const wchar_t *wc, name, wc, flags & EXECUTABLES_ONLY ); - + } } - + free( long_name ); - + } else { @@ -947,7 +947,7 @@ static int wildcard_expand_internal( const wchar_t *wc, { wchar_t *long_name = make_path( base_dir, name ); int skip = 0; - + if( is_recursive ) { /* @@ -959,9 +959,9 @@ static int wildcard_expand_internal( const wchar_t *wc, if( !wstat( long_name, &buf ) ) { skip = S_ISDIR(buf.st_mode); - } + } } - + if( skip ) { free( long_name ); @@ -983,7 +983,7 @@ static int wildcard_expand_internal( const wchar_t *wc, Wilcard segment is not the last segment. Recursively call wildcard_expand for all matching subdirectories. */ - + /* wc_str is the part of the wildcarded string from the beginning to the first slash @@ -1010,17 +1010,17 @@ static int wildcard_expand_internal( const wchar_t *wc, if( narrow_dir_string ) { - /* + /* Find out how long the filename can be in a worst case scenario */ - ln = pathconf( narrow_dir_string, _PC_NAME_MAX ); + ln = pathconf( narrow_dir_string, _PC_NAME_MAX ); /* If not specified, use som large number as fallback */ if( ln < 0 ) - ln = MAX_FILE_LENGTH; + ln = MAX_FILE_LENGTH; free( narrow_dir_string ); } new_dir= malloc( sizeof(wchar_t)*(base_len+ln+2) ); @@ -1033,19 +1033,19 @@ static int wildcard_expand_internal( const wchar_t *wc, } wcscpy( new_dir, base_dir ); - + while( (next=wreaddir(dir))!=0 ) { wchar_t *name = next->d_name; - + /* Test if the file/directory name matches the whole wildcard element, i.e. regular matching. */ int whole_match = wildcard_match2( name, wc_str, 1 ); int partial_match = 0; - - /* + + /* If we are doing recursive matching, also check if this directory matches the part up to the recusrive wildcard, if so, then we can search all subdirectories @@ -1057,24 +1057,24 @@ static int wildcard_expand_internal( const wchar_t *wc, wchar_t *wc_sub = wcsndup( wc, end-wc+1); partial_match = wildcard_match2( name, wc_sub, 1 ); free( wc_sub ); - } + } if( whole_match || partial_match ) { int new_len; - struct stat buf; + struct stat buf; char *dir_str; int stat_res; int new_res; wcscpy(&new_dir[base_len], name ); dir_str = wcs2str( new_dir ); - + if( dir_str ) { stat_res = stat( dir_str, &buf ); free( dir_str ); - + if( !stat_res ) { if( S_ISDIR(buf.st_mode) ) @@ -1082,7 +1082,7 @@ static int wildcard_expand_internal( const wchar_t *wc, new_len = wcslen( new_dir ); new_dir[new_len] = L'/'; new_dir[new_len+1] = L'\0'; - + /* Regular matching */ @@ -1100,51 +1100,51 @@ static int wildcard_expand_internal( const wchar_t *wc, new_wc++; } } - + new_res = wildcard_expand_internal( new_wc, - new_dir, - flags, + new_dir, + flags, out ); if( new_res == -1 ) { res = -1; break; - } + } res |= new_res; - + } - + /* Recursive matching */ if( partial_match ) { - - new_res = wildcard_expand_internal( wcschr( wc, ANY_STRING_RECURSIVE ), + + new_res = wildcard_expand_internal( wcschr( wc, ANY_STRING_RECURSIVE ), new_dir, - flags | WILDCARD_RECURSIVE, + flags | WILDCARD_RECURSIVE, out ); if( new_res == -1 ) { res = -1; break; - } + } res |= new_res; - + } - } + } } } } } - + free( wc_str ); free( new_dir ); } closedir( dir ); - + if( flags & ACCEPT_INCOMPLETE ) { sb_destroy( &sb_desc ); @@ -1154,7 +1154,7 @@ static int wildcard_expand_internal( const wchar_t *wc, } -int wildcard_expand( const wchar_t *wc, +int wildcard_expand( const wchar_t *wc, const wchar_t *base_dir, int flags, array_list_t *out ) @@ -1162,41 +1162,41 @@ int wildcard_expand( const wchar_t *wc, int c = al_get_count( out ); int res = wildcard_expand_internal( wc, base_dir, flags, out ); int i; - + if( flags & ACCEPT_INCOMPLETE ) { wchar_t *wc_base=L""; wchar_t *wc_base_ptr = wcsrchr( wc, L'/' ); string_buffer_t sb; - + if( wc_base_ptr ) { wc_base = wcsndup( wc, (wc_base_ptr-wc)+1 ); } - + sb_init( &sb ); for( i=c; iflags & COMPLETE_NO_CASE ) { sb_clear( &sb ); sb_printf( &sb, L"%ls%ls%ls", base_dir, wc_base, c->completion ); - + c->completion = halloc_wcsdup( out, (wchar_t *)sb.buff ); } } - + sb_destroy( &sb ); if( wc_base_ptr ) { free( wc_base ); } - + } return res; } diff --git a/wildcard.h b/wildcard.h index 917e15afd..26a8ce07f 100644 --- a/wildcard.h +++ b/wildcard.h @@ -1,4 +1,4 @@ -/** \file wildcard.h +/** \file wildcard.h My own globbing implementation. Needed to implement this instead of using libs globbing to support tab-expansion of globbed @@ -39,7 +39,7 @@ enum ; /** - Expand the wildcard by matching against the filesystem. + Expand the wildcard by matching against the filesystem. New strings are allocated using malloc and should be freed by the caller. @@ -61,11 +61,11 @@ enum \param out The list in which to put the output \return 1 if matches where found, 0 otherwise. Return -1 on abort (I.e. ^C was pressed). - + */ -int wildcard_expand( const wchar_t *wc, - const wchar_t *base_dir, - int flags, +int wildcard_expand( const wchar_t *wc, + const wchar_t *base_dir, + int flags, array_list_t *out ); /** Test whether the given wildcard matches the string @@ -74,7 +74,7 @@ int wildcard_expand( const wchar_t *wc, \param wc The wildcard to test against \return true if the wildcard matched */ -int wildcard_match( const wchar_t *str, +int wildcard_match( const wchar_t *str, const wchar_t *wc ); @@ -88,7 +88,7 @@ int wildcard_has( const wchar_t *str, int internal ); */ int wildcard_complete( const wchar_t *str, const wchar_t *wc, - const wchar_t *desc, + const wchar_t *desc, const wchar_t *(*desc_func)(const wchar_t *), array_list_t *out, int flags ); diff --git a/wutil.c b/wutil.c index 9c7e09a0b..3c55cf261 100644 --- a/wutil.c +++ b/wutil.c @@ -134,9 +134,9 @@ void wutil_destroy() static char *wutil_wcs2str( const wchar_t *in ) { size_t new_sz; - + wutil_calls++; - + new_sz =MAX_UTF8_BYTES*wcslen(in)+1; if( tmp_len < new_sz ) { @@ -161,9 +161,9 @@ static char *wutil_wcs2str( const wchar_t *in ) static wchar_t *wutil_str2wcs( const char *in ) { size_t new_sz; - + wutil_calls++; - + new_sz = sizeof(wchar_t)*(strlen(in)+1); if( tmp2_len < new_sz ) { @@ -175,7 +175,7 @@ static wchar_t *wutil_str2wcs( const char *in ) } tmp2_len = new_sz; } - + return str2wcs_internal( in, tmp2 ); } @@ -189,7 +189,7 @@ struct wdirent *wreaddir(DIR *dir ) my_wdirent.d_name = wutil_str2wcs( d->d_name ); return &my_wdirent; - + } @@ -198,24 +198,24 @@ wchar_t *wgetcwd( wchar_t *buff, size_t sz ) char *buffc = malloc( sz*MAX_UTF8_BYTES); char *res; wchar_t *ret = 0; - + if( !buffc ) { errno = ENOMEM; return 0; } - + res = getcwd( buffc, sz*MAX_UTF8_BYTES ); if( res ) { if( (size_t)-1 != mbstowcs( buff, buffc, sizeof( wchar_t ) * sz ) ) { ret = buff; - } + } } - + free( buffc ); - + return ret; } @@ -227,15 +227,15 @@ int wchdir( const wchar_t * dir ) FILE *wfopen(const wchar_t *path, const char *mode) { - + char *tmp =wutil_wcs2str(path); FILE *res=0; if( tmp ) { res = fopen(tmp, mode); - + } - return res; + return res; } FILE *wfreopen(const wchar_t *path, const char *mode, FILE *stream) @@ -246,7 +246,7 @@ FILE *wfreopen(const wchar_t *path, const char *mode, FILE *stream) { res = freopen(tmp, mode, stream); } - return res; + return res; } @@ -256,10 +256,10 @@ int wopen(const wchar_t *pathname, int flags, ...) char *tmp =wutil_wcs2str(pathname); int res=-1; va_list argp; - + if( tmp ) { - + if( ! (flags & O_CREAT) ) { res = open(tmp, flags); @@ -271,7 +271,7 @@ int wopen(const wchar_t *pathname, int flags, ...) va_end( argp ); } } - + return res; } @@ -283,7 +283,7 @@ int wcreat(const wchar_t *pathname, mode_t mode) { res= creat(tmp, mode); } - + return res; } @@ -291,11 +291,11 @@ DIR *wopendir(const wchar_t *name) { char *tmp =wutil_wcs2str(name); DIR *res = 0; - if( tmp ) + if( tmp ) { res = opendir(tmp); } - + return res; } @@ -308,8 +308,8 @@ int wstat(const wchar_t *file_name, struct stat *buf) { res = stat(tmp, buf); } - - return res; + + return res; } int lwstat(const wchar_t *file_name, struct stat *buf) @@ -321,8 +321,8 @@ int lwstat(const wchar_t *file_name, struct stat *buf) { res = lstat(tmp, buf); } - - return res; + + return res; } @@ -333,8 +333,8 @@ int waccess(const wchar_t *file_name, int mode) if( tmp ) { res= access(tmp, mode); - } - return res; + } + return res; } void wperror(const wchar_t *s) @@ -352,18 +352,18 @@ void wperror(const wchar_t *s) wchar_t *wrealpath(const wchar_t *pathname, wchar_t *resolved_path) { char *tmp = wutil_wcs2str(pathname); - char *narrow_res = realpath( tmp, 0 ); - wchar_t *res; + char *narrow_res = realpath( tmp, 0 ); + wchar_t *res; if( !narrow_res ) return 0; - + if( resolved_path ) { wchar_t *tmp2 = str2wcs( narrow_res ); wcslcpy( resolved_path, tmp2, PATH_MAX ); free( tmp2 ); - res = resolved_path; + res = resolved_path; } else { @@ -382,17 +382,17 @@ wchar_t *wrealpath(const wchar_t *pathname, wchar_t *resolved_path) char *tmp = wutil_wcs2str(pathname); char narrow_buff[PATH_MAX]; char *narrow_res = realpath( tmp, narrow_buff ); - wchar_t *res; + wchar_t *res; if( !narrow_res ) return 0; - + if( resolved_path ) { wchar_t *tmp2 = str2wcs( narrow_res ); wcslcpy( resolved_path, tmp2, PATH_MAX ); free( tmp2 ); - res = resolved_path; + res = resolved_path; } else { @@ -409,14 +409,14 @@ wchar_t *wdirname( wchar_t *path ) static string_buffer_t *sb = 0; if( sb ) sb_clear(sb); - else + else sb = sb_halloc( global_context ); - + char *tmp =wutil_wcs2str(path); char *narrow_res = dirname( tmp ); if( !narrow_res ) return 0; - + sb_printf( sb, L"%s", narrow_res ); wcscpy( path, (wchar_t *)sb->buff ); return path; @@ -427,14 +427,14 @@ wchar_t *wbasename( const wchar_t *path ) static string_buffer_t *sb = 0; if( sb ) sb_clear(sb); - else + else sb = sb_halloc( global_context ); - + char *tmp =wutil_wcs2str(path); char *narrow_res = basename( tmp ); if( !narrow_res ) return 0; - + sb_printf( sb, L"%s", narrow_res ); return (wchar_t *)sb->buff; } @@ -450,9 +450,9 @@ static void wgettext_destroy() if( !wgettext_is_init ) return; - + wgettext_is_init = 0; - + for(i=0; ibuff; - + } int wmkdir( const wchar_t *name, int mode ) @@ -555,7 +555,7 @@ int wrename( const wchar_t *old, const wchar_t *new ) char *old_narrow =wutil_wcs2str(old); char *new_narrow =wcs2str(new); int res; - + res = rename( old_narrow, new_narrow ); free( new_narrow ); diff --git a/wutil.h b/wutil.h index fcabfa93d..16f16d809 100644 --- a/wutil.h +++ b/wutil.h @@ -1,7 +1,7 @@ /** \file wutil.h Prototypes for wide character equivalents of various standard unix - functions. + functions. */ #ifndef FISH_WUTIL_H #define FISH_WUTIL_H @@ -95,7 +95,7 @@ wchar_t *wgetcwd( wchar_t *buff, size_t sz ); */ int wchdir( const wchar_t * dir ); -/** +/** Wide character version of realpath function. Just like the GNU version of realpath, wrealpath will accept 0 as the value for the second argument, in which case the result will be allocated using diff --git a/xdgmime.c b/xdgmime.c index e4934a975..1b66b05f0 100644 --- a/xdgmime.c +++ b/xdgmime.c @@ -2,13 +2,13 @@ /* xdgmime.c: XDG Mime Spec mime resolver. Based on version 0.11 of the spec. * * More info can be found at http://www.freedesktop.org/standards/ - * + * * Copyright (C) 2003,2004 Red Hat, Inc. * Copyright (C) 2003,2004 Jonathan Blandford * * Licensed under the Academic Free License version 2.0 * Or under the following terms: - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -440,7 +440,7 @@ xdg_mime_get_mime_type_for_file (const char *file_name) data = malloc (max_extent); if (data == NULL) return XDG_MIME_TYPE_UNKNOWN; - + file = fopen (file_name, "r"); if (file == NULL) { @@ -500,7 +500,7 @@ xdg_mime_shutdown (void) xdg_dir_time_list_free (dir_time_list); dir_time_list = NULL; } - + if (global_hash) { _xdg_glob_hash_free (global_hash); @@ -522,8 +522,8 @@ xdg_mime_shutdown (void) { _xdg_mime_parent_list_free ( parent_list); } - - + + for (list = callback_list; list; list = list->next) (list->callback) (list->data); @@ -534,7 +534,7 @@ int xdg_mime_get_max_buffer_extents (void) { xdg_mime_init (); - + return _xdg_mime_magic_get_buffer_extents (global_magic); } @@ -577,7 +577,7 @@ xdg_mime_media_type_equal (const char *mime_a, xdg_mime_init (); sep = strchr (mime_a, '/'); - + if (sep && strncmp (mime_a, mime_b, sep - mime_a + 1) == 0) return 1; @@ -616,7 +616,7 @@ xdg_mime_mime_type_subclass (const char *mime, if (strcmp (umime, ubase) == 0) return 1; -#if 0 +#if 0 /* Handle supertypes */ if (xdg_mime_is_super_type (ubase) && xdg_mime_media_type_equal (umime, ubase)) @@ -624,13 +624,13 @@ xdg_mime_mime_type_subclass (const char *mime, #endif /* Handle special cases text/plain and application/octet-stream */ - if (strcmp (ubase, "text/plain") == 0 && + if (strcmp (ubase, "text/plain") == 0 && strncmp (umime, "text/", 5) == 0) return 1; if (strcmp (ubase, "application/octet-stream") == 0) return 1; - + parents = _xdg_mime_parent_list_lookup (parent_list, umime); for (; parents && *parents; parents++) { @@ -653,7 +653,7 @@ xdg_mime_get_mime_parents (const char *mime) return _xdg_mime_parent_list_lookup (parent_list, umime); } -void +void xdg_mime_dump (void) { printf ("*** ALIASES ***\n\n"); diff --git a/xdgmime.h b/xdgmime.h index fd3647b59..a02b67881 100644 --- a/xdgmime.h +++ b/xdgmime.h @@ -2,13 +2,13 @@ /* xdgmime.h: XDG Mime Spec mime resolver. Based on version 0.11 of the spec. * * More info can be found at http://www.freedesktop.org/standards/ - * + * * Copyright (C) 2003 Red Hat, Inc. * Copyright (C) 2003 Jonathan Blandford * * Licensed under the Academic Free License version 2.0 * Or under the following terms: - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -44,7 +44,7 @@ extern "C" { typedef void (*XdgMimeCallback) (void *user_data); typedef void (*XdgMimeDestroy) (void *user_data); - + #ifdef XDG_PREFIX #define xdg_mime_get_mime_type_for_data XDG_ENTRY(get_mime_type_for_data) #define xdg_mime_get_mime_type_for_file XDG_ENTRY(get_mime_type_for_file) diff --git a/xdgmimealias.c b/xdgmimealias.c index 2dd70f1d6..35ce89078 100644 --- a/xdgmimealias.c +++ b/xdgmimealias.c @@ -47,7 +47,7 @@ typedef struct XdgAlias XdgAlias; -struct XdgAlias +struct XdgAlias { char *alias; char *mime_type; @@ -72,7 +72,7 @@ _xdg_mime_alias_list_new (void) return list; } -void +void _xdg_mime_alias_list_free (XdgAliasList *list) { int i; @@ -147,20 +147,20 @@ _xdg_mime_alias_read_from_file (XdgAliasList *list, if (list->n_aliases == alloc) { alloc <<= 1; - list->aliases = realloc (list->aliases, + list->aliases = realloc (list->aliases, alloc * sizeof (XdgAlias)); } list->aliases[list->n_aliases].alias = strdup (line); list->aliases[list->n_aliases].mime_type = strdup (sep); list->n_aliases++; } - list->aliases = realloc (list->aliases, + list->aliases = realloc (list->aliases, list->n_aliases * sizeof (XdgAlias)); - fclose (file); - + fclose (file); + if (list->n_aliases > 1) - qsort (list->aliases, list->n_aliases, + qsort (list->aliases, list->n_aliases, sizeof (XdgAlias), alias_entry_cmp); } @@ -174,7 +174,7 @@ _xdg_mime_alias_list_dump (XdgAliasList *list) { for (i = 0; i < list->n_aliases; i++) { - printf ("%s %s\n", + printf ("%s %s\n", list->aliases[i].alias, list->aliases[i].mime_type); } diff --git a/xdgmimeglob.c b/xdgmimeglob.c index ff3e27745..ef4a46085 100644 --- a/xdgmimeglob.c +++ b/xdgmimeglob.c @@ -302,11 +302,11 @@ _xdg_glob_hash_lookup_file_name (XdgGlobHash *glob_hash, mime_type = (_xdg_glob_hash_node_lookup_file_name (glob_hash->simple_node, ptr, FALSE)); if (mime_type != NULL) return mime_type; - + mime_type = (_xdg_glob_hash_node_lookup_file_name (glob_hash->simple_node, ptr, TRUE)); if (mime_type != NULL) return mime_type; - + ptr = strchr (ptr+1, '.'); } diff --git a/xdgmimeglob.h b/xdgmimeglob.h index 771c4527f..bd3e72cdd 100644 --- a/xdgmimeglob.h +++ b/xdgmimeglob.h @@ -39,7 +39,7 @@ typedef enum XDG_GLOB_FULL /* x*.[ch] */ } XdgGlobType; - + #ifdef XDG_PREFIX #define _xdg_mime_glob_read_from_file XDG_ENTRY(glob_read_from_file) #define _xdg_glob_hash_new XDG_ENTRY(hash_new) diff --git a/xdgmimeparent.c b/xdgmimeparent.c index 511bbacbc..30648e3ea 100644 --- a/xdgmimeparent.c +++ b/xdgmimeparent.c @@ -73,7 +73,7 @@ _xdg_mime_parent_list_new (void) return list; } -void +void _xdg_mime_parent_list_free (XdgParentList *list) { int i; @@ -159,13 +159,13 @@ _xdg_mime_parent_read_from_file (XdgParentList *list, break; } } - + if (!entry) { if (list->n_mimes == alloc) { alloc <<= 1; - list->parents = realloc (list->parents, + list->parents = realloc (list->parents, alloc * sizeof (XdgMimeParents)); } list->parents[list->n_mimes].mime = strdup (line); @@ -182,25 +182,25 @@ _xdg_mime_parent_read_from_file (XdgParentList *list, else { entry->n_parents += 1; - entry->parents = realloc (entry->parents, + entry->parents = realloc (entry->parents, (entry->n_parents + 2) * sizeof (char *)); } entry->parents[entry->n_parents - 1] = strdup (sep); entry->parents[entry->n_parents] = NULL; } - list->parents = realloc (list->parents, + list->parents = realloc (list->parents, list->n_mimes * sizeof (XdgMimeParents)); - fclose (file); - + fclose (file); + if (list->n_mimes > 1) - qsort (list->parents, list->n_mimes, + qsort (list->parents, list->n_mimes, sizeof (XdgMimeParents), &parent_entry_cmp); } -void +void _xdg_mime_parent_list_dump (XdgParentList *list) { int i; diff --git a/xsel-0.9.6.tar b/xsel-0.9.6.tar deleted file mode 100644 index 47e5ceb2b..000000000 Binary files a/xsel-0.9.6.tar and /dev/null differ diff --git a/xsel-1.2.0.tar.gz b/xsel-1.2.0.tar.gz new file mode 100644 index 000000000..866f678ee Binary files /dev/null and b/xsel-1.2.0.tar.gz differ