Add support for mounting folders from iOS

nonomal · Apr 12, 2020 · 68340ac · 68340ac
1 parent c1ab200
commit 68340ac
Show file tree

Hide file tree

Showing 9 changed files with 548 additions and 20 deletions.
diff --git a/app/AppDelegate.m b/app/AppDelegate.m
@@ -10,11 +10,13 @@
 #include <netdb.h>
 #import <SystemConfiguration/SystemConfiguration.h>
 #import "AppDelegate.h"
+#import "AppGroup.h"
+#import "iOSFS.h"
+#import "SceneDelegate.h"
 #import "PasteboardDevice.h"
 #import "LocationDevice.h"
 #import "TerminalViewController.h"
 #import "UserPreferences.h"
-#import "AppGroup.h"
 #include "kernel/init.h"
 #include "kernel/calls.h"
 #include "fs/dyndev.h"
@@ -137,7 +139,9 @@ - (int)boot {
     die_handler = ios_handle_die;
     NSString *sockTmp = [NSTemporaryDirectory() stringByAppendingString:@"ishsock"];
     sock_tmp_prefix = strdup(sockTmp.UTF8String);
-
+
+    filesystems[IOS_FILESYSTEM_ID] = &iosfs;
+    filesystems[IOS_UNSAFE_FILESYSTEM_ID] = &iosfs_unsafe;
     tty_drivers[TTY_CONSOLE_MAJOR] = &ios_console_driver;
     set_console_device(TTY_CONSOLE_MAJOR, 1);
     err = create_stdio("/dev/console", TTY_CONSOLE_MAJOR, 1);
@@ -237,6 +241,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     if (self.window != nil) {
         // For iOS <13, where the app delegate owns the window instead of the scene
         TerminalViewController *vc = (TerminalViewController *) self.window.rootViewController;
+        currentTerminalViewController = vc;
         [vc startNewSession];
     }
     return YES;

diff --git a/app/SceneDelegate.h b/app/SceneDelegate.h
@@ -6,9 +6,12 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "TerminalViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
+extern TerminalViewController *currentTerminalViewController;
+
 API_AVAILABLE(ios(13))
 @interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
 

diff --git a/app/SceneDelegate.m b/app/SceneDelegate.m
@@ -6,7 +6,8 @@
 //
 
 #import "SceneDelegate.h"
-#import "TerminalViewController.h"
+
+TerminalViewController *currentTerminalViewController = NULL;
 
 @interface SceneDelegate ()
 
@@ -40,4 +41,17 @@ - (NSUserActivity *)stateRestorationActivityForScene:(UIScene *)scene {
     return activity;
 }
 
+- (void)sceneDidBecomeActive:(UIScene *)scene {
+    TerminalViewController *terminalViewController = (TerminalViewController *) self.window.rootViewController;;
+    currentTerminalViewController = terminalViewController;
+}
+
+- (void)sceneWillResignActive:(UIScene *)scene {
+    TerminalViewController *terminalViewController = (TerminalViewController *) self.window.rootViewController;
+
+    if (currentTerminalViewController == terminalViewController) {
+        currentTerminalViewController = NULL;
+    }
+}
+
 @end
diff --git a/app/iOSFS.h b/app/iOSFS.h
@@ -0,0 +1,9 @@
+//
+//  iOSFS.h
+//  iSH
+//
+//  Created by Noah Peeters on 26.10.19.
+//
+
+extern const struct fs_ops iosfs;
+extern const struct fs_ops iosfs_unsafe;