replace ZSV_OPT_PROPERTY_OVERRIDE_XXX with opts.option_overrides.xxx (#321)

Author: liquidaty

app/cli.c

@@ -506,6 +506,8 @@ char havearg(const char *arg, const char *form1, size_t min_len1, const char *fo
 
 static struct builtin_cmd *find_builtin(const char *cmd_name) {
   int builtin_cmd_count = sizeof(builtin_cmds) / sizeof(*builtin_cmds);
+  if (!strcmp(cmd_name, "-h") || !strcmp(cmd_name, "--help"))
+    cmd_name = "help";
   for (int i = 0; i < builtin_cmd_count; i++)
     if (havearg(cmd_name, builtin_cmds[i].name, 0, 0, 0))
       return &builtin_cmds[i];

app/utils/arg.c

@@ -293,9 +293,13 @@ enum zsv_status zsv_args_to_opts(int argc, const char *argv[], int *argc_out, co
     }
     if (processed && opts_out) {
       if (arg == 'R')
-        opts_out->property_overrides |= ZSV_OPT_PROPERTY_OVERRIDE_SKIP_HEAD;
+        opts_out->option_overrides.skip_head = 1;
       else if (arg == 'd')
-        opts_out->property_overrides |= ZSV_OPT_PROPERTY_OVERRIDE_HEADER_SPAN;
+        opts_out->option_overrides.header_row_span = 1;
+      else if (arg == 'c')
+        opts_out->option_overrides.max_column_count = 1;
+      else if (arg == 'u')
+        opts_out->option_overrides.malformed_utf8_replacement = 1;
     }
   }
 

app/utils/prop.c

@@ -187,13 +187,13 @@ struct zsv_file_properties zsv_cache_load_props(const char *data_filepath, struc
   if (tmp.stat == zsv_status_ok) {
     // warn if the loaded properties conflict with command-line options
     if (fp->skip_specified) {
-      if (opts && (opts->property_overrides & ZSV_OPT_PROPERTY_OVERRIDE_SKIP_HEAD))
+      if (opts && opts->option_overrides.skip_head && opts->rows_to_ignore != fp->skip)
         fprintf(stderr, "Warning: file property 'skip-head' overridden by command option\n");
       else if (opts)
         opts->rows_to_ignore = fp->skip;
     }
     if (fp->header_span_specified) {
-      if (opts && (opts->property_overrides & ZSV_OPT_PROPERTY_OVERRIDE_HEADER_SPAN))
+      if (opts && opts->option_overrides.header_row_span && opts->header_span != fp->header_span)
         fprintf(stderr, "Warning: file property 'header-row-span' overridden by command option\n");
       else if (opts)
         opts->header_span = fp->header_span;

include/zsv/common.h

@@ -265,20 +265,24 @@ struct zsv_opts {
   char malformed_utf8_replace;
 
   /**
-   * `property_overrides` is a bitfield of ZSV_OPT_PROPERTY_OVERRIDE_xxx
-   * which, if set, indicates that the value of the related option in this
-   * zsv_opts structure should override any default value such as might be
-   * saved in an input file property
+   * `overrides` is a bitfield that indicates what ZSV options, if any, were
+   * specifically set in the command invocation and is used to ensure
+   * that option values set in the command invocation take priority over
+   * default values, or values saved in related property values such as
+   * .zsv/data/<filename>/props.json
    *
    * For example, if a file has a saved header row span of 2, but the
    * command-line arguments explicitly included `--header-row-span 3`,
-   * then setting header_span to 3 and setting property_overrides to
-   * ZSV_OPT_PROPERTY_OVERRIDE_HEADER_SPAN ensures that the value of 3
-   * is always used
+   * then setting header_span to 3 and setting overrides.header_row_span
+   * ensures that the value of 3 is used
    */
-#define ZSV_OPT_PROPERTY_OVERRIDE_HEADER_SPAN 1
-#define ZSV_OPT_PROPERTY_OVERRIDE_SKIP_HEAD 2
-  unsigned int property_overrides;
+  struct {
+    unsigned char header_row_span : 1;
+    unsigned char skip_head : 1;
+    unsigned char max_column_count : 1;
+    unsigned char malformed_utf8_replacement : 1;
+    unsigned char _ : 4;
+  } option_overrides;
 
 #ifdef ZSV_EXTRAS
   struct {