Changeset 136 for trunk/orca

Timestamp:

05/04/06 15:39:15 (3 years ago)

Author:

krobillard

Message:

Orca - Added os_call config option.

Location:

trunk/orca

Files:

• boot.c (modified) (2 diffs)
• boot.r (modified) (2 diffs)
• config.r (modified) (1 diff)
• files.c (modified) (4 diffs)
• unix/os.c (modified) (6 diffs)
• win32/os.c (modified) (3 diffs)

trunk/orca/boot.c

@@ -303 +303 @@
   "]\n"
   "getenv: native [name [string!]]\n"
-  "call: native [\n"
-  "    command [string! block!]\n"
-  "    /output\n"
-  "    out [string! file! none!]\n"
-  "    /wait\n"
-  "]\n"
   "change-dir: native [value]\n"
   "what-dir: native []\n"
@@ -359 +353 @@
   "cross: native [a [vec3!] b [vec3!]]\n"
   "normalize: native [vec [vec3!]]\n"
+  "call: native [\n"
+  "    command [string! block!]\n"
+  "    /output\n"
+  "    out [string! file! none!]\n"
+  "    /wait\n"
+  "]\n"
 ;
 

trunk/orca/boot.r

@@ -406 +406 @@
     getenv: native [name [string!]]
 
-    call: native [
-        command [string! block!]
-        ;/input
-        ;in [string! file! none!]    ; [any-string! port! file! url! none!]
-        /output
-        out [string! file! none!]    ; [string! port! file! url! none!]
-        /wait
-        ;/console
-        ;/shell
-        ;/info
-    ]
-
     change-dir: native [value]
     what-dir: native []
@@ -719 +707 @@
 if find config 'rebol [append boot load %rebol_compat.r]
 
+if find config 'os_call [
+    append natives [
+        call: native [
+            command [string! block!]
+            ;/input
+            ;in [string! file! none!]    ; [any-string! port! file! url! none!]
+            /output
+            out [string! file! none!]    ; [string! port! file! url! none!]
+            /wait
+            ;/console
+            ;/shell
+            ;/info
+        ]
+    ]
+]
+
 ;eof

trunk/orca/config.r

@@ -8 +8 @@
     hex_token
     math3d
+    os_call
 ]

trunk/orca/files.c

@@ -28 +28 @@
 extern void orReadDir( const char* filename );
 extern void orNowNative( OValue* a1 );
-extern void orCallNative( OValue* a1 );
 extern void orChangeDirNative( OValue* a1 );
 extern void orWhatDirNative();
@@ -35 +34 @@
 extern void orDeleteNative( OValue* a1 );
 extern void orGetenvNative( OValue* a1 );
+
+#ifdef OR_CONFIG_OS_CALL
+extern void orCallNative( OValue* a1 );
+#endif
 
 
@@ -592 +595 @@
     orNative( orRenameNative,     "rename"     );
     orNative( orDeleteNative,     "delete"     );
-    orNative( orCallNative,       "call"       );
     orNative( orChangeDirNative,  "change-dir" );
     orNative( orWhatDirNative,    "what-dir"   );
@@ -599 +601 @@
     orNative( orGetenvNative,     "getenv"     );
     orNative( cleanPathNative,    "clean-path" );
+
+#ifdef OR_CONFIG_OS_CALL
+    orNative( orCallNative,       "call"       );
+#endif
+
 #ifdef OR_CONFIG_COMPRESS
     orNative( orCompressNative,   "compress"   );

trunk/orca/unix/os.c

@@ -190 +190 @@
 
 
+#ifdef OR_CONFIG_OS_CALL
 static void argumentList( OString* str, int sindex, char** argv, int maxArg )
 {
@@ -361 +362 @@
   command /output out /wait
 */
-void orCallNative( OValue* a1 )
+OR_NATIVE_PUB( orCallNative )
 {
     if( a1->type != OT_STRING )
@@ -378 +379 @@
     }
 }
-
-
+#endif
+
+
+#ifdef OR_CONFIG_OS_CALL
 /* Cleans up after callSimple() */
 static void child_handler( int sig )
@@ -392 +395 @@
     }
 }
+#endif
 
 #if 0
@@ -411 +415 @@
 void orInstallExceptionHandlers()
 {
+#ifdef OR_CONFIG_OS_CALL
+    /* NOTE: Cannot use this if using Qt's QProcess (it uses SIGCHLD) */
     struct sigaction childSA;
 
@@ -418 +424 @@
 
     sigaction( SIGCHLD, &childSA, NULL );
+#endif
 
 #if 0

trunk/orca/win32/os.c

@@ -210 +210 @@
 }
 
+
+#ifdef OR_CONFIG_OS_CALL
 
 #define REF_CALL_OUTPUT     a1+1
@@ -373 +375 @@
 
 
-void orCallNative( OValue* a1 )
+OR_NATIVE_PUB( orCallNative )
 {
     if( a1->type != OT_STRING )
@@ -390 +392 @@
     }
 }
+#endif