# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1635900698 0
# Node ID 5c43d1ee97364dc59e6ae3b7092ee64ce9b44fe7
# Parent  4470089e14b3585d4a2f347e6db59d88589d3fc5
iOS: Implement dw_exec() using posix_spawnp(). Fix a few warnings.
Also put in some extra bounds checks in DWComboBox.

diff -r 4470089e14b3 -r 5c43d1ee9736 ios/dw.m
--- a/ios/dw.m	Tue Nov 02 22:34:17 2021 +0000
+++ b/ios/dw.m	Wed Nov 03 00:51:38 2021 +0000
@@ -21,6 +21,7 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <math.h>
+#include <spawn.h>
 
 /* Macros to handle local auto-release pools */
 #define DW_LOCAL_POOL_IN NSAutoreleasePool *localpool = nil; \
@@ -1478,7 +1479,7 @@
 -(DWBox *)parent;
 -(int)type;
 -(void)setType:(int)input;
--(int)state;
+-(int)checkState;
 -(void)setCheckState:(int)input;
 @end
 
@@ -2718,15 +2719,20 @@
 -(NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView { return 1; }
 -(void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
 {
-    selectedIndex = (int)row;
-    [self setText:[dataArray objectAtIndex:row]];
-    [self sendActionsForControlEvents:UIControlEventValueChanged];
-    _dw_event_handler(self, DW_INT_TO_POINTER(selectedIndex), _DW_EVENT_LIST_SELECT);
+    if(row > -1 && row < [dataArray count])
+    {
+        selectedIndex = (int)row;
+        [self setText:[dataArray objectAtIndex:row]];
+        [self sendActionsForControlEvents:UIControlEventValueChanged];
+        _dw_event_handler(self, DW_INT_TO_POINTER(selectedIndex), _DW_EVENT_LIST_SELECT);
+    }
 }
 -(NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component { return [dataArray count]; }
 -(NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component
 {
-    return [dataArray objectAtIndex:row];
+    if(row > -1 && row < [dataArray count])
+        return [dataArray objectAtIndex:row];
+    return nil;
 }
 -(void)doneClicked:(id)sender
 {
@@ -10787,66 +10793,22 @@
  * Returns:
  *       DW_ERROR_UNKNOWN (-1) on error.
  */
-int dw_exec(const char *program, int type, char **params)
-{
-    int ret = DW_ERROR_UNKNOWN;
-
-#if 0 /* TODO: Figure out how to do this on iOS */
-    if(type == DW_EXEC_GUI)
-    {
-        NSString *nsprogram = [NSString stringWithUTF8String:program];
-        NSWorkspace *ws = [NSWorkspace sharedWorkspace];
-
-        if(params && params[0] && params[1])
-        {
-            NSURL *url = _dw_url_from_program(nsprogram, ws);
-            NSMutableArray *array = [[NSMutableArray alloc] init];
-            __block DWDialog *dialog = dw_dialog_new(NULL);
-            int z = 1;
-
-            while(params[z])
-            {
-                NSString *thisfile = [NSString stringWithUTF8String:params[z]];
-                NSURL *nsfile = [NSURL fileURLWithPath:thisfile];
-
-                [array addObject:nsfile];
-                z++;
-            }
-
-            [ws openURLs:array withApplicationAtURL:url
-                                      configuration:[NSWorkspaceOpenConfiguration configuration]
-                                  completionHandler:^(NSRunningApplication *app, NSError *error) {
-                int pid = DW_ERROR_UNKNOWN;
-
-                if(error)
-                    NSLog(@"openURLs: %@", [error localizedDescription]);
-                else
-                    pid = [app processIdentifier];
-                dw_dialog_dismiss(dialog, DW_INT_TO_POINTER(pid));
-            }];
-            ret = DW_POINTER_TO_INT(dw_dialog_wait(dialog));
-        }
+int API dw_exec(const char *program, int type, char **params)
+{
+    int retval = DW_ERROR_UNKNOWN;
+    pid_t pid;
+
+    /* Launch the application directly using posix_spawnp()
+     * Might need to use openURLs to open DW_EXEC_GUI.
+     */
+    if(posix_spawnp(&pid, program, NULL, NULL, params, NULL) == 0)
+    {
+        if(pid > 0)
+            retval = pid;
         else
-        {
-            NSURL *url = _dw_url_from_program(nsprogram, ws);
-            __block DWDialog *dialog = dw_dialog_new(NULL);
-
-            [ws openApplicationAtURL:url
-                       configuration:[NSWorkspaceOpenConfiguration configuration]
-                   completionHandler:^(NSRunningApplication *app, NSError *error) {
-                int pid = DW_ERROR_UNKNOWN;
-
-                if(error)
-                    NSLog(@"openApplicationAtURL: %@", [error localizedDescription]);
-                else
-                    pid = [app processIdentifier];
-                dw_dialog_dismiss(dialog, DW_INT_TO_POINTER(pid));
-            }];
-            ret = DW_POINTER_TO_INT(dw_dialog_wait(dialog));
-        }
-    }
-#endif
-    return ret;
+            retval = DW_ERROR_NONE;
+    }
+    return retval;
 }
 
 /*