Filtered flat import of Oliver's svn package management branch
Bring the changes that aren't package management related and the ones that are but don't take effect as long as they are ignored by the build system into the master. Summary of changes: * Introduce private header <directories.h> with constants for a good deal of paths that should usually be retrieved via find_directory(). * Replace hard-coded paths by using find_directory() or the <directories.h> constants (e.g. in drivers and the kernel). * Add find_directory() constants needed for package management. * Add __HAIKU_ABI_NAME and B_HAIKU_ABI_NAME macros. * src/apps/deskbar: BeMenu.* -> DeskbarMenu.*, DeskBarUtils.* -> DeskbarUtils.* * Change deskbar menu settings directory from ~/config/be to ~/config/settings/deskbar. * Other smaller cleanups, changes, and fixes.
This commit is contained in:
committed by
Ingo Weinhold
parent
cb050a33be
commit
323b65468e
@@ -7,6 +7,8 @@
|
||||
*/
|
||||
|
||||
#include <Application.h>
|
||||
#include <FindDirectory.h>
|
||||
#include <Path.h>
|
||||
#include <Screen.h>
|
||||
#include <Window.h>
|
||||
|
||||
@@ -40,7 +42,6 @@ main(int argc, char *argv[])
|
||||
bool listenOnly = false;
|
||||
uint32 listenPort = 10900;
|
||||
uint32 sshPort = 22;
|
||||
const char *command = "/system/apps/Terminal";
|
||||
|
||||
for (int32 i = 2; i < argc; i++) {
|
||||
if (strcmp(argv[i], "-p") == 0) {
|
||||
@@ -85,10 +86,21 @@ main(int argc, char *argv[])
|
||||
|
||||
pid_t sshPID = -1;
|
||||
if (!listenOnly) {
|
||||
|
||||
BPath terminalPath;
|
||||
if (find_directory(B_SYSTEM_APPS_DIRECTORY, &terminalPath) != B_OK) {
|
||||
printf("failed to determine system-apps directory\n");
|
||||
return 3;
|
||||
}
|
||||
if (terminalPath.Append("Terminal") != B_OK) {
|
||||
printf("failed to append to system-apps path\n");
|
||||
return 3;
|
||||
}
|
||||
|
||||
char shellCommand[4096];
|
||||
snprintf(shellCommand, sizeof(shellCommand),
|
||||
"echo connected; export TARGET_SCREEN=localhost:%lu; %s\n",
|
||||
listenPort, command);
|
||||
listenPort, terminalPath.Path());
|
||||
|
||||
int pipes[4];
|
||||
if (pipe(&pipes[0]) != 0 || pipe(&pipes[2]) != 0) {
|
||||
|
||||
Reference in New Issue
Block a user