Move another common functionality (reproduced so far with cut'n'paste)

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 8e3f5cdac43f23d6d0156bf6ccf1c9423f371f82..6e72f1183d990eb00773506f0ba25323a748a1bd 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1707,22 +1707,7 @@ CA_DB *load_index(char *dbfile, DB_ATTR *db_attr)
 #ifdef RL_DEBUG
                        BIO_printf(bio_err, "DEBUG[load_index]: unique_subject = \"%s\"\n", p);
 #endif
-                       switch(*p)
-                               {
-                       case 'f': /* false */
-                       case 'F': /* FALSE */
-                       case 'n': /* no */
-                       case 'N': /* NO */
-                               retdb->attributes.unique_subject = 0;
-                               break;
-                       case 't': /* true */
-                       case 'T': /* TRUE */
-                       case 'y': /* yes */
-                       case 'Y': /* YES */
-                       default:
-                               retdb->attributes.unique_subject = 1;
-                               break;
-                               }
+                       retdb->attributes.unique_subject = parse_yesno(p,1);
                        }
                }
 
@@ -1962,6 +1947,35 @@ void free_index(CA_DB *db)
                }
        }
 
+int parse_yesno(char *str, int def)
+       {
+       int ret = def;
+       if (str)
+               {
+               switch (*str)
+                       {
+               case 'f': /* false */
+               case 'F': /* FALSE */
+               case 'n': /* no */
+               case 'N': /* NO */
+               case '0': /* 0 */
+                       ret = 0;
+                       break;
+               case 't': /* true */
+               case 'T': /* TRUE */
+               case 'y': /* yes */
+               case 'Y': /* YES */
+               case '1': /* 1 */
+                       ret = 0;
+                       break;
+               default:
+                       ret = def;
+                       break;
+                       }
+               }
+       return ret;
+       }
+
 /*
  * subject is expected to be in the format /type0=value0/type1=value1/type2=...
  * where characters may be escaped by \