~mdw
/
sgt
/
halibut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revamp of the Halibut error handling mechanism.
[sgt/halibut]
/
main.c
diff --git
a/main.c
b/main.c
index
60ad74f
..
405e6ef
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-85,7
+85,7
@@
int main(int argc, char **argv) {
*/
while (--argc) {
char *p = *++argv;
*/
while (--argc) {
char *p = *++argv;
- if (*p == '-') {
+ if (*p == '-'
&& p[1]
) {
/*
* An option.
*/
/*
* An option.
*/
@@
-128,11
+128,11
@@
int main(int argc, char **argv) {
/* do nothing */;
} else if (!strcmp(opt, "-input-charset")) {
if (!val) {
/* do nothing */;
} else if (!strcmp(opt, "-input-charset")) {
if (!val) {
- errs = TRUE, err
or(err_optnoarg,
opt);
+ errs = TRUE, err
_optnoarg(
opt);
} else {
int charset = charset_from_localenc(val);
if (charset == CS_NONE) {
} else {
int charset = charset_from_localenc(val);
if (charset == CS_NONE) {
- errs = TRUE, err
or(err_cmdcharset,
val);
+ errs = TRUE, err
_cmdcharset(
val);
} else {
input_charset = charset;
}
} else {
input_charset = charset;
}
@@
-155,7
+155,7
@@
int main(int argc, char **argv) {
} else if (!strcmp(opt, "-precise")) {
reportcols = 1;
} else {
} else if (!strcmp(opt, "-precise")) {
reportcols = 1;
} else {
- errs = TRUE, err
or(err_nosuchopt,
opt);
+ errs = TRUE, err
_nosuchopt(
opt);
}
}
p = NULL;
}
}
p = NULL;
@@
-200,7
+200,7
@@
int main(int argc, char **argv) {
char opt[2];
opt[0] = c;
opt[1] = '\0';
char opt[2];
opt[0] = c;
opt[1] = '\0';
- errs = TRUE, err
or(err_optnoarg,
opt);
+ errs = TRUE, err
_optnoarg(
opt);
}
/*
* Now c is the option and p is the parameter.
}
/*
* Now c is the option and p is the parameter.
@@
-224,7
+224,7
@@
int main(int argc, char **argv) {
*r = '\0';
/* XXX ad-hoc diagnostic */
if (!strcmp(s, "input-charset"))
*r = '\0';
/* XXX ad-hoc diagnostic */
if (!strcmp(s, "input-charset"))
- err
or(err_futileopt,
"Cinput-charset",
+ err
_futileopt(
"Cinput-charset",
"; use --input-charset");
cmdline_cfg_add(para, s);
r = s;
"; use --input-charset");
cmdline_cfg_add(para, s);
r = s;
@@
-256,7
+256,7
@@
int main(int argc, char **argv) {
char opt[2];
opt[0] = c;
opt[1] = '\0';
char opt[2];
opt[0] = c;
opt[1] = '\0';
- errs = TRUE, err
or(err_nosuchopt,
opt);
+ errs = TRUE, err
_nosuchopt(
opt);
}
}
}
}
}
}
@@
-264,7
+264,10
@@
int main(int argc, char **argv) {
/*
* A non-option argument.
*/
/*
* A non-option argument.
*/
- infiles[nfiles++] = p;
+ if (!strcmp(p, "-"))
+ infiles[nfiles++] = NULL; /* special case: read stdin */
+ else
+ infiles[nfiles++] = p;
}
}
}
}
@@
-277,7
+280,7
@@
int main(int argc, char **argv) {
* Do the work.
*/
if (nfiles == 0 && !list_fonts) {
* Do the work.
*/
if (nfiles == 0 && !list_fonts) {
- err
or(err_noinput
);
+ err
_noinput(
);
usage();
exit(EXIT_FAILURE);
}
usage();
exit(EXIT_FAILURE);
}