mkfs: factor boolean option parsing

Many of the options passed to mkfs have boolean options (0 or 1) and
all hand roll the same code and validity checks. Factor these out
into a common function.

Note that the lazy-count option is now changed to match other
booleans in that if you don't specify a value, it reverts to the
default value (on) rather than throwing an error.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Jan Tulak <jtulak@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 35b1d02e03726f50462619dbf41fc5ddd396f85d..ae5ce43eb889d20d8108b13ec97ab4d93fcbad44 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -38,7 +38,7 @@ struct fs_topology {
  * Prototypes for internal functions.
  */
 static void conflict(char opt, char *tab[], int oldidx, int newidx);
-static void illegal(char *value, char *opt);
+static void illegal(const char *value, const char *opt);
 static __attribute__((noreturn)) void usage (void);
 static __attribute__((noreturn)) void reqval(char opt, char *tab[], int idx);
 static void respec(char opt, char *tab[], int idx);
@@ -1006,6 +1006,21 @@ getnum(
        return i;
 }
 
+static bool
+getbool(
+       const char      *str,
+       const char      *illegal_str,
+       bool            default_val)
+{
+       long long       c;
+
+       if (!str || *str == '\0')
+               return default_val;
+       c = getnum(str, 0, 0, false);
+       if (c < 0 || c > 1)
+               illegal(str, illegal_str);
+       return c ? true : false;
+}
 
 int
 main(
@@ -1225,11 +1240,8 @@ main(
                                        dasize = 1;
                                        break;
                                case D_FILE:
-                                       if (!value || *value == '\0')
-                                               value = "1";
-                                       xi.disfile = getnum(value, 0, 0, false);
-                                       if (xi.disfile < 0 || xi.disfile > 1)
-                                               illegal(value, "d file");
+                                       xi.disfile = getbool(value, "d file",
+                                                            true);
                                        if (xi.disfile && !Nflag)
                                                xi.dcreat = 1;
                                        break;
@@ -1372,12 +1384,8 @@ main(
 
                                switch (getsubopt(&p, (constpp)iopts, &value)) {
                                case I_ALIGN:
-                                       if (!value || *value == '\0')
-                                               value = "1";
-                                       c = getnum(value, 0, 0, false);
-                                       if (c < 0 || c > 1)
-                                               illegal(value, "i align");
-                                       sb_feat.inode_align = c ? true : false;
+                                       sb_feat.inode_align = getbool(
+                                                       value, "i align", true);
                                        break;
                                case I_LOG:
                                        if (!value || *value == '\0')
@@ -1450,20 +1458,12 @@ main(
                                        sb_feat.attr_version = c;
                                        break;
                                case I_PROJID32BIT:
-                                       if (!value || *value == '\0')
-                                               value = "0";
-                                       c = getnum(value, 0, 0, false);
-                                       if (c < 0 || c > 1)
-                                               illegal(value, "i projid32bit");
-                                       sb_feat.projid16bit = c ? false : true;
+                                       sb_feat.projid16bit = !getbool(value,
+                                                       "i projid32bit", false);
                                        break;
                                case I_SPINODES:
-                                       if (!value || *value == '\0')
-                                               value = "1";
-                                       c = atoi(value);
-                                       if (c < 0 || c > 1)
-                                               illegal(value, "i spinodes");
-                                       sb_feat.spinodes = c;
+                                       sb_feat.spinodes = getbool(value,
+                                                       "i spinodes", true);
                                        break;
                                default:
                                        unknown('i', value);
@@ -1489,20 +1489,15 @@ main(
                                        laflag = 1;
                                        break;
                                case L_FILE:
-                                       if (!value || *value == '\0')
-                                               value = "1";
                                        if (loginternal)
                                                conflict('l', lopts, L_INTERNAL,
                                                         L_FILE);
-                                       xi.lisfile = getnum(value, 0, 0, false);
-                                       if (xi.lisfile < 0 || xi.lisfile > 1)
-                                               illegal(value, "l file");
+                                       xi.lisfile = getbool(value, "l file",
+                                                            true);
                                        if (xi.lisfile)
                                                xi.lcreat = 1;
                                        break;
                                case L_INTERNAL:
-                                       if (!value || *value == '\0')
-                                               value = "1";
                                        if (ldflag)
                                                conflict('l', lopts, L_INTERNAL, L_DEV);
                                        if (xi.lisfile)
@@ -1510,9 +1505,9 @@ main(
                                                         L_INTERNAL);
                                        if (liflag)
                                                respec('l', lopts, L_INTERNAL);
-                                       loginternal = getnum(value, 0, 0, false);
-                                       if (loginternal < 0 || loginternal > 1)
-                                               illegal(value, "l internal");
+
+                                       loginternal = getbool(value,
+                                                       "l internal", true);
                                        liflag = 1;
                                        break;
                                case L_SU:
@@ -1602,14 +1597,9 @@ main(
                                        lssflag = 1;
                                        break;
                                case L_LAZYSBCNTR:
-                                       if (!value || *value == '\0')
-                                               reqval('l', lopts,
-                                                               L_LAZYSBCNTR);
-                                       c = getnum(value, 0, 0, false);
-                                       if (c < 0 || c > 1)
-                                               illegal(value, "l lazy-count");
-                                       sb_feat.lazy_sb_counters = c ? true
-                                                                    : false;
+                                       sb_feat.lazy_sb_counters = getbool(
+                                                       value, "l lazy-count",
+                                                       true);
                                        break;
                                default:
                                        unknown('l', value);
@@ -1628,23 +1618,15 @@ main(
 
                                switch (getsubopt(&p, (constpp)mopts, &value)) {
                                case M_CRC:
-                                       if (!value || *value == '\0')
-                                               reqval('m', mopts, M_CRC);
-                                       c = getnum(value, 0, 0, false);
-                                       if (c < 0 || c > 1)
-                                               illegal(value, "m crc");
-                                       sb_feat.crcs_enabled = c ? true : false;
-                                       if (c)
+                                       sb_feat.crcs_enabled = getbool(
+                                                       value, "m crc", true);
+                                       if (sb_feat.crcs_enabled)
                                                sb_feat.dirftype = true;
                                        break;
                                case M_FINOBT:
-                                       if (!value || *value == '\0')
-                                               reqval('m', mopts, M_CRC);
-                                       c = atoi(value);
-                                       if (c < 0 || c > 1)
-                                               illegal(value, "m finobt");
                                        sb_feat.finobtflag = true;
-                                       sb_feat.finobt = c;
+                                       sb_feat.finobt = getbool(
+                                               value, "m finobt", true);
                                        break;
                                case M_UUID:
                                        if (!value || *value == '\0')
@@ -1712,14 +1694,10 @@ main(
                                        nvflag = 1;
                                        break;
                                case N_FTYPE:
-                                       if (!value || *value == '\0')
-                                               reqval('n', nopts, N_FTYPE);
                                        if (nftype)
                                                respec('n', nopts, N_FTYPE);
-                                       c = getnum(value, 0, 0, false);
-                                       if (c < 0 || c > 1)
-                                               illegal(value, "n ftype");
-                                       sb_feat.dirftype = c ? true : false;
+                                       sb_feat.dirftype = getbool(value,
+                                                            "n ftype", true);
                                        nftype = 1;
                                        break;
                                default:
@@ -1755,11 +1733,8 @@ main(
                                        rtextsize = value;
                                        break;
                                case R_FILE:
-                                       if (!value || *value == '\0')
-                                               value = "1";
-                                       xi.risfile = getnum(value, 0, 0, false);
-                                       if (xi.risfile < 0 || xi.risfile > 1)
-                                               illegal(value, "r file");
+                                       xi.risfile = getbool(value,
+                                                            "r file", true);
                                        if (xi.risfile)
                                                xi.rcreat = 1;
                                        break;
@@ -3205,8 +3180,8 @@ conflict(
 
 static void
 illegal(
-       char            *value,
-       char            *opt)
+       const char      *value,
+       const char      *opt)
 {
        fprintf(stderr, _("Illegal value %s for -%s option\n"), value, opt);
        usage();