projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
54c841f
)
Pass NULL, not 0, handle invalid --id better.
author
Mikael Magnusson
<mikachu@gmail.com>
Fri, 8 Jan 2010 20:51:35 +0000
(21:51 +0100)
committer
Mikael Magnusson
<mikachu@gmail.com>
Fri, 8 Jan 2010 20:51:35 +0000
(21:51 +0100)
tools/obxprop/obxprop.c
patch
|
blob
|
history
diff --git
a/tools/obxprop/obxprop.c
b/tools/obxprop/obxprop.c
index
b28b77a
..
2e6b2a0
100644
(file)
--- a/
tools/obxprop/obxprop.c
+++ b/
tools/obxprop/obxprop.c
@@
-273,13
+273,13
@@
int main(int argc, char **argv)
for (i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "--help")) {
for (i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "--help")) {
- return fail(
0
);
+ return fail(
NULL
);
}
else if (!strcmp(argv[i], "--root"))
root = TRUE;
else if (!strcmp(argv[i], "--id")) {
if (++i == argc)
}
else if (!strcmp(argv[i], "--root"))
root = TRUE;
else if (!strcmp(argv[i], "--id")) {
if (++i == argc)
- return fail(
0
);
+ return fail(
NULL
);
if (argv[i][0] == '0' && argv[i][1] == 'x') {
/* hex */
userid = parse_hex(argv[i]+2);
if (argv[i][0] == '0' && argv[i][1] == 'x') {
/* hex */
userid = parse_hex(argv[i]+2);
@@
-288,11
+288,12
@@
int main(int argc, char **argv)
/* decimal */
userid = atoi(argv[i]);
}
/* decimal */
userid = atoi(argv[i]);
}
- break;
+ if (!userid)
+ return fail("Unable to parse argument to --id.");
}
else if (!strcmp(argv[i], "--display")) {
if (++i == argc)
}
else if (!strcmp(argv[i], "--display")) {
if (++i == argc)
- return fail(
0
);
+ return fail(
NULL
);
dname = argv[i];
}
else if (*argv[i] != '-')
dname = argv[i];
}
else if (*argv[i] != '-')