Changeset c06a32 in git

Timestamp:

Sep 20, 1999, 8:03:51 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

70883173be34d0af981d9af508ccbb1e77912676

Parents:

aef7ccb547c93eee9ab75ef2c46ce9149f6dd9ca

Message:

* New Handling of Command-line options


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

Location:

Singular

Files:

• Makefile.in (modified) (15 diffs)
• cntrlc.cc (modified) (5 diffs)
• emacs.cc (modified) (10 diffs)
• extra.cc (modified) (5 diffs)
• feOpt.cc (added)
• feOpt.h (added)
• feResource.cc (modified) (4 diffs)
• febase.cc (modified) (2 diffs)
• febase.h (modified) (2 diffs)
• fegetopt.c (added)
• fegetopt.h (added)
• fehelp.cc (modified) (9 diffs)
• feread.cc (modified) (2 diffs)
• find_exec.c (modified) (2 diffs)
• getopt.h (modified) (6 diffs)
• ipshell.h (modified) (2 diffs)
• kbPolyProcs.cc (modified) (1 diff)
• misc.cc (modified) (1 diff)
• mmisc.c (modified) (2 diffs)
• sing_mp.cc (modified) (5 diffs)
• tesths.cc (modified) (11 diffs)
• utils.cc (modified) (4 diffs)

Singular/Makefile.in

@@ -66 +66 @@
 ###
 
+# normal C++ source files
 CXXSOURCES=grammar.cc scanner.cc algmap.cc attrib.cc binom.cc clapconv.cc \
-    clapmem.cc clapsing.cc claptmpl.cc cntrlc.cc \
-    extra.cc febase.cc feread.cc fehelp.cc feResource.cc feCmdLineOptions.cc\
+    clapmem.cc clapsing.cc cntrlc.cc\
+    extra.cc febase.cc feread.cc fehelp.cc feResource.cc feOpt.cc\
     ffields.cc hdegree.cc hilb.cc hutil.cc \
-    ideals.cc intvec.cc iparith.cc \
+    ideals.cc intvec.cc \
     ipassign.cc ipconv.cc ipid.cc iplib.cc \
     ipprint.cc ipshell.cc khstd.cc kstdfac.cc \
@@ -82 +83 @@
     sing_dld.cc sing_dbm.cc spolys.cc spolys0.cc \
     subexpr.cc syz.cc syz0.cc syz1.cc \
-    tesths.cc timer.cc weight.cc \
-    mpsr_Put.cc mpsr_PutPoly.cc mpsr_Tok.cc mpsr_GetPoly.cc \
+    timer.cc weight.cc \
+    mpsr_Put.cc mpsr_PutPoly.cc mpsr_GetPoly.cc \
     mpsr_Get.cc mpsr_GetMisc.cc mpsr_Error.cc \
     GMPrat.cc multicnt.cc npolygon.cc semic.cc spectrum.cc splist.cc \
@@ -90 +91 @@
     mpr_inout.cc mpr_base.cc mpr_numeric.cc
 
-CSOURCES=gmalloc.c mmalloc.c mmheap.c mmpage.c mmcheck.c  mmisc.c mmtables.c \
-    mmbt.c weight0.c find_exec.c getopt.c fereadl.c page.c
-
-SOURCES=${CSOURCES} ${CXXSOURCES} grammar.y scanner.l libparse.l spSpolyLoop.pl generate.pl
+# normal C source files
+CSOURCES=mmalloc.c mmheap.c mmpage.c mmcheck.c  mmisc.c mmtables.c \
+    mmbt.c weight0.c find_exec.c fegetopt.c fereadl.c page.c
+
+# special source files (need extra compiling and/or linking)
+ESOURCES=iparith.cc gmalloc.c tesths.cc mpsr_Tok.cc claptmpl.cc
+
+SOURCES=${CSOURCES} ${CXXSOURCES} ${ESOURCES} \
+        grammar.y scanner.l libparse.l spSpolyLoop.pl generate.pl
 
 HEADERS=algmap.h hutil.h lists.h stairc.h attrib.h ideals.h \
@@ -107 +113 @@
         kstdfac.h mpsr_Get.h spolys.h \
         kutil.h mpsr_Put.h spolys0.h sing_dld.h\
-        ndbm.h spSpolyLoop.h polys-impl.h polys-comp.h getopt.h libparse.h \
+        ndbm.h spSpolyLoop.h polys-impl.h polys-comp.h libparse.h \
         GMPrat.h multicnt.h npolygon.h semic.h spectrum.h splist.h multicnt.h \
         pcv.h mod_raw.h kbuckets.h kbPolyProcs.h \
-        mpr_global.h mpr_inout.h mpr_base.h mpr_numeric.h 
-
-INCS=febase.inc polys.inc iparith.inc mpsr_Tok.inc spSpolyLoop.inc
+        mpr_global.h mpr_inout.h mpr_base.h mpr_numeric.h \
+        feOpt.h fegetopt.h
+
+INCS=febase.inc polys.inc iparith.inc mpsr_Tok.inc spSpolyLoop.inc feOpt.inc
 
 TESTS=${testdir}/comparecheck ${testdir}/fac_test.in ${testdir}/fac_test.out\
@@ -123 +130 @@
         ${INCS}
 
-OBJS=grammar.o scanner.o matpol.o binom.o mpr_complex.o gnumpfl.o gnumpc.o \
-     febase.o feread.o fehelp.o feResource.o timer.o intvec.o attrib.o lists.o\
-     longrat.o longrat0.o misc.o ring.o numbers.o maps.o\
-     hilb.o comm.o kstd1.o kstd2.o kutil.o khstd.o kstdfac.o modulop.o spolys.o\
-     ideals.o subexpr.o hdegree.o hutil.o ffields.o shortfl.o \
-     longalg.o spolys0.o syz.o syz0.o syz1.o weight.o weight0.o \
-     ipid.o ipshell.o iplib.o ipassign.o ipconv.o ipprint.o\
-     polys.o polys0.o polys1.o polys-impl.o extra.o sparsmat.o\
-     mminit.o mmtables.o mmalloc.o mmheap.o mmpage.o page.o \
-     mmisc.o mmcheck.o mmbt.o sing_dld.o sing_dbm.o silink.o \
-     sing_mp.o fglm.o fglmzero.o fglmvec.o fglmhom.o fglmgauss.o cntrlc.o \
-     algmap.o clapconv.o  clapmem.o clapsing.o claptmpl.o\
-     mpsr_Error.o mpsr_Put.o mpsr_PutPoly.o mpsr_GetPoly.o \
-     mpsr_Get.o mpsr_GetMisc.o ndbm.o spSpolyLoop.o libparse.o \
-     find_exec.o getopt.o fereadl.o  mod_raw.o sdb.o \
-     GMPrat.o multicnt.o npolygon.o semic.o spectrum.o splist.o \
-     pcv.o kbuckets.o kbPolyProcs.o \
-     mpr_inout.o mpr_base.o mpr_numeric.o
+OBJS := $(CXXSOURCES:.cc=.o) $(CSOURCES:.c=.o)
 
 # Singular libraries which go into distribution
@@ -179 +169 @@
 
 Singular: mod2.h Makefile version.h scanner.cc gmalloc.o \
-          ${OBJS} iparith.o mpsr_Tok.o tesths.cc libparse.cc 
-        ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} -o Singular \
-        tesths.cc iparith.o mpsr_Tok.o ${OBJS} ${LDFLAGS} ${LIBS} \
-        ${LD_DYN_FLAGS} gmalloc.o ${LD_LIBC}
+          ${OBJS} iparith.o tesths.cc libparse.cc claptmpl.o
+        ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} \
+          -o Singular \
+          tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
+          ${OBJS} ${LDFLAGS} ${LIBS} ${LD_DYN_FLAGS} \
+          gmalloc.o ${LD_LIBC}
 
 Singular-static: mod2.h Makefile version.h scanner.cc  gmalloc.o \
-                ${OBJS} iparith.o mpsr_Tok.o tesths.cc
+                ${OBJS} iparith.o mpsr_Tok.o tesths.cc claptmpl.o
         ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} \
-        -o Singular-static \
-        tesths.cc iparith.o mpsr_Tok.o \
-        ${OBJS} ${STATIC_LDFLAGS} ${LDFLAGS} ${LIBS} ${LD_DYN_FLAGS} \
-        gmalloc.o ${LD_LIBC}
+          -o Singular-static \
+          tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
+          ${OBJS} ${STATIC_LDFLAGS} ${LDFLAGS} ${LIBS} ${LD_DYN_FLAGS} \
+          gmalloc.o ${LD_LIBC}
 
 iparith.o mpsr_Tok.o : iparith.inc mpsr_Tok.inc
@@ -197 +189 @@
         ${CXX} ${CXXFLAGS}  ${CPPFLAGS} ${DEFS} -c $<   
 
-iparith.inc mpsr_Tok.inc: gmalloc.o iparith.cc ipconv.cc tok.h mpsr_Tok.cc grammar.h mod2.h
+iparith.inc mpsr_Tok.inc: gmalloc.o claptmpl.o iparith.cc \
+                          ipconv.cc tok.h mpsr_Tok.cc grammar.h mod2.h
         ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} -DGENTABLE \
-             -o gentable iparith.cc tesths.cc mpsr_Tok.cc \
+             -o gentable claptmpl.o iparith.cc tesths.cc mpsr_Tok.cc \
              ${OBJS} ${LDFLAGS} ${LIBS} gmalloc.o ${LD_LIBC}
         ./gentable
@@ -215 +208 @@
 version.h: ${SOURCES} ${HEADERS} Makefile.in mod2.h.in \
            configure.in
-        echo "#define SINGULAR_VERSION_ID " `date '+%Y%m%d%H'` >version.h
+        echo unsigned long feVersionId =  `date '+%Y%m%d%H'`\; >version.h
 
 kbPolyProcs.cc kbPolyProcs.dd : kbPolyProcs.pin 
@@ -235 +228 @@
         ${PERL5} spSpolyLoop.pl > spSpolyLoop.inc
 
-libparse: libparse_main.o utils.o getopt.o
-        ${CXX} -o libparse libparse_main.o utils.o getopt.o
+
+libparse: libparse_main.o utils.o fegetopt.o
+        ${CXX} -o libparse libparse_main.o utils.o fegetopt.o
 
 libparse_main.o: libparse.cc
@@ -248 +242 @@
         ${LEX} -I -Pyylp -olibparse.cc libparse.l
 
-ESingular: getopt.o feResource.cc mod2.h feCmdLineOptions.cc version.h emacs.cc
-        ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -o ESingular emacs.cc getopt.o ${LDFLAGS} ${LIBS}
+ESingular: fegetopt.o feResource.cc mod2.h feOpt.cc version.h emacs.cc \
+           feOptES.inc
+        ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -o ESingular emacs.cc fegetopt.o ${LDFLAGS} ${LIBS}
+
+feOpt.h: feOpt.inc feOptES.inc
+
+feOpt.inc: feOpt.cc
+        $(CXX) -DGENERATE_OPTION_INDEX feOpt.cc
+        ./a.out
+        rm a.out
+
+feOptES.inc: feOpt.cc
+        $(CXX) -DGENERATE_OPTION_INDEX -DESINGULAR feOpt.cc
+        ./a.out
+        rm a.out
 
 src: scanner.cc grammar.h grammar.cc libparse.cc spSpolyLoop.inc
@@ -302 +309 @@
 
 clean:
-        -rm -f Singular Singularg Singularp Singularb libparse \
+        -rm -f Singular Singularg Singularp Singularb libparse feOpt*.inc\
             *.o *.og core *.op *.ob 
 
@@ -327 +334 @@
 
 Singular-bindist: ${OBJS} Makefile
-        echo "#define SINGULAR_VERSION_ID " `date '+%y%m%d%H'` >version.h
-        echo "#define MAKE_DISTRIBUTION " >> version.h
+        echo "#define MAKE_DISTRIBUTION " > distrib.h
         ${MAKE} Singular ESingular
         strip Singular ESingular
         ${INSTALL} -s Singular Singular-bindist
         ${INSTALL} -s ESingular ESingular-bindist
-        echo "#define SINGULAR_VERSION_ID " `date '+%y%m%d%H'` >version.h
+        echo "#undef MAKE_DISTRIBUTION " > distrib.h
 
 Singular-static-bindist: ${OBJS} Makefile
-        echo "#define SINGULAR_VERSION_ID " `date '+%y%m%d%H'` >version.h
-        echo "#define MAKE_DISTRIBUTION " >> version.h
+        echo "#define MAKE_DISTRIBUTION " > distrib.h
         ${MAKE} Singular-static ESingular
         strip Singular-static ESingular
         mv Singular-static Singular-static-bindist
         ${INSTALL} -s ESingular ESingular-bindist
-        echo "#define SINGULAR_VERSION_ID " `date '+%y%m%d%H'` >version.h
+        echo "#undef MAKE_DISTRIBUTION " > distrib.h
 
 tar:
@@ -380 +385 @@
 ## 
 
-OBJG1=  grammar.og scanner.og matpol.og binom.og gnumpfl.og mpr_complex.og \
-     febase.og feread.og fehelp.og feResource.og timer.og intvec.og attrib.og lists.og \
-     gnumpc.og longrat.og longrat0.og misc.og ring.og numbers.og maps.og\
-     hilb.og comm.og kstd1.og kstd2.og kutil.og khstd.og kstdfac.og modulop.og \
-     spolys.og ideals.og subexpr.og hdegree.og hutil.og ffields.og shortfl.og \
-     longalg.og spolys0.og syz.og syz0.og syz1.og weight.og \
-     ipid.og ipshell.og iplib.og ipassign.og ipconv.og ipprint.og\
-     polys.og polys0.og polys1.og polys-impl.og extra.og\
-     mminit.og sing_dld.og sing_dbm.og silink.og sparsmat.og\
-     sing_mp.og fglm.og fglmzero.og fglmvec.og fglmgauss.og fglmhom.og\
-     algmap.og clapconv.og  clapmem.og clapsing.og cntrlc.og  sdb.og\
-     mpsr_Error.og mpsr_Put.og mpsr_PutPoly.og mpsr_GetPoly.og \
-     mpsr_Get.og mpsr_GetMisc.og \
-     ndbm.og spSpolyLoop.og libparse.og  mod_raw.og \
-     GMPrat.og multicnt.og npolygon.og semic.og spectrum.og splist.og \
-     mpr_inout.og mpr_base.og mpr_numeric.og \
-     pcv.og kbuckets.og kbPolyProcs.og
-
-OBJG2= mmalloc.og mmheap.og mmpage.og mmcheck.og mmbt.og page.og \
-     mmisc.og mmtables.og weight0.og find_exec.og getopt.og fereadl.og
-
-
-OBJG=$(OBJG1) $(OBJG2) claptmpl.og 
+OBJG1 := $(CXXSOURCES:.cc=.og) 
+OBJG2 := $(CSOURCES:.c=.og) 
+
+
+OBJG=$(OBJG1) $(OBJG2) 
 
 ##
@@ -410 +397 @@
 claptmpl.og: claptmpl.cc mod2.h
         $(CXXG)  ${CXXFLAGSG} ${CPPFLAGS} ${DEFSG} -c $< -o $@
-$(OBJG1): %.og: %.cc
+
+$(OBJG1) : %.og: %.cc
         $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -c $< -o $@
 
@@ -416 +404 @@
         $(CCG)  ${CFLAGSG} ${CPPFLAGS} ${DEFSG} -c $< -o $@
 
-Singularg: scanner.cc gmalloc.og $(OBJG) iparith.og mpsr_Tok.og tesths.cc version.h 
+Singularg: scanner.cc gmalloc.og $(OBJG) iparith.og mpsr_Tok.og claptmpl.og tesths.cc version.h 
         $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -o Singularg \
-        tesths.cc iparith.og mpsr_Tok.og $(OBJG) ${LDFLAGS} ${LIBS} \
+        tesths.cc iparith.og mpsr_Tok.og claptmpl.og $(OBJG) ${LDFLAGS} ${LIBS} \
         ${LD_DYN_FLAGS} gmalloc.og
 

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: cntrlc.cc,v 1.24 1999-08-25 16:02:42 Singular Exp $ */
+/* $Id: cntrlc.cc,v 1.25 1999-09-20 18:03:43 obachman Exp $ */
 /*
 * ABSTRACT - interupt handling
@@ -12 +12 @@
 #include <stdlib.h>
 #include <signal.h>
-#include "version.h"
 #include "mod2.h"
 #include "tok.h"
@@ -109 +108 @@
 void sigsegv_handler(int sig, sigcontext s)
 {
-  fprintf(stderr,"Singular : signal %d (v: %d/%d):\n",sig,SINGULAR_VERSION,SINGULAR_VERSION_ID);
+  fprintf(stderr,"Singular : signal %d (v: %d/%lu):\n",sig,SINGULAR_VERSION,feVersionId);
   if (sig!=SIGINT)
   {
@@ -215 +214 @@
 void sigsegv_handler(int sig, int code, struct sigcontext *scp, char *addr)
 {
-  fprintf(stderr,"Singular : signal %d, code %d (v: %d/%d):\n",
-    sig,code,SINGULAR_VERSION,SINGULAR_VERSION_ID);
+  fprintf(stderr,"Singular : signal %d, code %d (v: %d/%lu):\n",
+    sig,code,SINGULAR_VERSION,feVersionId);
   if ((sig!=SIGINT)&&(sig!=SIGABRT))
   {
@@ -259 +258 @@
 void sigsegv_handler(int sig)
 {
-  fprintf(stderr,"Singular : signal %d (v: %d/%d):\n",
-    sig,SINGULAR_VERSION,SINGULAR_VERSION_ID);
+  fprintf(stderr,"Singular : signal %d (v: %d/%lu):\n",
+    sig,SINGULAR_VERSION,feVersionId);
   if (sig!=SIGINT)
   {

Singular/emacs.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: emacs.cc,v 1.7 1999-09-07 08:36:09 Singular Exp $ */
+/* $Id: emacs.cc,v 1.8 1999-09-20 18:03:43 obachman Exp $ */
 /*
 * ABSTRACT: Esingular main file
@@ -50 +50 @@
   Warn("Bug occured at %s:%d ", file, line);
   Warn("Message: %s ", msg);
-  Warn("Version: " S_UNAME S_VERSION1 " (%d) " __DATE__ __TIME__,
-       SINGULAR_VERSION_ID);
+  Warn("Version: " S_UNAME S_VERSION1 " (%lu) " __DATE__ __TIME__,
+       feVersionId);
 }
 
@@ -63 +63 @@
 }
 #include "feResource.cc"
-#include "feCmdLineOptions.cc"
+#include "feOpt.cc"
+
+void mainUsage()
+{
+  fprintf(stderr, "Use `%s --help' for a complete list of options\n", feArgv0);
+}
 
 int main(int argc, char** argv)
@@ -83 +88 @@
   int optc, option_index;
   
-  while ((optc = getopt_long(argc, argv, SHORT_OPTS_STRING, 
-                             longopts, &option_index))
+  while ((optc = fe_getopt_long_only(argc, argv, SHORT_OPTS_STRING, 
+                                     feOptSpec, &option_index))
         != EOF)
   {
@@ -90 +95 @@
     {
         case 'h':
-          mainHelp(argv[0]);
+          feOptHelp(feArgv0);
           exit(0);
           
         case '?':
         case ':':
-          mainUsage(argv[0]);
+        case '\0':
+          mainUsage();
           exit(1);
 
         case  LONG_OPTION_RETURN:
-          if (strcmp(longopts[option_index].name, LON_EMACS) == 0)
+        {
+          switch(option_index)
           {
-            emacs = optarg;
-          }
-          else if (strcmp(longopts[option_index].name, LON_EMACS_DIR) == 0)
-          {
-            emacs_dir = optarg;
-          }
-          else if (strcmp(longopts[option_index].name, LON_EMACS_LOAD) == 0)
-          {
-            emacs_load = optarg;
-          }
-          else if (strcmp(longopts[option_index].name, LON_SINGULAR) == 0)
-          {
-            singular = optarg;
-          }
-          else if (strcmp(longopts[option_index].name, LON_NO_EMACS_CALL) == 0)
-          {
-            no_emacs_call = 1;
-          }
-          else
-          {
-            break;
+              case FE_OPT_EMACS:
+                emacs = fe_optarg;
+                break;
+                
+              case FE_OPT_EMACS_DIR:
+                emacs_dir = fe_optarg;
+                break;
+                
+              case FE_OPT_EMACS_LOAD:
+                emacs_load = fe_optarg;
+                break;
+                
+              case FE_OPT_SINGULAR:
+                singular = fe_optarg;
+                break;
+
+              case FE_OPT_NO_EMACS_CALL:
+                no_emacs_call = 1;
+                break;
+                
+              default:
+                goto NEXT;
           }
           // delete options from option-list
-          if (optind > 2 && *argv[optind-1] != '-' && 
-              optarg != NULL && longopts[option_index].has_arg)
+          if (fe_optind > 2 && *argv[fe_optind-1] != '-' && 
+              fe_optarg != NULL && feOptSpec[option_index].has_arg)
           {
-            argv[optind-2] = NULL;
+            argv[fe_optind-2] = NULL;
           }
-          argv[optind-1] = NULL;
-    }
-  } 
+          argv[fe_optind-1] = NULL;
+        }
+    }
+    NEXT:{}
+  }
   
   // make sure  emacs, singular, emacs_dir, emacs_load are set
@@ -139 +149 @@
     fprintf(stderr, "Error: Can't find emacs executable. \nExpected it at %s\n. Specify alternative with --emacs option,\n or set EMACS environment variable.\n", 
             feResourceDefault("emacs"));
-    mainUsage(argv[0]);
+    mainUsage();
     exit(1);
   }
@@ -148 +158 @@
     fprintf(stderr, "Error: Can't find singular executable.\nExpected it at %s\nSpecify with --singular option,\n  or set SINGULAR_EMACS environment variable.\n", 
             feResourceDefault("SingularEmacs"));
-    mainUsage(argv[0]);
+    mainUsage();
     exit(1);
   }
@@ -157 +167 @@
     fprintf(stderr, "Error: Can't find emacs directory for Singular lisp files. \nExpected it at %s\nSpecify with --emacs_dir option,\n  or set SINGULAR_EMACS_DIR environment variable.\n", 
             feResourceDefault("EmacsDir"));
-    mainUsage(argv[0]);
+    mainUsage();
     exit(1);
   }
@@ -182 +192 @@
           fprintf(stderr, "Error: Can't find emacs load file for Singular mode. \nExpected it at %s\nSpecify with --emacs_load option,\n or set SINGULAR_EMACS_LOAD environment variable,\n or put file '.emacs-singular' in your home directory.\n", 
                   feResourceDefault("EmacsLoad"));  
-          mainUsage(argv[0]);
+          mainUsage();
           exit(1);
         }
@@ -232 +242 @@
     {
       fprintf(stderr, "Error: Executation of\n%s\n");
-      mainUsage(argv[0]);
+      mainUsage();
       exit(1);
     }

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.103 1999-08-20 16:06:49 Singular Exp $ */
+/* $Id: extra.cc,v 1.104 1999-09-20 18:03:43 obachman Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -49 +49 @@
 #include "syz.h"
 #include "sdb.h"
+#include "feOpt.h"
+#include "distrib.h"
 
 // Define to enable many more system commands
@@ -237 +239 @@
       res->rtyp = STRING_CMD;
       char* b = StringSetS("");
-      feStringAppendBrowsers(1);
+      feStringAppendBrowsers(0);
       res->data = mstrdup(b);
       return FALSE;
@@ -316 +318 @@
     if (strstr(sys_cmd, "--") == sys_cmd)
     {
-      BOOLEAN mainGetSingOptionValue(const char* name, char** result);
-      char* val;
-
-      if (h != NULL)
-      {
-        if (strcmp(sys_cmd, "--browser") == 0)
-        {
-          if (h->Typ() == STRING_CMD)
-          {
-            if (strcmp(feHelpBrowser((char*) h->Data(), 1),
-                       (char*) h->Data()) != 0)
-            {
-              Werror("Can not set HelpBrowser to '%s'", (char*) h->Data());
-              return TRUE;
-            }
-          }
+      if (strcmp(sys_cmd, "--") == 0)
+      {
+        fePrintOptValues();
+        return FALSE;
+      }
+      
+      feOptIndex opt = feGetOptIndex(&sys_cmd[2]);
+      if (opt == FE_OPT_UNDEF)
+      {
+        Werror("Unknown option %s", sys_cmd);
+        Werror("Use 'system(\"--\");' for listing of available options");
+        return TRUE;
+      }
+      
+      if (h == NULL)
+      {
+        if (feOptSpec[opt].type == feOptString)
+        {
+          res->rtyp = STRING_CMD;
+          if (feOptSpec[opt].value != NULL)
+            res->data = mstrdup((char*) feOptSpec[opt].value);
           else
-          {
-            Werror("Need string to set HelpBrowser");
-            return TRUE;
-          }
+            res->data = mstrdup("");
         }
         else
         {
-          Werror("Can not set value of option %s", sys_cmd);
+          res->rtyp = INT_CMD;
+          res->data = feOptSpec[opt].value;
+        }
+        return FALSE;
+      }
+      
+      if (h->Typ() != STRING_CMD && 
+          h->Typ() != INT_CMD)
+      {
+        Werror("Need string or int argument to set option value");
+        return TRUE;
+      }
+      char* errormsg;
+      if (h->Typ() == INT_CMD)
+      {
+        if (feOptSpec[opt].type == feOptString)
+        {
+          Werror("Need string argument to set value of option %s", sys_cmd);
           return TRUE;
         }
-      }
-
-      if (mainGetSingOptionValue(&(sys_cmd)[2], &val))
-      {
-        if ((unsigned int) val > 1)
-        {
-          res->rtyp=STRING_CMD;
-          if (strcmp(sys_cmd, "--browser") == 0 &&
-              (val == NULL || *val == '\0'))
-            res->data = (void*) mstrdup(feHelpBrowser());
-          else
-            res->data = (void*) mstrdup( val );
-        }
-        else
-        {
-          res->rtyp=INT_CMD;
-          res->data=(void *)val;
-        }
-        return FALSE;
-      }
-      else
-      {
-        Werror("Unknown option %s\n", sys_cmd);
-        return TRUE;
-      }
+        errormsg = feSetOptValue(opt, (int) h->Data());
+        if (errormsg != NULL) 
+          Werror("Option '--%s=%d' %s", sys_cmd, (int) h->Data(), errormsg);
+      }
+      else
+      {
+        errormsg = feSetOptValue(opt, (char*) h->Data());
+        if (errormsg != NULL)
+          Werror("Option '--%s=%s' %s", sys_cmd, (char*) h->Data(), errormsg);
+      }
+      if (errormsg != NULL) return TRUE;
+      return FALSE;
     }
     else
@@ -1005 +1013 @@
     }
     else
-/*==================== print all option values =================*/
-#ifndef NDEBUG
-    if (strcmp(sys_cmd, "options") == 0)
-    {
-      void mainOptionValues();
-      mainOptionValues();
-      return FALSE;
-    }
-    else
-#endif
 /*==================== GF =================*/
 #if 0

Singular/feResource.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feResource.cc,v 1.10 1999-08-25 16:02:46 Singular Exp $ */
+/* $Id: feResource.cc,v 1.11 1999-09-20 18:03:45 obachman Exp $ */
 /*
 * ABSTRACT: management of resources
@@ -9 +9 @@
 #include <unistd.h>
 
-#include "version.h"
 #include "mod2.h"
-#include "version.h"
+#include "distrib.h"
 #ifndef ESINGULAR
 #include "mmemory.h"
@@ -99 +98 @@
  *
  *****************************************************************/
-static char* feArgv0;
+char* feArgv0;
 #define MAXRESOURCELEN 5*MAXPATHLEN
 char fePathSep = 
@@ -194 +193 @@
   }
 #ifdef RESOURCE_DEBUG
-  printf("feInitResources: entering with argv0=%s=\n", argv0);
+  printf("feInitResources: entering with argv0=%s=\n", feArgv0);
 #endif
   // init some Resources

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.81 1999-08-25 16:02:46 Singular Exp $ */
+/* $Id: febase.cc,v 1.82 1999-09-20 18:03:46 obachman Exp $ */
 /*
 * ABSTRACT: i/o system
 */
 
-#include "version.h"
 #include "mod2.h"
 
@@ -362 +361 @@
   Warn("Bug occured at %s:%d", file, line);
   Warn("Message: %s", msg);
-  Warn("Version: " S_UNAME S_VERSION1 " (%d) " __DATE__ __TIME__,
-       SINGULAR_VERSION_ID);
+  Warn("Version: " S_UNAME S_VERSION1 " (%lu) " __DATE__ __TIME__,
+       feVersionId);
 }
 

Singular/febase.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.h,v 1.36 1999-08-25 16:02:46 Singular Exp $ */
+/* $Id: febase.h,v 1.37 1999-09-20 18:03:47 obachman Exp $ */
 /*
 * ABSTRACT: basic i/o
@@ -148 +148 @@
 // display general help, otherwise
 void feHelp(char* str = NULL);
-// if browser != NULL or OptionValue("browser") != NULL 
+// if browser != NULL or feOpt("browser") != NULL 
 //    set HelpBrowser to browser 
 // otherwise, if browser was already set, leave as is, 
 //            if not, choose first available browser
 // return string identifying current browser
-// keeps OptionValue("browser") up-to-date
+// keeps feOpt("browser") up-to-date
 // Optional warn argument is as in feResource
 char* feHelpBrowser(char* browser = NULL, int warn = -1);
 void feStringAppendBrowsers(int warn = -1);
 
+/*****************************************************************
+ *
+ * version Id
+ *
+ *****************************************************************/
+extern unsigned long feVersionId;
+
+/*****************************************************************
+ *
+ * File Stuff
+ *
+ *****************************************************************/
 FILE *  feFopen(char *path, char *mode, char *where=NULL, int useWerror=FALSE);
 #ifndef __MWERKS__

Singular/fehelp.cc

@@ -21 +21 @@
 #include "ipshell.h"
 #include "libparse.h"
+#include "feOpt.h"
 
 /*****************************************************************
@@ -149 +150 @@
         Warn("No help for topic '%s' (not even for '*%s*')", str, str);
         WarnS("Try '?;'       for general help");
-        WarnS("or  '?Index;'  for all available help topics");
+        WarnS("or  '?Index;'  for all available help topics.");
         return;
       }
@@ -182 +183 @@
 {
   int i = 0;
-  extern void mainSetSingOptionValue(const char* name, char* value);
-  char* mainGetSingOptionValue(const char* name);
-
-  // if no argument, see what we have as value to the option
-  if (which == NULL || *which == '\0')
-    which = mainGetSingOptionValue("browser");
 
   // if no argument, choose first available help browser
   if (which == NULL || *which == '\0')
   {
-    // unles one is already set
-    if (heCurrentHelpBrowser != NULL) goto Finish;
-
+    // return, if already set
+    if (heCurrentHelpBrowser != NULL) 
+      return heCurrentHelpBrowser->browser;
+
+    // First, try emacs, if emacs-option is set
+    if (feOptValue(FE_OPT_EMACS) != NULL)
+    {
+      while (heHelpBrowsers[i].browser != NULL)
+      {
+        if (strcmp(heHelpBrowsers[i].browser, "emacs") == 0 &&
+            (heHelpBrowsers[i].init_proc(0)))
+        {
+          heCurrentHelpBrowser = &(heHelpBrowsers[i]);
+          goto Finish;
+        }
+        i++;
+      }
+      i=0;
+    }
     while (heHelpBrowsers[i].browser != NULL)
     {
@@ -200 +211 @@
       {
         heCurrentHelpBrowser = &(heHelpBrowsers[i]);
-        return heCurrentHelpBrowser->browser;
+        goto Finish;
       }
       i++;
@@ -215 +226 @@
   if (heHelpBrowsers[i].browser == NULL)
   {
-    if (warn) Warn("No help browser '%s' available", which);
+    if (warn) Warn("No help browser '%s' available.", which);
   }
   else
@@ -230 +241 @@
   if (heCurrentHelpBrowser == NULL)
   {
-    // choose first available help browser
-    mainSetSingOptionValue("browser", "");
     feHelpBrowser();
     assume(heCurrentHelpBrowser != NULL);
     if (warn)
-      Warn("Setting help browser to '%s'", heCurrentHelpBrowser->browser);
+      Warn("Setting help browser to '%s'.", heCurrentHelpBrowser->browser);
     return heCurrentHelpBrowser->browser;
   }
@@ -242 +251 @@
     // or, leave as is
     if (warn)
-      Warn("Help browser stays at '%s'",  heCurrentHelpBrowser->browser);
+      Warn("Help browser stays at '%s'.",  heCurrentHelpBrowser->browser);
+    return heCurrentHelpBrowser->browser;
   }
 
   Finish:
-  mainSetSingOptionValue("browser", heCurrentHelpBrowser->browser);
+  // update value of Browser Option
+  if (feOptSpec[FE_OPT_BROWSER].value == NULL ||
+      strcmp((char*) feOptSpec[FE_OPT_BROWSER].value,  
+             heCurrentHelpBrowser->browser) != 0)
+  {
+    if (feOptSpec[FE_OPT_BROWSER].value == NULL) 
+      FreeL(feOptSpec[FE_OPT_BROWSER].value);
+   feOptSpec[FE_OPT_BROWSER].value 
+     = (void*) mstrdup(heCurrentHelpBrowser->browser);
+  }
   return heCurrentHelpBrowser->browser;
 }
@@ -642 +661 @@
     return;
 
-  if (heCurrentHelpBrowser == NULL) feHelpBrowser();
+  if (heCurrentHelpBrowser == NULL) feHelpBrowser(NULL, 0);
   assume(heCurrentHelpBrowser != NULL);
   if (! feHelpCalled)
@@ -722 +741 @@
   {
     if (warn) WarnS("no local HtmlDir found");
-    if (warn) Warn("using %s instead", feResource('u' /*"ManualUrl"*/, warn));
+    return FALSE;
+//    if (warn) Warn("using %s instead", feResource('u' /*"ManualUrl"*/, warn));
   }
   return TRUE;

Singular/feread.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feread.cc,v 1.22 1999-08-25 16:02:47 Singular Exp $ */
+/* $Id: feread.cc,v 1.23 1999-09-20 18:03:48 obachman Exp $ */
 /*
 * ABSTRACT: input from ttys, simulating fgets
@@ -8 +8 @@
 
 
-#include "version.h"
 #include "mod2.h"
 #include "tok.h"

Singular/find_exec.c

@@ -64 +64 @@
   {
     if (((name[0] == '.') && (name[1] == '/')) ||
-        ((name[0] == '.') && (name[1] == '.') && (name[2] == '/')))
-    {
-      strcpy (tbuf, (name[1] == '.' ? ".." : "."));
+        ((name[0] == '.') && (name[1] == '.') && (name[2] == '/')) ||
+        strchr(name, '/') != NULL)
+    {
 
 #ifdef HAVE_GETCWD
@@ -77 +77 @@
       strcat (tbuf, "/");
       strcat (tbuf, name);
-      return copy_of (tbuf);
-    }
-
+      if (! access(name, X_OK))
+        return copy_of (tbuf);
+    }
 
     search = getenv("PATH");

Singular/getopt.h

@@ -16 +16 @@
    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+/* obachman: adapted to Singular by adding prefix fe_ to global variables
+ */
 #ifndef _GETOPT_H
 #define _GETOPT_H 1
@@ -29 +31 @@
    each non-option ARGV-element is returned here.  */
 
-extern char *optarg;
+extern char *fe_optarg;
 
 /* Index in ARGV of the next element to be scanned.
@@ -43 +45 @@
    how much of ARGV has been scanned so far.  */
 
-extern int optind;
+extern int fe_optind;
 
 /* Callers store zero here to inhibit the error message `getopt' prints
    for unrecognized options.  */
 
-extern int opterr;
+extern int fe_opterr;
 
 /* Set to an option character which was unrecognized.  */
 
-extern int optopt;
+extern int fe_optopt;
 
 /* Describe the long-named options requested by the application.
@@ -75 +77 @@
    returns the contents of the `val' field.  */
 
-struct option
+typedef enum {feOptBool=0, feOptInt, feOptString} feOptType;
+struct fe_option
 {
 #if        __STDC__
@@ -87 +90 @@
   int *flag;
   int val;
+  /* Stuff added for Singular  */
+  const char*   arg_name;// name of argument, for display in help
+  const char*   help;    // (short) help string
+  feOptType     type;    // type of argument, if has_arg > 0
+  void*         value;   // (default) value of option 
+  int           set;     // only relevant for strings: 0 if not set, 1 if set
 };
 
 /* Names for the values of the `has_arg' field of `struct option'.  */
 
-#define        no_argument                0
+#define        no_argument       0
 #define required_argument        1
 #define optional_argument        2
@@ -100 +109 @@
    differences in the consts, in stdlib.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int argc, char *const *argv, const char *shortopts);
+extern int fe_getopt (int argc, char *const *argv, const char *shortopts);
 #endif /* not __GNU_LIBRARY__ */
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
-                        const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
+extern int fe_getopt_long (int argc, char *const *argv, const char *shortopts,
+                        const struct fe_option *longopts, int *longind);
+extern int fe_getopt_long_only (int argc, char *const *argv,
                              const char *shortopts,
-                             const struct option *longopts, int *longind);
+                             const struct fe_option *longopts, int *longind);
 
 /* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int argc, char *const *argv,
+extern int _fe_getopt_internal (int argc, char *const *argv,
                              const char *shortopts,
-                             const struct option *longopts, int *longind,
+                             const struct fe_option *longopts, int *longind,
                              int long_only);
 #else /* not __STDC__ */
-extern int getopt ();
-extern int getopt_long ();
-extern int getopt_long_only ();
+extern int fe_getopt ();
+extern int fe_getopt_long ();
+extern int fe_getopt_long_only ();
 
-extern int _getopt_internal ();
+extern int _fe_getopt_internal ();
 #endif /* not __STDC__ */
 

Singular/ipshell.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.h,v 1.19 1999-07-28 17:51:07 Singular Exp $ */
+/* $Id: ipshell.h,v 1.20 1999-09-20 18:03:49 obachman Exp $ */
 /*
 * ABSTRACT
@@ -24 +24 @@
 extern int  myynest;
 extern char *  currid;
-extern char * thisfile;
+extern char * feArgv0;
 extern int     iiRETURNEXPR_len;
 extern sleftv *iiRETURNEXPR;

Singular/kbPolyProcs.cc

@@ -373 +373 @@
 
   // set characterisic
-  if (r->ch > 1) ch = chMODP;
+  if (rField_is_Zp(r)) ch = chMODP;
   
   // set Ordering Type

Singular/misc.cc

@@ -14 +14 @@
 #include <limits.h>
 
-#include "version.h"
 #include "mod2.h"
 #include "tok.h"

Singular/mmisc.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmisc.c,v 1.9 1999-08-18 09:18:28 obachman Exp $ */
+/* $Id: mmisc.c,v 1.10 1999-09-20 18:03:50 obachman Exp $ */
 
 /*
@@ -13 +13 @@
 #include "mmpage.h"
 #include "febase.h"
+#include "distrib.h"
+
 #ifdef MTRACK
 #include "mmbt.h"

Singular/sing_mp.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sing_mp.cc,v 1.26 1999-08-13 11:21:44 Singular Exp $ */
+/* $Id: sing_mp.cc,v 1.27 1999-09-20 18:03:50 obachman Exp $ */
 
 /*
@@ -22 +22 @@
 #include "ipid.h"
 #include "silink.h"
+#include "feOpt.h"
 
 static int Batch_ReadEval(si_link silink);
@@ -164 +165 @@
  *
  ***************************************************************/
-extern BOOLEAN mainGetSingOptionValue(const char* name, char** val);
-
 
 static MP_Link_pt slOpenMPConnect(int n_argc, char **n_argv)
@@ -175 +174 @@
   char *host = IMP_GetCmdlineArg(n_argc, n_argv, "--MPhost");
 
-  if (port == NULL) mainGetSingOptionValue("--MPport", &port);
-  if (host == NULL) mainGetSingOptionValue("--MPhost", &host);
+  if (port == NULL) port = (char*) feOptValue(FE_OPT_MP_PORT);
+  if (host == NULL) host = (char*) feOptValue(FE_OPT_MP_HOST);
 
   if (port != NULL)
@@ -194 +193 @@
   char *port = IMP_GetCmdlineArg(n_argc, n_argv, "--MPport");
 
-  if (port == NULL) mainGetSingOptionValue("--MPport", &port);
+  if (port == NULL) port = (char*) feOptValue(FE_OPT_MP_HOST);
 
   if (port != NULL) argv[5] = port;

Singular/tesths.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tesths.cc,v 1.69 1999-08-25 15:26:02 obachman Exp $ */
+/* $Id: tesths.cc,v 1.70 1999-09-20 18:03:51 obachman Exp $ */
 
 /*
@@ -15 +15 @@
 #include <time.h>
 #include <errno.h>
-#include "version.h"
 #include "mod2.h"
 #include "tok.h"
@@ -27 +26 @@
 #include "timer.h"
 #include "sdb.h"
+#include "fegetopt.h"
+#include "feOpt.h"
+#include "distrib.h"
+#include "version.h"
+
 #ifdef HAVE_FACTORY
 #define SI_DONT_HAVE_GLOBAL_VARS
@@ -32 +36 @@
 #endif
 
-#include "feCmdLineOptions.cc"
 /*0 implementation*/
 int main(          /* main entry to Singular */
@@ -38 +41 @@
     char** argv)   /* parameter array */
 {
-  char * thisfile;
-  /* initialize components */
-  siRandomStart=inits();
 #ifdef INIT_BUG
   jjInitTab1();
@@ -54 +54 @@
   ttGen2();
 #else
-  thisfile = argv[0];
-  BOOLEAN load_std_lib=TRUE;
-  BOOLEAN load_rc = TRUE;
-  char* execute_string = NULL;
+  /* initialize components */
+  siRandomStart=inits();
+  feOptSpec[FE_OPT_RANDOM].value = (void*) siRandomStart;
   int optc, option_index;
+  char* errormsg;
 
   // do this first, because -v might print version path
-  feInitResources(thisfile);
+  feInitResources(argv[0]);
 
   // parse command line options
-  while((optc = getopt_long(argc, argv,
-                            SHORT_OPTS_STRING, longopts, &option_index))
+  while((optc = fe_getopt_long_only(argc, argv,
+                               SHORT_OPTS_STRING, feOptSpec, &option_index))
+//                               "", feOptSpec, &option_index))
         != EOF)
   {
-    switch(optc)
-    {
-
-        case 'b':
-#ifdef HAVE_MPSR
-          fe_fgets_stdin=fe_fgets_dummy;
-          mainSetSingOptionValue(LON_BATCH, (char*) 1);
-          break;
-#else
-          printf("%s: Option `-b' not supported in this configuration\n", argv[0]);
-          mainUsage(argv[0]);
-          exit(1);
-#endif
-        case 'h':
-          mainHelp(argv[0]);
-          exit(0);
-
-        case 'q':
-          verbose &= ~(Sy_bit(0)|Sy_bit(V_LOAD_LIB));
-          mainSetSingOptionValue(LON_QUIET, (char*) 1);
-          break;
-
-        case 't':
-#if defined(HAVE_FEREAD) || defined(HAVE_READLINE)
-          fe_fgets_stdin=fe_fgets;
-#endif
-          mainSetSingOptionValue(LON_NO_TTY, (char*) 1);
-          break;
-
-        case 'd':
-          sdb_flags = 1;
-          break;
-
-        case 'v':
-          printf("Singular for %s version %s  (%d)  %s %s\n",
-                 S_UNAME, S_VERSION1,
-                 SINGULAR_VERSION_ID,__DATE__,__TIME__);
-          printf("with\n");
-          printf(versionString());
-          printf("\n\n");
-          mainSetSingOptionValue(LON_VERSION, (char*) 1);
-          break;
-
-        case 'x':
-#ifdef HAVE_TCL
-          tclmode = TRUE;
-          fe_fgets_stdin=fe_fgets_tcl;
-          mainSetSingOptionValue(LON_TCLMODE, (char*) 1);
-          verbose|=Sy_bit(V_SHOW_MEM);
-          break;
-#else
-          printf("%s: Option `-x' not supported in this configuration\n", argv[0]);
-          mainUsage(argv[0]);
-          exit(1);
-#endif
-
-        case 'e':
-          if (optarg != NULL)
-          {
-            errno = 0;
-            si_echo = strtol(optarg, NULL, 10);
-            if (errno)
-            {
-              printf("%s: `%s' invalid integer argument for option `--%s'\n", argv[0], optarg, LON_ECHO);
-              mainUsage(argv[0]);
-              exit(1);
-            }
-            if (si_echo < 0 || si_echo > 9)
-            {
-              printf("%s: `%s' argument for option `--%s' is not in valid range 0..9\n",
-                     argv[0], optarg, LON_ECHO);
-              mainUsage(argv[0]);
-              exit(1);
-            }
-            mainSetSingOptionValue(LON_ECHO, optarg);
-          }
-          else
-          {
-            si_echo = 1;
-            mainSetSingOptionValue(LON_ECHO, "1");
-          }
-          break;
-
-        case 'c':
-          execute_string = optarg;
-          mainSetSingOptionValue(LON_EXECUTE, optarg);
-          break;
-
-        case 'r':
-          errno = 0;
-          siRandomStart = strtol(optarg, NULL, 10);
-          if (errno || siRandomStart == 0)
-          {
-            printf("%s: `%s' invalid integer argument for option `--%s'\n", argv[0], optarg, LON_RANDOM);
-            mainUsage(argv[0]);
-            exit(1);
-          }
-          #ifdef buildin_rand
-          siSeed=siRandomStart;
-          #else
-          srand((unsigned int)siRandomStart);
-          #endif
-          #ifdef HAVE_FACTORY
-          factoryseed(siRandomStart);
-          #endif
-          mainSetSingOptionValue(LON_RANDOM, optarg);
-          break;
-
-        case 'u':
-          mainSetSingOptionValue(LON_USER_OPTION, optarg);
-          break;
-
-        case LONG_OPTION_RETURN:
-          if (strcmp(longopts[option_index].name, LON_NO_STDLIB) == 0)
-          {
-            load_std_lib = FALSE;
-            mainSetSingOptionValue(LON_NO_STDLIB, (char*) 1);
-          }
-          else if (strcmp(longopts[option_index].name, LON_BROWSER) == 0)
-          {
-            mainSetSingOptionValue(LON_BROWSER, optarg);
-          }
-          else if (strcmp(longopts[option_index].name, LON_EMACS) == 0)
-          {
-            mainSetSingOptionValue(LON_EMACS, (char*) 1);
-            // print EmacsDir and InfoFile so that Emacs
-            // mode can pcik it up
-            Warn("EmacsDir: %s", (feResource('e' /*"EmacsDir"*/) != NULL ?
-                                  feResource('e' /*"EmacsDir"*/) : ""));
-            Warn("InfoFile: %s", (feResource('i' /*"InfoFile"*/) != NULL ?
-                                  feResource('i' /*"InfoFile"*/) : ""));
-          }
-          else if (strcmp(longopts[option_index].name, LON_NO_RC) == 0)
-          {
-            load_rc = FALSE;
-            mainSetSingOptionValue(LON_NO_RC, (char*) 1);
-          }
-          else if (strcmp(longopts[option_index].name, LON_NO_WARN) == 0)
-          {
-            feWarn = FALSE;
-            mainSetSingOptionValue(LON_NO_WARN, (char*) 1);
-          }
-          else if (strcmp(longopts[option_index].name, LON_NO_OUT) == 0)
-          {
-            feOut = FALSE;
-            mainSetSingOptionValue(LON_NO_OUT, (char*) 1);
-          }
-          else if (strcmp(longopts[option_index].name, LON_MIN_TIME) == 0)
-          {
-            double mintime = atof(optarg);
-            if (mintime <= 0)
-            {
-              printf("%s: `%s' invalid float argument for option `--%s'\n",
-                     argv[0], optarg, LON_MIN_TIME);
-              mainUsage(argv[0]);
-              exit(1);
-            }
-            SetMinDisplayTime(mintime);
-            mainSetSingOptionValue(LON_MIN_TIME, optarg);
-          }
-#ifdef HAVE_MPSR
-          else if (strcmp(longopts[option_index].name, LON_MP_PORT) == 0)
-          {
-            mainSetSingOptionValue(LON_MP_PORT, optarg);
-          }
-          else if (strcmp(longopts[option_index].name, LON_MP_HOST) == 0)
-          {
-            mainSetSingOptionValue(LON_MP_HOST, optarg);
-          }
-#endif
-          else if (strcmp(longopts[option_index].name, LON_TICKS_PER_SEC) == 0)
-          {
-            int ticks = atoi(optarg);
-            if (ticks <= 0)
-            {
-              printf("%s: `%s' invalid integer argument for option `--%s'\n",
-                     argv[0], optarg, LON_TICKS_PER_SEC);
-              mainUsage(argv[0]);
-              exit(1);
-            }
-            SetTimerResolution(ticks);
-            mainSetSingOptionValue(LON_TICKS_PER_SEC, optarg);
-          }
-          else
-            // undocumented options
-#ifdef HAVE_MPSR
-            if (strcmp(longopts[option_index].name, LON_MP_MODE) == 0 ||
-                strcmp(longopts[option_index].name, LON_MP_TRANSP) == 0)
-            {
-              /* ignore */
-            }
-          else
-#endif
-            assume(0);
-          break;
-
-        default:
-          // Error message already emmited by getopt_long
-          mainUsage(argv[0]);
-          exit(1);
-    }
-  }
+    if (optc == '?' || optc == 0) 
+    {
+      fprintf(stderr, "Use '%s --help' for a complete list of options\n", feArgv0);
+      exit(1);
+    }
+
+    if (optc != LONG_OPTION_RETURN)
+      option_index = feGetOptIndex(optc);
+
+    assume(option_index > 0 && option_index < (int) FE_OPT_UNDEF);
+    
+    if (fe_optarg == NULL && 
+        (feOptSpec[option_index].type == feOptBool ||
+         feOptSpec[option_index].has_arg == optional_argument))
+      errormsg = feSetOptValue((feOptIndex) option_index, (int) 1);
+    else
+      errormsg = feSetOptValue((feOptIndex) option_index, fe_optarg);
+    
+    if (errormsg)
+    {
+      if (fe_optarg == NULL)
+        fprintf(stderr, "Error: Option '--%s' %s\n", 
+               feOptSpec[option_index].name, errormsg);
+      else
+        fprintf(stderr, "Error: Option '--%s=%s' %s\n", 
+               feOptSpec[option_index].name, fe_optarg, errormsg);
+      fprintf(stderr, "Use '%s --help' for a complete list of options\n", feArgv0);
+      exit(1);
+    }
+    if (optc == 'h') exit(0);
+  }
+
   /* say hello */
   {
@@ -307 +138 @@
   }
   slStandardInit();
-  dlInit(thisfile);
+  dlInit(feArgv0);
   myynest=0;
-  if (load_std_lib)
+  if (! feOptValue(FE_OPT_NO_STDLIB))
   {
     int vv=verbose;
@@ -327 +158 @@
 
   // Last thing to do is to execute given scripts
-  if (optind < argc)
+  if (fe_optind < argc)
   {
     int i = argc - 1;
-    while (i >= optind)
+    while (i >= fe_optind)
     {
       newFile(argv[i]);
@@ -342 +173 @@
 
   // before scripts, we execute -c, if it was given
-  // now execute -c, if it was given
-  if (execute_string != NULL)
-    newBuffer(mstrdup(execute_string), BT_execute);
+  if (feOptValue(FE_OPT_EXECUTE) != NULL)
+    newBuffer(mstrdup((char*) feOptValue(FE_OPT_EXECUTE)), BT_execute);
 
   // first thing, however, is to load .singularrc
-  if (load_rc)
+  if (! feOptValue(FE_OPT_NO_RC))
   {
     FILE * rc=myfopen(".singularrc","r");
@@ -378 +208 @@
 #ifdef HAVE_MPSR
     extern int Batch_do(const char* port, const char* host);
-    return Batch_do(mainGetSingOptionValue(LON_MP_PORT),
-                    mainGetSingOptionValue(LON_MP_HOST));
+    return Batch_do((char*) feOptValue(FE_OPT_MP_PORT),
+                    (char*) feOptValue(FE_OPT_MP_HOST));
 #else
     assume(0);
@@ -391 +221 @@
   return 0;
 }
+

Singular/utils.cc

@@ -3 +3 @@
 #include <stdlib.h>
 #include <ctype.h>
-#include "getopt.h"
+#include "fegetopt.h"
 #include "utils.h"
 #ifdef __MWERKS__
 #define __GNU_LIBRARY__
-#include "getopt.h"
+#include "fegetopt.h"
 #endif
 
@@ -38 +38 @@
   char c;
 
-  while((c=getopt(argc, argv, "ihd:sf:"))>=0) {
+  while((c=fe_getopt(argc, argv, "ihd:sf:"))>=0) {
     switch(c) {
         case 'd':
           lpverbose = 1;
-          if(isdigit(argv[optind-1][0])) sscanf(optarg, "%d", &lpverbose);
-          else optind--;
-          break;
-        case 'f': lib_file = argv[optind-1];
+          if(isdigit(argv[fe_optind-1][0])) sscanf(optarg, "%d", &lpverbose);
+          else fe_optind--;
+          break;
+        case 'f': lib_file = argv[fe_optind-1];
           break;
         case 's':
@@ -57 +57 @@
           break;
           
-        case -1 : printf("no such option:%s\n", argv[optind]);
+        case -1 : printf("no such option:%s\n", argv[fe_optind]);
           usage(argv[0]);
           break;
-        default: printf("no such option.%x, %c %s\n", c&0xff, c, argv[optind]);
+        default: printf("no such option.%x, %c %s\n", c&0xff, c, argv[fe_optind]);
           usage(argv[0]);
     }
@@ -73 +73 @@
       printf("$library = \"%s\";\n", lib_file);
   } else {
-    while(argc>optind && yylpin==NULL) {
-      yylpin = fopen( argv[optind], "rb" );
+    while(argc>fe_optind && yylpin==NULL) {
+      yylpin = fopen( argv[fe_optind], "rb" );
       if(yylpin!=NULL) 
       {
-        lib_file = argv[optind];
+        lib_file = argv[fe_optind];
         if (! texinfo_out) 
-          printf("Checking library '%s'\n", argv[optind]);
+          printf("Checking library '%s'\n", argv[fe_optind]);
         else
           printf("$library = \"%s\";\n", lib_file);
       }
-      else optind++;
+      else fe_optind++;
     }
   }