Fix SF/2760553

	* lisp/core.lisp.in (associateRequestWithFileType): Remember
	FILE-TYPE as default value for REQUEST.
	(|processCommandLine|): Standard options have length at least 2.
	(|handleCommandLine|): Use default file type if non is present.

6 files changed, 30 insertions, 31 deletions

diff --git a/config/openaxiom-c-macros.h.in b/config/openaxiom-c-macros.h.in
index a7cd9255..d96918ce 100644
--- a/config/openaxiom-c-macros.h.in
+++ b/config/openaxiom-c-macros.h.in
@@ -1,8 +1,5 @@
 /* config/openaxiom-c-macros.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
 /* BSD flavour */
 #undef BSDplatform
 
@@ -147,23 +144,15 @@
 /* SunOS flavour */
 #undef SUNplatform
 
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
 
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 
 /* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
    #define below would cause a syntax error. */
 #undef _UINT8_T
 
diff --git a/configure b/configure
index 175fe10a..4955c197 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-04-13.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-04-14.
 #
 # Report bugs to <open-axiom-bugs@lists.sf.net>.
 #
@@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='OpenAxiom'
 PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.3.0-2009-04-13'
-PACKAGE_STRING='OpenAxiom 1.3.0-2009-04-13'
+PACKAGE_VERSION='1.3.0-2009-04-14'
+PACKAGE_STRING='OpenAxiom 1.3.0-2009-04-14'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1406,7 +1406,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenAxiom 1.3.0-2009-04-13 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.3.0-2009-04-14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1476,7 +1476,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-04-13:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-04-14:";;
    esac
   cat <<\_ACEOF
 
@@ -1580,7 +1580,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.3.0-2009-04-13
+OpenAxiom configure 1.3.0-2009-04-14
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1594,7 +1594,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenAxiom $as_me 1.3.0-2009-04-13, which was
+It was created by OpenAxiom $as_me 1.3.0-2009-04-14, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -26808,7 +26808,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenAxiom $as_me 1.3.0-2009-04-13, which was
+This file was extended by OpenAxiom $as_me 1.3.0-2009-04-14, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26857,7 +26857,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom config.status 1.3.0-2009-04-13
+OpenAxiom config.status 1.3.0-2009-04-14
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 3d36bb8f..80420f6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2009-04-13], 
+AC_INIT([OpenAxiom], [1.3.0-2009-04-14], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index b48751ca..9fa7267d 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1131,7 +1131,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2009-04-13], 
+AC_INIT([OpenAxiom], [1.3.0-2009-04-14], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index f7002d72..9159ff43 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-14  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	Fix SF/2760553
+	* lisp/core.lisp.in (associateRequestWithFileType): Remember
+	FILE-TYPE as default value for REQUEST.
+	(|processCommandLine|): Standard options have length at least 2.
+	(|handleCommandLine|): Use default file type if non is present.
+
 2009-04-13  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	Fix SF/2760823 
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index f66cc267..50fc80b9 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -107,6 +107,7 @@
            "IMPORT-MODULE"
 	   "BOOT-IMPORT"
 	   "CONCAT"
+	   "$EditorProgram"
            ))
 
 (in-package "AxiomCore")
@@ -331,7 +332,7 @@
   ;; We don't allow overriding at the moment.
   (let ((key (cons request file-type)))
     (unless (|useFileType?| request)
-      (setf (get request 'use-file-type) t))
+      (setf (get request 'use-file-type) file-type))
     (|installDriver| key driver)))
 
 
@@ -382,7 +383,7 @@
 ;; a non-option form is encountered. OPTIONS-SO-FAR accumulates the
 ;; the list of processed options.
 (defun |processCommandLine| (argv options-so-far)
-  (if (and argv
+  (if (and argv (>= (length (car argv)) 2)
            (equal "--" (subseq (car argv) 0 2)))
       (let ((option (|parseOption| (car argv))))
         (cond ((symbolp option)
@@ -663,7 +664,7 @@
     (when (null driver) 
       (|fatalError| (format nil "invalid option `--~a'" (string request))))
     (funcall driver prog-name options args)))
-  
+
 (defun |hasHandler?| (request)
   (|getDriver| request))
 
@@ -683,8 +684,9 @@
 	     (|coreError| "missing input files")
 	     (return t))
            (dolist (f args)
-             (let* ((file-type (|getFileType| f))
-                    (opt-name (car opt))
+             (let* ((opt-name (car opt))
+		    (file-type (or (|getFileType| f) 
+				   (|useFileType?| opt-name)))
                     (request (cons opt-name file-type)))
                (unless (|handleRequest| prog-name request options f)
 		 (return nil))))