Changeset e8b1f3 in git

Timestamp:

Oct 2, 2017, 4:44:23 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

6b604b12e5560493fc5aac287116a3caf35ec816

Parents:

85d1a44041f41d257fd21fa1115c1bc7cd8fcd5b

Message:

fix: construction of package name and libname in package

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• iplib.cc (modified) (1 diff)

Singular/iparith.cc

@@ -5047 +5047 @@
           pl = enterid( plib,0, PACKAGE_CMD, &(basePack->idroot), TRUE );
           IDPACKAGE(pl)->language = LANG_SINGULAR;
-          IDPACKAGE(pl)->libname=plib;
+          IDPACKAGE(pl)->libname=omStrDup(s);
         }
         else if (IDTYP(pl)!=PACKAGE_CMD)
@@ -5055 +5055 @@
           return TRUE;
         }
-        else
-          omFree(plib);
+        omFree(plib);
         package savepack=currPack;
         currPack=IDPACKAGE(pl);

Singular/iplib.cc

@@ -1336 +1336 @@
   char *p = strrchr(tmpname, DIR_SEP);
   char *r;
-  if(p==NULL) p = tmpname;
-  else p++;
-  r = (char *)strchr(p, '.');
-  if( r!= NULL) *r = '\0';
+  if(p==NULL) p = tmpname; else p++;
+  // p is now the start of the file name (without path)
+  r=p;
+  while(isalnum(*r)) r++;
+  // r point the the end of the main part of the filename
+  *r = '\0';
   r = omStrDup(p);
   *r = mytoupper(*r);