diff options
| -rw-r--r-- | util/ChangeLog | 7 | ||||
| -rw-r--r-- | util/miscutil.c | 47 |
2 files changed, 43 insertions, 11 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 2dad265ba..78ded44bf 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,10 @@ +2003-11-20 David Shaw <[email protected]> + + * miscutil.c (match_multistr): New. Match against each segment in + a string with tokens separated by |. + (answer_is_yes_no_default, answer_is_yes_no_quit): Use it here to + enable alternate translations. + 2003-10-23 Werner Koch <[email protected]> * secmem.c (lock_pool) [_AIX]: Don't use plock. diff --git a/util/miscutil.c b/util/miscutil.c index b266d27d4..0ae259df4 100644 --- a/util/miscutil.c +++ b/util/miscutil.c @@ -293,18 +293,20 @@ make_printable_string( const byte *p, size_t n, int delim ) int answer_is_yes_no_default( const char *s, int def_answer ) { - const char *long_yes = _("yes"); + /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */ + const char *long_yes = _("yes|yes"); const char *short_yes = _("yY"); - const char *long_no = _("no"); + /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */ + const char *long_no = _("no|no"); const char *short_no = _("nN"); /* Note: we have to use the local dependent strcasecmp here */ - if( !strcasecmp(s, long_yes ) ) + if( match_multistr(long_yes,s) ) return 1; if( *s && strchr( short_yes, *s ) && !s[1] ) return 1; /* test for no strings to catch ambiguities for the next test */ - if( !strcasecmp(s, long_no ) ) + if( match_multistr(long_no,s) ) return 0; if( *s && strchr( short_no, *s ) && !s[1] ) return 0; @@ -328,19 +330,21 @@ answer_is_yes( const char *s ) int answer_is_yes_no_quit( const char *s ) { - const char *long_yes = _("yes"); - const char *long_no = _("no"); - const char *long_quit = _("quit"); + /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */ + const char *long_yes = _("yes|yes"); + /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */ + const char *long_no = _("no|no"); + /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */ + const char *long_quit = _("quit|quit"); const char *short_yes = _("yY"); const char *short_no = _("nN"); const char *short_quit = _("qQ"); - /* Note: We have to use the locale dependent strcasecmp */ - if( !strcasecmp(s, long_no ) ) + if( match_multistr(long_no,s) ) return 0; - if( !strcasecmp(s, long_yes ) ) + if( match_multistr(long_yes,s) ) return 1; - if( !strcasecmp(s, long_quit ) ) + if( match_multistr(long_quit,s) ) return -1; if( *s && strchr( short_no, *s ) && !s[1] ) return 0; @@ -359,3 +363,24 @@ answer_is_yes_no_quit( const char *s ) return -1; return 0; } + +/* Try match against each substring of multistr, delimited by | */ +int +match_multistr(const char *multistr,const char *match) +{ + do + { + size_t seglen=strcspn(multistr,"|"); + if(!seglen) + break; + /* Using the localized strncasecmp */ + if(strncasecmp(multistr,match,seglen)==0) + return 1; + multistr+=seglen; + if(*multistr=='|') + multistr++; + } + while(*multistr); + + return 0; +} |