Fix differentiate incomplete/uknown in symbolic utilities

Fixup 40af29f (Differentiate error/incomplete/unknown in
symbolic utilities)

src/symbolic/symbolicUtility.ml

@@ -72,7 +72,7 @@ module MakeInterpreter (Filesystem: FILESYSTEM) = struct
     match !Options.unknown_behaviour with
     | Exception -> raise (Errors.Unknown_behaviour (utility, msg))
     | Incomplete -> incomplete ~utility msg
-    | Error -> error ~utility "not found"
+    | Error -> error ~utility msg
 
   let table : (string, utility_context -> utility) Hashtbl.t =
     let table = Hashtbl.create 10 in

src/symbolic/utilities/cp.ml

@@ -209,11 +209,13 @@ let interprete ctx : utility =
   let e = ref None in
   let r = ref false in
   let i = ref false in
+  let a = ref false in
   let args_rev = ref [] in
   List.iter
     (function
       | "-H" | "-L" | "-f" | "-p" | "-P" -> () (* Option ignored *)
       | "-i" -> i := true
+      | "-a"  ->  a := true
       | "-r" | "-R" -> r := true
       | arg ->
         if String.length arg > 0 && arg.[0] = '-' && !e = None then
@@ -223,9 +225,11 @@ let interprete ctx : utility =
     ctx.args;
   if !i then
     error ~utility:"cp" "option `-i` forbidden"
+  else if !a then
+    incomplete ~utility:"cp" "option -a"
   else
     match !e with
-    | Some arg -> error ~utility:"cp" ("unknown argument: " ^ arg)
+    | Some arg -> unknown ~utility:"cp" ("unknown argument: " ^ arg)
     | None -> (
       let args = List.rev !args_rev in
       match args with

src/symbolic/utilities/dpkg.ml

@@ -30,6 +30,6 @@ let interprete ctx =
       (* TODO: return error state *)
       error ~utility "no argument found"
     | arg :: _ ->
-      incomplete ~utility ("unsupported argument: " ^ arg)
+      unknown ~utility ("argument: " ^ arg)
   in
   aux ctx.args

src/symbolic/utilities/dpkgMaintscriptHelper.ml

@@ -474,7 +474,7 @@ let interprete ctx =
            | "dir_to_symlink" ->
               dir_to_symlink {ctx with args = List.tl args}
                 scriptarg1 scriptarg2 dms_package default_package dms_name
-           | _ -> unknown ~utility:"dpkg-maintscript-helper" ("unknown subcommand: " ^subcmd)
+           | _ -> unknown ~utility:"dpkg-maintscript-helper" ("subcommand: " ^subcmd)
          with
          | NoDashDash ->
            error ~utility:("dpkg-maintscript-helper " ^ subcmd) "missing -- separator"

src/symbolic/utilities/mkdir.ml

@@ -63,7 +63,7 @@ let interp_mkdir1 cwd path_str =
     ]
 
 let interprete parents ctx args : utility =
-  if parents then incomplete ~utility:name "-p" else
+  if parents then incomplete ~utility:name "option -p" else
   multiple_times (interp_mkdir1 ctx.cwd) args
 
 let interprete ctx : utility =

src/symbolic/utilities/mv.ml

@@ -11,14 +11,19 @@ let name = "mv"
 let interp_rename ctx src dstpath : utility =
   let qsrc = Path.from_string src in
   let qdst = Path.from_string dstpath in
-  specification_cases @@
-    match Path.split_last qsrc, Path.split_last qdst with
+  match Path.split_last qsrc, Path.split_last qdst with
     | (None, _) ->
-      [error_case ~descr:"mv: invalid source path ''" noop]
+      specification_cases [
+        error_case ~descr:"mv: invalid source path ''" noop
+      ]
     | (_, None) ->
-      [error_case ~descr:"mv: invalid destination path ''" noop]
+      specification_cases [
+        error_case ~descr:"mv: invalid destination path ''" noop
+      ]
     | (Some (_, (Here|Up)), _) | (_, Some(_, (Here|Up))) ->
-      [error_case ~descr:"mv: paths end in . or .." noop]
+      specification_cases [
+        error_case ~descr:"mv: paths end in . or .." noop
+      ]
     | (Some (qs, Down fs), Some (qd, Down fd)) ->
        let unconditional_cases = [
            error_case
@@ -204,6 +209,7 @@ let interp_rename ctx src dstpath : utility =
                end
            ]
        in
+       specification_cases @@
        List.concat [ unconditional_cases; ancestor_case ; slash_case ]
 
 
@@ -239,7 +245,7 @@ let interprete ctx : utility =
     error ~utility:"mv" "option `-i` forbidden"
   else
     match !e with
-    | Some arg -> error ~utility:"mv" ("unknown argument: " ^ arg)
+    | Some arg -> unknown ~utility:"mv" ("unknown argument: " ^ arg)
     | None -> (
       let args = List.rev !args_rev in
       match args with

src/symbolic/utilities/test.ml

@@ -220,18 +220,21 @@ let rec interp_test_expr cwd e : utility =
   | Unary("-z",arg) -> interp_test_z arg
   | Binary ("=",a1,a2) -> interp_test_string_equal a1 a2
   | Binary ("!=",a1,a2) -> interp_test_string_notequal a1 a2
+  | Binary ("-eq"|"-ne"|"-gt"|"-ge"|"-lt"|"-le" as opt,_,_) ->
+    incomplete ~utility:name ("option "^opt)
   | Unary(op,_) ->
-     unknown ~utility:name ("unsupported unary operator: " ^ op)
+     (* The Unary cases above are complete, everything else is an error *)
+     error ~utility:name ("unsupported unary operator: " ^ op)
   | And(e1,e2) ->
      uand (interp_test_expr cwd e1) (interp_test_expr cwd e2)
   | Or(e1,e2) ->
      uor (interp_test_expr cwd e1) (interp_test_expr cwd e2)
   | Not(e1) -> uneg (interp_test_expr cwd e1)
   | Binary (op,_e1,_e2) ->
-     unknown ~utility:name ("unsupported binary operator: " ^ op)
+    (* The Binary cases above are complete, everything else is an error *)
+     error ~utility:name ("unknown binary operator: " ^ op)
   | Single arg ->
-     unknown ~utility:name ("unsupported single argument: " ^ arg)
-  )
+    incomplete ~utility:name ("unsupported single argument: " ^ arg))
 
 let interpret ~bracket ctx : utility =
   match Morsmall_utilities.TestParser.parse ~bracket ctx.args with

src/symbolic/utilities/updateAlternatives.ml

@@ -11,6 +11,6 @@ let interprete ctx =
     | "--quiet" :: rem->
       fun st -> aux rem (print_utility_trace (name ^ ": ignored option --quiet") st)
     | arg :: _ ->
-      error ~utility:name ("unsupported argument: " ^ arg)
+      unknown ~utility:name ("unsupported argument: " ^ arg)
   in
   aux ctx.args