exit with 1 when an error occurs
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21494 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+6
-9
@@ -67,7 +67,7 @@ main(int argc, char **argv)
|
|||||||
// parse arguments
|
// parse arguments
|
||||||
|
|
||||||
if (argc < 2)
|
if (argc < 2)
|
||||||
usage(-1);
|
usage(1);
|
||||||
|
|
||||||
while (*++argv) {
|
while (*++argv) {
|
||||||
char *arg = *argv;
|
char *arg = *argv;
|
||||||
@@ -87,7 +87,7 @@ main(int argc, char **argv)
|
|||||||
usage(0);
|
usage(0);
|
||||||
else {
|
else {
|
||||||
fprintf(stderr, "unknown option \"%s\"\n", arg);
|
fprintf(stderr, "unknown option \"%s\"\n", arg);
|
||||||
usage(-1);
|
usage(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,7 +95,6 @@ main(int argc, char **argv)
|
|||||||
|
|
||||||
BApplication app("application/x-vnd.haiku.mimeset");
|
BApplication app("application/x-vnd.haiku.mimeset");
|
||||||
|
|
||||||
int err = 0;
|
|
||||||
while (*argv) {
|
while (*argv) {
|
||||||
char *arg = *argv++;
|
char *arg = *argv++;
|
||||||
|
|
||||||
@@ -105,14 +104,12 @@ main(int argc, char **argv)
|
|||||||
while (fgets(name, sizeof(name), stdin) != NULL) {
|
while (fgets(name, sizeof(name), stdin) != NULL) {
|
||||||
name[strlen(name) - 1] = '\0';
|
name[strlen(name) - 1] = '\0';
|
||||||
// remove trailing '\n'
|
// remove trailing '\n'
|
||||||
err = process_file(name);
|
if (process_file(name) != B_OK)
|
||||||
if (err)
|
exit(1);
|
||||||
exit(err);
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
err = process_file(arg);
|
if (process_file(arg) != B_OK)
|
||||||
if (err)
|
exit(1);
|
||||||
exit(err);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user