Changeset 8436eb4 in git

Timestamp:

Feb 5, 2013, 12:32:38 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

44fac1f7d6452783407efa315a7e588d75d35842

Parents:

3621e7317a4ff5f11cb74f268c348ff205ce8b0e

Message:

avoid autoloading of non-pacakges

from master

File:

• Singular/iparith.cc (modified) (1 diff)

Singular/iparith.cc

@@ -687 +687 @@
   {
       case 0:
-        Print("%s of type 'ANY'. Trying load.\n", v->name);
-        if(iiTryLoadLib(u, u->name))
+      {
+        int name_err=0;
+        if(isupper(u->name[0]))
         {
-          Werror("'%s' no such package", u->name);
-          return TRUE;
+          const char *c=u->name+1;
+          while((*c!='\0')&&(islower(*c))) c++;
+          if (*c!='\0')
+            name_err=1;
+          else
+          {
+            Print("%s of type 'ANY'. Trying load.\n", u->name);
+            if(iiTryLoadLib(u, u->name))
+            {
+              Werror("'%s' no such package", u->name);
+              return TRUE;
+            }
+            syMake(u,u->name,NULL);
+          }
         }
-        syMake(u,u->name,NULL);
-        // else: use next case !!! no break !!!
+        else name_err=1;
+        if(name_err)
+        { Werror("'%s' is an invalid package name",u->name);return TRUE;}
+        // and now, after the loading: use next case !!! no break !!!
+      }
       case PACKAGE_CMD:
         packhdl = (idhdl)u->data;