Changeset 7272c7 in git for Singular/emacs.cc

Timestamp:

Aug 26, 1999, 11:58:27 AM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

568f65903005ab5f4b482cd1ad5a753f08decb6e

Parents:

ed431c4d123ff261aa5e38a84582a7935bfc786f

Message:

* recognize and delete abbreviations of long options


git-svn-id: file:///usr/local/Singular/svn/trunk@3554 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/emacs.cc (modified) (6 diffs)

Singular/emacs.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: emacs.cc,v 1.3 1999-08-25 20:34:39 wichmann Exp $ */
+/* $Id: emacs.cc,v 1.4 1999-08-26 09:58:27 obachman Exp $ */
 /*
 * ABSTRACT: Esingular main file
@@ -46 +46 @@
 void fePrintReportBug(char* msg, char* file, int line)
 {
-  WarnS("YOU HAVE FOUND A BUG IN SINGULAR.");
-  WarnS("Please, email the following output to singular@mathematik.uni-kl.de");
-  Warn("Bug occured at %s:%d", file, line);
-  Warn("Message: %s", msg);
+  WarnS("YOU HAVE FOUND A BUG IN SINGULAR. ");
+  WarnS("Please, email the following output to singular@mathematik.uni-kl.de ");
+  Warn("Bug occured at %s:%d ", file, line);
+  Warn("Message: %s ", msg);
   Warn("Version: " S_UNAME S_VERSION1 " (%d) " __DATE__ __TIME__,
        SINGULAR_VERSION_ID);
@@ -92 +92 @@
           
         case '?':
+        case ':':
           mainUsage(argv[0]);
           exit(1);
@@ -116 +117 @@
             no_emacs_call = 1;
           }
-          break;
-          
-        default:
-          feReportBug("Parsing of Cmd-line options");
-    }
-  }
+          else
+          {
+            break;
+          }
+          // delete options from option-list
+          if (optind > 2 && *argv[optind-1] != '-' && 
+              optarg != NULL && longopts[option_index].has_arg)
+          {
+            argv[optind-2] = NULL;
+          }
+          argv[optind-1] = NULL;
+    }
+  } 
   
   // make sure  emacs, singular, emacs_dir, emacs_load are set
@@ -183 +191 @@
   for (i=1; i<argc; i++)
   {
-    if (strstr(argv[i], "--"LON_EMACS) != argv[i] &&
-        strstr(argv[i], "--"LON_SINGULAR) != argv[i] &&
-        strstr(argv[i], "--"LON_EMACS_DIR) != argv[i] &&
-        strstr(argv[i], "--"LON_EMACS_LOAD) != argv[i] &&
-        strstr(argv[i], "--"LON_NO_EMACS_CALL) != argv[i])
-    {
-      length += strlen(argv[i]) + 3;
-    }
+    if (argv[i] != NULL) length += strlen(argv[i]) + 3;
   }
   
@@ -211 +212 @@
   for (i=1; i<argc; i++)
   {
-    if (strstr(argv[i], "--"LON_EMACS) != argv[i] &&
-        strstr(argv[i], "--"LON_SINGULAR) != argv[i] &&
-        strstr(argv[i], "--"LON_EMACS_DIR) != argv[i] &&
-        strstr(argv[i], "--"LON_EMACS_LOAD) != argv[i] &&
-        strstr(argv[i], "--"LON_NO_EMACS_CALL) != argv[i])
+    if (argv[i] != NULL)
     {
       strcat(syscall, "\"");