Added exception trapping in main

This commit is contained in:
Erik C. Thauvin 2023-01-02 11:32:35 -08:00
parent 3ed294bf72
commit 9003f95df3
2 changed files with 12 additions and 7 deletions

View file

@ -23,6 +23,7 @@
<id>gbevin</id> <id>gbevin</id>
<name>Geert Bevin</name> <name>Geert Bevin</name>
<email>gbevin@uwyn.com</email> <email>gbevin@uwyn.com</email>
<url>https://github.com/gbevin</url>
</developer> </developer>
<developer> <developer>
<id>ethauvin</id> <id>ethauvin</id>

View file

@ -144,7 +144,6 @@ object UrlEncoder {
ch = source[i] ch = source[i]
if (ch.isUnreserved() || allow.indexOf(ch) != -1) { if (ch.isUnreserved() || allow.indexOf(ch) != -1) {
out?.append(ch) out?.append(ch)
println(out)
i++ i++
} else { } else {
if (out == null) { if (out == null) {
@ -192,13 +191,18 @@ object UrlEncoder {
*/ */
@JvmStatic @JvmStatic
fun main(args: Array<String>) { fun main(args: Array<String>) {
val result = processMain(args) try {
if (result.status == 1) { val result = processMain(args)
System.err.println(result.output) if (result.status == 1) {
} else { System.err.println(result.output)
println(result.output) } else {
println(result.output)
}
exitProcess(result.status)
} catch (e: IllegalArgumentException) {
System.err.println("${UrlEncoder::class.java.simpleName}: ${e.message}");
exitProcess(1)
} }
exitProcess(result.status)
} }
internal data class MainResult(var output: String = usage, var status: Int = 1) internal data class MainResult(var output: String = usage, var status: Int = 1)