i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now always ignores B_ALREADY_RUNNING error codes.

Browse Source 
Cleanup.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10859 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-01-19 00:10:48 +00:00
parent b8fb69518c
commit a225b6b9b6
1 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/bin/open.cpp
+37 -33
View File
@@ -1,10 +1,11 @@
/* Launches an application/document from the shell /*
** * Copyright 2003-2005, Axel Dörfler, [email protected]. All rights reserved.
** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved. * Distributed under the terms of the MIT License.
** Distributed under the terms of the OpenBeOS License. */
*/
/* Launches an application/document from the shell */
#include <InterfaceDefs.h>
#include <Roster.h> #include <Roster.h>
#include <Entry.h> #include <Entry.h>
#include <String.h> #include <String.h>
@@ -15,11 +16,15 @@
#include <errno.h> #include <errno.h>
const char *kTrackerSignature = "application/x-vnd.Be-TRAK";
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
const char *openWith = kTrackerSignature;
char *progName = argv[0]; char *progName = argv[0];
char *openWith = "application/x-vnd.Be-TRAK";
if (strrchr(progName, '/')) if (strrchr(progName, '/'))
progName = strrchr(progName, '/') + 1; progName = strrchr(progName, '/') + 1;
@@ -29,11 +34,11 @@ main(int argc, char **argv)
BRoster roster; BRoster roster;
while (*++argv) { while (*++argv) {
status_t rc = B_OK; status_t status = B_OK;
argc--; argc--;
BEntry entry(*argv); BEntry entry(*argv);
if ((rc = entry.InitCheck()) == B_OK && entry.Exists()) { if ((status = entry.InitCheck()) == B_OK && entry.Exists()) {
entry_ref ref; entry_ref ref;
entry.GetRef(&ref); entry.GetRef(&ref);
@@ -41,41 +46,40 @@ main(int argc, char **argv)
if (target.IsValid()) { if (target.IsValid()) {
BMessage message(B_REFS_RECEIVED); BMessage message(B_REFS_RECEIVED);
message.AddRef("refs", &ref); message.AddRef("refs", &ref);
/* tell the app to open the file */ // tell the app to open the file
rc = target.SendMessage(&message); status = target.SendMessage(&message);
} else } else
rc = roster.Launch(&ref); status = roster.Launch(&ref);
} else if (!strncasecmp("application/", *argv, 12)) { } else if (!strncasecmp("application/", *argv, 12)) {
// maybe it's an application-mimetype? // maybe it's an application-mimetype?
// subsequent files are open with that app // subsequent files are open with that app
openWith = *argv; openWith = *argv;
// in the case the app is already started, // in the case the app is already started,
// don't start it twice if we have other args // don't start it twice if we have other args
BList teams; BList teams;
if (argc > 1) { if (argc > 1)
roster.GetAppList(*argv, &teams); roster.GetAppList(*argv, &teams);
rc = B_OK;
}
if (teams.IsEmpty())
rc = roster.Launch(*argv);
} else if (strstr(*argv, ":")) {
BString mimetype = "application/x-vnd.Be.URL.";
BString arg(*argv);
if (strstr(*argv, "://"))
mimetype.Append(arg, arg.FindFirst("://"));
else
mimetype.Append(arg, arg.FindFirst(":"));
char *args[2] = { *argv, NULL };
rc = roster.Launch(mimetype.String(), 1, args);
if (rc == B_ALREADY_RUNNING)
rc = B_OK;
} else if (rc == B_OK)
rc = B_ENTRY_NOT_FOUND;
if (rc != B_OK) if (teams.IsEmpty())
fprintf(stderr, "%s: \"%s\": %s\n", progName, *argv, strerror(rc)); status = roster.Launch(*argv);
} else if (strchr(*argv, ':')) {
// try to open it as an URI
BString mimeType = "application/x-vnd.Be.URL.";
BString arg(*argv);
if (arg.FindFirst("://") >= 0)
mimeType.Append(arg, arg.FindFirst("://"));
else
mimeType.Append(arg, arg.FindFirst(":"));
char *args[2] = { *argv, NULL };
status = roster.Launch(mimeType.String(), 1, args);
} else
status = B_ENTRY_NOT_FOUND;
if (status != B_OK && status != B_ALREADY_RUNNING)
fprintf(stderr, "%s: \"%s\": %s\n", progName, *argv, strerror(status));
} }
return 0; return 0;