Ticket #89: ticket89-files-arg.patch

Source/CommandLine.cobra

@@ -1143 +1143 @@
         validate names and add into fileList
         """
         for fileName as String in fileNamesList
-            baseDir = Path.getDirectoryName(fileName)
             try
+                what = 'name "[fileName]"'
+                baseDir = Path.getDirectoryName(fileName)
                 for line in File.readAllLines(fileName)
                     line = line.trim
                     if line.length==0 or line.startsWith('#')
                         continue
                     # note that source files are relative to the location of the "files file"
-                    _processAsFile(Path.combine(baseDir, line), fileList, nil)
+                    what = 'line - filename "[line]"'
+                    fileArg = Path.combine(baseDir, line)
+                    _processAsFile(fileArg, fileList, nil)
             catch IOException
                 _error('Cannot open file "[fileName]".')
+            catch ArgumentException
+                _error('Invalid filesFile [what].')
 
     def _processAsFile(arg as String, fileList as List<of String>, errHint as String?)
         """

Tests/700-command-line/860-files.cobra

@@ +1 @@
+# check missing/weirded filesFiles arg
+class Test
+
+    def main is shared
+        .check('-c -files:xyzzy', 'cannot open file "xyzzy"')
+        .check('-c -files: ', 'invalid filesfile name "".')
+        .check('-c -files:100-find-cobra.exe', 'invalid filesfile line - filename')
+    
+    def check(opt as String, contains) is shared
+        process as System.Diagnostics.Process?
+
+        output = CobraCore.runCobraExe('[opt] ', out process)
+        assert output.toLower.contains(contains)