Changeset 2412


Ignore:
Timestamp:
03/12/10 18:51:27 (5 months ago)
Author:
aturner
Message:

merge r2410. fixes #412

Location:
trunk/libopts
Files:
42 edited

Legend:

Unmodified
Added
Removed
  • trunk/libopts

  • trunk/libopts/COPYING.gplv3

    r1892 r2412  
    22                       Version 3, 29 June 2007 
    33 
    4  copyright (c) 2007 by Bruce Korb - all rights reserved 
     4 copyright (c) 2009 by Bruce Korb - all rights reserved 
    55 Everyone is permitted to copy and distribute verbatim copies 
    66 of this license document, but changing it is not allowed. 
     
    633633 
    634634    <one line to give the program's name and a brief idea of what it does.> 
    635     copyright (c)  by Bruce Korb - all rights reserved 
     635    copyright (c) by Bruce Korb - all rights reserved 
    636636 
    637637    This program is free software: you can redistribute it and/or modify 
  • trunk/libopts/COPYING.lgplv3

    r1892 r2412  
    22                       Version 3, 29 June 2007 
    33 
    4  copyright (c) 2007 by Bruce Korb - all rights reserved 
     4 copyright (c) 2009 by Bruce Korb - all rights reserved 
    55 Everyone is permitted to copy and distribute verbatim copies 
    66 of this license document, but changing it is not allowed. 
  • trunk/libopts/README

    r1885 r2412  
    8686LICENSING: 
    8787 
    88 This material is copyright 1993-2007 by Bruce Korb. 
     88This material is copyright (c) 1993-2009 by Bruce Korb. 
    8989You are licensed to use this under the terms of either 
    9090the GNU Lesser General Public License (see: COPYING.lgpl), or, 
  • trunk/libopts/ag-char-map.h

    r2091 r2412  
    11/* 
    2  *   Character mapping generated 12/31/08 19:07:31 
     2 *   Character mapping generated 08/08/09 10:14:55 
    33 * 
    44 *  This file contains the character classifications 
     
    1313# elif defined(HAVE_STDINT_H) 
    1414#  include <stdint.h> 
     15 
    1516# else 
    16 #  error "no int-types header." 
    17 #  choke-me-now. 
    18 # endif 
    19 #else 
     17#   ifndef HAVE_INT8_T 
     18        typedef signed char     int8_t; 
     19#   endif 
     20#   ifndef HAVE_UINT8_T 
     21        typedef unsigned char   uint8_t; 
     22#   endif 
     23#   ifndef HAVE_INT16_T 
     24        typedef signed short    int16_t; 
     25#   endif 
     26#   ifndef HAVE_UINT16_T 
     27        typedef unsigned short  uint16_t; 
     28#   endif 
     29#   ifndef HAVE_UINT_T 
     30        typedef unsigned int    uint_t; 
     31#   endif 
     32 
     33#   ifndef HAVE_INT32_T 
     34#    if SIZEOF_INT == 4 
     35        typedef signed int      int32_t; 
     36#    elif SIZEOF_LONG == 4 
     37        typedef signed long     int32_t; 
     38#    endif 
     39#   endif 
     40 
     41#   ifndef HAVE_UINT32_T 
     42#    if SIZEOF_INT == 4 
     43        typedef unsigned int    uint32_t; 
     44#    elif SIZEOF_LONG == 4 
     45        typedef unsigned long   uint32_t; 
     46#    endif 
     47#   endif 
     48# endif /* HAVE_*INT*_H header */ 
     49 
     50#else /* not HAVE_CONFIG_H -- */ 
    2051# ifdef __sun 
    2152#  include <inttypes.h> 
     
    2354#  include <stdint.h> 
    2455# endif 
    25 #endif 
     56#endif /* HAVE_CONFIG_H */ 
    2657 
    2758#if 0 /* mapping specification source (from autogen.map) */ 
  • trunk/libopts/autoopts.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: autoopts.c,v 4.36 2008/12/20 18:35:26 bkorb Exp $ 
    4  *  Time-stamp:      "2008-12-16 14:52:28 bkorb" 
     3 *  $Id: autoopts.c,v 4.45 2009/08/01 17:43:05 bkorb Exp $ 
     4 *  Time-stamp:      "2009-01-12 02:49:49 bkorb" 
    55 * 
    66 *  This file contains all of the routines that must be linked into 
     
    1111 *  This file is part of AutoOpts, a companion to AutoGen. 
    1212 *  AutoOpts is free software. 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    14  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     13 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1514 * 
    1615 *  AutoOpts is available under any one of two licenses.  The license 
     
    2625 *  These files have the following md5sums: 
    2726 * 
    28  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    29  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     27 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     28 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    3029 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3130 */ 
     
    3938 
    4039static tSuccess 
    41 nextOption( tOptions* pOpts, tOptState* pOptState ); 
     40next_opt_arg_must(tOptions* pOpts, tOptState* pOptState); 
     41 
     42static tSuccess 
     43next_opt_arg_may(tOptions* pOpts, tOptState* pOptState); 
     44 
     45static tSuccess 
     46next_opt_arg_none(tOptions* pOpts, tOptState* pOptState); 
     47 
     48static tSuccess 
     49nextOption(tOptions* pOpts, tOptState* pOptState); 
    4250 
    4351static tSuccess 
     
    547555 
    548556 
     557static tSuccess 
     558next_opt_arg_must(tOptions* pOpts, tOptState* pOptState) 
     559{ 
     560    /* 
     561     *  An option argument is required.  Long options can either have 
     562     *  a separate command line argument, or an argument attached by 
     563     *  the '=' character.  Figure out which. 
     564     */ 
     565    switch (pOptState->optType) { 
     566    case TOPT_SHORT: 
     567        /* 
     568         *  See if an arg string follows the flag character 
     569         */ 
     570        if (*++(pOpts->pzCurOpt) == NUL) 
     571            pOpts->pzCurOpt = pOpts->origArgVect[ pOpts->curOptIdx++ ]; 
     572        pOptState->pzOptArg = pOpts->pzCurOpt; 
     573        break; 
     574 
     575    case TOPT_LONG: 
     576        /* 
     577         *  See if an arg string has already been assigned (glued on 
     578         *  with an `=' character) 
     579         */ 
     580        if (pOptState->pzOptArg == NULL) 
     581            pOptState->pzOptArg = pOpts->origArgVect[ pOpts->curOptIdx++ ]; 
     582        break; 
     583 
     584    default: 
     585#ifdef DEBUG 
     586        fputs( "AutoOpts lib error: option type not selected\n", 
     587               stderr ); 
     588        exit( EXIT_FAILURE ); 
     589#endif 
     590 
     591    case TOPT_DEFAULT: 
     592        /* 
     593         *  The option was selected by default.  The current token is 
     594         *  the option argument. 
     595         */ 
     596        break; 
     597    } 
     598 
     599    /* 
     600     *  Make sure we did not overflow the argument list. 
     601     */ 
     602    if (pOpts->curOptIdx > pOpts->origArgCt) { 
     603        fprintf( stderr, zMisArg, pOpts->pzProgPath, 
     604                 pOptState->pOD->pz_Name ); 
     605        return FAILURE; 
     606    } 
     607 
     608    pOpts->pzCurOpt = NULL;  /* next time advance to next arg */ 
     609    return SUCCESS; 
     610} 
     611 
     612 
     613static tSuccess 
     614next_opt_arg_may(tOptions* pOpts, tOptState* pOptState) 
     615{ 
     616    /* 
     617     *  An option argument is optional. 
     618     */ 
     619    switch (pOptState->optType) { 
     620    case TOPT_SHORT: 
     621        if (*++pOpts->pzCurOpt != NUL) 
     622            pOptState->pzOptArg = pOpts->pzCurOpt; 
     623        else { 
     624            char* pzLA = pOpts->origArgVect[ pOpts->curOptIdx ]; 
     625 
     626            /* 
     627             *  BECAUSE it is optional, we must make sure 
     628             *  we did not find another flag and that there 
     629             *  is such an argument. 
     630             */ 
     631            if ((pzLA == NULL) || (*pzLA == '-')) 
     632                pOptState->pzOptArg = NULL; 
     633            else { 
     634                pOpts->curOptIdx++; /* argument found */ 
     635                pOptState->pzOptArg = pzLA; 
     636            } 
     637        } 
     638        break; 
     639 
     640    case TOPT_LONG: 
     641        /* 
     642         *  Look for an argument if we don't already have one (glued on 
     643         *  with a `=' character) *AND* we are not in named argument mode 
     644         */ 
     645        if (  (pOptState->pzOptArg == NULL) 
     646              && (! NAMED_OPTS(pOpts))) { 
     647            char* pzLA = pOpts->origArgVect[ pOpts->curOptIdx ]; 
     648 
     649            /* 
     650             *  BECAUSE it is optional, we must make sure 
     651             *  we did not find another flag and that there 
     652             *  is such an argument. 
     653             */ 
     654            if ((pzLA == NULL) || (*pzLA == '-')) 
     655                pOptState->pzOptArg = NULL; 
     656            else { 
     657                pOpts->curOptIdx++; /* argument found */ 
     658                pOptState->pzOptArg = pzLA; 
     659            } 
     660        } 
     661        break; 
     662 
     663    default: 
     664    case TOPT_DEFAULT: 
     665        fputs(zAO_Woops, stderr ); 
     666        exit( EX_SOFTWARE ); 
     667    } 
     668 
     669    /* 
     670     *  After an option with an optional argument, we will 
     671     *  *always* start with the next option because if there 
     672     *  were any characters following the option name/flag, 
     673     *  they would be interpreted as the argument. 
     674     */ 
     675    pOpts->pzCurOpt = NULL; 
     676    return SUCCESS; 
     677} 
     678 
     679 
     680static tSuccess 
     681next_opt_arg_none(tOptions* pOpts, tOptState* pOptState) 
     682{ 
     683    /* 
     684     *  No option argument.  Make sure next time around we find 
     685     *  the correct option flag character for short options 
     686     */ 
     687    if (pOptState->optType == TOPT_SHORT) 
     688        (pOpts->pzCurOpt)++; 
     689 
     690    /* 
     691     *  It is a long option.  Make sure there was no ``=xxx'' argument 
     692     */ 
     693    else if (pOptState->pzOptArg != NULL) { 
     694        fprintf(stderr, zNoArg, pOpts->pzProgPath, pOptState->pOD->pz_Name); 
     695        return FAILURE; 
     696    } 
     697 
     698    /* 
     699     *  It is a long option.  Advance to next command line argument. 
     700     */ 
     701    else 
     702        pOpts->pzCurOpt = NULL; 
     703    return SUCCESS; 
     704} 
     705 
    549706/* 
    550707 *  nextOption 
     
    556713 */ 
    557714static tSuccess 
    558 nextOption( tOptions* pOpts, tOptState* pOptState ) 
    559 { 
    560     tSuccess res; 
    561     enum { ARG_NONE, ARG_MAY, ARG_MUST } arg_type = ARG_NONE; 
    562     teOptArgType at; 
    563  
    564     res = findOptDesc( pOpts, pOptState ); 
    565     if (! SUCCESSFUL( res )) 
    566         return res; 
     715nextOption(tOptions* pOpts, tOptState* pOptState) 
     716{ 
     717    { 
     718        tSuccess res; 
     719        res = findOptDesc( pOpts, pOptState ); 
     720        if (! SUCCESSFUL( res )) 
     721            return res; 
     722    } 
     723 
     724    if (  ((pOptState->flags & OPTST_DEFINED) != 0) 
     725       && ((pOptState->pOD->fOptState & OPTST_NO_COMMAND) != 0)) { 
     726        fprintf(stderr, zNotCmdOpt, pOptState->pOD->pz_Name); 
     727        return FAILURE; 
     728    } 
     729 
    567730    pOptState->flags |= (pOptState->pOD->fOptState & OPTST_PERSISTENT_MASK); 
    568     at = OPTST_GET_ARGTYPE(pOptState->flags); 
    569731 
    570732    /* 
     
    574736     *  Disabled mode option selection also disables option arguments. 
    575737     */ 
    576     if ((pOptState->flags & OPTST_DISABLED) != 0) 
    577         arg_type = ARG_NONE; 
    578     else if (at == OPARG_TYPE_NONE) 
    579         arg_type = ARG_NONE; 
    580     else if (pOptState->flags & OPTST_ARG_OPTIONAL) 
    581         arg_type = ARG_MAY; 
    582     else 
    583         arg_type = ARG_MUST; 
    584  
    585     switch (arg_type) { 
    586     case ARG_MUST: 
    587         /* 
    588          *  An option argument is required.  Long options can either have 
    589          *  a separate command line argument, or an argument attached by 
    590          *  the '=' character.  Figure out which. 
    591          */ 
    592         switch (pOptState->optType) { 
    593         case TOPT_SHORT: 
    594             /* 
    595              *  See if an arg string follows the flag character 
    596              */ 
    597             if (*++(pOpts->pzCurOpt) == NUL) 
    598                 pOpts->pzCurOpt = pOpts->origArgVect[ pOpts->curOptIdx++ ]; 
    599             pOptState->pzOptArg = pOpts->pzCurOpt; 
    600             break; 
    601  
    602         case TOPT_LONG: 
    603             /* 
    604              *  See if an arg string has already been assigned (glued on 
    605              *  with an `=' character) 
    606              */ 
    607             if (pOptState->pzOptArg == NULL) 
    608                 pOptState->pzOptArg = pOpts->origArgVect[ pOpts->curOptIdx++ ]; 
    609             break; 
    610  
    611         default: 
    612 #ifdef DEBUG 
    613             fputs( "AutoOpts lib error: option type not selected\n", 
    614                    stderr ); 
    615             exit( EXIT_FAILURE ); 
    616 #endif 
    617  
    618         case TOPT_DEFAULT: 
    619             /* 
    620              *  The option was selected by default.  The current token is 
    621              *  the option argument. 
    622              */ 
    623             break; 
    624         } 
    625  
    626         /* 
    627          *  Make sure we did not overflow the argument list. 
    628          */ 
    629         if (pOpts->curOptIdx > pOpts->origArgCt) { 
    630             fprintf( stderr, zMisArg, pOpts->pzProgPath, 
    631                      pOptState->pOD->pz_Name ); 
    632             return FAILURE; 
    633         } 
    634  
    635         pOpts->pzCurOpt = NULL;  /* next time advance to next arg */ 
    636         break; 
    637  
    638     case ARG_MAY: 
    639         /* 
    640          *  An option argument is optional. 
    641          */ 
    642         switch (pOptState->optType) { 
    643         case TOPT_SHORT: 
    644             if (*++pOpts->pzCurOpt != NUL) 
    645                 pOptState->pzOptArg = pOpts->pzCurOpt; 
    646             else { 
    647                 char* pzLA = pOpts->origArgVect[ pOpts->curOptIdx ]; 
    648  
    649                 /* 
    650                  *  BECAUSE it is optional, we must make sure 
    651                  *  we did not find another flag and that there 
    652                  *  is such an argument. 
    653                  */ 
    654                 if ((pzLA == NULL) || (*pzLA == '-')) 
    655                     pOptState->pzOptArg = NULL; 
    656                 else { 
    657                     pOpts->curOptIdx++; /* argument found */ 
    658                     pOptState->pzOptArg = pzLA; 
    659                 } 
    660             } 
    661             break; 
    662  
    663         case TOPT_LONG: 
    664             /* 
    665              *  Look for an argument if we don't already have one (glued on 
    666              *  with a `=' character) *AND* we are not in named argument mode 
    667              */ 
    668             if (  (pOptState->pzOptArg == NULL) 
    669                && (! NAMED_OPTS(pOpts))) { 
    670                 char* pzLA = pOpts->origArgVect[ pOpts->curOptIdx ]; 
    671  
    672                 /* 
    673                  *  BECAUSE it is optional, we must make sure 
    674                  *  we did not find another flag and that there 
    675                  *  is such an argument. 
    676                  */ 
    677                 if ((pzLA == NULL) || (*pzLA == '-')) 
    678                     pOptState->pzOptArg = NULL; 
    679                 else { 
    680                     pOpts->curOptIdx++; /* argument found */ 
    681                     pOptState->pzOptArg = pzLA; 
    682                 } 
    683             } 
    684             break; 
    685  
    686         default: 
    687         case TOPT_DEFAULT: 
    688             fputs("AutoOpts lib error: defaulted to option with optional arg\n", 
    689                   stderr ); 
    690             exit( EX_SOFTWARE ); 
    691         } 
    692  
    693         /* 
    694          *  After an option with an optional argument, we will 
    695          *  *always* start with the next option because if there 
    696          *  were any characters following the option name/flag, 
    697          *  they would be interpreted as the argument. 
    698          */ 
    699         pOpts->pzCurOpt = NULL; 
    700         break; 
    701  
    702     default: /* CANNOT */ 
    703         /* 
    704          *  No option argument.  Make sure next time around we find 
    705          *  the correct option flag character for short options 
    706          */ 
    707         if (pOptState->optType == TOPT_SHORT) 
    708             (pOpts->pzCurOpt)++; 
    709  
    710         /* 
    711          *  It is a long option.  Make sure there was no ``=xxx'' argument 
    712          */ 
    713         else if (pOptState->pzOptArg != NULL) { 
    714             fprintf( stderr, zNoArg, pOpts->pzProgPath, 
    715                      pOptState->pOD->pz_Name ); 
    716             return FAILURE; 
    717         } 
    718  
    719         /* 
    720          *  It is a long option.  Advance to next command line argument. 
    721          */ 
     738    { 
     739        enum { ARG_NONE, ARG_MAY, ARG_MUST } arg_type = ARG_NONE; 
     740        tSuccess res; 
     741 
     742        if ((pOptState->flags & OPTST_DISABLED) != 0) 
     743            arg_type = ARG_NONE; 
     744 
     745        else if (OPTST_GET_ARGTYPE(pOptState->flags) == OPARG_TYPE_NONE) 
     746            arg_type = ARG_NONE; 
     747 
     748        else if (pOptState->flags & OPTST_ARG_OPTIONAL) 
     749            arg_type = ARG_MAY; 
     750 
    722751        else 
    723             pOpts->pzCurOpt = NULL; 
    724     } 
    725  
    726     return SUCCESS; 
     752            arg_type = ARG_MUST; 
     753 
     754        switch (arg_type) { 
     755        case ARG_MUST: res = next_opt_arg_must(pOpts, pOptState); break; 
     756        case ARG_MAY:  res = next_opt_arg_may( pOpts, pOptState); break; 
     757        case ARG_NONE: res = next_opt_arg_none(pOpts, pOptState); break; 
     758        } 
     759 
     760        return res; 
     761    } 
    727762} 
    728763 
  • trunk/libopts/autoopts.h

    r2091 r2412  
    33 *  Time-stamp:      "2008-11-01 20:08:06 bkorb" 
    44 * 
    5  *  autoopts.h  $Id: autoopts.h,v 4.29 2008/11/02 18:51:26 bkorb Exp $ 
     5 *  autoopts.h  $Id: autoopts.h,v 4.42 2009/08/01 17:43:05 bkorb Exp $ 
    66 * 
    77 *  This file defines all the global structures and special values 
     
    1010 *  This file is part of AutoOpts, a companion to AutoGen. 
    1111 *  AutoOpts is free software. 
    12  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     12 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1413 * 
    1514 *  AutoOpts is available under any one of two licenses.  The license 
     
    2524 *  These files have the following md5sums: 
    2625 * 
    27  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    28  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     26 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     27 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2928 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3029 */ 
  • trunk/libopts/autoopts/options.h

    r2091 r2412  
    33 *  DO NOT EDIT THIS FILE   (options.h) 
    44 *   
    5  *  It has been AutoGen-ed  Wednesday December 31, 2008 at 07:07:15 PM PST 
     5 *  It has been AutoGen-ed  August  8, 2009 at 10:14:44 AM by AutoGen 5.9.9 
    66 *  From the definitions    funcs.def 
    77 *  and the template file   options_h 
     
    1010 *  used in the automated option processing library. 
    1111 * 
    12  *  Automated Options copyright 1992-Y Bruce Korb 
     12 *  Automated Options copyright (c) 1992-Y by Bruce Korb 
    1313 * 
    1414 *  AutoOpts is free software: you can redistribute it and/or modify it 
     
    6767 */ 
    6868 
    69 #define  OPTIONS_STRUCT_VERSION  131072 
    70 #define  OPTIONS_VERSION_STRING  "32:0:7" 
     69#define  OPTIONS_STRUCT_VERSION  131074 
     70#define  OPTIONS_VERSION_STRING  "32:2:7" 
    7171#define  OPTIONS_MINIMUM_VERSION 102400 
    7272#define  OPTIONS_MIN_VER_STRING  "25:0:0" 
     
    140140    OPTST_TWICE_ID           =  22, /* process opt twice - imm + reg */ 
    141141    OPTST_DISABLE_TWICE_ID   =  23, /* process disabled option twice */ 
    142     OPTST_SCALED_NUM_ID      =  24  /* scaled integer value          */ 
     142    OPTST_SCALED_NUM_ID      =  24, /* scaled integer value          */ 
     143    OPTST_NO_COMMAND_ID      =  25, /* disable from cmd line         */ 
     144    OPTST_DEPRECATED_ID      =  26  /* support is being removed      */ 
    143145} opt_state_enum_t; 
    144146 
    145 #define OPTST_INIT           0U 
     147#define OPTST_INIT               0U 
    146148#define OPTST_SET            (1U << OPTST_SET_ID) 
    147149#define OPTST_PRESET         (1U << OPTST_PRESET_ID) 
     
    168170#define OPTST_DISABLE_TWICE  (1U << OPTST_DISABLE_TWICE_ID) 
    169171#define OPTST_SCALED_NUM     (1U << OPTST_SCALED_NUM_ID) 
    170 #define OPT_STATE_MASK       0x01FFFF7FU 
    171  
    172 #define OPTST_SET_MASK       (  \ 
    173         OPTST_SET | \ 
    174         OPTST_PRESET | \ 
    175         OPTST_RESET | \ 
    176         OPTST_DEFINED ) 
    177  
    178 #define OPTST_MUTABLE_MASK   (  \ 
    179         OPTST_SET | \ 
    180         OPTST_PRESET | \ 
    181         OPTST_RESET | \ 
    182         OPTST_DEFINED | \ 
    183         OPTST_EQUIVALENCE | \ 
    184         OPTST_DISABLED | \ 
    185         OPTST_ALLOC_ARG ) 
    186  
    187 #define OPTST_SELECTED_MASK  (  \ 
    188         OPTST_SET | \ 
    189         OPTST_DEFINED ) 
    190  
    191 #define OPTST_ARG_TYPE_MASK  (  \ 
    192         OPTST_ARG_TYPE_1 | \ 
    193         OPTST_ARG_TYPE_2 | \ 
    194         OPTST_ARG_TYPE_3 | \ 
    195         OPTST_ARG_TYPE_4 ) 
    196  
    197 #define OPTST_DO_NOT_SAVE_MASK   (  \ 
    198         OPTST_NO_INIT | \ 
    199         OPTST_DOCUMENT | \ 
    200         OPTST_OMITTED ) 
     172#define OPTST_NO_COMMAND     (1U << OPTST_NO_COMMAND_ID) 
     173#define OPTST_DEPRECATED     (1U << OPTST_DEPRECATED_ID) 
     174#define OPT_STATE_MASK       0x07FFFF7FU 
     175 
     176#define OPTST_SET_MASK       ( \ 
     177        OPTST_DEFINED | OPTST_PRESET |  OPTST_RESET | \ 
     178        OPTST_SET \ 
     179        /* 0x0000000FU */ ) 
     180 
     181#define OPTST_MUTABLE_MASK   ( \ 
     182        OPTST_ALLOC_ARG |   OPTST_DEFINED | \ 
     183        OPTST_DISABLED |    OPTST_EQUIVALENCE | \ 
     184        OPTST_PRESET |      OPTST_RESET | \ 
     185        OPTST_SET \ 
     186        /* 0x0000007FU */ ) 
     187 
     188#define OPTST_SELECTED_MASK  ( \ 
     189        OPTST_DEFINED | OPTST_SET \ 
     190        /* 0x00000005U */ ) 
     191 
     192#define OPTST_ARG_TYPE_MASK  ( \ 
     193        OPTST_ARG_TYPE_1 | OPTST_ARG_TYPE_2 | OPTST_ARG_TYPE_3 | \ 
     194        OPTST_ARG_TYPE_4 \ 
     195        /* 0x0000F000U */ ) 
     196 
     197#define OPTST_DO_NOT_SAVE_MASK   ( \ 
     198        OPTST_DOCUMENT | OPTST_NO_INIT |  OPTST_OMITTED \ 
     199        /* 0x00280100U */ ) 
     200 
     201#define OPTST_NO_USAGE_MASK  ( \ 
     202        OPTST_DEPRECATED | OPTST_NO_COMMAND | OPTST_OMITTED \ 
     203        /* 0x06080000U */ ) 
    201204 
    202205#ifdef NO_OPTIONAL_OPT_ARGS 
     
    240243    OPTPROC_GNUUSAGE_ID        =  12, /* emit usage in GNU style        */ 
    241244    OPTPROC_TRANSLATE_ID       =  13, /* Translate strings in tOptions  */ 
    242     OPTPROC_HAS_IMMED_ID       =  14, /* program defines immed options  */ 
    243245    OPTPROC_NXLAT_OPT_CFG_ID   =  16, /* suppress for config only       */ 
    244246    OPTPROC_NXLAT_OPT_ID       =  17, /* suppress xlation always        */ 
     
    246248} optproc_state_enum_t; 
    247249 
    248 #define OPTPROC_NONE           0U 
     250#define OPTPROC_NONE               0U 
    249251#define OPTPROC_LONGOPT        (1U << OPTPROC_LONGOPT_ID) 
    250252#define OPTPROC_SHORTOPT       (1U << OPTPROC_SHORTOPT_ID) 
     
    261263#define OPTPROC_GNUUSAGE       (1U << OPTPROC_GNUUSAGE_ID) 
    262264#define OPTPROC_TRANSLATE      (1U << OPTPROC_TRANSLATE_ID) 
    263 #define OPTPROC_HAS_IMMED      (1U << OPTPROC_HAS_IMMED_ID) 
    264265#define OPTPROC_NXLAT_OPT_CFG  (1U << OPTPROC_NXLAT_OPT_CFG_ID) 
    265266#define OPTPROC_NXLAT_OPT      (1U << OPTPROC_NXLAT_OPT_ID) 
    266267#define OPTPROC_PRESETTING     (1U << OPTPROC_PRESETTING_ID) 
    267 #define OPTPROC_STATE_MASK     0x000B7FFFU 
    268  
    269 #define OPTPROC_NO_XLAT_MASK   (  \ 
    270         OPTPROC_NXLAT_OPT_CFG | \ 
    271         OPTPROC_NXLAT_OPT ) 
     268#define OPTPROC_STATE_MASK     0x000B3FFFU 
     269 
     270#define OPTPROC_NO_XLAT_MASK   ( \ 
     271        OPTPROC_NXLAT_OPT |     OPTPROC_NXLAT_OPT_CFG \ 
     272        /* 0x00030000U */ ) 
    272273 
    273274#define STMTS(s)  do { s; } while (0) 
     
    501502 */ 
    502503 
    503 /* From: tokenize.c line 118 
     504/* From: tokenize.c line 117 
    504505 * 
    505506 * ao_string_tokenize - tokenize an input string 
     
    545546 
    546547 
    547 /* From: configfile.c line 86 
     548/* From: configfile.c line 85 
    548549 * 
    549550 * configFileLoad - parse a configuration file 
     
    565566 
    566567 
    567 /* From: configfile.c line 883 
     568/* From: configfile.c line 897 
    568569 * 
    569570 * optionFileLoad - Load the locatable config files, in order 
     
    595596 
    596597 
    597 /* From: configfile.c line 218 
     598/* From: configfile.c line 217 
    598599 * 
    599600 * optionFindNextValue - find a hierarcicaly valued option instance 
     
    614615 
    615616 
    616 /* From: configfile.c line 144 
     617/* From: configfile.c line 143 
    617618 * 
    618619 * optionFindValue - find a hierarcicaly valued option instance 
     
    631632 
    632633 
    633 /* From: restore.c line 166 
     634/* From: restore.c line 165 
    634635 * 
    635636 * optionFree - free allocated option processing memory 
     
    644645 
    645646 
    646 /* From: configfile.c line 287 
     647/* From: configfile.c line 286 
    647648 * 
    648649 * optionGetValue - get a specific value from a hierarcical list 
     
    662663 
    663664 
    664 /* From: load.c line 499 
     665/* From: load.c line 498 
    665666 * 
    666667 * optionLoadLine - process a string for an option name and value 
     
    686687 
    687688 
    688 /* From: configfile.c line 346 
     689/* From: configfile.c line 345 
    689690 * 
    690691 * optionNextValue - get the next value from a hierarchical list 
     
    705706 
    706707 
    707 /* From: usage.c line 108 
     708/* From: usage.c line 107 
    708709 * 
    709710 * optionOnlyUsage - Print usage text for just the options 
     
    720721 
    721722 
    722 /* From: autoopts.c line 1006 
     723/* From: autoopts.c line 1041 
    723724 * 
    724725 * optionProcess - this is the main option processing routine 
     
    750751 
    751752 
    752 /* From: restore.c line 123 
     753/* From: restore.c line 122 
    753754 * 
    754755 * optionRestore - restore option state from memory copy 
     
    792793 
    793794 
    794 /* From: restore.c line 71 
     795/* From: restore.c line 70 
    795796 * 
    796797 * optionSaveState - saves the option state to memory 
     
    814815 
    815816 
    816 /* From: nested.c line 570 
     817/* From: nested.c line 569 
    817818 * 
    818819 * optionUnloadNested - Deallocate the memory for a nested value 
     
    828829 
    829830 
    830 /* From: version.c line 38 
     831/* From: version.c line 37 
    831832 * 
    832833 * optionVersion - return the compiled AutoOpts version number 
     
    884885 
    885886 
    886 /* From: streqvcmp.c line 209 
     887/* From: streqvcmp.c line 208 
    887888 * 
    888889 * strequate - map a list of characters to the same value 
     
    899900 
    900901 
    901 /* From: streqvcmp.c line 119 
     902/* From: streqvcmp.c line 118 
    902903 * 
    903904 * streqvcmp - compare two strings with an equivalence mapping 
     
    918919 
    919920 
    920 /* From: streqvcmp.c line 156 
     921/* From: streqvcmp.c line 155 
    921922 * 
    922923 * streqvmap - Set the character mappings for the streqv functions 
     
    946947 
    947948 
    948 /* From: streqvcmp.c line 78 
     949/* From: streqvcmp.c line 77 
    949950 * 
    950951 * strneqvcmp - compare two strings with an equivalence mapping 
     
    967968 
    968969 
    969 /* From: streqvcmp.c line 235 
     970/* From: streqvcmp.c line 234 
    970971 * 
    971972 * strtransform - convert a string into its mapped-to value 
  • trunk/libopts/autoopts/usage-txt.h

    r2091 r2412  
    33 *  DO NOT EDIT THIS FILE   (usage-txt.h) 
    44 *   
    5  *  It has been AutoGen-ed  Wednesday December 31, 2008 at 07:07:15 PM PST 
     5 *  It has been AutoGen-ed  August  8, 2009 at 10:14:43 AM by AutoGen 5.9.9 
    66 *  From the definitions    usage-txt.def 
    77 *  and the template file   usage-txt.tpl 
    88 * 
    99 *  This file handles all the bookkeeping required for tracking all the little 
    10  *  tiny strings used by the AutoOpts library.  There are 128 
     10 *  tiny strings used by the AutoOpts library.  There are 130 
    1111 *  of them.  This is not versioned because it is entirely internal to the 
    1212 *  library and accessed by client code only in a very well-controlled way: 
     
    4545  char*     utpz_GnuNumArg; 
    4646  char*     utpz_GnuStrArg; 
    47   cch_t*    apz_str[ 121 ]; 
     47  cch_t*    apz_str[ 123 ]; 
    4848} usage_text_t; 
    4949 
     
    6363#define zAO_Sml               (option_usage_text.apz_str[  3]) 
    6464#define zAO_Ver               (option_usage_text.apz_str[  4]) 
    65 #define zAll                  (option_usage_text.apz_str[  5]) 
    66 #define zAlt                  (option_usage_text.apz_str[  6]) 
    67 #define zAmbigKey             (option_usage_text.apz_str[  7]) 
    68 #define zAmbigOptStr          (option_usage_text.apz_str[  8]) 
    69 #define zArgsMust             (option_usage_text.apz_str[  9]) 
    70 #define zAtMost               (option_usage_text.apz_str[ 10]) 
    71 #define zAuto                 (option_usage_text.apz_str[ 11]) 
    72 #define zBadPipe              (option_usage_text.apz_str[ 12]) 
    73 #define zBadVerArg            (option_usage_text.apz_str[ 13]) 
    74 #define zCantFmt              (option_usage_text.apz_str[ 14]) 
    75 #define zCantSave             (option_usage_text.apz_str[ 15]) 
    76 #define zDefaultOpt           (option_usage_text.apz_str[ 16]) 
    77 #define zDis                  (option_usage_text.apz_str[ 17]) 
    78 #define zEnab                 (option_usage_text.apz_str[ 18]) 
    79 #define zEquiv                (option_usage_text.apz_str[ 19]) 
    80 #define zErrOnly              (option_usage_text.apz_str[ 20]) 
    81 #define zExamineFmt           (option_usage_text.apz_str[ 21]) 
    82 #define zFiveSpaces           (option_usage_text.apz_str[ 22]) 
    83 #define zFlagOkay             (option_usage_text.apz_str[ 23]) 
    84 #define zFmtFmt               (option_usage_text.apz_str[ 24]) 
    85 #define zForkFail             (option_usage_text.apz_str[ 25]) 
    86 #define zFSErrOptLoad         (option_usage_text.apz_str[ 26]) 
    87 #define zFSErrReadFile        (option_usage_text.apz_str[ 27]) 
    88 #define zFSOptError           (option_usage_text.apz_str[ 28]) 
    89 #define zFSOptErrMayExist     (option_usage_text.apz_str[ 29]) 
    90 #define zFSOptErrMustExist    (option_usage_text.apz_str[ 30]) 
    91 #define zFSOptErrNoExist      (option_usage_text.apz_str[ 31]) 
    92 #define zFSOptErrOpen         (option_usage_text.apz_str[ 32]) 
    93 #define zFSOptErrFopen        (option_usage_text.apz_str[ 33]) 
    94 #define zFileCannotExist      (option_usage_text.apz_str[ 34]) 
    95 #define zFileMustExist        (option_usage_text.apz_str[ 35]) 
    96 #define zGenshell             (option_usage_text.apz_str[ 36]) 
     65#define zAO_Woops             (option_usage_text.apz_str[  5]) 
     66#define zAll                  (option_usage_text.apz_str[  6]) 
     67#define zAlt                  (option_usage_text.apz_str[  7]) 
     68#define zAmbigKey             (option_usage_text.apz_str[  8]) 
     69#define zAmbigOptStr          (option_usage_text.apz_str[  9]) 
     70#define zArgsMust             (option_usage_text.apz_str[ 10]) 
     71#define zAtMost               (option_usage_text.apz_str[ 11]) 
     72#define zAuto                 (option_usage_text.apz_str[ 12]) 
     73#define zBadPipe              (option_usage_text.apz_str[ 13]) 
     74#define zBadVerArg            (option_usage_text.apz_str[ 14]) 
     75#define zCantFmt              (option_usage_text.apz_str[ 15]) 
     76#define zCantSave             (option_usage_text.apz_str[ 16]) 
     77#define zDefaultOpt           (option_usage_text.apz_str[ 17]) 
     78#define zDis                  (option_usage_text.apz_str[ 18]) 
     79#define zEnab                 (option_usage_text.apz_str[ 19]) 
     80#define zEquiv                (option_usage_text.apz_str[ 20]) 
     81#define zErrOnly              (option_usage_text.apz_str[ 21]) 
     82#define zExamineFmt           (option_usage_text.apz_str[ 22]) 
     83#define zFiveSpaces           (option_usage_text.apz_str[ 23]) 
     84#define zFlagOkay             (option_usage_text.apz_str[ 24]) 
     85#define zFmtFmt               (option_usage_text.apz_str[ 25]) 
     86#define zForkFail             (option_usage_text.apz_str[ 26]) 
     87#define zFSErrOptLoad         (option_usage_text.apz_str[ 27]) 
     88#define zFSErrReadFile        (option_usage_text.apz_str[ 28]) 
     89#define zFSOptError           (option_usage_text.apz_str[ 29]) 
     90#define zFSOptErrMayExist     (option_usage_text.apz_str[ 30]) 
     91#define zFSOptErrMustExist    (option_usage_text.apz_str[ 31]) 
     92#define zFSOptErrNoExist      (option_usage_text.apz_str[ 32]) 
     93#define zFSOptErrOpen         (option_usage_text.apz_str[ 33]) 
     94#define zFSOptErrFopen        (option_usage_text.apz_str[ 34]) 
     95#define zFileCannotExist      (option_usage_text.apz_str[ 35]) 
     96#define zFileMustExist        (option_usage_text.apz_str[ 36]) 
     97#define zGenshell             (option_usage_text.apz_str[ 37]) 
    9798#define zGnuBoolArg           (option_usage_text.utpz_GnuBoolArg) 
    98 #define zGnuBreak             (option_usage_text.apz_str[ 37]) 
     99#define zGnuBreak             (option_usage_text.apz_str[ 38]) 
    99100#define zGnuKeyArg            (option_usage_text.utpz_GnuKeyArg) 
    100101#define zGnuFileArg           (option_usage_text.utpz_GnuFileArg) 
    101102#define zGnuKeyLArg           (option_usage_text.utpz_GnuKeyLArg) 
    102103#define zGnuTimeArg           (option_usage_text.utpz_GnuTimeArg) 
    103 #define zGnuNestArg           (option_usage_text.apz_str[ 38]) 
     104#define zGnuNestArg           (option_usage_text.apz_str[ 39]) 
    104105#define zGnuNumArg            (option_usage_text.utpz_GnuNumArg) 
    105 #define zGnuOptArg            (option_usage_text.apz_str[ 39]) 
    106 #define zGnuOptFmt            (option_usage_text.apz_str[ 40]) 
     106#define zGnuOptArg            (option_usage_text.apz_str[ 40]) 
     107#define zGnuOptFmt            (option_usage_text.apz_str[ 41]) 
    107108#define zGnuStrArg            (option_usage_text.utpz_GnuStrArg) 
    108 #define zIllOptChr            (option_usage_text.apz_str[ 41]) 
    109 #define zIllOptStr            (option_usage_text.apz_str[ 42]) 
    110 #define zIllegal              (option_usage_text.apz_str[ 43]) 
    111 #define zIntRange             (option_usage_text.apz_str[ 44]) 
    112 #define zInvalOptDesc         (option_usage_text.apz_str[ 45]) 
    113 #define zLowerBits            (option_usage_text.apz_str[ 46]) 
    114 #define zMembers              (option_usage_text.apz_str[ 47]) 
    115 #define zMisArg               (option_usage_text.apz_str[ 48]) 
    116 #define zMultiEquiv           (option_usage_text.apz_str[ 49]) 
    117 #define zMust                 (option_usage_text.apz_str[ 50]) 
    118 #define zNeedOne              (option_usage_text.apz_str[ 51]) 
    119 #define zNoArg                (option_usage_text.apz_str[ 52]) 
    120 #define zNoArgs               (option_usage_text.apz_str[ 53]) 
    121 #define zNoCreat              (option_usage_text.apz_str[ 54]) 
    122 #define zNoFlags              (option_usage_text.apz_str[ 55]) 
    123 #define zNoKey                (option_usage_text.apz_str[ 56]) 
    124 #define zNoLim                (option_usage_text.apz_str[ 57]) 
    125 #define zNoPreset             (option_usage_text.apz_str[ 58]) 
    126 #define zNoResetArg           (option_usage_text.apz_str[ 59]) 
    127 #define zNoRq_NoShrtTtl       (option_usage_text.apz_str[ 60]) 
    128 #define zNoRq_ShrtTtl         (option_usage_text.apz_str[ 61]) 
    129 #define zNoStat               (option_usage_text.apz_str[ 62]) 
    130 #define zNoState              (option_usage_text.apz_str[ 63]) 
    131 #define zNone                 (option_usage_text.apz_str[ 64]) 
    132 #define zNotDef               (option_usage_text.apz_str[ 65]) 
    133 #define zNotEnough            (option_usage_text.apz_str[ 66]) 
    134 #define zNotFile              (option_usage_text.apz_str[ 67]) 
    135 #define zNotNumber            (option_usage_text.apz_str[ 68]) 
    136 #define zNrmOptFmt            (option_usage_text.apz_str[ 69]) 
    137 #define zNumberOpt            (option_usage_text.apz_str[ 70]) 
    138 #define zOneSpace             (option_usage_text.apz_str[ 71]) 
    139 #define zOnlyOne              (option_usage_text.apz_str[ 72]) 
    140 #define zOptsOnly             (option_usage_text.apz_str[ 73]) 
    141 #define zPathFmt              (option_usage_text.apz_str[ 74]) 
    142 #define zPlsSendBugs          (option_usage_text.apz_str[ 75]) 
    143 #define zPreset               (option_usage_text.apz_str[ 76]) 
    144 #define zPresetFile           (option_usage_text.apz_str[ 77]) 
    145 #define zPresetIntro          (option_usage_text.apz_str[ 78]) 
    146 #define zProg                 (option_usage_text.apz_str[ 79]) 
    147 #define zProhib               (option_usage_text.apz_str[ 80]) 
    148 #define zReorder              (option_usage_text.apz_str[ 81]) 
    149 #define zRange                (option_usage_text.apz_str[ 82]) 
    150 #define zRangeAbove           (option_usage_text.apz_str[ 83]) 
    151 #define zRangeLie             (option_usage_text.apz_str[ 84]) 
    152 #define zRangeBadLie          (option_usage_text.apz_str[ 85]) 
    153 #define zRangeOnly            (option_usage_text.apz_str[ 86]) 
    154 #define zRangeOr              (option_usage_text.apz_str[ 87]) 
    155 #define zRangeErr             (option_usage_text.apz_str[ 88]) 
    156 #define zRangeExact           (option_usage_text.apz_str[ 89]) 
    157 #define zRangeScaled          (option_usage_text.apz_str[ 90]) 
    158 #define zRangeUpto            (option_usage_text.apz_str[ 91]) 
    159 #define zResetNotConfig       (option_usage_text.apz_str[ 92]) 
    160 #define zReqFmt               (option_usage_text.apz_str[ 93]) 
    161 #define zReqOptFmt            (option_usage_text.apz_str[ 94]) 
    162 #define zReqThese             (option_usage_text.apz_str[ 95]) 
    163 #define zReq_NoShrtTtl        (option_usage_text.apz_str[ 96]) 
    164 #define zReq_ShrtTtl          (option_usage_text.apz_str[ 97]) 
    165 #define zSepChars             (option_usage_text.apz_str[ 98]) 
    166 #define zSetMemberSettings    (option_usage_text.apz_str[ 99]) 
    167 #define zShrtGnuOptFmt        (option_usage_text.apz_str[100]) 
    168 #define zSixSpaces            (option_usage_text.apz_str[101]) 
    169 #define zStdBoolArg           (option_usage_text.apz_str[102]) 
    170 #define zStdBreak             (option_usage_text.apz_str[103]) 
    171 #define zStdFileArg           (option_usage_text.apz_str[104]) 
    172 #define zStdKeyArg            (option_usage_text.apz_str[105]) 
    173 #define zStdKeyLArg           (option_usage_text.apz_str[106]) 
    174 #define zStdTimeArg           (option_usage_text.apz_str[107]) 
    175 #define zStdNestArg           (option_usage_text.apz_str[108]) 
    176 #define zStdNoArg             (option_usage_text.apz_str[109]) 
    177 #define zStdNumArg            (option_usage_text.apz_str[110]) 
    178 #define zStdOptArg            (option_usage_text.apz_str[111]) 
    179 #define zStdReqArg            (option_usage_text.apz_str[112]) 
    180 #define zStdStrArg            (option_usage_text.apz_str[113]) 
    181 #define zTabHyp               (option_usage_text.apz_str[114]) 
    182 #define zTabHypAnd            (option_usage_text.apz_str[115]) 
    183 #define zTabout               (option_usage_text.apz_str[116]) 
    184 #define zThreeSpaces          (option_usage_text.apz_str[117]) 
    185 #define zTwoSpaces            (option_usage_text.apz_str[118]) 
    186 #define zUpTo                 (option_usage_text.apz_str[119]) 
    187 #define zValidKeys            (option_usage_text.apz_str[120]) 
     109#define zIllOptChr            (option_usage_text.apz_str[ 42]) 
     110#define zIllOptStr            (option_usage_text.apz_str[ 43]) 
     111#define zIllegal              (option_usage_text.apz_str[ 44]) 
     112#define zIntRange             (option_usage_text.apz_str[ 45]) 
     113#define zInvalOptDesc         (option_usage_text.apz_str[ 46]) 
     114#define zLowerBits            (option_usage_text.apz_str[ 47]) 
     115#define zMembers              (option_usage_text.apz_str[ 48]) 
     116#define zMisArg               (option_usage_text.apz_str[ 49]) 
     117#define zMultiEquiv           (option_usage_text.apz_str[ 50]) 
     118#define zMust                 (option_usage_text.apz_str[ 51]) 
     119#define zNeedOne              (option_usage_text.apz_str[ 52]) 
     120#define zNoArg                (option_usage_text.apz_str[ 53]) 
     121#define zNoArgs               (option_usage_text.apz_str[ 54]) 
     122#define zNoCreat              (option_usage_text.apz_str[ 55]) 
     123#define zNoFlags              (option_usage_text.apz_str[ 56]) 
     124#define zNoKey                (option_usage_text.apz_str[ 57]) 
     125#define zNoLim                (option_usage_text.apz_str[ 58]) 
     126#define zNoPreset             (option_usage_text.apz_str[ 59]) 
     127#define zNoResetArg           (option_usage_text.apz_str[ 60]) 
     128#define zNoRq_NoShrtTtl       (option_usage_text.apz_str[ 61]) 
     129#define zNoRq_ShrtTtl         (option_usage_text.apz_str[ 62]) 
     130#define zNoStat               (option_usage_text.apz_str[ 63]) 
     131#define zNoState              (option_usage_text.apz_str[ 64]) 
     132#define zNone                 (option_usage_text.apz_str[ 65]) 
     133#define zNotDef               (option_usage_text.apz_str[ 66]) 
     134#define zNotCmdOpt            (option_usage_text.apz_str[ 67]) 
     135#define zNotEnough            (option_usage_text.apz_str[ 68]) 
     136#define zNotFile              (option_usage_text.apz_str[ 69]) 
     137#define zNotNumber            (option_usage_text.apz_str[ 70]) 
     138#define zNrmOptFmt            (option_usage_text.apz_str[ 71]) 
     139#define zNumberOpt            (option_usage_text.apz_str[ 72]) 
     140#define zOneSpace             (option_usage_text.apz_str[ 73]) 
     141#define zOnlyOne              (option_usage_text.apz_str[ 74]) 
     142#define zOptsOnly             (option_usage_text.apz_str[ 75]) 
     143#define zPathFmt              (option_usage_text.apz_str[ 76]) 
     144#define zPlsSendBugs          (option_usage_text.apz_str[ 77]) 
     145#define zPreset               (option_usage_text.apz_str[ 78]) 
     146#define zPresetFile           (option_usage_text.apz_str[ 79]) 
     147#define zPresetIntro          (option_usage_text.apz_str[ 80]) 
     148#define zProg                 (option_usage_text.apz_str[ 81]) 
     149#define zProhib               (option_usage_text.apz_str[ 82]) 
     150#define zReorder              (option_usage_text.apz_str[ 83]) 
     151#define zRange                (option_usage_text.apz_str[ 84]) 
     152#define zRangeAbove           (option_usage_text.apz_str[ 85]) 
     153#define zRangeLie             (option_usage_text.apz_str[ 86]) 
     154#define zRangeBadLie          (option_usage_text.apz_str[ 87]) 
     155#define zRangeOnly            (option_usage_text.apz_str[ 88]) 
     156#define zRangeOr              (option_usage_text.apz_str[ 89]) 
     157#define zRangeErr             (option_usage_text.apz_str[ 90]) 
     158#define zRangeExact           (option_usage_text.apz_str[ 91]) 
     159#define zRangeScaled          (option_usage_text.apz_str[ 92]) 
     160#define zRangeUpto            (option_usage_text.apz_str[ 93]) 
     161#define zResetNotConfig       (option_usage_text.apz_str[ 94]) 
     162#define zReqFmt               (option_usage_text.apz_str[ 95]) 
     163#define zReqOptFmt            (option_usage_text.apz_str[ 96]) 
     164#define zReqThese             (option_usage_text.apz_str[ 97]) 
     165#define zReq_NoShrtTtl        (option_usage_text.apz_str[ 98]) 
     166#define zReq_ShrtTtl          (option_usage_text.apz_str[ 99]) 
     167#define zSepChars             (option_usage_text.apz_str[100]) 
     168#define zSetMemberSettings    (option_usage_text.apz_str[101]) 
     169#define zShrtGnuOptFmt        (option_usage_text.apz_str[102]) 
     170#define zSixSpaces            (option_usage_text.apz_str[103]) 
     171#define zStdBoolArg           (option_usage_text.apz_str[104]) 
     172#define zStdBreak             (option_usage_text.apz_str[105]) 
     173#define zStdFileArg           (option_usage_text.apz_str[106]) 
     174#define zStdKeyArg            (option_usage_text.apz_str[107]) 
     175#define zStdKeyLArg           (option_usage_text.apz_str[108]) 
     176#define zStdTimeArg           (option_usage_text.apz_str[109]) 
     177#define zStdNestArg           (option_usage_text.apz_str[110]) 
     178#define zStdNoArg             (option_usage_text.apz_str[111]) 
     179#define zStdNumArg            (option_usage_text.apz_str[112]) 
     180#define zStdOptArg            (option_usage_text.apz_str[113]) 
     181#define zStdReqArg            (option_usage_text.apz_str[114]) 
     182#define zStdStrArg            (option_usage_text.apz_str[115]) 
     183#define zTabHyp               (option_usage_text.apz_str[116]) 
     184#define zTabHypAnd            (option_usage_text.apz_str[117]) 
     185#define zTabout               (option_usage_text.apz_str[118]) 
     186#define zThreeSpaces          (option_usage_text.apz_str[119]) 
     187#define zTwoSpaces            (option_usage_text.apz_str[120]) 
     188#define zUpTo                 (option_usage_text.apz_str[121]) 
     189#define zValidKeys            (option_usage_text.apz_str[122]) 
    188190 
    189191  /* 
     
    200202  static char    eng_zGnuNumArg[] = "=num"; 
    201203  static char    eng_zGnuStrArg[] = "=str"; 
    202 static char const usage_txt[3927] = 
     204static char const usage_txt[4024] = 
    203205    "AutoOpts function called without option descriptor\n\0" 
    204206    "\tThis exceeds the compiled library version:  \0" 
     
    207209    "\tThis is less than the minimum library version:  \0" 
    208210    "Automated Options version %s\n" 
    209     "\tcopyright (c) 1999-2008 Bruce Korb - all rights reserved\n\0" 
     211    "\tcopyright (c) 1999-2009 by Bruce Korb - all rights reserved\n\0" 
     212    "AutoOpts lib error: defaulted to option with optional arg\n\0" 
    210213    "all\0" 
    211214    "\t\t\t\t- an alternate for %s\n\0" 
     
    278281    "none\0" 
    279282    "'%s' not defined\n\0" 
     283    "'%s' is not a command line option\n\0" 
    280284    "ERROR:  The %s option must appear %d times\n\0" 
    281285    "error:  cannot load options from non-regular file %s\n\0" 
     
    348352   */ 
    349353  usage_text_t option_usage_text = { 
    350     128, 
     354    130, 
    351355    eng_zGnuBoolArg, eng_zGnuKeyArg,  eng_zGnuFileArg, eng_zGnuKeyLArg, 
    352356    eng_zGnuTimeArg, eng_zGnuNumArg,  eng_zGnuStrArg, 
    353357    { 
    354358      usage_txt +   0, usage_txt +  52, usage_txt +  98, usage_txt + 197, 
    355       usage_txt + 247, usage_txt + 335, usage_txt + 339, usage_txt + 366, 
    356       usage_txt + 415, usage_txt + 443, usage_txt + 480, usage_txt + 505, 
    357       usage_txt + 531, usage_txt + 571, usage_txt + 708, usage_txt + 756, 
    358       usage_txt + 810, usage_txt + 852, usage_txt + 876, usage_txt + 902, 
    359       usage_txt + 915, usage_txt + 929, usage_txt + 976, usage_txt + 982, 
    360       usage_txt +1085, usage_txt +1097, usage_txt +1148, usage_txt +1199, 
    361       usage_txt +1233, usage_txt +1274, usage_txt +1297, usage_txt +1323, 
    362       usage_txt +1354, usage_txt +1368, usage_txt +1383, usage_txt +1414, 
    363       usage_txt +1441, usage_txt +1547, usage_txt +1553, usage_txt +1559, 
    364       usage_txt +1566, usage_txt +1577, usage_txt +1603, usage_txt +1629, 
    365       usage_txt +1637, usage_txt +1673, usage_txt +1724, usage_txt +1780, 
    366       usage_txt +1814, usage_txt +1852, usage_txt +1917, usage_txt +1960, 
    367       usage_txt +1995, usage_txt +2036, usage_txt +2076, usage_txt +2103, 
    368       usage_txt +2170, usage_txt +2218, usage_txt +2251, usage_txt +2276, 
    369       usage_txt +2324, usage_txt +2359, usage_txt +2397, usage_txt +2424, 
    370       usage_txt +2473, usage_txt +2478, usage_txt +2496, usage_txt +2540, 
    371       usage_txt +2594, usage_txt +2640, usage_txt +2648, usage_txt +2696, 
    372       usage_txt +2698, usage_txt +2723, usage_txt +2757, usage_txt +2776, 
    373       usage_txt +2810, usage_txt +2846, usage_txt +2884, usage_txt +2940, 
    374       usage_txt +2948, usage_txt +2974, usage_txt +3040, usage_txt +3053, 
    375       usage_txt +3084, usage_txt +3121, usage_txt +3167, usage_txt +3183, 
    376       usage_txt +3189, usage_txt +3241, usage_txt +3255, usage_txt +3301, 
    377       usage_txt +3329, usage_txt +3374, usage_txt +3416, usage_txt +3430, 
    378       usage_txt +3455, usage_txt +3495, usage_txt +3538, usage_txt +3542, 
    379       usage_txt +3761, usage_txt +3764, usage_txt +3771, usage_txt +3775, 
    380       usage_txt +3783, usage_txt +3787, usage_txt +3791, usage_txt +3795, 
    381       usage_txt +3799, usage_txt +3803, usage_txt +3807, usage_txt +3811, 
    382       usage_txt +3815, usage_txt +3819, usage_txt +3823, usage_txt +3830, 
    383       usage_txt +3842, usage_txt +3850, usage_txt +3854, usage_txt +3857, 
    384       usage_txt +3890 
     359      usage_txt + 247, usage_txt + 338, usage_txt + 397, usage_txt + 401, 
     360      usage_txt + 428, usage_txt + 477, usage_txt + 505, usage_txt + 542, 
     361      usage_txt + 567, usage_txt + 593, usage_txt + 633, usage_txt + 770, 
     362      usage_txt + 818, usage_txt + 872, usage_txt + 914, usage_txt + 938, 
     363      usage_txt + 964, usage_txt + 977, usage_txt + 991, usage_txt +1038, 
     364      usage_txt +1044, usage_txt +1147, usage_txt +1159, usage_txt +1210, 
     365      usage_txt +1261, usage_txt +1295, usage_txt +1336, usage_txt +1359, 
     366      usage_txt +1385, usage_txt +1416, usage_txt +1430, usage_txt +1445, 
     367      usage_txt +1476, usage_txt +1503, usage_txt +1609, usage_txt +1615, 
     368      usage_txt +1621, usage_txt +1628, usage_txt +1639, usage_txt +1665, 
     369      usage_txt +1691, usage_txt +1699, usage_txt +1735, usage_txt +1786, 
     370      usage_txt +1842, usage_txt +1876, usage_txt +1914, usage_txt +1979, 
     371      usage_txt +2022, usage_txt +2057, usage_txt +2098, usage_txt +2138, 
     372      usage_txt +2165, usage_txt +2232, usage_txt +2280, usage_txt +2313, 
     373      usage_txt +2338, usage_txt +2386, usage_txt +2421, usage_txt +2459, 
     374      usage_txt +2486, usage_txt +2535, usage_txt +2540, usage_txt +2558, 
     375      usage_txt +2593, usage_txt +2637, usage_txt +2691, usage_txt +2737, 
     376      usage_txt +2745, usage_txt +2793, usage_txt +2795, usage_txt +2820, 
     377      usage_txt +2854, usage_txt +2873, usage_txt +2907, usage_txt +2943, 
     378      usage_txt +2981, usage_txt +3037, usage_txt +3045, usage_txt +3071, 
     379      usage_txt +3137, usage_txt +3150, usage_txt +3181, usage_txt +3218, 
     380      usage_txt +3264, usage_txt +3280, usage_txt +3286, usage_txt +3338, 
     381      usage_txt +3352, usage_txt +3398, usage_txt +3426, usage_txt +3471, 
     382      usage_txt +3513, usage_txt +3527, usage_txt +3552, usage_txt +3592, 
     383      usage_txt +3635, usage_txt +3639, usage_txt +3858, usage_txt +3861, 
     384      usage_txt +3868, usage_txt +3872, usage_txt +3880, usage_txt +3884, 
     385      usage_txt +3888, usage_txt +3892, usage_txt +3896, usage_txt +3900, 
     386      usage_txt +3904, usage_txt +3908, usage_txt +3912, usage_txt +3916, 
     387      usage_txt +3920, usage_txt +3927, usage_txt +3939, usage_txt +3947, 
     388      usage_txt +3951, usage_txt +3954, usage_txt +3987 
    385389    } 
    386390  }; 
  • trunk/libopts/boolean.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: boolean.c,v 4.15 2008/08/04 01:01:52 bkorb Exp $ 
     3 *  $Id: boolean.c,v 4.16 2009/08/01 17:43:05 bkorb Exp $ 
    44 * Time-stamp:      "2008-08-03 13:06:02 bkorb" 
    55 * 
     
    1111 *  This file is part of AutoOpts, a companion to AutoGen. 
    1212 *  AutoOpts is free software. 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    14  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     13 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1514 * 
    1615 *  AutoOpts is available under any one of two licenses.  The license 
     
    2625 *  These files have the following md5sums: 
    2726 * 
    28  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    29  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     27 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     28 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    3029 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3130 */ 
  • trunk/libopts/compat/compat.h

    r2198 r2412  
    55 *  Time-stamp:      "2008-06-14 09:36:25 bkorb" 
    66 * 
    7  * $Id: compat.h,v 4.20 2008/06/14 22:24:22 bkorb Exp $ 
     7 * $Id: compat.h,v 4.22 2009/01/01 16:49:26 bkorb Exp $ 
    88 * 
    99 *  compat.h is free software. 
    1010 *  This file is part of AutoGen. 
    1111 * 
    12  *  AutoGen copyright (c) 1992-2008 Bruce Korb - all rights reserved 
    13  *  AutoGen copyright (c) 1992-2008 Bruce Korb - all rights reserved 
     12 *  AutoGen copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1413 * 
    1514 *  AutoGen is free software: you can redistribute it and/or modify it 
  • trunk/libopts/compat/pathfind.c

    r1892 r2412  
    66 * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk> 
    77 * Time-stamp:       "2006-09-23 19:46:16 bkorb" 
    8  * Last Modified:    $Date: 2007/07/04 20:51:18 $ 
     8 * Last Modified:    $Date: 2007/10/07 16:54:54 $ 
    99 *            by: bkorb 
    1010 * 
    11  * $Id: pathfind.c,v 4.11 2007/07/04 20:51:18 bkorb Exp $ 
     11 * $Id: pathfind.c,v 4.12 2007/10/07 16:54:54 bkorb Exp $ 
    1212 */ 
    1313 
  • trunk/libopts/compat/windows-config.h

    r1892 r2412  
    11 
    22/* 
    3  * Time-stamp:        "2007-07-04 09:45:44 bkorb" 
     3 * Time-stamp:        "2009-07-22 18:53:59 bkorb" 
    44 *             by: bkorb 
    5  * Last Committed:    $Date: 2007/07/04 20:51:18 $ 
     5 * Last Committed:    $Date: 2009/07/23 02:05:55 $ 
    66 * 
    77 *  This file is part of AutoGen. 
    88 * 
    9  *  AutoGen copyright (c) 1992-2007 Bruce Korb - all rights reserved 
     9 *  AutoGen copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1010 * 
    1111 *  AutoGen is free software: you can redistribute it and/or modify it 
  • trunk/libopts/configfile.c

    r2091 r2412  
    11/* 
    2  *  $Id: configfile.c,v 1.32 2008/08/04 01:01:52 bkorb Exp $ 
    3  *  Time-stamp:      "2008-08-03 11:00:30 bkorb" 
     2 *  $Id: configfile.c,v 4.47 2009/08/01 17:43:05 bkorb Exp $ 
     3 *  Time-stamp:      "2009-01-18 10:21:58 bkorb" 
    44 * 
    55 *  configuration/rc/ini file handling. 
     
    77 *  This file is part of AutoOpts, a companion to AutoGen. 
    88 *  AutoOpts is free software. 
    9  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    10  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     9 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1110 * 
    1211 *  AutoOpts is available under any one of two licenses.  The license 
     
    2221 *  These files have the following md5sums: 
    2322 * 
    24  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    25  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     23 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     24 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2625 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    2726 */ 
     
    754753    memset(pcNulPoint, ' ', pzData - pcNulPoint); 
    755754 
    756     if ((pOS->pOD->fOptState & OPTST_ARG_TYPE_MASK) == OPARG_TYPE_STRING) { 
     755    /* 
     756     *  If we are getting a "string" value, the process the XML-ish 
     757     *  %XX hex characters. 
     758     */ 
     759    if (valu.valType == OPARG_TYPE_STRING) { 
    757760        char * pzSrc = pzData; 
    758761        char * pzDst = pzData; 
     
    799802internalFileLoad( tOptions* pOpts ) 
    800803{ 
    801     int     idx; 
    802     int     inc = DIRECTION_PRESET; 
    803     char    zFileName[ AG_PATH_MAX+1 ]; 
     804    uint32_t  svfl; 
     805    int       idx; 
     806    int       inc; 
     807    char      zFileName[ AG_PATH_MAX+1 ]; 
    804808 
    805809    if (pOpts->papzHomeList == NULL) 
    806810        return; 
     811 
     812    svfl = pOpts->fOptSet; 
     813    inc  = DIRECTION_PRESET; 
     814 
     815    /* 
     816     *  Never stop on errors in config files. 
     817     */ 
     818    pOpts->fOptSet &= ~OPTPROC_ERRSTOP; 
    807819 
    808820    /* 
     
    878890        } 
    879891    } /* twice for every path in the home list, ... */ 
     892 
     893    pOpts->fOptSet = svfl; 
    880894} 
    881895 
  • trunk/libopts/cook.c

    r2091 r2412  
    11/* 
    2  *  $Id: cook.c,v 4.16 2008/01/23 00:36:04 bkorb Exp $ 
     2 *  $Id: cook.c,v 4.17 2009/08/01 17:43:06 bkorb Exp $ 
    33 *  Time-stamp:      "2007-11-16 22:49:11 bkorb" 
    44 * 
     
    88 *  This file is part of AutoOpts, a companion to AutoGen. 
    99 *  AutoOpts is free software. 
    10  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    11  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     10 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1211 * 
    1312 *  AutoOpts is available under any one of two licenses.  The license 
     
    2322 *  These files have the following md5sums: 
    2423 * 
    25  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    26  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     24 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     25 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2726 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    2827 */ 
  • trunk/libopts/enumeration.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: enumeration.c,v 4.24 2008/07/28 04:51:29 bkorb Exp $ 
     3 *  $Id: enumeration.c,v 4.26 2009/08/01 17:43:06 bkorb Exp $ 
    44 * Time-stamp:      "2008-07-27 12:28:01 bkorb" 
    55 * 
     
    1111 *  This file is part of AutoOpts, a companion to AutoGen. 
    1212 *  AutoOpts is free software. 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    14  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     13 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1514 * 
    1615 *  AutoOpts is available under any one of two licenses.  The license 
     
    2625 *  These files have the following md5sums: 
    2726 * 
    28  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    29  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     27 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     28 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    3029 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3130 */ 
  • trunk/libopts/environment.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: environment.c,v 4.17 2008/06/14 22:24:22 bkorb Exp $ 
    4  * Time-stamp:      "2007-07-04 11:33:50 bkorb" 
     3 *  $Id: environment.c,v 4.21 2009/08/01 17:43:06 bkorb Exp $ 
     4 * Time-stamp:      "2009-07-20 20:12:24 bkorb" 
    55 * 
    66 *  This file contains all of the routines that must be linked into 
     
    1111 *  This file is part of AutoOpts, a companion to AutoGen. 
    1212 *  AutoOpts is free software. 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    14  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     13 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1514 * 
    1615 *  AutoOpts is available under any one of two licenses.  The license 
     
    2625 *  These files have the following md5sums: 
    2726 * 
    28  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    29  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     27 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     28 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    3029 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3130 */ 
     
    5453 
    5554    /* 
    56      *  IF there is no such environment variable 
    57      *   *or* there is, but we are doing immediate opts and there are 
    58      *        no immediate opts to do (--help inside $PROGNAME is silly, 
    59      *        but --no-load-defs is not, so that is marked) 
    60      *  THEN bail out now.  ( 
    61      */ 
    62     if (  (pczOptStr == NULL) 
    63        || (  (type == ENV_IMM) 
    64           && ((pOpts->fOptSet & OPTPROC_HAS_IMMED) == 0)  )  ) 
     55     *  No such beast?  Then bail now. 
     56     */ 
     57    if (pczOptStr == NULL) 
    6558        return; 
    6659 
     
    9588    switch (type) { 
    9689    case ENV_IMM: 
    97         /* 
    98          *  We know the OPTPROC_HAS_IMMED bit is set. 
    99          */ 
    10090        (void)doImmediateOpts( pOpts ); 
    10191        break; 
    10292 
     93    case ENV_ALL: 
     94        (void)doImmediateOpts( pOpts ); 
     95        pOpts->curOptIdx = 1; 
     96        pOpts->pzCurOpt  = NULL; 
     97        /* FALLTHROUGH */ 
     98 
    10399    case ENV_NON_IMM: 
    104100        (void)doRegularOpts( pOpts ); 
    105         break; 
    106  
    107     default: 
    108         /* 
    109          *  Only to immediate opts if the OPTPROC_HAS_IMMED bit is set. 
    110          */ 
    111         if (pOpts->fOptSet & OPTPROC_HAS_IMMED) { 
    112             (void)doImmediateOpts( pOpts ); 
    113             pOpts->curOptIdx = 1; 
    114             pOpts->pzCurOpt  = NULL; 
    115         } 
    116         (void)doRegularOpts( pOpts ); 
    117         break; 
    118101    } 
    119102 
     
    242225     *  Special handling for ${PROGNAME_LOAD_OPTS} 
    243226     */ 
    244     if (pOpts->specOptIdx.save_opts != 0) { 
     227    if (  (pOpts->specOptIdx.save_opts != NO_EQUIVALENT) 
     228       && (pOpts->specOptIdx.save_opts != 0)) { 
    245229        st.pOD = pOpts->pOptDesc + pOpts->specOptIdx.save_opts + 1; 
    246230        strcpy( pzFlagName, st.pOD->pz_NAME ); 
  • trunk/libopts/file.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: file.c,v 1.6 2008/12/20 18:35:27 bkorb Exp $ 
    4  *  Time-stamp:      "2008-12-06 10:15:33 bkorb" 
     3 *  $Id: file.c,v 4.9 2009/08/01 17:43:06 bkorb Exp $ 
     4 *  Time-stamp:      "2009-07-23 17:23:46 bkorb" 
    55 * 
    66 *  This file is part of AutoOpts, a companion to AutoGen. 
    77 *  AutoOpts is free software. 
    8  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    9  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     8 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    109 * 
    1110 *  AutoOpts is available under any one of two licenses.  The license 
     
    2120 *  These files have the following md5sums: 
    2221 * 
    23  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    24  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     22 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     23 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2524 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    2625 */ 
     
    9998                /* NOTREACHED */ 
    10099            } 
    101             *p = '/'; 
     100            if (p != NULL) 
     101                *p = DIRCH; 
    102102            break; 
    103103        } 
  • trunk/libopts/genshell.c

    r2091 r2412  
    33 *  DO NOT EDIT THIS FILE   (genshell.c) 
    44 *   
    5  *  It has been AutoGen-ed  Wednesday December 31, 2008 at 07:07:16 PM PST 
     5 *  It has been AutoGen-ed  August  8, 2009 at 10:14:45 AM by AutoGen 5.9.9 
    66 *  From the definitions    genshell.def 
    77 *  and the template file   options 
    88 * 
    9  * Generated from AutoOpts 32:0:7 templates. 
     9 * Generated from AutoOpts @AO_CURRENT@:@AO_REVISION@:@AO_AGE@ templates. 
    1010 */ 
    1111 
     
    2121 * This source file is copyrighted and licensed under the following terms: 
    2222 * 
    23  * genshellopt copyright 1999-2007 Bruce Korb - all rights reserved 
     23 * genshellopt copyright (c) 1999-2009 Bruce Korb - all rights reserved 
    2424 * 
    2525 * genshellopt is free software: you can redistribute it and/or modify it 
     
    5252                cannot ever change your mind. */ 
    5353tSCC zCopyright[] = 
    54        "genshellopt copyright (c) 1999-2007 Bruce Korb, all rights reserved"; 
     54       "genshellopt copyright (c) 1999-2009 Bruce Korb, all rights reserved"; 
    5555tSCC zCopyrightNotice[610] = 
    5656"genshellopt is free software: you can redistribute it and/or modify it under\n\ 
     
    211211by the newly generated text.  The first `#!' line will be regenerated.\n"; 
    212212tSCC    zFullVersion[] = GENSHELLOPT_FULL_VERSION; 
    213 /* extracted from optcode.tpl near line 496 */ 
     213/* extracted from optcode.tpl near line 501 */ 
    214214 
    215215#if defined(ENABLE_NLS) 
     
    264264    tOptDesc*   pOptDesc ) 
    265265{ 
     266    (void)pOptions; 
    266267    USAGE( EXIT_SUCCESS ); 
    267268} 
    268 /* extracted from optcode.tpl near line 629 */ 
     269/* extracted from optcode.tpl near line 633 */ 
    269270 
    270271#if ENABLE_NLS 
  • trunk/libopts/genshell.h

    r2091 r2412  
    33 *  DO NOT EDIT THIS FILE   (genshell.h) 
    44 *   
    5  *  It has been AutoGen-ed  Wednesday December 31, 2008 at 07:07:16 PM PST 
     5 *  It has been AutoGen-ed  August  8, 2009 at 10:14:45 AM by AutoGen 5.9.9 
    66 *  From the definitions    genshell.def 
    77 *  and the template file   options 
    88 * 
    9  * Generated from AutoOpts 32:0:7 templates. 
     9 * Generated from AutoOpts @AO_CURRENT@:@AO_REVISION@:@AO_AGE@ templates. 
    1010 */ 
    1111 
     
    2121 * This source file is copyrighted and licensed under the following terms: 
    2222 * 
    23  * genshellopt copyright 1999-2007 Bruce Korb - all rights reserved 
     23 * genshellopt copyright (c) 1999-2009 Bruce Korb - all rights reserved 
    2424 * 
    2525 * genshellopt is free software: you can redistribute it and/or modify it 
     
    5353 *  template was released. 
    5454 */ 
    55 #define AO_TEMPLATE_VERSION 131072 
     55#define AO_TEMPLATE_VERSION 131074 
    5656#if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ 
    5757 || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) 
     
    6464 */ 
    6565typedef enum { 
    66         INDEX_OPT_SCRIPT           =  0, 
    67         INDEX_OPT_SHELL            =  1, 
    68         INDEX_OPT_VERSION          = 2, 
    69         INDEX_OPT_HELP             = 3, 
    70         INDEX_OPT_MORE_HELP        = 4 
     66    INDEX_OPT_SCRIPT      =  0, 
     67    INDEX_OPT_SHELL       =  1, 
     68    INDEX_OPT_VERSION     = 2, 
     69    INDEX_OPT_HELP        = 3, 
     70    INDEX_OPT_MORE_HELP   = 4 
    7171} teOptIndex; 
    7272 
     
    115115#define START_OPT       RESTART_OPT(1) 
    116116#define USAGE(c)        (*genshelloptOptions.pUsageProc)( &genshelloptOptions, c ) 
    117 /* extracted from opthead.tpl near line 415 */ 
     117/* extracted from opthead.tpl near line 409 */ 
    118118 
    119119/* * * * * * 
  • trunk/libopts/load.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: load.c,v 4.27 2008/12/20 18:35:27 bkorb Exp $ 
     3 *  $Id: load.c,v 4.38 2009/08/01 17:43:06 bkorb Exp $ 
    44 *  Time-stamp:      "2008-12-06 10:16:05 bkorb" 
    55 * 
     
    1010 *  This file is part of AutoOpts, a companion to AutoGen. 
    1111 *  AutoOpts is free software. 
    12  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     12 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1413 * 
    1514 *  AutoOpts is available under any one of two licenses.  The license 
     
    2524 *  These files have the following md5sums: 
    2625 * 
    27  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    28  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     26 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     27 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2928 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3029 */ 
  • trunk/libopts/makeshell.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: makeshell.c,v 4.27 2008/07/28 04:51:29 bkorb Exp $ 
     3 *  $Id: makeshell.c,v 4.30 2009/08/01 17:43:06 bkorb Exp $ 
    44 * Time-stamp:      "2008-07-26 16:10:51 bkorb" 
    55 * 
     
    99 *  This file is part of AutoOpts, a companion to AutoGen. 
    1010 *  AutoOpts is free software. 
    11  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    12  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     11 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1312 * 
    1413 *  AutoOpts is available under any one of two licenses.  The license 
     
    2423 *  These files have the following md5sums: 
    2524 * 
    26  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    27  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     25 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     26 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2827 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    2928 */ 
  • trunk/libopts/nested.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: nested.c,v 4.26 2008/08/02 16:10:07 bkorb Exp $ 
     3 *  $Id: nested.c,v 4.32 2009/08/01 17:43:06 bkorb Exp $ 
    44 *  Time-stamp:      "2008-07-28 19:18:28 bkorb" 
    55 * 
     
    88 *  This file is part of AutoOpts, a companion to AutoGen. 
    99 *  AutoOpts is free software. 
    10  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    11  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     10 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1211 * 
    1312 *  AutoOpts is available under any one of two licenses.  The license 
     
    2322 *  These files have the following md5sums: 
    2423 * 
    25  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    26  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     24 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     25 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2726 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    2827 */ 
  • trunk/libopts/numeric.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: numeric.c,v 4.19 2008/11/02 18:51:26 bkorb Exp $ 
    4  *  Time-stamp:      "2008-11-01 14:28:56 bkorb" 
     3 *  $Id: numeric.c,v 4.22 2009/08/01 17:43:06 bkorb Exp $ 
     4 *  Time-stamp:      "2009-07-23 17:25:39 bkorb" 
    55 * 
    66 *  This file is part of AutoOpts, a companion to AutoGen. 
    77 *  AutoOpts is free software. 
    8  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    9  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     8 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    109 * 
    1110 *  AutoOpts is available under any one of two licenses.  The license 
     
    2120 *  These files have the following md5sums: 
    2221 * 
    23  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    24  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     22 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     23 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2524 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    2625 */ 
     
    4140optionShowRange(tOptions* pOpts, tOptDesc* pOD, void * rng_table, int rng_ct) 
    4241{ 
     42    static char const bullet[] = "\t\t\t\t- "; 
     43    static char const deepin[] = "\t\t\t\t  "; 
     44    static char const onetab[] = "\t"; 
     45 
    4346    const struct {long const rmin, rmax;} * rng = rng_table; 
     47 
    4448    char const * pz_indent = 
    45         (pOpts != OPTPROC_EMIT_USAGE) ? "\t" : "\t\t\t\t  "; 
     49        (pOpts != OPTPROC_EMIT_USAGE) ? onetab : bullet; 
    4650 
    4751    if ((pOpts == OPTPROC_EMIT_USAGE) || (pOpts > OPTPROC_EMIT_LIMIT)) { 
     
    5963            fprintf(option_usage_fp, zRangeScaled, pz_indent); 
    6064 
    61         if (rng_ct > 1) 
     65        if (rng_ct > 1) { 
    6266            fprintf(option_usage_fp, lie_in_range, pz_indent); 
    63         else { 
     67            pz_indent = 
     68                (pOpts != OPTPROC_EMIT_USAGE) ? onetab : deepin; 
     69 
     70        } else { 
    6471            fprintf(option_usage_fp, zRangeOnly, pz_indent); 
     72            pz_indent = onetab + 1; /* empty string */ 
    6573        } 
    6674 
     
    8290            fputs(zRangeOr, option_usage_fp); 
    8391            rng++; 
     92            pz_indent = 
     93                (pOpts != OPTPROC_EMIT_USAGE) ? onetab : deepin; 
    8494        } 
    8595 
     
    106116    long  val; 
    107117 
    108     if ((pOD->fOptState & OPTST_RESET) != 0) 
    109         return; 
    110  
    111118    /* 
    112119     *  Numeric options may have a range associated with it. 
    113120     *  If it does, the usage procedure requests that it be 
    114      *  emitted by passing a NULL pOD pointer. 
     121     *  emitted by passing a NULL pOD pointer.  Also bail out 
     122     *  if there is no option argument or if we are being reset. 
    115123     */ 
    116     if ((pOD == NULL) || (pOD->optArg.argString == NULL)) 
     124    if (  (pOD == NULL) 
     125       || (pOD->optArg.argString == NULL) 
     126       || ((pOD->fOptState & OPTST_RESET) != 0)) 
    117127        return; 
    118128 
     
    149159    return; 
    150160 
    151 bad_number: 
     161    bad_number: 
     162 
    152163    fprintf( stderr, zNotNumber, pOpts->pzProgName, pOD->optArg.argString ); 
    153164    if ((pOpts->fOptSet & OPTPROC_ERRSTOP) != 0) 
  • trunk/libopts/pgusage.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: pgusage.c,v 4.16 2008/07/28 04:51:30 bkorb Exp $ 
     3 *  $Id: pgusage.c,v 4.18 2009/08/01 17:43:06 bkorb Exp $ 
    44 * Time-stamp:      "2008-07-27 21:08:42 bkorb" 
    55 * 
     
    1111 *  This file is part of AutoOpts, a companion to AutoGen. 
    1212 *  AutoOpts is free software. 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    14  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     13 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1514 * 
    1615 *  AutoOpts is available under any one of two licenses.  The license 
     
    2625 *  These files have the following md5sums: 
    2726 * 
    28  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    29  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     27 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     28 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    3029 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3130 */ 
  • trunk/libopts/proto.h

    r2091 r2412  
    22 * 
    33 * Prototypes for autoopts 
    4  * Generated Wed Dec 31 19:07:16 PST 2008 
     4 * Generated Sat Aug  8 10:14:45 PDT 2009 
    55 */ 
    66#ifndef AUTOOPTS_PROTO_H_GUARD 
  • trunk/libopts/putshell.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: putshell.c,v 4.25 2008/07/28 04:51:30 bkorb Exp $ 
     3 *  $Id: putshell.c,v 4.27 2009/08/01 17:43:06 bkorb Exp $ 
    44 * Time-stamp:      "2008-07-27 12:14:38 bkorb" 
    55 * 
     
    1010 *  This file is part of AutoOpts, a companion to AutoGen. 
    1111 *  AutoOpts is free software. 
    12  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     12 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1413 * 
    1514 *  AutoOpts is available under any one of two licenses.  The license 
     
    2524 *  These files have the following md5sums: 
    2625 * 
    27  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    28  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     26 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     27 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2928 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3029 */ 
  • trunk/libopts/reset.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: reset.c,v 4.2 2008/08/02 22:50:30 bkorb Exp $ 
     3 *  $Id: reset.c,v 4.7 2009/08/01 17:43:06 bkorb Exp $ 
    44 *  Time-stamp:      "2008-08-02 12:25:18 bkorb" 
    55 * 
    66 *  This file is part of AutoOpts, a companion to AutoGen. 
    77 *  AutoOpts is free software. 
    8  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     8 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    99 * 
    1010 *  AutoOpts is available under any one of two licenses.  The license 
     
    2020 *  These files have the following md5sums: 
    2121 * 
    22  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    23  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     22 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     23 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2424 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    2525 */ 
  • trunk/libopts/restore.c

    r2091 r2412  
    11 
    22/* 
    3  *  restore.c  $Id: restore.c,v 4.13 2008/01/23 00:36:05 bkorb Exp $ 
     3 *  restore.c  $Id: restore.c,v 4.14 2009/08/01 17:43:06 bkorb Exp $ 
    44 * Time-stamp:      "2007-07-04 11:34:40 bkorb" 
    55 * 
     
    1010 *  This file is part of AutoOpts, a companion to AutoGen. 
    1111 *  AutoOpts is free software. 
    12  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     12 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1413 * 
    1514 *  AutoOpts is available under any one of two licenses.  The license 
     
    2524 *  These files have the following md5sums: 
    2625 * 
    27  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    28  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     26 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     27 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2928 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3029 */ 
  • trunk/libopts/save.c

    r2091 r2412  
    11 
    22/* 
    3  *  save.c  $Id: save.c,v 4.28 2008/09/28 23:23:36 bkorb Exp $ 
    4  * Time-stamp:      "2008-09-23 14:24:58 bkorb" 
     3 *  save.c  $Id: save.c,v 4.36 2009/08/01 17:43:06 bkorb Exp $ 
     4 * Time-stamp:      "2009-07-20 20:40:28 bkorb" 
    55 * 
    66 *  This module's routines will take the currently set options and 
     
    1010 *  This file is part of AutoOpts, a companion to AutoGen. 
    1111 *  AutoOpts is free software. 
    12  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     12 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1413 * 
    1514 *  AutoOpts is available under any one of two licenses.  The license 
     
    2524 *  These files have the following md5sums: 
    2625 * 
    27  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    28  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     26 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     27 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2928 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3029 */ 
     
    8382    tCC*  pzDir; 
    8483 
    85     if (pOpts->specOptIdx.save_opts == 0) 
     84    if (  (pOpts->specOptIdx.save_opts == NO_EQUIVALENT) 
     85       || (pOpts->specOptIdx.save_opts == 0)) 
    8686        return NULL; 
    8787 
  • trunk/libopts/sort.c

    r2091 r2412  
    11 
    22/* 
    3  *  sort.c  $Id: sort.c,v 4.14 2008/06/14 22:24:22 bkorb Exp $ 
     3 *  sort.c  $Id: sort.c,v 4.17 2009/08/01 17:43:06 bkorb Exp $ 
    44 * Time-stamp:      "2007-07-04 11:34:52 bkorb" 
    55 * 
     
    88 *  This file is part of AutoOpts, a companion to AutoGen. 
    99 *  AutoOpts is free software. 
    10  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    11  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     10 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1211 * 
    1312 *  AutoOpts is available under any one of two licenses.  The license 
     
    2322 *  These files have the following md5sums: 
    2423 * 
    25  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    26  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     24 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     25 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2726 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    2827 */ 
  • trunk/libopts/stack.c

    r2091 r2412  
    22/* 
    33 *  stack.c 
    4  *  $Id: stack.c,v 4.17 2008/08/02 16:10:07 bkorb Exp $ 
     4 *  $Id: stack.c,v 4.19 2009/08/01 17:43:06 bkorb Exp $ 
    55 *  Time-stamp:      "2008-07-30 16:56:32 bkorb" 
    66 * 
     
    1010 *  This file is part of AutoOpts, a companion to AutoGen. 
    1111 *  AutoOpts is free software. 
    12  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     12 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1413 * 
    1514 *  AutoOpts is available under any one of two licenses.  The license 
     
    2524 *  These files have the following md5sums: 
    2625 * 
    27  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    28  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     26 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     27 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2928 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3029 */ 
  • trunk/libopts/streqvcmp.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: streqvcmp.c,v 4.14 2008/12/29 06:14:25 bkorb Exp $ 
     3 *  $Id: streqvcmp.c,v 4.17 2009/08/01 17:43:06 bkorb Exp $ 
    44 * Time-stamp:      "2008-12-26 10:15:46 bkorb" 
    55 * 
     
    1313 *  This file is part of AutoOpts, a companion to AutoGen. 
    1414 *  AutoOpts is free software. 
    15  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    16  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     15 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1716 * 
    1817 *  AutoOpts is available under any one of two licenses.  The license 
     
    2827 *  These files have the following md5sums: 
    2928 * 
    30  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    31  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     29 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     30 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    3231 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3332 * 
  • trunk/libopts/text_mmap.c

    r2091 r2412  
    11/* 
    2  * $Id: text_mmap.c,v 4.18 2008/01/23 00:36:05 bkorb Exp $ 
     2 * $Id: text_mmap.c,v 4.21 2009/08/01 17:43:06 bkorb Exp $ 
    33 * 
    44 * Time-stamp:      "2007-07-04 11:35:49 bkorb" 
     
    66 *  This file is part of AutoOpts, a companion to AutoGen. 
    77 *  AutoOpts is free software. 
    8  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    9  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     8 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    109 * 
    1110 *  AutoOpts is available under any one of two licenses.  The license 
     
    2120 *  These files have the following md5sums: 
    2221 * 
    23  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    24  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     22 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     23 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2524 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    2625 */ 
  • trunk/libopts/time.c

    r2091 r2412  
    11 
    22/* 
    3  *  $Id: time.c,v 4.2 2008/11/16 23:56:59 bkorb Exp $ 
     3 *  $Id: time.c,v 4.5 2009/08/01 17:43:06 bkorb Exp $ 
    44 *  Time-stamp:      "2008-11-16 14:51:48 bkorb" 
    55 * 
    66 *  This file is part of AutoOpts, a companion to AutoGen. 
    77 *  AutoOpts is free software. 
    8  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    9  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     8 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    109 * 
    1110 *  AutoOpts is available under any one of two licenses.  The license 
     
    2120 *  These files have the following md5sums: 
    2221 * 
    23  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    24  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     22 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     23 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2524 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    2625 */ 
  • trunk/libopts/tokenize.c

    r2091 r2412  
    55 *  This file is part of AutoOpts, a companion to AutoGen. 
    66 *  AutoOpts is free software. 
    7  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    8  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     7 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    98 * 
    109 *  AutoOpts is available under any one of two licenses.  The license 
     
    2019 *  These files have the following md5sums: 
    2120 * 
    22  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    23  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     21 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     22 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2423 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    2524 */ 
  • trunk/libopts/usage.c

    r2091 r2412  
    11 
    22/* 
    3  *  usage.c  $Id: usage.c,v 4.28 2008/11/02 18:51:27 bkorb Exp $ 
    4  * Time-stamp:      "2008-11-01 20:09:17 bkorb" 
     3 *  usage.c  $Id: usage.c,v 4.30 2009/08/01 17:43:06 bkorb Exp $ 
     4 * Time-stamp:      "2009-01-17 13:18:23 bkorb" 
    55 * 
    66 *  This module implements the default usage procedure for 
     
    1616 *  This file is part of AutoOpts, a companion to AutoGen. 
    1717 *  AutoOpts is free software. 
    18  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    19  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     18 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    2019 * 
    2120 *  AutoOpts is available under any one of two licenses.  The license 
     
    3130 *  These files have the following md5sums: 
    3231 * 
    33  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    34  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     32 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     33 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    3534 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3635 */ 
     
    551550 
    552551    do  { 
    553         if ((pOD->fOptState & OPTST_OMITTED) != 0) 
     552        if ((pOD->fOptState & OPTST_NO_USAGE_MASK) != 0) 
    554553            continue; 
    555554 
  • trunk/libopts/value-type.c

    r2091 r2412  
    1 /* ANSI-C code produced by gperf version 3.0.3 */ 
     1/* ANSI-C code produced by gperf version 3.0.2 */ 
    22 
    33 
     
    9292 
    9393#ifdef __GNUC__ 
    94 #ifdef __GNUC_STDC_INLINE__ 
    95 __attribute__ ((__gnu_inline__)) 
    96 #endif 
    9794#endif 
    9895static inline const value_type_map_t * 
  • trunk/libopts/value-type.h

    r2091 r2412  
    11/* 
    2  *  Generated header for gperf generated source Wed Dec 31 19:07:31 PST 2008 
     2 *  Generated header for gperf generated source Sat Aug  8 10:14:55 PDT 2009 
    33 *  This file enumerates the list of names and declares the 
    44 *  procedure for mapping string names to the enum value. 
  • trunk/libopts/version.c

    r2091 r2412  
    11 
    2 /*  $Id: version.c,v 4.15 2008/07/28 04:51:30 bkorb Exp $ 
     2/*  $Id: version.c,v 4.19 2009/08/01 17:43:06 bkorb Exp $ 
    33 * Time-stamp:      "2008-07-27 10:11:30 bkorb" 
    44 * 
     
    1010 *  This file is part of AutoOpts, a companion to AutoGen. 
    1111 *  AutoOpts is free software. 
    12  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
    13  *  AutoOpts is copyright (c) 1992-2008 by Bruce Korb - all rights reserved 
     12 *  AutoOpts is copyright (c) 1992-2009 by Bruce Korb - all rights reserved 
    1413 * 
    1514 *  AutoOpts is available under any one of two licenses.  The license 
     
    2524 *  These files have the following md5sums: 
    2625 * 
    27  *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3 
    28  *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3 
     26 *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3 
     27 *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3 
    2928 *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd 
    3029 */ 
  • trunk/libopts/xat-attribute.c

    r2091 r2412  
    1 /* ANSI-C code produced by gperf version 3.0.3 */ 
     1/* ANSI-C code produced by gperf version 3.0.2 */ 
    22 
    33 
     
    8383 
    8484#ifdef __GNUC__ 
    85 #ifdef __GNUC_STDC_INLINE__ 
    86 __attribute__ ((__gnu_inline__)) 
    87 #endif 
    8885#endif 
    8986static inline const xat_attribute_map_t * 
  • trunk/libopts/xat-attribute.h

    r2091 r2412  
    11/* 
    2  *  Generated header for gperf generated source Wed Dec 31 19:07:31 PST 2008 
     2 *  Generated header for gperf generated source Sat Aug  8 10:14:55 PDT 2009 
    33 *  This file enumerates the list of names and declares the 
    44 *  procedure for mapping string names to the enum value. 
Note: See TracChangeset for help on using the changeset viewer.