summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--doc/dillo.110
-rw-r--r--src/dillo.cc6
3 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 62aa345c..9e9fffe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@ dillo-2.2 [??]
- Split words that contain whitespace as numeric character references.
- Allow linebreaks around Chinese/Japanese characters.
- Fix segfault in Html_parse_doctype (BUG#918).
+ - Change exit code used for bad command line argument.
Patches: corvid
-----------------------------------------------------------------------------
diff --git a/doc/dillo.1 b/doc/dillo.1
index 74a1142e..0e6287a7 100644
--- a/doc/dillo.1
+++ b/doc/dillo.1
@@ -1,4 +1,4 @@
-.TH dillo 1 "July 23, 2009" "version 2.2" "USER COMMANDS"
+.TH dillo 1 "August 11, 2009" "version 2.2" "USER COMMANDS"
.SH NAME
dillo \- web browser
.SH SYNOPSIS
@@ -44,14 +44,14 @@ Display version info and exit.
Open first Dillo window in an existing window whose window ID is \fIXID\fR.
.SH EXIT STATUS
.TP
-.B -1
-Error in command line arguments.
-.TP
.B 0
No error.
.TP
.B 1
-Runtime error.
+Internal error.
+.TP
+.B 2
+Error in command line arguments.
.SH ENVIRONMENT
.TP
.BR "HOME " "(or " "HOMEDRIVE " "and " "HOMEPATH " "on Cygwin)"
diff --git a/src/dillo.cc b/src/dillo.cc
index 45a98de6..5e1bbd3e 100644
--- a/src/dillo.cc
+++ b/src/dillo.cc
@@ -234,7 +234,7 @@ int main(int argc, char **argv)
xid = strtol(opt_argv[0], &end, 0);
if (*end) {
fprintf(stderr, "XID argument \"%s\" not valid.\n",opt_argv[0]);
- return -1;
+ return 2;
}
break;
}
@@ -242,7 +242,7 @@ int main(int argc, char **argv)
if (!a_Misc_parse_geometry(opt_argv[0],&xpos,&ypos,&width,&height)){
fprintf(stderr, "geometry argument \"%s\" not valid. Must be of "
"the form WxH[{+-}X{+-}Y].\n", opt_argv[0]);
- return -1;
+ return 2;
}
break;
case DILLO_CLI_VERSION:
@@ -253,7 +253,7 @@ int main(int argc, char **argv)
return 0;
default:
printHelp(argv[0], Options);
- return -1;
+ return 2;
}
}
dFree(opt_argv);