Merge pull request #155 from emkey1/V1.3B500

V1.3 b500

app/App.xcconfig

@@ -1,6 +1,6 @@
 #include "iOS.xcconfig"
 
-PRODUCT_NAME = iSH
+PRODUCT_NAME = iSH-AOK
 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER)
 INFOPLIST_FILE = app/Info.plist
 INFOPLIST_PREPROCESS = YES

app/AppDelegate.m

@@ -43,19 +43,24 @@ @interface AppDelegate ()
 static void ios_handle_exit(struct task *task, int code) {
     // we are interested in init and in children of init
     // this is called with pids_lock as an implementation side effect, please do not cite as an example of good API design
+    complex_lockt(&pids_lock, 0, __FILE__, __LINE__);
     if(task->pid > MAX_PID) {// Corruption
         printk("ERROR: Insane PID in ios_handle_exit(%d)\n", task->pid);
+        unlock(&pids_lock);
         return;
     }
-    if (task->parent != NULL && task->parent->parent != NULL)
+    if (task->parent != NULL && task->parent->parent != NULL) {
+        unlock(&pids_lock);
         return;
+    }
     // pid should be saved now since task would be freed
     pid_t pid = task->pid;
  //   if(pids_lock.pid == pid)
   //      unlock_pids(&pids_lock);
 //    while((critical_region_count(task)) || (locks_held_count(task))) { // Wait for now, task is in one or more critical sections, and/or has locks
 //        nanosleep(&lock_pause, NULL);
 //    }
+    unlock(&pids_lock);
     dispatch_async(dispatch_get_main_queue(), ^{
         [[NSNotificationCenter defaultCenter] postNotificationName:ProcessExitedNotification
                                                             object:nil
@@ -276,7 +281,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
         [UIView setAnimationsEnabled:NO];
 
 #if !ISH_LINUX
-    NSString *ishVersion = [NSString stringWithFormat:@"iSH %@ (%@)",
+    NSString *ishVersion = [NSString stringWithFormat:@"iSH-AOK %@ (%@)",
                          [NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"],
                          [NSBundle.mainBundle objectForInfoDictionaryKey:(NSString *) kCFBundleVersionKey]];
     extern const char *proc_ish_version;
@@ -324,10 +329,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   //      });
   //  }];
 
-    struct sockaddr_in6 address = {
-        .sin6_len = sizeof(address),
-        .sin6_family = AF_INET6,
+        // This code is IPv4 and IPv6 aware: see https://developer.apple.com/library/archive/samplecode/Reachability/Listings/ReadMe_md.html.
+    struct sockaddr_in address = {
+        .sin_len = sizeof(address),
+        .sin_family = AF_INET,
     };
+
     self.reachability = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, (struct sockaddr *) &address);
     SCNetworkReachabilityContext context = {
         .info = (__bridge void *) self,

app/AppGroup.m

@@ -33,7 +33,7 @@
     char entitlements[];
 };
 
-static NSDictionary *AppEntitlements() {
+static NSDictionary *AppEntitlements(void) {
     static NSDictionary *entitlements;
     if (entitlements != nil)
         return entitlements;
@@ -101,7 +101,7 @@
     return AppEntitlements()[@"com.apple.security.application-groups"];
 }
 
-NSURL *ContainerURL() {
+NSURL *ContainerURL(void) {
     NSString *appGroup = CurrentAppGroups()[0];
     return [NSFileManager.defaultManager containerURLForSecurityApplicationGroupIdentifier:appGroup];
 }

app/CurrentRoot.m

@@ -45,7 +45,7 @@ static int remove_directory(const char *path) {
 #define remove_directory linux_remove_directory
 #endif
 
-void FsInitialize() {
+void FsInitialize(void) {
     // /ish/version is the last ish version that opened this root. Used to migrate the filesystem.
     char buf[1000];
     ssize_t n = read_file("/ish/version", buf, sizeof(buf));
@@ -76,15 +76,15 @@ void FsInitialize() {
     }
 }
 
-bool FsIsManaged() {
+bool FsIsManaged(void) {
     return fs_ish_version != 0;
 }
 
-bool FsNeedsRepositoryUpdate() {
+bool FsNeedsRepositoryUpdate(void) {
     return FsIsManaged() && fs_ish_apk_version < COMPATIBLE_APK_VERSION;
 }
 
-void FsUpdateOnlyRepositoriesFile() {
+void FsUpdateOnlyRepositoriesFile(void) {
     NSURL *repositories = [NSBundle.mainBundle URLForResource:@"repositories" withExtension:@"txt"];
     if (repositories != nil) {
         NSMutableData *repositoriesData = [@"# This file contains pinned repositories managed by iSH. If the /ish directory\n"
@@ -95,7 +95,7 @@ void FsUpdateOnlyRepositoriesFile() {
     }
 }
 
-void FsUpdateRepositories() {
+void FsUpdateRepositories(void) {
     NSString *currentVersion = NSBundle.mainBundle.infoDictionary[(__bridge NSString *) kCFBundleVersionKey];
     NSString *currentVersionFile = [NSString stringWithFormat:@"%@\n", currentVersion];
     FsUpdateOnlyRepositoriesFile();

app/FileProvider/FileProviderEnumerator.m

@@ -64,8 +64,11 @@ - (void)enumerateItemsForObserver:(id<NSFileProviderEnumerationObserver>)observe
         } else if (strcmp(dirent->d_name, ".") != 0) {
             db_begin(&_item.mount->db);
             inode_t inode = path_get_inode(&_item.mount->db, [path stringByAppendingFormat:@"/%@", [NSString stringWithUTF8String:dirent->d_name]].fileSystemRepresentation);
-            NSAssert(inode != 0, @"");
             db_commit(&_item.mount->db);
+            if (inode == 0) {
+                NSLog(@"could not find %s in database, assuming nonexistent", dirent->d_name);
+                continue;
+            }
             childIdent = [NSString stringWithFormat:@"%lu", (unsigned long) inode];
         }
 

app/FileProvider/FileProviderExtension.m

@@ -30,7 +30,7 @@ - (BOOL)getMount:(struct fakefs_mount **)mount error:(NSError **)error {
     @synchronized (self) {
         if (!_mounted) {
             if (self.domain == nil) {
-                *error = [NSError errorWithDomain:NSFileProviderErrorDomain code:NSFileProviderErrorServerUnreachable userInfo:nil];
+                *error = [NSError errorWithDomain:NSFileProviderErrorDomain code:NSFileProviderErrorNotAuthenticated userInfo:nil];
                 return NO;
             }
             NSURL *container = ContainerURL();

app/FileProvider/FileProviderItem.h

@@ -17,7 +17,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)saveFromURL:(NSURL *)url;
 - (int)openNewFDWithError:(NSError *_Nullable *)err;
 
-@property (readonly) NSURL *URL;
 @property (readonly) NSString *path;
 @property (readonly) struct fakefs_mount *mount;
 

app/FileProvider/FileProviderItem.m

@@ -74,7 +74,8 @@ - (NSString *)path {
     char path[PATH_MAX] = "";
     int err = fcntl(_fd, F_GETPATH, path);
     [self handleError:err inFunction:@"getpath"];
-    return [NSString stringWithUTF8String:path + strlen(_mount->source)];
+    const char *myPath = path + strlen(_mount->source);
+    return [NSFileManager.defaultManager stringWithFileSystemRepresentation:myPath length:strlen(myPath)];
 }
 
 - (NSURL *)URL {
@@ -230,8 +231,7 @@ - (void)dealloc {
 
 - (void)handleError:(long)err inFunction:(NSString *)func {
     if (err < 0) {
-        NSLog(@"%@ returned %ld %d", func, err, errno);
-        abort();
+        [NSException raise:NSGenericException format:@"%@ returned %ld %d", func, err, errno];
     }
 }
 

app/Roots.m

@@ -11,7 +11,7 @@
 #import "NSObject+SaneKVO.h"
 #include "tools/fakefs.h"
 
-static NSURL *RootsDir() {
+static NSURL *RootsDir(void) {
     static NSURL *rootsDir;
     static dispatch_once_t token;
     dispatch_once(&token, ^{

app/TerminalView.m

@@ -525,13 +525,13 @@ - (void)handleKeyCommand:(UIKeyCommand *)command {
     [self addKeys:controlKeys withModifiers:UIKeyModifierControl];
 
     if (@available(iOS 13.4, *)) {
-        [self addFunctionKey:UIKeyInputUpArrow withName:@"Up" withNormalEscapeSequence:@"\x1b[A" withShiftEscapeSequence:@"\x1b[1;2A" withControlEscapeSequence:@"\x1b[1;5A"];
-        [self addFunctionKey:UIKeyInputDownArrow withName:@"Down" withNormalEscapeSequence:@"\x1b[B" withShiftEscapeSequence:@"\x1b[1;2B" withControlEscapeSequence:@"\x1b[1;5B"];
-        [self addFunctionKey:UIKeyInputRightArrow withName:@"Right" withNormalEscapeSequence:@"\x1b[C" withShiftEscapeSequence:@"\x1b[1;2C" withControlEscapeSequence:@"\x1b[1;5C"];
-        [self addFunctionKey:UIKeyInputLeftArrow withName:@"Left" withNormalEscapeSequence:@"\x1b[D" withShiftEscapeSequence:@"\x1b[1;2D" withControlEscapeSequence:@"\x1b[1;5D"];
-        [self addFunctionKey:@"\t" withName:@"Tab" withNormalEscapeSequence:@"\t" withShiftEscapeSequence:@"\x1b[Z" withControlEscapeSequence:NULL];
+        [self addFunctionKey:UIKeyInputUpArrow withName:@"Up" withNormalEscapeSequence:@"\x1b[A" withShiftEscapeSequence:@"\x1b[1;2A" withControlEscapeSequence:@"\x1b[1;5A" withAltEscapeSequence:@"\x1b[1;3A"];
+        [self addFunctionKey:UIKeyInputDownArrow withName:@"Down" withNormalEscapeSequence:@"\x1b[B" withShiftEscapeSequence:@"\x1b[1;2B" withControlEscapeSequence:@"\x1b[1;5B" withAltEscapeSequence:@"\x1b[1;3B"];
+        [self addFunctionKey:UIKeyInputRightArrow withName:@"Right" withNormalEscapeSequence:@"\x1b[C" withShiftEscapeSequence:@"\x1b[1;2C" withControlEscapeSequence:@"\x1b[1;5C" withAltEscapeSequence:@"\x1b[1;3C"];
+        [self addFunctionKey:UIKeyInputLeftArrow withName:@"Left" withNormalEscapeSequence:@"\x1b[D" withShiftEscapeSequence:@"\x1b[1;2D" withControlEscapeSequence:@"\x1b[1;5D" withAltEscapeSequence:@"\x1b[1;3D"];
+        [self addFunctionKey:@"\t" withName:@"Tab" withNormalEscapeSequence:@"\t" withShiftEscapeSequence:@"\x1b[Z" withControlEscapeSequence:NULL withAltEscapeSequence:@"\x1b\t"];
 
-        [self addFunctionKey:UIKeyInputEscape withName:@"Esc" withNormalEscapeSequence:@"\x1b" withShiftEscapeSequence:NULL withControlEscapeSequence:NULL];
+        [self addFunctionKey:UIKeyInputEscape withName:@"Esc" withNormalEscapeSequence:@"\x1b" withShiftEscapeSequence:NULL withControlEscapeSequence:NULL withAltEscapeSequence:NULL];
         // Navigation keys
 
         /*
@@ -542,25 +542,25 @@ - (void)handleKeyCommand:(UIKeyCommand *)command {
         //if (@available(iOS 15.0, *)) {
         //    [self addFunctionKey:UIKeyInputDelete withName:@"Del" withNormalEscapeSequence:@"\x1b[3~" withShiftEscapeSequence:@"\x1b[3;2~" withControlEscapeSequence:@"\x1b[3;5~"];
        // } // This breaks the del key.  -mke
-        [self addFunctionKey:UIKeyInputPageUp withName:@"PgUp" withNormalEscapeSequence:@"\x1b[5~" withShiftEscapeSequence:@"\x1b[5;2~" withControlEscapeSequence:@"\x1b[5;5~"];
-        [self addFunctionKey:UIKeyInputPageDown withName:@"PgDn" withNormalEscapeSequence:@"\x1b[6~" withShiftEscapeSequence:@"\x1b[6;2~" withControlEscapeSequence:@"\x1b[6;5~"];
-        [self addFunctionKey:UIKeyInputHome withName:@"Home" withNormalEscapeSequence:@"\x1bOH" withShiftEscapeSequence:@"\x1b[1;2H" withControlEscapeSequence:@"\x1b[1;5H"];
-        [self addFunctionKey:UIKeyInputEnd withName:@"End" withNormalEscapeSequence:@"\x1bOF" withShiftEscapeSequence:@"\x1b[1;2F" withControlEscapeSequence:@"\x1b[1;5F"];
+        [self addFunctionKey:UIKeyInputPageUp withName:@"PgUp" withNormalEscapeSequence:@"\x1b[5~" withShiftEscapeSequence:@"\x1b[5;2~" withControlEscapeSequence:@"\x1b[5;5~" withAltEscapeSequence:@"\x1b[5;3~"];
+        [self addFunctionKey:UIKeyInputPageDown withName:@"PgDn" withNormalEscapeSequence:@"\x1b[6~" withShiftEscapeSequence:@"\x1b[6;2~" withControlEscapeSequence:@"\x1b[6;5~" withAltEscapeSequence:@"\x1b[6;3~"];
+        [self addFunctionKey:UIKeyInputHome withName:@"Home" withNormalEscapeSequence:@"\x1bOH" withShiftEscapeSequence:@"\x1b[1;2H" withControlEscapeSequence:@"\x1b[1;5H" withAltEscapeSequence:@"\x1b[1;3H"];
+        [self addFunctionKey:UIKeyInputEnd withName:@"End" withNormalEscapeSequence:@"\x1bOF" withShiftEscapeSequence:@"\x1b[1;2F" withControlEscapeSequence:@"\x1b[1;5F" withAltEscapeSequence:@"\x1b[1;3F"];
         // Function keys
-        [self addFunctionKey:UIKeyInputF1 withName:@"F1" withNormalEscapeSequence:@"\x1bOP" withShiftEscapeSequence:@"\x1b[1;2P" withControlEscapeSequence:@"\x1b[1;5P"];
-        [self addFunctionKey:UIKeyInputF2 withName:@"F2" withNormalEscapeSequence:@"\x1bOQ" withShiftEscapeSequence:@"\x1b[1;2Q" withControlEscapeSequence:@"\x1b[1;5Q"];
-        [self addFunctionKey:UIKeyInputF3 withName:@"F3" withNormalEscapeSequence:@"\x1bOR" withShiftEscapeSequence:@"\x1b[1;2R" withControlEscapeSequence:@"\x1b[1;5R"];
-        [self addFunctionKey:UIKeyInputF4 withName:@"F4" withNormalEscapeSequence:@"\x1bOS" withShiftEscapeSequence:@"\x1b[1;2S" withControlEscapeSequence:@"\x1b[1;5S"];
-        [self addFunctionKey:UIKeyInputF5 withName:@"F5" withNormalEscapeSequence:@"\x1b[15~" withShiftEscapeSequence:@"\x1b[15;2~" withControlEscapeSequence:@"\x1b[15;5~"];
+        [self addFunctionKey:UIKeyInputF1 withName:@"F1" withNormalEscapeSequence:@"\x1bOP" withShiftEscapeSequence:@"\x1b[1;2P" withControlEscapeSequence:@"\x1b[1;5P" withAltEscapeSequence:@"\x1bO3P"];
+        [self addFunctionKey:UIKeyInputF2 withName:@"F2" withNormalEscapeSequence:@"\x1bOQ" withShiftEscapeSequence:@"\x1b[1;2Q" withControlEscapeSequence:@"\x1b[1;5Q" withAltEscapeSequence:@"\x1bO3Q"];
+        [self addFunctionKey:UIKeyInputF3 withName:@"F3" withNormalEscapeSequence:@"\x1bOR" withShiftEscapeSequence:@"\x1b[1;2R" withControlEscapeSequence:@"\x1b[1;5R" withAltEscapeSequence:@"\x1bO3R"];
+        [self addFunctionKey:UIKeyInputF4 withName:@"F4" withNormalEscapeSequence:@"\x1bOS" withShiftEscapeSequence:@"\x1b[1;2S" withControlEscapeSequence:@"\x1b[1;5S" withAltEscapeSequence:@"\x1bO3S"];
+        [self addFunctionKey:UIKeyInputF5 withName:@"F5" withNormalEscapeSequence:@"\x1b[15~" withShiftEscapeSequence:@"\x1b[15;2~" withControlEscapeSequence:@"\x1b[15;5~" withAltEscapeSequence:@"\x1b[15;3~"];
         // Yes, @"\x1b[16~" is missing; it is meant to be
-        [self addFunctionKey:UIKeyInputF6 withName:@"F6" withNormalEscapeSequence:@"\x1b[17~" withShiftEscapeSequence:@"\x1b[17;2~" withControlEscapeSequence:@"\x1b[17;5~"];
-        [self addFunctionKey:UIKeyInputF7 withName:@"F7" withNormalEscapeSequence:@"\x1b[18~" withShiftEscapeSequence:@"\x1b[18;2~" withControlEscapeSequence:@"\x1b[18;5~"];
-        [self addFunctionKey:UIKeyInputF8 withName:@"F8" withNormalEscapeSequence:@"\x1b[19~" withShiftEscapeSequence:@"\x1b[19;2~" withControlEscapeSequence:@"\x1b[19;5~"];
-        [self addFunctionKey:UIKeyInputF9 withName:@"F9" withNormalEscapeSequence:@"\x1b[20~" withShiftEscapeSequence:@"\x1b[20;2~" withControlEscapeSequence:@"\x1b[20;5~"];
-        [self addFunctionKey:UIKeyInputF10 withName:@"F10" withNormalEscapeSequence:@"\x1b[21~" withShiftEscapeSequence:@"\x1b[21;2~" withControlEscapeSequence:@"\x1b[21;5~"];
+        [self addFunctionKey:UIKeyInputF6 withName:@"F6" withNormalEscapeSequence:@"\x1b[17~" withShiftEscapeSequence:@"\x1b[17;2~" withControlEscapeSequence:@"\x1b[17;5~" withAltEscapeSequence:@"\x1b[17;3~"];
+        [self addFunctionKey:UIKeyInputF7 withName:@"F7" withNormalEscapeSequence:@"\x1b[18~" withShiftEscapeSequence:@"\x1b[18;2~" withControlEscapeSequence:@"\x1b[18;5~" withAltEscapeSequence:@"\x1b[18;3~"];
+        [self addFunctionKey:UIKeyInputF8 withName:@"F8" withNormalEscapeSequence:@"\x1b[19~" withShiftEscapeSequence:@"\x1b[19;2~" withControlEscapeSequence:@"\x1b[19;5~" withAltEscapeSequence:@"\x1b[19;3~"];
+        [self addFunctionKey:UIKeyInputF9 withName:@"F9" withNormalEscapeSequence:@"\x1b[20~" withShiftEscapeSequence:@"\x1b[20;2~" withControlEscapeSequence:@"\x1b[20;5~" withAltEscapeSequence:@"\x1b[20;3~"];
+        [self addFunctionKey:UIKeyInputF10 withName:@"F10" withNormalEscapeSequence:@"\x1b[21~" withShiftEscapeSequence:@"\x1b[21;2~" withControlEscapeSequence:@"\x1b[21;5~" withAltEscapeSequence:@"\x1b[21;3~"];
         // Yes, @"\x1b[22~" is missing; it is meant to be
-        [self addFunctionKey:UIKeyInputF11 withName:@"F11" withNormalEscapeSequence:@"\x1b[23~" withShiftEscapeSequence:@"\x1b[23;2~" withControlEscapeSequence:@"\x1b[23;5~"];
-        [self addFunctionKey:UIKeyInputF12 withName:@"F12" withNormalEscapeSequence:@"\x1b[24~" withShiftEscapeSequence:@"\x1b[24;2~" withControlEscapeSequence:@"\x1b[24;5~"];
+        [self addFunctionKey:UIKeyInputF11 withName:@"F11" withNormalEscapeSequence:@"\x1b[23~" withShiftEscapeSequence:@"\x1b[23;2~" withControlEscapeSequence:@"\x1b[23;5~" withAltEscapeSequence:@"\x1b[23;3~"];
+        [self addFunctionKey:UIKeyInputF12 withName:@"F12" withNormalEscapeSequence:@"\x1b[24~" withShiftEscapeSequence:@"\x1b[24;2~" withControlEscapeSequence:@"\x1b[24;5~" withAltEscapeSequence:@"\x1b[24;3~"];
     } else {
         for (NSString *specialKey in @[UIKeyInputEscape, UIKeyInputUpArrow, UIKeyInputDownArrow,
                                    UIKeyInputLeftArrow, UIKeyInputRightArrow, @"\t"]) {
@@ -606,7 +606,7 @@ - (void)addKey:(NSString *)key withModifiers:(UIKeyModifierFlags)modifiers {
     [_keyCommands addObject:command];
 }
 
-- (void)addFunctionKey:(NSString *)keyName withName:(NSString *)keyTitle withNormalEscapeSequence:(NSString *)normalEscapeSequence withShiftEscapeSequence:(NSString *)shiftEscapeSequence withControlEscapeSequence:(NSString *)controlEscapeSequence API_AVAILABLE(ios(13.4)) {
+- (void)addFunctionKey:(NSString *)keyName withName:(NSString *)keyTitle withNormalEscapeSequence:(NSString *)normalEscapeSequence withShiftEscapeSequence:(NSString *)shiftEscapeSequence withControlEscapeSequence:(NSString *)controlEscapeSequence withAltEscapeSequence:(NSString *)altEscapeSequence API_AVAILABLE(ios(13.4)) {
 
     UIKeyCommand *command;
 
@@ -627,6 +627,11 @@ - (void)addFunctionKey:(NSString *)keyName withName:(NSString *)keyTitle withNor
         command.wantsPriorityOverSystemBehavior = YES;
     }
     [_keyCommands addObject:command];
+    command = [UIKeyCommand commandWithTitle: @"" image: nil action:@selector(handleKeyCommand:) input: keyName modifierFlags:UIKeyModifierAlternate propertyList:altEscapeSequence];
+    if (@available(iOS 15, *)) {
+        command.wantsPriorityOverSystemBehavior = YES;
+    }
+    [_keyCommands addObject:command];
 }
 
 - (void)keyCommandTriggered:(UIKeyCommand *)sender {

app/hook.c

@@ -89,7 +89,7 @@ void *exception_handler(void *unused) {
     abort();
 }
 
-static bool initialize_if_needed() {
+static bool initialize_if_needed(void) {
     if (initialized) {
         return true;
     }

app/iOSFS.m

@@ -102,10 +102,10 @@ - (void)dealloc {
 // To avoid locking issues, only access from the main thread
 static NSMutableDictionary<NSString *, NSData *> *ios_mount_bookmarks;
 static bool mount_from_bookmarks = false; // This is a hack because I am bad at parameter passing
-static void sync_bookmarks() {
+static void sync_bookmarks(void) {
     [NSUserDefaults.standardUserDefaults setObject:ios_mount_bookmarks forKey:kMountBookmarks];
 }
-void iosfs_init() {
+void iosfs_init(void) {
     ios_mount_bookmarks = [NSUserDefaults.standardUserDefaults dictionaryForKey:kMountBookmarks].mutableCopy;
     if (ios_mount_bookmarks == nil)
         ios_mount_bookmarks = [NSMutableDictionary new];